Author: hobbes1069 Update of /cvs/free/rpms/sox-plugins-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13882 Modified Files: sox-plugins-freeworld.spec Added Files: 01-Don-t-build-libgsm-avoid-no-portability-warnings.patch 07-Dont-configure-libgsm.patch 07-dont-configure-external-components.patch Removed 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 Log Message: * Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 14.4.0-1 - Update to latest upstream release. 01-Don-t-build-libgsm-avoid-no-portability-warnings.patch: Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE 01-Don-t-build-libgsm-avoid-no-portability-warnings.patch --- From: Alec Leamas <alec(a)tests.notat.diaspora.com&gt; Date: Tue, 30 Oct 2012 20:33:27 +0100 Subject: [PATCH 1/2] Don't build libgsm, avoid no-portability warnings. --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 089b014..36bcbe9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,10 @@ ## 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 +SUBDIRS = lpc10 src +DIST_SUBDIRS = lpc10 src msvc9 msvc10 RM = rm -f -- 1.7.11.4 07-Dont-configure-libgsm.patch: configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE 07-Dont-configure-libgsm.patch --- From: Alec Leamas <alec(a)tests.notat.diaspora.com&gt; Date: Tue, 30 Oct 2012 20:38:19 +0100 Subject: [PATCH] Dont configure libgsm --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9117695..d141104 100644 --- a/configure.ac +++ b/configure.ac @@ -603,7 +603,7 @@ AC_SUBST(PLAYRECLINKS) AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_static" = "yes") dnl Generate output files. -AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc) +AC_CONFIG_FILES(Makefile src/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc) AC_OUTPUT if test "$using_gsm" != "no"; then -- 1.7.11.4 07-dont-configure-external-components.patch: configure.ac | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- NEW FILE 07-dont-configure-external-components.patch --- From: Alec Leamas <alec(a)tests.notat.diaspora.com&gt; Date: Tue, 30 Oct 2012 20:38:19 +0100 Subject: [PATCH 3/3] Don't configure out-of-tree components. Avoid creation of Makefile in components where external ones are instead (lpc10, libgsm). --- configure.ac | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9117695..bfc804f 100644 --- a/configure.ac +++ b/configure.ac @@ -602,23 +602,23 @@ AC_SUBST(PLAYRECLINKS) AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_static" = "yes") -dnl Generate output files. -AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc) -AC_OUTPUT - if test "$using_gsm" != "no"; then if test "$found_libgsm" = "yes"; then gsm_option="(external)" + gsm_makefile="" else gsm_option="(in-tree)" + gsm_makefile="libgsm/Makefile" fi fi if test "$using_lpc10" != "no"; then if test "$found_liblpc10" = "yes"; then lpc10_option="(external)" + lpc10_makefile="" else lpc10_option="(in-tree)" + lpc10_makefile="lpc10/Makefile" fi fi @@ -628,6 +628,11 @@ else pkgconfig_option="$with_pkgconfigdir" fi +dnl Generate output files. +AC_CONFIG_FILES(Makefile src/Makefile $libgsm_makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc) + +AC_OUTPUT + # Report configuration. echo echo "BUILD OPTIONS" -- 1.7.11.4 Index: sox-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/sox-plugins-freeworld/devel/sox-plugins-freeworld.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sox-plugins-freeworld.spec 28 Oct 2012 13:26:08 -0000 1.3 +++ sox-plugins-freeworld.spec 31 Oct 2012 14:27:44 -0000 1.4 @@ -9,14 +9,11 @@ Group: Applications/Multimedia URL: http://sox.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{realname}/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 +Patch0: 01-Don-t-build-libgsm-avoid-no-portability-warnings.patch +#Patch1: 07-dont-configure-external-components.patch +Patch1: 07-Dont-configure-libgsm.patch BuildRequires: libvorbis-devel BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel @@ -46,19 +43,13 @@ %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 +rm -f m4/libtool.m4 %build @@ -66,7 +57,6 @@ autoreconf -if %configure --enable-static=no \ --with-dyn-default \ - --with-lpc10 \ --with-gsm=dyn \ --includedir=%{_includedir}/sox \ --with-distro=Fedora --- 01-making-autoreconf-possible.patch DELETED --- --- 02-reconfigured-using-autoreconf.patch DELETED --- --- 03-adding-support-for-without-lpc.patch DELETED --- --- 04-nuking-libgsm-from-build-system.patch DELETED --- --- 06-fix-compile-error.patch DELETED --- --- 07-ignore-internal-libgsm.patch DELETED ---