diff --git a/sox-14.4.1-lpc10.patch b/sox-14.4.1-lpc10.patch deleted file mode 100644 index 92b98de..0000000 --- a/sox-14.4.1-lpc10.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up wrk/configure.ac.wrk wrk/configure.ac ---- wrk/configure.ac.wrk 2013-07-12 17:19:34.079965200 +0200 -+++ wrk/configure.ac 2013-07-22 16:53:01.630128139 +0200 -@@ -414,8 +414,6 @@ AC_CHECK_HEADERS(lpc10.h, , - AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no) - if test "$found_liblpc10" = yes; then - AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library]) --else -- LIBLPC10_LIBADD=../lpc10/liblpc10.la - fi - AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes) - AC_SUBST(LIBLPC10_LIBADD) -@@ -603,7 +601,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 libgsm/Makefile msvc9/Makefile msvc10/Makefile sox.pc) - AC_OUTPUT - - if test "$using_gsm" != "no"; then -diff -up wrk/Makefile.am.wrk wrk/Makefile.am ---- wrk/Makefile.am.wrk 2013-07-12 17:17:11.512971143 +0200 -+++ wrk/Makefile.am 2013-07-12 17:17:29.990970373 +0200 -@@ -2,8 +2,8 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = lpc10 libgsm src --DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10 -+SUBDIRS = libgsm src -+DIST_SUBDIRS = libgsm src msvc9 msvc10 - - RM = rm -f - diff --git a/sox-14.4.2-lpc10.patch b/sox-14.4.2-lpc10.patch new file mode 100644 index 0000000..da359be --- /dev/null +++ b/sox-14.4.2-lpc10.patch @@ -0,0 +1,35 @@ +diff -Naur sox-14.4.2.orig/configure.ac sox-14.4.2/configure.ac +--- sox-14.4.2.orig/configure.ac 2015-02-22 14:48:57.000000000 -0600 ++++ sox-14.4.2/configure.ac 2015-11-06 11:48:26.179858149 -0600 +@@ -471,8 +471,6 @@ + AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no) + if test "$found_liblpc10" = yes; then + AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library]) +-else +- LIBLPC10_LIBADD=../lpc10/liblpc10.la + fi + AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes) + AC_SUBST(LIBLPC10_LIBADD) +@@ -670,7 +668,7 @@ + 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 libgsm/Makefile msvc9/Makefile msvc10/Makefile sox.pc) + AC_OUTPUT + + if test "$using_gsm" != "no"; then +diff -Naur sox-14.4.2.orig/Makefile.am sox-14.4.2/Makefile.am +--- sox-14.4.2.orig/Makefile.am 2014-10-05 21:02:30.000000000 -0500 ++++ sox-14.4.2/Makefile.am 2015-11-06 11:48:26.179858149 -0600 +@@ -2,8 +2,8 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = lpc10 libgsm src +-DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10 ++SUBDIRS = libgsm src ++DIST_SUBDIRS = libgsm src msvc9 msvc10 + + RM = rm -f + diff --git a/sox-14.4.2-lsx_symbols.patch b/sox-14.4.2-lsx_symbols.patch new file mode 100644 index 0000000..f5cebd7 --- /dev/null +++ b/sox-14.4.2-lsx_symbols.patch @@ -0,0 +1,12 @@ +diff -Naur sox-14.4.2.orig/src/Makefile.am sox-14.4.2/src/Makefile.am +--- sox-14.4.2.orig/src/Makefile.am 2014-10-29 22:29:54.000000000 -0500 ++++ sox-14.4.2/src/Makefile.am 2015-11-06 09:49:34.466595616 -0600 +@@ -95,7 +95,7 @@ + + libsox_la_CFLAGS = @WARN_CFLAGS@ + libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ +- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' ++ -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|flush|error|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' + + if HAVE_WIN32_LTDL + libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h diff --git a/sox.spec b/sox.spec index 273e412..1e63572 100644 --- a/sox.spec +++ b/sox.spec @@ -1,14 +1,15 @@ Summary: A general purpose sound file conversion tool Name: sox Version: 14.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ and MIT Group: Applications/Multimedia #Modified source tarball with libgsm license, without unlicensed liblpc10 #Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source: %{name}/%{name}-%{version}.modified.tar.gz URL: http://sox.sourceforge.net/ -Patch1: sox-14.4.1-lpc10.patch +Patch0: sox-14.4.2-lsx_symbols.patch +Patch1: sox-14.4.2-lpc10.patch BuildRequires: libvorbis-devel BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel @@ -24,7 +25,7 @@ sound manipulation functions, including sound effects. %package -n sox-devel Summary: The SoX sound file format converter libraries Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description -n sox-devel @@ -33,34 +34,21 @@ which will use the SoX sound file format converter. %prep %setup -q +%patch0 -p1 %patch1 -p1 -b .lpc #regenerate scripts from older autoconf to support aarch64 autoreconf -vfi %build CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" -%configure --without-lpc10 --with-gsm --includedir=%{_includedir}/sox --disable-static --with-distro=Fedora \ ---with-alsa=dyn \ ---with-ao=dyn \ ---with-caf=dyn \ ---with-fap=dyn \ ---with-mat4=dyn \ ---with-mat5=dyn \ ---with-opus=dyn \ ---with-paf=dyn \ ---with-pulseaudio=dyn \ ---with-pvf=dyn \ ---with-sd2=dyn \ ---with-sndfile=dyn \ ---with-vorbis=dyn \ ---with-w64=dyn \ ---with-wavpack=dyn \ ---with-xi=dyn -#--with-dyn-default is broken (flac and oss dont link), therefore plugins enumerated explicitly -#--with-flac=dyn \ -#--with-oss=dyn \ - -make %{?_smp_mflags} +%configure --without-lpc10 \ + --with-gsm \ + --includedir=%{_includedir}/sox \ + --disable-static \ + --with-distro=Fedora \ + --with-dyn-default + +make V=1 %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -74,7 +62,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a %postun -p /sbin/ldconfig %files -%doc AUTHORS ChangeLog COPYING README +%{!?_licensedir:%global license %doc} +%license COPYING +%doc AUTHORS ChangeLog README %{_bindir}/play %{_bindir}/rec %{_bindir}/sox @@ -93,6 +83,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sox/*.a %changelog +* Tue Nov 10 2015 Richard Shaw - 14.4.2-4 +- Expose required lsx_* symbols so all plugins can build dynamically. +- Minor spec fixes for merge review, RHBZ#226425. + * Wed Aug 19 2015 Frantisek Kluknavsky - 14.4.2-3 - play opus files (added dependency on opusfile)