Attachment 295071 Details for Bug 226425 – Patch to add modular sox built (need to be approved upstream)

[patch] Patch to add modular sox built (need to be approved upstream)

sox-modular-v1.patch (text/plain), 6.43 KB, created by Nicolas Chauvet (kwizart) on 2008-02-16 14:11:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Chauvet (kwizart)

Created: 2008-02-16 14:11:17 UTC

Size: 6.43 KB

patch

obsolete

>? sox-modular-v1.patch
>Index: sox-14.0.1-avoid_version.patch
>===================================================================
>RCS file: sox-14.0.1-avoid_version.patch
>diff -N sox-14.0.1-avoid_version.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ sox-14.0.1-avoid_version.patch	16 Feb 2008 14:09:29 -0000
>@@ -0,0 +1,57 @@
>+diff -up sox-14.0.1/configure.ac.avoid_version sox-14.0.1/configure.ac
>+--- sox-14.0.1/configure.ac.avoid_version	2008-01-28 23:47:14.000000000 +0100
>++++ sox-14.0.1/configure.ac	2008-02-07 17:12:53.000000000 +0100
>+@@ -52,6 +52,18 @@ if test "$using_libltdl" != "no"; then
>+ fi
>+ AM_CONDITIONAL(HAVE_LIBLTDL, test x$using_libltdl = xyes)
>+ 
>++LIBSOX_VERSION_CURRENT=1
>++LIBSOX_VERSION_REVISION=0
>++LIBSOX_VERSION_AGE=0
>++LIBSOX_VERSION_INFO=$LIBSOX_VERSION_CURRENT:$LIBSOX_VERSION_REVISION:$LIBSOX_VERSION_AGE
>++AC_SUBST(LIBSOX_VERSION_INFO)
>++
>++LIBSFX_VERSION_CURRENT=1
>++LIBSFX_VERSION_REVISION=0
>++LIBSFX_VERSION_AGE=0
>++LIBSFX_VERSION_INFO=$LIBSFX_VERSION_CURRENT:$LIBSFX_VERSION_REVISION:$LIBSFX_VERSION_AGE
>++AC_SUBST(LIBSFX_VERSION_INFO)
>++
>+ m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG])
>+ 
>+ dnl Debugging
>+diff -up sox-14.0.1/src/Makefile.am.avoid_version sox-14.0.1/src/Makefile.am
>+--- sox-14.0.1/src/Makefile.am.avoid_version	2008-01-14 04:40:59.000000000 +0100
>++++ sox-14.0.1/src/Makefile.am	2008-02-07 17:12:53.000000000 +0100
>+@@ -28,7 +28,7 @@ sox_sample_test_SOURCES = sox_sample_tes
>+ 
>+ if HAVE_LIBLTDL
>+ AM_CFLAGS += $(LTDLINCL)
>+-AM_LDFLAGS = $(LIBLTDL)
>++AM_LDFLAGS = $(LIBLTDL) -avoid-version
>+ 
>+ # Format modules; listed first so optional ones can be added later
>+ pkglib_LTLIBRARIES = libsox_fmt_auto.la libsox_fmt_raw.la libsox_fmt_s1.la \
>+@@ -202,6 +202,10 @@ libsfx_la_SOURCES = band.h biquad.c biqu
>+ 	  vol.c
>+ libsfx_la_CFLAGS = @SAMPLERATE_CFLAGS@
>+ libsfx_la_LIBADD = @SAMPLERATE_LIBS@ libsox.la
>++libsfx_la_LDFLAGS = -version-info @LIBSFX_VERSION_INFO@
>++if HAVE_LIBLTDL
>++libsfx_la_LDFLAGS += $(LIBLTDL)
>++endif
>+ 
>+ ############################################
>+ # libsox - file format and utility library #
>+@@ -213,6 +217,10 @@ libsox_la_SOURCES = adpcms.c adpcms.h ai
>+ 	  soxio.c util.c xmalloc.c xmalloc.h getopt.c getopt1.c getopt.h \
>+ 	  soxconfig.h
>+ libsox_la_CFLAGS = 
>++libsox_la_LDFLAGS = -version-info @LIBSOX_VERSION_INFO@ 
>++if HAVE_LIBLTDL
>++libsox_la_LDFLAGS += $(LIBLTDL)
>++endif
>+ 
>+ if HAVE_LIBLTDL
>+ else
>+
>Index: sox.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/sox/devel/sox.spec,v
>retrieving revision 1.31
>diff -u -r1.31 sox.spec
>--- sox.spec	29 Oct 2007 12:07:15 -0000	1.31
>+++ sox.spec	16 Feb 2008 14:09:29 -0000
>@@ -1,24 +1,45 @@
> Summary: A general purpose sound file conversion tool
> Name: sox
>-Version: 14.0.0
>+Version: 14.0.1
> Release: 1%{?dist}
>-License: GPL
>+License: GPLv2+ and LGPLv2+
> Group: Applications/Multimedia
>-Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
>+Source0: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
>+Patch0: sox-14.0.1-avoid_version.patch
> URL: http://sox.sourceforge.net/
>+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+
> BuildRequires: libvorbis-devel
> BuildRequires: alsa-lib-devel
> BuildRequires: gsm-devel
>-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+BuildRequires: ladspa-devel
>+BuildRequires: libsamplerate-devel
>+BuildRequires: libtool-ltdl-devel
>+BuildRequires: libid3tag-devel
>+BuildRequires: libtool, automake, autoconf
> 
> %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.
> 
>+%package        libs
>+Summary:        Library for %{name}
>+Group:          System Environment/Libraries
>+# Introduced in F-9 to solve multilib transition
>+Obsoletes:      sox < 14.0.1
>+
>+%description    libs
>+The %{name}-libs package contains library for %{name}.
>+
> %package -n  sox-devel
>-Summary: The SoX sound file format converter libraries.
>+Summary: The SoX sound file format converter libraries
> Group: Development/Libraries
>+Requires: %{name}-libs = %{version}-%{release}
>+# Might be uneeded since we use modular sox libs.
>+#Requires: libvorbis-devel
>+#Requires: alsa-lib-devel
>+#Requires: gsm-devel
> 
> %description -n sox-devel 
> This package contains the library needed for compiling applications
>@@ -26,48 +47,70 @@
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .avoid_version
>+
>+# Fix spurious executable perms
>+chmod 644 src/{tempo.c,key.c}
>+
>+# Re-run autotools
>+aclocal -I m4
>+autoconf
>+automake --gnu
>+
>+
> 
> %build
>-CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-gsm --includedir=%{_includedir}/sox
>+CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-gsm --disable-static --includedir=%{_includedir}/sox
> make %{?_smp_mflags}
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-make install DESTDIR=$RPM_BUILD_ROOT
>-rm -f $RPM_BUILD_ROOT/%{_libdir}/libsox.la
>-rm -f $RPM_BUILD_ROOT/%{_libdir}/libsfx.la
>-rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.la
>-rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a
>+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
>+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
> 
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-%post -p /sbin/ldconfig
>+%post libs -p /sbin/ldconfig
> 
>-%postun -p /sbin/ldconfig
>+%postun libs -p /sbin/ldconfig
> 
> %files
> %defattr(-,root,root)
>-%doc AUTHORS ChangeLog COPYING README
>-%{_bindir}/play
>-%{_bindir}/rec
>+%doc sox.txt
>+# This part is GPLv2+
> %{_bindir}/sox
>-%{_libdir}/libsox.so.*
>-%{_libdir}/libsfx.so.*
>+# Too much generic name  - Patches apps to use sox instead
>+%exclude %{_bindir}/play
>+%exclude %{_bindir}/rec
> %{_mandir}/man1/*
> %{_mandir}/man7/*
> 
>+%files libs
>+%defattr(-,root,root)
>+%doc AUTHORS ChangeLog COPYING README
>+# This part is LGPLv2+ or GPLv2+ when linked against GPL libs
>+%{_libdir}/libsox.so.*
>+%{_libdir}/libsfx.so.*
>+%dir %{_libdir}/sox
>+%{_libdir}/sox/*.so
>+
> %files -n sox-devel
> %defattr(-,root,root)
>-%{_includedir}/sox
>-%{_libdir}/libsox.a
>+%{_includedir}/sox/
> %{_libdir}/libsox.so
>-%{_libdir}/libsfx.a
> %{_libdir}/libsfx.so
> %{_mandir}/man3/*
> 
> %changelog
>+* Wed Feb  6 2008 kwizart < kwizart at gmail.com > - 14.0.1-1
>+- Update to 14.0.1
>+- Disable static
>+- Split libs for multilibs
>+- Build modular libs (BR libtool-ltdl-devel )
>+- Add missing BR in sox-devel
>+
> * Mon Oct 29 2007 Jiri Moskovcak <jmoskovc@redhat.com> - 14.0.0-1
> - New version 14.0.0
> - Thanks to Chris Bagwell <chris at cnpbagwell dot com> for initial changes to spec file

Actions: View | Diff

Attachments on bug 226425: 295071 | 313708