diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 17:14:11 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 17:14:11 +0000 |
commit | ac64103fc03b1e7dbfeec9389d5dba1edd05b60e (patch) | |
tree | 72215b86d19be445d27635b873731954081c3f8f /media-libs/faac | |
parent | Better fix for bug 231089; some packages look for sgutils2 (diff) | |
download | gentoo-2-ac64103fc03b1e7dbfeec9389d5dba1edd05b60e.tar.gz gentoo-2-ac64103fc03b1e7dbfeec9389d5dba1edd05b60e.tar.bz2 gentoo-2-ac64103fc03b1e7dbfeec9389d5dba1edd05b60e.zip |
remove old patches too
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/faac')
-rw-r--r-- | media-libs/faac/Manifest | 5 | ||||
-rw-r--r-- | media-libs/faac/files/faac-1.24-as-needed.patch | 10 | ||||
-rw-r--r-- | media-libs/faac/files/faac-1.24-faad.patch | 23 | ||||
-rw-r--r-- | media-libs/faac/files/faac-1.24-fixnoise-hang.patch | 18 | ||||
-rw-r--r-- | media-libs/faac/files/faac-1.24-tracknumber.patch | 23 | ||||
-rw-r--r-- | media-libs/faac/files/faac-1.25-external-libmp4v2.patch | 61 |
6 files changed, 0 insertions, 140 deletions
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest index f10be0badafa..32974fbbaf36 100644 --- a/media-libs/faac/Manifest +++ b/media-libs/faac/Manifest @@ -1,8 +1,3 @@ -AUX faac-1.24-as-needed.patch 515 RMD160 2cfb414929d4b0099773460f05e547d713410f78 SHA1 fb9f343bd3b5007199ca10add3bc370db047a61e SHA256 f713b86101debfb4d6ddfe6b9f48f8edef6aa6241e5a577d11ed23bee8b3e419 -AUX faac-1.24-faad.patch 885 RMD160 7f7e323c7a4953bb7610f58473932d50f976168b SHA1 2c18386b40b60af3cc2f297c9905287e7b93f7dd SHA256 6bacb992f8f7ecfd2fd8ecf5be7d203bdcc0806ebf36362b58531d90028d634a -AUX faac-1.24-fixnoise-hang.patch 729 RMD160 5797afe821231b4216266a5a46d1a82435beccbd SHA1 1ebd5de739a00fab6a854bb458ed19eddd0c2ce1 SHA256 166bc8bca9c54a33c0b42917edeada29c70cd2dae6cb77d8b34500bbc1b69548 -AUX faac-1.24-tracknumber.patch 799 RMD160 76281d80c2dbc16cd44b83841bdcfa59a660b3ba SHA1 48c8f8d03741b297c18aeac62acb3c5073fff91e SHA256 d5c9206a7bb0033f12de16f2099b3bb0e96991b48325b2da1e2c806b35d2655c -AUX faac-1.25-external-libmp4v2.patch 2175 RMD160 9fab6320c41c6bde007e95b507146c5d63ce9e96 SHA1 31839e77e2e6fa05b111cab03f14d8d657e6b507 SHA256 aed09e5f01b6a184a1c6269eac94426caa85e83f0b9f8c4c9576bf0c2ad3a8c2 AUX faac-1.26-external-libmp4v2.patch 1287 RMD160 9e85f1f8e8f06206b5c9978168d534115555a159 SHA1 6b0d8bd26216c1b3aa4efaeb5080fc481420d807 SHA256 613615585e67d7e22782fd6661b399a06d5ad641dc7291729009f730c5bdf04c AUX faac-1.28-external-libmp4v2.patch 1766 RMD160 fcb3567d6a3752e10a0180b9d0937b3211de59f3 SHA1 790f83abaecb458f67e627f04b1eccfbbf2be2b7 SHA256 8e0bfe501acb7f31a701ab2c797c2ace539ccd60e5f5b3c0ae538bcd5719c1df DIST faac-1.26.tar.gz 400915 RMD160 40656b7b1a7c207373d7a1ba0167f220d9073ecd SHA1 5aad6d5a60107a5d6bf79654970168f498961b21 SHA256 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951 diff --git a/media-libs/faac/files/faac-1.24-as-needed.patch b/media-libs/faac/files/faac-1.24-as-needed.patch deleted file mode 100644 index a73ef574df97..000000000000 --- a/media-libs/faac/files/faac-1.24-as-needed.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- faac/libfaac/Makefile.am 2003-10-17 18:41:05.000000000 +0200 -+++ faac-1/libfaac/Makefile.am 2006-04-20 17:08:30.103745000 +0200 -@@ -2,6 +2,7 @@ - - libfaac_la_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c psychkni.c util.c backpred.c channels.c filtbank.c huffman.c ltp.c tns.c - libfaac_la_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h psych.h backpred.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h ltp.h util.h -+libfaac_la_LIBADD = -lm - - INCLUDES = -I$(top_srcdir)/include - diff --git a/media-libs/faac/files/faac-1.24-faad.patch b/media-libs/faac/files/faac-1.24-faad.patch deleted file mode 100644 index b26b155d598c..000000000000 --- a/media-libs/faac/files/faac-1.24-faad.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: faac/configure.in -=================================================================== ---- faac.orig/configure.in -+++ faac/configure.in -@@ -21,12 +21,12 @@ AC_CHECK_TYPES(int16_t) - AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) - - AC_CHECK_LIB(gnugetopt, getopt_long) --AC_CHECK_LIB(mp4v2, MP4MetadataDelete, -- [AC_MSG_NOTICE([*** Building with MP4 support ***]) -- MY_DEFINE([HAVE_LIBMP4V2]) -- LIBS="$LIBS -lstdc++ -lmp4v2"], -- [AC_MSG_NOTICE([*** Building without MP4 support ***])], -- -lstdc++) -+dnl AC_CHECK_LIB(mp4v2, MP4MetadataDelete, -+dnl [AC_MSG_NOTICE([*** Building with MP4 support ***]) -+dnl MY_DEFINE([HAVE_LIBMP4V2]) -+dnl LIBS="$LIBS -lstdc++ -lmp4v2"], -+dnl [AC_MSG_NOTICE([*** Building without MP4 support ***])], -+dnl -lstdc++) - AC_C_BIGENDIAN - - dnl Checks for header files required for mp4.h diff --git a/media-libs/faac/files/faac-1.24-fixnoise-hang.patch b/media-libs/faac/files/faac-1.24-fixnoise-hang.patch deleted file mode 100644 index d4e3c39526f0..000000000000 --- a/media-libs/faac/files/faac-1.24-fixnoise-hang.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=103444 -http://sourceforge.net/tracker/index.php?func=detail&aid=975905&group_id=704&atid=100704 - -diff -Naur faac-orig/libfaac/frame.c faac/libfaac/frame.c ---- faac-orig/libfaac/frame.c 2004-04-13 07:47:33.000000000 -0600 -+++ faac/libfaac/frame.c 2007-03-11 21:24:23.000000000 -0600 -@@ -731,6 +731,11 @@ - - MSEncode(coderInfo, channelInfo, hEncoder->freqBuff, numChannels, allowMidside); - -+ for (channel = 0; channel < numChannels; channel++) -+ { -+ CalcAvgEnrg(&coderInfo[channel], hEncoder->freqBuff[channel]); -+ } -+ - /* Quantize and code the signal */ - for (channel = 0; channel < numChannels; channel++) { - if (coderInfo[channel].block_type == ONLY_SHORT_WINDOW) { diff --git a/media-libs/faac/files/faac-1.24-tracknumber.patch b/media-libs/faac/files/faac-1.24-tracknumber.patch deleted file mode 100644 index faea8fd55731..000000000000 --- a/media-libs/faac/files/faac-1.24-tracknumber.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch is needed to fix usage of faac with track numbers higher than 7 with -a 0 prefix. The original scanf parameter %i will consider numbers starting by 0 -as octal, thus breaking the numbering for 08 and 09 tracks. - -See Gentoo bug #80690. - -Index: faac/frontend/main.c -=================================================================== ---- faac.orig/frontend/main.c -+++ faac/frontend/main.c -@@ -607,10 +607,10 @@ int main(int argc, char *argv[]) - album = optarg; - break; - case TRACK_FLAG: -- sscanf(optarg, "%i/%i", &trackno, &ntracks); -+ sscanf(optarg, "%d/%d", &trackno, &ntracks); - break; - case DISC_FLAG: -- sscanf(optarg, "%i/%i", &discno, &ndiscs); -+ sscanf(optarg, "%d/%d", &discno, &ndiscs); - break; - case COMPILATION_FLAG: - compilation = 0x1; diff --git a/media-libs/faac/files/faac-1.25-external-libmp4v2.patch b/media-libs/faac/files/faac-1.25-external-libmp4v2.patch deleted file mode 100644 index 77e74abe2947..000000000000 --- a/media-libs/faac/files/faac-1.25-external-libmp4v2.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -ur faac/common/Makefile.am faac-new/common/Makefile.am ---- faac/common/Makefile.am 2004-07-28 10:18:21.000000000 +0200 -+++ faac-new/common/Makefile.am 2006-11-22 16:40:22.000000000 +0100 -@@ -1,4 +1,4 @@ --if WITH_MP4V2
-+if WITH_INTERNAL_MP4V2
- SUBDIRS = mp4v2
- else
- SUBDIRS =
-diff -ur faac/configure.in faac-new/configure.in ---- faac/configure.in 2006-08-13 16:17:26.000000000 +0200 -+++ faac-new/configure.in 2006-11-22 16:39:18.000000000 +0100 -@@ -7,7 +7,7 @@ -
- AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
-
--AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
-+AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
-
- CFLAGS=${CFLAGS:-"-O2 -Wall"}
-
-@@ -27,6 +27,7 @@
- AC_CHECK_LIB(gnugetopt, getopt_long)
-
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_INTERNAL_MP4V2, false)
-
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-@@ -35,10 +36,13 @@
-
- if test x$external_mp4v2 = xyes; then
- AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+ MY_DEFINE(HAVE_LIBMP4V2)
-+ AM_CONDITIONAL(WITH_MP4V2, true)
- else
- if test x$WITHMP4V2 = xyes; then
- AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
- AM_CONDITIONAL(WITH_MP4V2, true)
-+ AM_CONDITIONAL(WITH_INTERNAL_MP4V2, true)
- AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
- MY_DEFINE(HAVE_LIBMP4V2)
- else
-diff -ur faac/frontend/Makefile.am faac-new/frontend/Makefile.am ---- faac/frontend/Makefile.am 2004-07-28 10:18:21.000000000 +0200 -+++ faac-new/frontend/Makefile.am 2006-11-22 16:24:16.000000000 +0100 -@@ -3,9 +3,14 @@
- faac_SOURCES = main.c input.c
-
- if WITH_MP4V2
-+if WITH_INTERNAL_MP4V2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
-+endif
-+else
-+INCLUDES = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
|