diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-04-29 12:03:03 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-04-29 12:03:03 +0000 |
commit | fb837fb9a4c1d29eb63dd2d46c403e6ebe75008b (patch) | |
tree | b564dae67b5ffb36a0708ae49fc80dee63b76f37 /media-sound | |
parent | Fix commit that was made 29 Dec 2009 to stabilize sox-14.3.0 for sparc. (diff) | |
download | gentoo-2-fb837fb9a4c1d29eb63dd2d46c403e6ebe75008b.tar.gz gentoo-2-fb837fb9a4c1d29eb63dd2d46c403e6ebe75008b.tar.bz2 gentoo-2-fb837fb9a4c1d29eb63dd2d46c403e6ebe75008b.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/sox/Manifest | 2 | ||||
-rw-r--r-- | media-sound/sox/files/sox-14.2.0-distro.patch | 36 | ||||
-rw-r--r-- | media-sound/sox/files/sox-14.2.0-file-5.0.patch | 12 |
3 files changed, 0 insertions, 50 deletions
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 6b12d05ce21c..63c41ebb0d23 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -1,5 +1,3 @@ -AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6 -AUX sox-14.2.0-file-5.0.patch 580 RMD160 8a6c0de5d55b3986bb343de02e96f4f155eee91c SHA1 6eded5629a863e88e9b96a08eff3e24224ae2413 SHA256 5fa17a034348bd9b5301b7df9c4b8b6603902404103a9d145d5e7084a39bd622 AUX sox-14.3.1-nomad.patch 401 RMD160 ebd569e1fe54521cce9acf22f5c10a039deae27b SHA1 8eda98ea9ff97cca42007d6964d8139f111bf70f SHA256 d8a8ffd166becd9acf39b1b55dc49f1dabeebdcc3965cfb5e6985f4b571dc033 DIST sox-14.3.0.tar.gz 1007679 RMD160 9302e00d76c972c4916979d147468f640e04acaa SHA1 34b8e991ba8511fa9683e9e9d356fb7f4179d03c SHA256 9abf411c949366d75c884b368284690b6c8c7d5fb5df0deaf599539b704b2397 DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 SHA1 ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384 SHA256 c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54 diff --git a/media-sound/sox/files/sox-14.2.0-distro.patch b/media-sound/sox/files/sox-14.2.0-distro.patch deleted file mode 100644 index 2545934d3b9c..000000000000 --- a/media-sound/sox/files/sox-14.2.0-distro.patch +++ /dev/null @@ -1,36 +0,0 @@ -=== modified file 'configure.ac' ---- configure.ac 2008-11-11 12:27:08 +0000 -+++ configure.ac 2008-11-11 12:28:01 +0000 -@@ -117,15 +117,23 @@ - AC_SUBST(APP_LDFLAGS) - AC_SUBST(WARN_CFLAGS) - --dnl Get distro name from /etc/issue --if test -r /etc/issue; then -- AC_MSG_CHECKING([distro name]) -- DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/ */ /g" -e "s/^ //" -e "s/ $//"` -- AC_MSG_RESULT("$DISTRO") -- AC_SUBST(DISTRO) -- AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined]) -- have_distro=yes -+AC_ARG_WITH(distro, -+ AC_HELP_STRING([--with-distro=distro], -+ [Provide distribution name, by default will try to grep /etc/issue])) -+ -+if test "$with_distro" != "no"; then -+ DISTRO=$with_distro -+else -+ dnl Get distro name from /etc/issue -+ if test -r /etc/issue; then -+ AC_MSG_CHECKING([distro name]) -+ DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/ */ /g" -e "s/^ //" -e "s/ $//"` -+ AC_MSG_RESULT("$DISTRO") -+ fi - fi -+AC_SUBST(DISTRO) -+AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined]) -+have_distro=yes - AM_CONDITIONAL(HAVE_DISTRO, test x$have_distro = xyes) - - dnl Check for system dependent features. - diff --git a/media-sound/sox/files/sox-14.2.0-file-5.0.patch b/media-sound/sox/files/sox-14.2.0-file-5.0.patch deleted file mode 100644 index bc7c251d1e69..000000000000 --- a/media-sound/sox/files/sox-14.2.0-file-5.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u --recursive --new-file sox-14.2.0/src/mp3.c sox-14.2.0_new/src/mp3.c ---- sox-14.2.0/src/mp3.c 2008-11-02 21:54:31.000000000 +0100 -+++ sox-14.2.0_new/src/mp3.c 2009-02-25 11:48:53.000000000 +0100 -@@ -504,7 +504,7 @@ - - SOX_FORMAT_HANDLER(mp3) - { -- static char const * const names[] = {"mp3", "mp2", "audio/mpeg", NULL}; -+ static char const * const names[] = {"mp3", "mp2", "audio/mpeg", "audio/mpeg; charset=binary", NULL}; - static unsigned const write_encodings[] = { - SOX_ENCODING_GSM, 0, 0}; - static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE, |