Author: hobbes1069 Update of /cvs/free/rpms/sox-plugins-freeworld/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11090 Added Files: 01-making-autoreconf-possible.patch 02-reconfigured-using-autoreconf.patch 03-adding-support-for-without-lpc.patch 04-nuking-libgsm-from-build-system.patch 06-fix-compile-error.patch 07-ignore-internal-libgsm.patch sox-plugins-freeworld.spec Log Message: * Thu Mar 22 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-3 - Add patches to deal with bundled libraries. 01-making-autoreconf-possible.patch: b/Makefile.am | 1 m4/libtool.m4 | 7441 ---------------------------------------------------------- 2 files changed, 1 insertion(+), 7441 deletions(-) --- NEW FILE 01-making-autoreconf-possible.patch --- Making autoreconf possible From: Alec Leamas <leamas.alec(a)gmail.com&gt; --- Makefile.am | 9 m4/libtool.m4 | 7441 --------------------------------------------------------- 2 files changed, 5 insertions(+), 7445 deletions(-) delete mode 100644 m4/libtool.m4 diff --git a/Makefile.am b/Makefile.am index cc2dbb1..cbcb8ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = -Wno-portability SUBDIRS = lpc10 libgsm src DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10 diff --git a/m4/libtool.m4 b/m4/libtool.m4 deleted file mode 100644 index 8c99a62..0000000 --- a/m4/libtool.m4 +++ /dev/null @@ -1,7441 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl [...7073 lines suppressed...] -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF - ;; - esac -]) 02-reconfigured-using-autoreconf.patch: Makefile.in | 3 aclocal.m4 | 4 compile | 21 config.guess | 221 ++--- config.sub | 58 + configure | 1808 ++++++++++++++++++++++++++++++-------------- depcomp | 87 +- install-sh | 5 libgsm/Makefile.in | 2 lpc10/Makefile.in | 2 ltmain.sh | 2155 +++++++++++++++++++++++++++++++++++++---------------- m4/ltversion.m4 | 12 missing | 49 - msvc10/Makefile.in | 2 msvc9/Makefile.in | 2 src/Makefile.in | 2 16 files changed, 3028 insertions(+), 1405 deletions(-) --- NEW FILE 02-reconfigured-using-autoreconf.patch --- Reconfigured using autoreconf -fi From: Alec Leamas <leamas.alec(a)gmail.com&gt; --- Makefile.in | 11 aclocal.m4 | 4 compile | 21 config.guess | 221 ++--- config.sub | 58 + configure | 1932 ++++++++++++++++++++++++++++-------------- depcomp | 87 +- install-sh | 5 libgsm/Makefile.in | 2 lpc10/Makefile.in | 2 ltmain.sh | 2405 ++++++++++++++++++++++++++++++++++++---------------- m4/ltversion.m4 | 12 missing | 49 + msvc10/Makefile.in | 2 msvc9/Makefile.in | 2 src/Makefile.in | 2 16 files changed, 3219 insertions(+), 1596 deletions(-) diff --git a/Makefile.in b/Makefile.in index dd8c345..ee53dba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,6 +205,7 @@ LPC10_LIBS = @LPC10_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAGIC_LIBS = @MAGIC_LIBS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ @@ -257,6 +258,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -309,6 +311,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = -Wno-portability SUBDIRS = lpc10 libgsm src DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10 RM = rm -f diff --git a/aclocal.m4 b/aclocal.m4 index 775bb46..8dc0963 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, -[m4_warning([this file was generated for autoconf 2.66. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/compile b/compile index 1b1d232..c0096a7 100755 --- a/compile +++ b/compile @@ -1,9 +1,10 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2009-10-06.20; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com&gt;. # # This program is free software; you can redistribute it and/or modify @@ -17,8 +18,7 @@ scriptversion=2005-05-14.22 # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>;. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15 ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" @@ -138,5 +138,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/config.guess b/config.guess index 7b24a87..dc84c68 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2008-11-15' +timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ timestamp='2008-11-15' # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner <per(a)bothner.com&gt;. -# Please send patches to <config-patches(a)gnu.org&gt;. Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to <config-patches(a)gnu.org&gt; and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gu... me=`echo "$0" | sed -e 's,.*/,,'` @@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -324,12 +324,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build [...8982 lines suppressed...] # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>;. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ Supported PROGRAM values: tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org&gt;.&quot; exit $? ;; @@ -106,15 +107,22 @@ Send bug reports to <bug-automake(a)gnu.org&gt;.&quot; esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ esac # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg. fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/msvc10/Makefile.in b/msvc10/Makefile.in index bb8af26..85cd9d9 100644 --- a/msvc10/Makefile.in +++ b/msvc10/Makefile.in @@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAGIC_LIBS = @MAGIC_LIBS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ @@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/msvc9/Makefile.in b/msvc9/Makefile.in index 2162f0e..9393c70 100644 --- a/msvc9/Makefile.in +++ b/msvc9/Makefile.in @@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAGIC_LIBS = @MAGIC_LIBS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ @@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/src/Makefile.in b/src/Makefile.in index 639ce91..b25a90e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -732,6 +732,7 @@ LPC10_LIBS = @LPC10_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAGIC_LIBS = @MAGIC_LIBS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MP3_CFLAGS = @MP3_CFLAGS@ MP3_LIBS = @MP3_LIBS@ @@ -784,6 +785,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ 03-adding-support-for-without-lpc.patch: configure | 37 +++++++++++++++++++++++++------------ configure.ac | 27 ++++++++++++++++++--------- 2 files changed, 43 insertions(+), 21 deletions(-) --- NEW FILE 03-adding-support-for-without-lpc.patch --- Adding support for --without-lpc10 From: Alec Leamas <leamas.alec(a)gmail.com&gt; --- configure | 41 +++++++++++++++++++++------------ configure.ac | 73 +++++++++++++++++++++++++++++++++------------------------- 2 files changed, 68 insertions(+), 46 deletions(-) diff --git a/configure b/configure index c063f96..b326b3d 100755 --- a/configure +++ b/configure @@ -728,9 +728,9 @@ STATIC_OGG_VORBIS_FALSE STATIC_OGG_VORBIS_TRUE HAVE_OGG_VORBIS_FALSE HAVE_OGG_VORBIS_TRUE -LIBLPC10_LIBADD EXTERNAL_LPC10_FALSE EXTERNAL_LPC10_TRUE +LIBLPC10_LIBADD LIBGSM_LIBADD EXTERNAL_GSM_FALSE EXTERNAL_GSM_TRUE @@ -907,6 +907,7 @@ enable_dl_mad with_id3tag with_lame enable_dl_lame +with_lpc10 with_oggvorbis with_flac enable_dl_amrwb @@ -927,7 +928,6 @@ with_oss with_sunaudio with_mp3 with_gsm -with_lpc10 enable_symlinks ' ac_precious_vars='build_alias @@ -1607,6 +1607,7 @@ Optional Packages: --without-mad Don't try to use MAD (MP3 Audio Decoder) --without-id3tag Don't try to use id3tag --without-lame Don't try to use LAME (LAME Ain't an MP3 Encoder) + --without-lpc10 Don't try to use lpc10 --with-oggvorbis=dyn load oggvorbis dynamically --with-flac=dyn load flac dynamically --with-amrwb=dyn load amrwb dynamically @@ -14156,9 +14157,18 @@ fi -# Check for liblpc10 -found_liblpc10=yes -for ac_header in lpc10.h +using_lpc10=no + +# Check whether --with-lpc10 was given. +if test "${with_lpc10+set}" = set; then : + withval=$with_lpc10; +fi + +if test "$with_lpc10" != no; then + using_lpc10=yes + # Check for liblpc10 + found_liblpc10=yes + for ac_header in lpc10.h do : ac_fn_c_check_header_mongrel "$LINENO" "lpc10.h" "ac_cv_header_lpc10_h" "$ac_includes_default" if test "x$ac_cv_header_lpc10_h" = xyes; then : @@ -14227,12 +14237,14 @@ else found_liblpc10=no fi -if test "$found_liblpc10" = yes; then + if test "$found_liblpc10" = yes; then $as_echo "#define EXTERNAL_LPC10 1" >>confdefs.h -else + else LIBLPC10_LIBADD=../lpc10/liblpc10.la + fi + fi if test x$found_liblpc10 = xyes; then EXTERNAL_LPC10_TRUE= @@ -14244,8 +14256,6 @@ fi - - # Check for Ogg Vorbis # Check whether --with-oggvorbis was given. @@ -16544,7 +16554,7 @@ as_fn_error $? "invalid selection --with-lpc10=$with_lpc10 See \`config.log' for more details" "$LINENO" 5; } fi if test _$with_lpc10 != _no; then - + "$using_lpc10"=yes if test _$with_lpc10 != _ -a $using_lpc10 = no; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -17085,7 +17095,10 @@ $as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" ac_config_commands="$ac_config_commands $ac_stdint_h" -ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc" +if test "$using_lpc10" = yes; then + lpc10_makefile=lpc10/Makefile +fi +ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18313,7 +18326,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "libgsm/Makefile") CONFIG_FILES="$CONFIG_FILES libgsm/Makefile" ;; - "lpc10/Makefile") CONFIG_FILES="$CONFIG_FILES lpc10/Makefile" ;; + "$lpc10_makefile") CONFIG_FILES="$CONFIG_FILES $lpc10_makefile" ;; "msvc9/Makefile") CONFIG_FILES="$CONFIG_FILES msvc9/Makefile" ;; "msvc10/Makefile") CONFIG_FILES="$CONFIG_FILES msvc10/Makefile" ;; "sox.pc") CONFIG_FILES="$CONFIG_FILES sox.pc" ;; diff --git a/configure.ac b/configure.ac index ae249bc..3277172 100644 --- a/configure.ac +++ b/configure.ac @@ -389,19 +389,25 @@ AC_SUBST(LIBGSM_LIBADD) -# Check for liblpc10 -found_liblpc10=yes -AC_CHECK_HEADERS(lpc10.h, , +dnl Check for liblpc10 library. +using_lpc10=no +AC_ARG_WITH(lpc10, + AC_HELP_STRING([--without-lpc10], [Dont try to use lpc10])) +if test "$with_lpc10" != no; then + using_lpc10=yes + # Check for liblpc10 + found_liblpc10=yes + AC_CHECK_HEADERS(lpc10.h, , [AC_CHECK_HEADERS(lpc10.h, ,found_liblpc10=no)]) AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no) -if test "$found_liblpc10" = yes; then + if test "$found_liblpc10" = yes; then AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library]) -else + else LIBLPC10_LIBADD=../lpc10/liblpc10.la + fi + AC_SUBST(LIBLPC10_LIBADD) fi AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes) -AC_SUBST(LIBLPC10_LIBADD) - # Check for Ogg Vorbis @@ -559,7 +565,7 @@ AC_OPTIONAL_FORMAT(gsm, GSM) # LPC10 format depends on liblpc10 # No need to check; LPC10 is always found -AC_OPTIONAL_FORMAT(lpc10, LPC10) +AC_OPTIONAL_FORMAT(lpc10, LPC10, ["$using_lpc10"=yes]) @@ -591,7 +597,10 @@ AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_stat dnl Generate output files. AX_CREATE_STDINT_H(src/soxstdint.h) -AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc) +if test "$using_lpc10" = yes; then + lpc10_makefile=lpc10/Makefile +fi +AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc) AC_OUTPUT if test "$using_gsm" != "no"; then 04-nuking-libgsm-from-build-system.patch: Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE 04-nuking-libgsm-from-build-system.patch --- diff --git a/Makefile.am b/Makefile.am index cbcb8ed..7f67e60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = -Wno-portability -SUBDIRS = lpc10 libgsm src -DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10 +SUBDIRS = lpc10 src +DIST_SUBDIRS = lpc10 src msvc9 msvc10 RM = rm -f 06-fix-compile-error.patch: ffmpeg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- NEW FILE 06-fix-compile-error.patch --- Fix for CODEC_TYPE_AUDIO not found compile error From: Alec Leamas <leamas.alec(a)gmail.com&gt; --- src/ffmpeg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ffmpeg.c b/src/ffmpeg.c index e6292f3..b9727ba 100644 --- a/src/ffmpeg.c +++ b/src/ffmpeg.c @@ -91,7 +91,7 @@ static int stream_component_open(priv_t * ffmpeg, int stream_index) if (!codec || avcodec_open(enc, codec) < 0) return -1; - if (enc->codec_type != CODEC_TYPE_AUDIO) { + if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); return -1; } @@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) /* Find audio stream (FIXME: allow different stream to be selected) */ for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { + if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { ffmpeg->audio_index = i; break; } @@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_format_t * ft, AVFormatContext *oc, enum C c = st->codec; c->codec_id = codec_id; - c->codec_type = CODEC_TYPE_AUDIO; + c->codec_type = AVMEDIA_TYPE_AUDIO; /* put sample parameters */ c->bit_rate = 256000; /* FIXME: allow specification */ @@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t * ft, const sox_sample_t *buf, size_t l av_init_packet(&pkt); pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); - pkt.flags |= PKT_FLAG_KEY; + pkt.flags |= AV_PKT_FLAG_KEY; pkt.stream_index = ffmpeg->audio_st->index; pkt.data = ffmpeg->audio_buf_aligned; 07-ignore-internal-libgsm.patch: configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- NEW FILE 07-ignore-internal-libgsm.patch --- diff -Naur sox-14.3.2.orig/configure.ac sox-14.3.2/configure.ac --- sox-14.3.2.orig/configure.ac 2012-03-22 10:00:31.150631401 -0500 +++ sox-14.3.2/configure.ac 2012-03-22 10:03:05.872649536 -0500 @@ -600,7 +600,10 @@ if test "$using_lpc10" = yes; then lpc10_makefile=lpc10/Makefile fi -AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc) +if test "$using_libgsm" = yes; then + libgsm_makefile=libgsm/Makefile +fi +AC_CONFIG_FILES(Makefile src/Makefile $libgsm_makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc) AC_OUTPUT if test "$using_gsm" != "no"; then --- NEW FILE sox-plugins-freeworld.spec --- %global realname sox Summary: Additional (free) codecs for sox Name: sox-plugins-freeworld Version: 14.3.2 Release: 3%{?dist} # sox.c is GPLv2, all other is LGPL2.1 License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://sox.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz Patch0: 01-making-autoreconf-possible.patch Patch1: 02-reconfigured-using-autoreconf.patch Patch2: 03-adding-support-for-without-lpc.patch Patch3: 04-nuking-libgsm-from-build-system.patch Patch4: 06-fix-compile-error.patch Patch5: 07-ignore-internal-libgsm.patch BuildRequires: libvorbis-devel BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel BuildRequires: pulseaudio-libs-devel BuildRequires: libtool # Additional requirements for RPM Fusion BuildRequires: lame-devel ladspa-devel BuildRequires: libmad-devel # Require Fedora package Requires: sox%{?_isa} # No upstream exists and it has been moified by sox. Provides: bundled(lpc10) %description SoX (Sound eXchange) is a sound file format converter SoX can convert between many different digitized sound formats and perform simple sound manipulation functions, including sound effects. This package provides the plugin for MPEG-2 audio layer 3 audio (MP3) support. %prep %setup -q -n %{realname}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 # Only appliy for ffmpeg 0.8 and above %if %fedora >= 16 %patch4 -p1 %endif %patch5 -p1 # Remove bundled libs rm -rf libgsm # lpc10 has no upstream so consider it a private lib. # See http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2012-March/0120... #rm -rf lpc10 %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"; export CFLAGS autoreconf -if %configure --enable-static=no \ --with-dyn-default \ --with-lpc10 \ --with-gsm=dyn \ --includedir=%{_includedir}/sox \ --with-distro=Fedora make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} # Remove all static libs find %{buildroot}%{_libdir} -name "*.la" -exec rm -f {} \; # Remove all the plugins execept the one we want. find %{buildroot}%{_libdir}/sox -name "*.so" \! -name "*mp3.so" -exec rm -f {} \; %files %doc AUTHORS ChangeLog COPYING README %{_libdir}/sox/libsox_fmt_mp3.so %exclude %{_bindir} %exclude %{_datadir} %exclude %{_includedir} %exclude %{_libdir}/*.so* %exclude %{_libdir}/pkgconfig %changelog * Thu Mar 22 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-3 - Add patches to deal with bundled libraries. * Thu Mar 01 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-2 - Strip rpath from library. * Sun Feb 26 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.3.2-1 - Initial Release.