Date: Thu, 13 Nov 2008 21:40:05 GMT From: Dan Nelson <dnelson@allantgroup.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/128849: audio/sox bump to 14.2.0 Message-ID: <200811132140.mADLe5gY001049@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/128849; it has been noted by GNATS. From: Dan Nelson <dnelson@allantgroup.com> To: Peter Beckman <beckman@angryox.com> Cc: bug-followup@freebsd.org Subject: Re: ports/128849: audio/sox bump to 14.2.0 Date: Thu, 13 Nov 2008 15:11:04 -0600 --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In the last episode (Nov 13), Peter Beckman said: > I was able to get it working... here's a diff. They fixed the > parenthesis stuff, so I removed the patch file. It's never that easy :) It looks like sox-14.2.0 removed a shared library, bumped the version of libsox.so, removed a manpage, and also removed the .so.0 files for all of its loadable modules. Try the attached patch. -- Dan Nelson dnelson@allantgroup.com --ikeVEW9yuYc//A+q Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="sox.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/sox/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- Makefile 24 Sep 2008 12:12:25 -0000 1.40 +++ Makefile 13 Nov 2008 19:42:51 -0000 @@ -6,7 +6,7 @@ # PORTNAME= sox -PORTVERSION= 14.1.0 +PORTVERSION= 14.2.0 CATEGORIES= audio MASTER_SITES= SF @@ -17,14 +17,12 @@ MAN1= sox.1 soxi.1 MAN3= libsox.3 -MAN7= soxformat.7 soxeffect.7 +MAN7= soxformat.7 MLINKS= sox.1 play.1 sox.1 rec.1 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libltdl USE_GNOME= pkgconfig -# src/Makefile uses ${RM} but never sets it -MAKE_ENV+= RM="rm -f" .if defined(PACKAGE_BUILDING) _LAME= off Index: distinfo =================================================================== RCS file: /home/ncvs/ports/audio/sox/distinfo,v retrieving revision 1.18 diff -u -r1.18 distinfo --- distinfo 24 Sep 2008 12:12:25 -0000 1.18 +++ distinfo 13 Nov 2008 19:12:35 -0000 @@ -1,3 +1,3 @@ -MD5 (sox-14.1.0.tar.gz) = b8e2cb3d615d3830347a0948dd8b74a8 -SHA256 (sox-14.1.0.tar.gz) = 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101 -SIZE (sox-14.1.0.tar.gz) = 912057 +MD5 (sox-14.2.0.tar.gz) = 7afc0e85d14be014f08e7d3b7ee8c24e +SHA256 (sox-14.2.0.tar.gz) = 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1 +SIZE (sox-14.2.0.tar.gz) = 964800 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/sox/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 24 Sep 2008 12:12:25 -0000 1.10 +++ pkg-plist 13 Nov 2008 20:54:43 -0000 @@ -5,261 +5,195 @@ bin/soxi include/sox.h include/soxstdint.h -lib/libsfx.a -lib/libsfx.la -lib/libsfx.so -lib/libsfx.so.0 lib/libsox.a lib/libsox.la lib/libsox.so -lib/libsox.so.0 +lib/libsox.so.1 lib/sox/libsox_fmt_aifc.a lib/sox/libsox_fmt_aifc.la lib/sox/libsox_fmt_aifc.so -lib/sox/libsox_fmt_aifc.so.0 lib/sox/libsox_fmt_aiff.a lib/sox/libsox_fmt_aiff.la lib/sox/libsox_fmt_aiff.so -lib/sox/libsox_fmt_aiff.so.0 lib/sox/libsox_fmt_al.a lib/sox/libsox_fmt_al.la lib/sox/libsox_fmt_al.so -lib/sox/libsox_fmt_al.so.0 %%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.a %%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.la %%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.so -%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.so.0 %%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.a %%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.la %%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.so -%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.so.0 %%PLIST_AO%%lib/sox/libsox_fmt_ao.a %%PLIST_AO%%lib/sox/libsox_fmt_ao.la %%PLIST_AO%%lib/sox/libsox_fmt_ao.so -%%PLIST_AO%%lib/sox/libsox_fmt_ao.so.0 lib/sox/libsox_fmt_au.a lib/sox/libsox_fmt_au.la lib/sox/libsox_fmt_au.so -lib/sox/libsox_fmt_au.so.0 lib/sox/libsox_fmt_avr.a lib/sox/libsox_fmt_avr.la lib/sox/libsox_fmt_avr.so -lib/sox/libsox_fmt_avr.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so.0 lib/sox/libsox_fmt_cdr.a lib/sox/libsox_fmt_cdr.la lib/sox/libsox_fmt_cdr.so -lib/sox/libsox_fmt_cdr.so.0 lib/sox/libsox_fmt_cvsd.a lib/sox/libsox_fmt_cvsd.la lib/sox/libsox_fmt_cvsd.so -lib/sox/libsox_fmt_cvsd.so.0 lib/sox/libsox_fmt_dat.a lib/sox/libsox_fmt_dat.la lib/sox/libsox_fmt_dat.so -lib/sox/libsox_fmt_dat.so.0 lib/sox/libsox_fmt_dvms.a lib/sox/libsox_fmt_dvms.la lib/sox/libsox_fmt_dvms.so -lib/sox/libsox_fmt_dvms.so.0 lib/sox/libsox_fmt_f4.a lib/sox/libsox_fmt_f4.la lib/sox/libsox_fmt_f4.so -lib/sox/libsox_fmt_f4.so.0 lib/sox/libsox_fmt_f8.a lib/sox/libsox_fmt_f8.la lib/sox/libsox_fmt_f8.so -lib/sox/libsox_fmt_f8.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so.0 %%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a %%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la %%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so -%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so.0 %%PLIST_FLAC%%lib/sox/libsox_fmt_flac.a %%PLIST_FLAC%%lib/sox/libsox_fmt_flac.la %%PLIST_FLAC%%lib/sox/libsox_fmt_flac.so -%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.so.0 lib/sox/libsox_fmt_gsm.a lib/sox/libsox_fmt_gsm.la lib/sox/libsox_fmt_gsm.so -lib/sox/libsox_fmt_gsm.so.0 lib/sox/libsox_fmt_hcom.a lib/sox/libsox_fmt_hcom.la lib/sox/libsox_fmt_hcom.so -lib/sox/libsox_fmt_hcom.so.0 lib/sox/libsox_fmt_htk.a lib/sox/libsox_fmt_htk.la lib/sox/libsox_fmt_htk.so -lib/sox/libsox_fmt_htk.so.0 lib/sox/libsox_fmt_ima.a lib/sox/libsox_fmt_ima.la lib/sox/libsox_fmt_ima.so -lib/sox/libsox_fmt_ima.so.0 lib/sox/libsox_fmt_la.a lib/sox/libsox_fmt_la.la lib/sox/libsox_fmt_la.so -lib/sox/libsox_fmt_la.so.0 lib/sox/libsox_fmt_lpc10.a lib/sox/libsox_fmt_lpc10.la lib/sox/libsox_fmt_lpc10.so -lib/sox/libsox_fmt_lpc10.so.0 lib/sox/libsox_fmt_lu.a lib/sox/libsox_fmt_lu.la lib/sox/libsox_fmt_lu.so -lib/sox/libsox_fmt_lu.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so.0 lib/sox/libsox_fmt_maud.a lib/sox/libsox_fmt_maud.la lib/sox/libsox_fmt_maud.so -lib/sox/libsox_fmt_maud.so.0 %%PLIST_MP3%%lib/sox/libsox_fmt_mp3.a %%PLIST_MP3%%lib/sox/libsox_fmt_mp3.la %%PLIST_MP3%%lib/sox/libsox_fmt_mp3.so -%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.so.0 lib/sox/libsox_fmt_nul.a lib/sox/libsox_fmt_nul.la lib/sox/libsox_fmt_nul.so -lib/sox/libsox_fmt_nul.so.0 lib/sox/libsox_fmt_oss.a lib/sox/libsox_fmt_oss.la lib/sox/libsox_fmt_oss.so -lib/sox/libsox_fmt_oss.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so.0 lib/sox/libsox_fmt_prc.a lib/sox/libsox_fmt_prc.la lib/sox/libsox_fmt_prc.so -lib/sox/libsox_fmt_prc.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so.0 lib/sox/libsox_fmt_raw.a lib/sox/libsox_fmt_raw.la lib/sox/libsox_fmt_raw.so -lib/sox/libsox_fmt_raw.so.0 lib/sox/libsox_fmt_s1.a lib/sox/libsox_fmt_s1.la lib/sox/libsox_fmt_s1.so -lib/sox/libsox_fmt_s1.so.0 lib/sox/libsox_fmt_s2.a lib/sox/libsox_fmt_s2.la lib/sox/libsox_fmt_s2.so -lib/sox/libsox_fmt_s2.so.0 lib/sox/libsox_fmt_s3.a lib/sox/libsox_fmt_s3.la lib/sox/libsox_fmt_s3.so -lib/sox/libsox_fmt_s3.so.0 lib/sox/libsox_fmt_s4.a lib/sox/libsox_fmt_s4.la lib/sox/libsox_fmt_s4.so -lib/sox/libsox_fmt_s4.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so.0 lib/sox/libsox_fmt_sf.a lib/sox/libsox_fmt_sf.la lib/sox/libsox_fmt_sf.so -lib/sox/libsox_fmt_sf.so.0 lib/sox/libsox_fmt_smp.a lib/sox/libsox_fmt_smp.la lib/sox/libsox_fmt_smp.so -lib/sox/libsox_fmt_smp.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so.0 lib/sox/libsox_fmt_sounder.a lib/sox/libsox_fmt_sounder.la lib/sox/libsox_fmt_sounder.so -lib/sox/libsox_fmt_sounder.so.0 lib/sox/libsox_fmt_soundtool.a lib/sox/libsox_fmt_soundtool.la lib/sox/libsox_fmt_soundtool.so -lib/sox/libsox_fmt_soundtool.so.0 lib/sox/libsox_fmt_sphere.a lib/sox/libsox_fmt_sphere.la lib/sox/libsox_fmt_sphere.so -lib/sox/libsox_fmt_sphere.so.0 lib/sox/libsox_fmt_svx.a lib/sox/libsox_fmt_svx.la lib/sox/libsox_fmt_svx.so -lib/sox/libsox_fmt_svx.so.0 lib/sox/libsox_fmt_txw.a lib/sox/libsox_fmt_txw.la lib/sox/libsox_fmt_txw.so -lib/sox/libsox_fmt_txw.so.0 lib/sox/libsox_fmt_u1.a lib/sox/libsox_fmt_u1.la lib/sox/libsox_fmt_u1.so -lib/sox/libsox_fmt_u1.so.0 lib/sox/libsox_fmt_u2.a lib/sox/libsox_fmt_u2.la lib/sox/libsox_fmt_u2.so -lib/sox/libsox_fmt_u2.so.0 lib/sox/libsox_fmt_u3.a lib/sox/libsox_fmt_u3.la lib/sox/libsox_fmt_u3.so -lib/sox/libsox_fmt_u3.so.0 lib/sox/libsox_fmt_u4.a lib/sox/libsox_fmt_u4.la lib/sox/libsox_fmt_u4.so -lib/sox/libsox_fmt_u4.so.0 lib/sox/libsox_fmt_ul.a lib/sox/libsox_fmt_ul.la lib/sox/libsox_fmt_ul.so -lib/sox/libsox_fmt_ul.so.0 lib/sox/libsox_fmt_voc.a lib/sox/libsox_fmt_voc.la lib/sox/libsox_fmt_voc.so -lib/sox/libsox_fmt_voc.so.0 %%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.a %%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.la %%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.so -%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.so.0 lib/sox/libsox_fmt_vox.a lib/sox/libsox_fmt_vox.la lib/sox/libsox_fmt_vox.so -lib/sox/libsox_fmt_vox.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so.0 lib/sox/libsox_fmt_wav.a lib/sox/libsox_fmt_wav.la lib/sox/libsox_fmt_wav.so -lib/sox/libsox_fmt_wav.so.0 %%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a %%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la %%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so -%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so.0 lib/sox/libsox_fmt_wve.a lib/sox/libsox_fmt_wve.la lib/sox/libsox_fmt_wve.so -lib/sox/libsox_fmt_wve.so.0 lib/sox/libsox_fmt_xa.a lib/sox/libsox_fmt_xa.la lib/sox/libsox_fmt_xa.so -lib/sox/libsox_fmt_xa.so.0 %%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a %%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la %%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so -%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so.0 @dirrm lib/sox libdata/pkgconfig/sox.pc Index: files/patch-sox.c =================================================================== RCS file: files/patch-sox.c diff -N files/patch-sox.c --- files/patch-sox.c 24 Sep 2008 12:12:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Fix badly-imbalanced parens. - -diff -burp sox-14.1.0/src/sox.c sox-14.1.0-dan/src/sox.c ---- src/sox.c 2008-07-28 15:04:36.000000000 -0500 -+++ src/sox.c 2008-07-30 11:36:41.046073378 -0500 -@@ -1716,7 +1716,7 @@ int main(int argc, char **argv) - combine_method = sox_concatenate; - - /* Make sure we got at least the required # of input filenames */ -- if (input_count < is_serial(combine_method ? 1 : 2)) -+ if (input_count < (is_serial(combine_method) ? 1 : 2)) - usage("Not enough input filenames specified"); - - /* Check for misplaced input/output-specific options */ --ikeVEW9yuYc//A+q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811132140.mADLe5gY001049>