From 5ace0368f5d4606f8cbf742b4c0e1dc0c705bac8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 10 Jan 2007 20:10:35 +0000 Subject: [PATCH] Cleanup old version (and all patches, as they are now handled in a tarball patchset). Package-Manager: portage-2.1.2_rc4-r7 --- media-libs/faad2/Manifest | 60 +-- media-libs/faad2/faad2-2.0-r12.ebuild | 64 --- media-libs/faad2/faad2-2.0-r7.ebuild | 82 ---- media-libs/faad2/files/digest-faad2-2.0-r12 | 6 - media-libs/faad2/files/digest-faad2-2.0-r7 | 3 - media-libs/faad2/files/faad-2.0-xmms.patch | 20 - media-libs/faad2/files/faad2-2.0-amd64.patch | 285 ----------- .../files/faad2-2.0-configure-mpeg4ip.patch | 11 - media-libs/faad2/files/faad2-2.0-gcc34.patch | 10 - .../files/faad2-2.0-makefile-space.patch | 11 - .../faad2-gcc4-warnings-and-errors.patch | 463 ------------------ media-libs/faad2/files/mp4atom-sliver.patch | 24 - 12 files changed, 14 insertions(+), 1025 deletions(-) delete mode 100644 media-libs/faad2/faad2-2.0-r12.ebuild delete mode 100644 media-libs/faad2/faad2-2.0-r7.ebuild delete mode 100644 media-libs/faad2/files/digest-faad2-2.0-r12 delete mode 100644 media-libs/faad2/files/digest-faad2-2.0-r7 delete mode 100644 media-libs/faad2/files/faad-2.0-xmms.patch delete mode 100644 media-libs/faad2/files/faad2-2.0-amd64.patch delete mode 100644 media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch delete mode 100644 media-libs/faad2/files/faad2-2.0-gcc34.patch delete mode 100644 media-libs/faad2/files/faad2-2.0-makefile-space.patch delete mode 100644 media-libs/faad2/files/faad2-gcc4-warnings-and-errors.patch delete mode 100644 media-libs/faad2/files/mp4atom-sliver.patch diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest index 97007507ebac..c8f3ee0fa2db 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -1,53 +1,20 @@ -AUX faad-2.0-xmms.patch 1061 RMD160 f8e487dc7b943ccde38f983b0cd9541f98701ed9 SHA1 af69e62ba61cbc3a1041a58cd508bff2745a5296 SHA256 f84d20107436fc671471765103f02648b878aefa3f9efe93335477c52f44bf03 -MD5 fc9521f7d68e650b0a63f3b81464bcae files/faad-2.0-xmms.patch 1061 -RMD160 f8e487dc7b943ccde38f983b0cd9541f98701ed9 files/faad-2.0-xmms.patch 1061 -SHA256 f84d20107436fc671471765103f02648b878aefa3f9efe93335477c52f44bf03 files/faad-2.0-xmms.patch 1061 -AUX faad2-2.0-amd64.patch 9564 RMD160 77e3072b171be3a47768a3bdc272a3d88566ab3a SHA1 03b6d4291847945c07d35977cf2244f3c1f89111 SHA256 bfa66e643345e204eb9647883bb724814f487c79f336a26bae9a0d0429dbcc84 -MD5 edab653b8b9960b0ea4a04a745786c5f files/faad2-2.0-amd64.patch 9564 -RMD160 77e3072b171be3a47768a3bdc272a3d88566ab3a files/faad2-2.0-amd64.patch 9564 -SHA256 bfa66e643345e204eb9647883bb724814f487c79f336a26bae9a0d0429dbcc84 files/faad2-2.0-amd64.patch 9564 -AUX faad2-2.0-configure-mpeg4ip.patch 416 RMD160 7c0941c5c76ff8befb5ac2567053c8edb117ec92 SHA1 db7b9aacdb51539f25e58bfed5de015ed901f98a SHA256 42b177730204ea88a6b682a52b2ea27e8e3de88b0a733cf7b758281b059cce8d -MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416 -RMD160 7c0941c5c76ff8befb5ac2567053c8edb117ec92 files/faad2-2.0-configure-mpeg4ip.patch 416 -SHA256 42b177730204ea88a6b682a52b2ea27e8e3de88b0a733cf7b758281b059cce8d files/faad2-2.0-configure-mpeg4ip.patch 416 -AUX faad2-2.0-gcc34.patch 296 RMD160 8b992a907b90bb7becb0457945adf0cfef2907cc SHA1 cb40a5a2c669864ed31d3824692dc3802a4f5e9d SHA256 34c65024c78b385a42bd2a245559d92b52b422a2ab50d62cc8c47125960fbe58 -MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296 -RMD160 8b992a907b90bb7becb0457945adf0cfef2907cc files/faad2-2.0-gcc34.patch 296 -SHA256 34c65024c78b385a42bd2a245559d92b52b422a2ab50d62cc8c47125960fbe58 files/faad2-2.0-gcc34.patch 296 -AUX faad2-2.0-makefile-space.patch 326 RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5a6883b SHA1 1a7c7da396b302fc414f47f1393997ba05e3cbf7 SHA256 da086ad6ede60f6a78bc74ac859676cdc4b5d3e7ae3aa5da617565506133d708 -MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326 -RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5a6883b files/faad2-2.0-makefile-space.patch 326 -SHA256 da086ad6ede60f6a78bc74ac859676cdc4b5d3e7ae3aa5da617565506133d708 files/faad2-2.0-makefile-space.patch 326 -AUX faad2-gcc4-warnings-and-errors.patch 12071 RMD160 fdbce480063a4d5a4de63f589b251ef69ada6067 SHA1 429cb9086d8a1305a1fd6bdec1ab8906bd65b7da SHA256 60ecc66631fd202dde63f4b43dc6a88008d14f22a916902652561cb81e523c14 -MD5 9fcaf9f55fd1f37b129ce5457b50e40d files/faad2-gcc4-warnings-and-errors.patch 12071 -RMD160 fdbce480063a4d5a4de63f589b251ef69ada6067 files/faad2-gcc4-warnings-and-errors.patch 12071 -SHA256 60ecc66631fd202dde63f4b43dc6a88008d14f22a916902652561cb81e523c14 files/faad2-gcc4-warnings-and-errors.patch 12071 -AUX mp4atom-sliver.patch 659 RMD160 08e3104023bc9288d83f450d1b4442e41e8ac271 SHA1 7bb53a578333ea27c7b579c5ac40f98840e28d84 SHA256 8f37bd575870e33001d05bd60a8a9d1fc353e8cf6f25bce835478ee6ce37d88a -MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659 -RMD160 08e3104023bc9288d83f450d1b4442e41e8ac271 files/mp4atom-sliver.patch 659 -SHA256 8f37bd575870e33001d05bd60a8a9d1fc353e8cf6f25bce835478ee6ce37d88a files/mp4atom-sliver.patch 659 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST faad2-2.0.tar.gz 766660 RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 SHA1 fc9f8d0812a9f46bbd851880045131e0e4ab08b8 SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 DIST faad2-patches-5.tar.bz2 8667 RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa SHA1 1470d2ee2ea5acf667db6b01c259b94e746f9dba SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4 EBUILD faad2-2.0-r11.ebuild 1510 RMD160 1426a445ab0495c5aab60573d52850bf0f5d3dff SHA1 aa2173125d46a81d6c6762fde42eba87c2ebecb2 SHA256 f573ceab63bee725f45ed3d5e3db579e945dd30db5d74769f762307ae6833e61 MD5 91733c78bb5623c00a8068863d1c04ad faad2-2.0-r11.ebuild 1510 RMD160 1426a445ab0495c5aab60573d52850bf0f5d3dff faad2-2.0-r11.ebuild 1510 SHA256 f573ceab63bee725f45ed3d5e3db579e945dd30db5d74769f762307ae6833e61 faad2-2.0-r11.ebuild 1510 -EBUILD faad2-2.0-r12.ebuild 1528 RMD160 d4f6ef25c9cba9e277fe25b7c5ae73a4c167c06f SHA1 3739ec7668c2548e20b725f1065d020e836044d4 SHA256 95974fa16c6adb888885e3920cd4f45c36ff02068d9573621e3c519acf97dfb2 -MD5 b0864cbdfb3d02116301bdd9420520a3 faad2-2.0-r12.ebuild 1528 -RMD160 d4f6ef25c9cba9e277fe25b7c5ae73a4c167c06f faad2-2.0-r12.ebuild 1528 -SHA256 95974fa16c6adb888885e3920cd4f45c36ff02068d9573621e3c519acf97dfb2 faad2-2.0-r12.ebuild 1528 EBUILD faad2-2.0-r13.ebuild 1568 RMD160 e8a7b28ad0f154459eb3ff221ac6465d1e396ee5 SHA1 5e569c1ec06627075bb4caff4f338ef377d32d46 SHA256 5fa5af29c7b0380d287e81cf6d790f52b47b0d1aa930375ccc820fe80f6cf1fa MD5 af69b72242ec3ae25bb893ef3f080db6 faad2-2.0-r13.ebuild 1568 RMD160 e8a7b28ad0f154459eb3ff221ac6465d1e396ee5 faad2-2.0-r13.ebuild 1568 SHA256 5fa5af29c7b0380d287e81cf6d790f52b47b0d1aa930375ccc820fe80f6cf1fa faad2-2.0-r13.ebuild 1568 -EBUILD faad2-2.0-r7.ebuild 1957 RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c SHA1 b1c0936efde51e5a7f6b900e2e8457fc4d3ab3bc SHA256 97ef83943cec14d205c00ff9b13eb12f91856603bb0975ed92fc2eb881ab089b -MD5 554c3c256e3c9c8ba19cd5cd138bab44 faad2-2.0-r7.ebuild 1957 -RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c faad2-2.0-r7.ebuild 1957 -SHA256 97ef83943cec14d205c00ff9b13eb12f91856603bb0975ed92fc2eb881ab089b faad2-2.0-r7.ebuild 1957 -MISC ChangeLog 11780 RMD160 0fdb5af893034570854e096ccadbd6707fba1416 SHA1 a5f8dea64cc11093234f89b5c98ec3a6520561a3 SHA256 6c9bf63ab64b14e0225529ccdc8032e4adbef330fea6a29e8686d88442c3fba2 -MD5 04a1e492b3385a2bc9790a5cc934b814 ChangeLog 11780 -RMD160 0fdb5af893034570854e096ccadbd6707fba1416 ChangeLog 11780 -SHA256 6c9bf63ab64b14e0225529ccdc8032e4adbef330fea6a29e8686d88442c3fba2 ChangeLog 11780 +MISC ChangeLog 12220 RMD160 85a70f05859246acddb4501cf1606424da41de4f SHA1 0885f5f851e27888dbd4b4da717e83723c3246aa SHA256 ac9271383b22963458ceb940e8a31f0e7f016558fbc4b0192b70c472bdb74973 +MD5 5bd07249027e64eec62a86f087d036ed ChangeLog 12220 +RMD160 85a70f05859246acddb4501cf1606424da41de4f ChangeLog 12220 +SHA256 ac9271383b22963458ceb940e8a31f0e7f016558fbc4b0192b70c472bdb74973 ChangeLog 12220 MISC metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace SHA1 f013305de22423b585f4138b1a5e9d67ca45c17f SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace metadata.xml 387 @@ -55,12 +22,13 @@ SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356 metadata MD5 c9ab8398ff921c6b50e73c82328aaec5 files/digest-faad2-2.0-r11 473 RMD160 727854ccb709c9ff48f2b12ddf2a763aadc293be files/digest-faad2-2.0-r11 473 SHA256 fb76d0987ca664ad08d88c5a97f79328d83357088d9d75db4b5bc3d2dc04b4b1 files/digest-faad2-2.0-r11 473 -MD5 9640728e8e4b1d1726f7189f13f7b390 files/digest-faad2-2.0-r12 473 -RMD160 ae418ef22cbda30819261428f50fc487cf0b040c files/digest-faad2-2.0-r12 473 -SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/digest-faad2-2.0-r12 473 MD5 9640728e8e4b1d1726f7189f13f7b390 files/digest-faad2-2.0-r13 473 RMD160 ae418ef22cbda30819261428f50fc487cf0b040c files/digest-faad2-2.0-r13 473 SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/digest-faad2-2.0-r13 473 -MD5 a46d304d3915a77a1c628a501d7fd693 files/digest-faad2-2.0-r7 229 -RMD160 324f8ba6e8f513994e0a3abd7a78967838a16214 files/digest-faad2-2.0-r7 229 -SHA256 286a43349ed357736d71bc0ea7b79d3a73ae37a89bdd9aa69837f7e12a4ddf54 files/digest-faad2-2.0-r7 229 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFpUg6AiZjviIA2XgRAkTtAKDmEp3eoP58fvylL5+gmwwCCO5QmQCdE+PK +BzG+pwMw4OccpS/XUC2p3Vc= +=Ffye +-----END PGP SIGNATURE----- diff --git a/media-libs/faad2/faad2-2.0-r12.ebuild b/media-libs/faad2/faad2-2.0-r12.ebuild deleted file mode 100644 index 6d7e526456f8..000000000000 --- a/media-libs/faad2/faad2-2.0-r12.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r12.ebuild,v 1.6 2006/11/13 15:33:36 flameeyes Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils libtool flag-o-matic autotools - -PATCHLEVEL="5" - -DESCRIPTION="AAC audio decoding library" -HOMEPAGE="http://www.audiocoding.com/" -SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="media-libs/libmp4v2" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${A} - cd ${S} - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - eautoreconf -} - -src_compile() { - # see #34392 - filter-flags -mfpmath=sse - - # mp4v2 needed for rhythmbox - # drm needed for nothing but doesn't hurt - econf \ - --with-drm \ - --without-xmms \ - || die "econf failed" - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc AUTHORS ChangeLog NEWS README README.linux TODO - - # unneeded include, breaks building of apps, but - # it is necessary because includes , - # which is needed by /usr/include/mp4.h... so we just - # include instead. See bug #55767 - sed -i -e "s:#include :#include :" \ - ${D}/usr/include/mpeg4ip.h - sed -i -e "s:\"mp4ff_int_types.h\"::" \ - ${D}/usr/include/mp4ff.h - -} diff --git a/media-libs/faad2/faad2-2.0-r7.ebuild b/media-libs/faad2/faad2-2.0-r7.ebuild deleted file mode 100644 index 23ed4b871738..000000000000 --- a/media-libs/faad2/faad2-2.0-r7.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r7.ebuild,v 1.11 2006/11/13 15:33:36 flameeyes Exp $ - -inherit eutils libtool flag-o-matic - -DESCRIPTION="AAC audio decoding library" -HOMEPAGE="http://www.audiocoding.com/" -SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND="!media-video/mpeg4ip" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4.0.7 - sys-devel/automake - sys-devel/autoconf" - -S=${WORKDIR}/${PN} - -DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-makefile-space.patch - epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch - epatch ${FILESDIR}/${P}-gcc34.patch - epatch ${FILESDIR}/${PN}-gcc4-warnings-and-errors.patch - - cd ${S}/common/mp4v2 - epatch ${FILESDIR}/mp4atom-sliver.patch - - cd ${S} - epatch ${FILESDIR}/${P}-amd64.patch -} - -src_compile() { - # see #34392 - filter-flags -mfpmath=sse - - # Fix for bug #67510 - WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 \ - aclocal -I . && \ - autoheader && \ - libtoolize --automake --copy && \ - automake --add-missing --copy && \ - autoconf || die "Couldn't build configuration file" - elibtoolize - - # mp4v2 needed for rhythmbox - # drm needed for nothing but doesn't hurt - - econf \ - --with-mp4v2 \ - --with-drm \ - --without-xmms \ - || die - - emake || die - -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc ${DOCS} - - # unneeded include, breaks building of apps, but - # it is necessary because includes , - # which is needed by /usr/include/mp4.h... so we just - # include instead. See bug #55767 - dosed "s:#include :#include :" /usr/include/mpeg4ip.h - # make latexer happy - dosed "s:\"mp4ff_int_types.h\"::" /usr/include/mp4ff.h - -} diff --git a/media-libs/faad2/files/digest-faad2-2.0-r12 b/media-libs/faad2/files/digest-faad2-2.0-r12 deleted file mode 100644 index cb21f92dfbf2..000000000000 --- a/media-libs/faad2/files/digest-faad2-2.0-r12 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660 -RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 faad2-2.0.tar.gz 766660 -SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 faad2-2.0.tar.gz 766660 -MD5 51a371fb21fcbf77e27ed82d63273a95 faad2-patches-5.tar.bz2 8667 -RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa faad2-patches-5.tar.bz2 8667 -SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4 faad2-patches-5.tar.bz2 8667 diff --git a/media-libs/faad2/files/digest-faad2-2.0-r7 b/media-libs/faad2/files/digest-faad2-2.0-r7 deleted file mode 100644 index 3a8a5d4bfefb..000000000000 --- a/media-libs/faad2/files/digest-faad2-2.0-r7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660 -RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 faad2-2.0.tar.gz 766660 -SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 faad2-2.0.tar.gz 766660 diff --git a/media-libs/faad2/files/faad-2.0-xmms.patch b/media-libs/faad2/files/faad-2.0-xmms.patch deleted file mode 100644 index 55a577732197..000000000000 --- a/media-libs/faad2/files/faad-2.0-xmms.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/xmms/src/mp4_utils.c.orig 2006-02-26 23:29:45.000000000 -0500 -+++ plugins/xmms/src/mp4_utils.c 2006-02-26 23:30:20.000000000 -0500 -@@ -54,7 +54,7 @@ - const char *trackType = MP4GetTrackType(file, trackID); - if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track ! - int j=0; -- u_int8_t audiotype = MP4GetTrackAudioType(file, trackID); -+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID); - while(mp4AudioTypes[j]){ // what kind of audio is ? - if(mp4AudioTypes[j] == audiotype){ - if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok -@@ -126,7 +126,7 @@ - printf("Track %d, %s", trackID, trackType); - if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track ! - int j=0; -- u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID); -+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID); - while(mp4AudioTypes[j]){ // what kind of audio is ? - if(mp4AudioTypes[j] == audiotype){ - if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){ diff --git a/media-libs/faad2/files/faad2-2.0-amd64.patch b/media-libs/faad2/files/faad2-2.0-amd64.patch deleted file mode 100644 index e80c865ad57b..000000000000 --- a/media-libs/faad2/files/faad2-2.0-amd64.patch +++ /dev/null @@ -1,285 +0,0 @@ -diff -ur faad2/include/faad.h faad2-patch/include/faad.h ---- faad2/include/faad.h 2004-02-06 04:23:28.000000000 -0600 -+++ faad2-patch/include/faad.h 2005-05-10 10:58:39.000000000 -0600 -@@ -43,6 +43,10 @@ - #endif - #endif - -+/* needed for standard integer types */ -+#define __STDC_LIMIT_MACROS -+#include -+ - #define FAAD2_VERSION "2.0 " - - /* object types for AAC */ -@@ -112,86 +116,86 @@ - typedef struct mp4AudioSpecificConfig - { - /* Audio Specific Info */ -- unsigned char objectTypeIndex; -- unsigned char samplingFrequencyIndex; -- unsigned long samplingFrequency; -- unsigned char channelsConfiguration; -+ uint8_t objectTypeIndex; -+ uint8_t samplingFrequencyIndex; -+ uint32_t samplingFrequency; -+ uint8_t channelsConfiguration; - - /* GA Specific Info */ -- unsigned char frameLengthFlag; -- unsigned char dependsOnCoreCoder; -- unsigned short coreCoderDelay; -- unsigned char extensionFlag; -- unsigned char aacSectionDataResilienceFlag; -- unsigned char aacScalefactorDataResilienceFlag; -- unsigned char aacSpectralDataResilienceFlag; -- unsigned char epConfig; -+ uint8_t frameLengthFlag; -+ uint8_t dependsOnCoreCoder; -+ uint16_t coreCoderDelay; -+ uint8_t extensionFlag; -+ uint8_t aacSectionDataResilienceFlag; -+ uint8_t aacScalefactorDataResilienceFlag; -+ uint8_t aacSpectralDataResilienceFlag; -+ uint8_t epConfig; - -- char sbr_present_flag; -- char forceUpSampling; -+ int8_t sbr_present_flag; -+ int8_t forceUpSampling; - } mp4AudioSpecificConfig; - - typedef struct faacDecConfiguration - { -- unsigned char defObjectType; -- unsigned long defSampleRate; -- unsigned char outputFormat; -- unsigned char downMatrix; -- unsigned char useOldADTSFormat; -- unsigned char dontUpSampleImplicitSBR; -+ uint8_t defObjectType; -+ uint8_t defSampleRate; -+ uint8_t outputFormat; -+ uint8_t downMatrix; -+ uint8_t useOldADTSFormat; -+ uint8_t dontUpSampleImplicitSBR; - } faacDecConfiguration, *faacDecConfigurationPtr; - - typedef struct faacDecFrameInfo - { -- unsigned long bytesconsumed; -- unsigned long samples; -- unsigned char channels; -- unsigned char error; -- unsigned long samplerate; -+ uint32_t bytesconsumed; -+ uint32_t samples; -+ uint8_t channels; -+ uint8_t error; -+ uint32_t samplerate; - - /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */ -- unsigned char sbr; -+ uint8_t sbr; - - /* MPEG-4 ObjectType */ -- unsigned char object_type; -+ uint8_t object_type; - - /* AAC header type; MP4 will be signalled as RAW also */ -- unsigned char header_type; -+ uint8_t header_type; - - /* multichannel configuration */ -- unsigned char num_front_channels; -- unsigned char num_side_channels; -- unsigned char num_back_channels; -- unsigned char num_lfe_channels; -- unsigned char channel_position[64]; -+ uint8_t num_front_channels; -+ uint8_t num_side_channels; -+ uint8_t num_back_channels; -+ uint8_t num_lfe_channels; -+ uint8_t channel_position[64]; - } faacDecFrameInfo; - --char* FAADAPI faacDecGetErrorMessage(unsigned char errcode); -+int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode); - --unsigned long FAADAPI faacDecGetCapabilities(void); -+uint32_t FAADAPI faacDecGetCapabilities(void); - - faacDecHandle FAADAPI faacDecOpen(void); - - faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder); - --unsigned char FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder, -+uint8_t FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder, - faacDecConfigurationPtr config); - - /* Init the library based on info from the AAC file (ADTS/ADIF) */ - long FAADAPI faacDecInit(faacDecHandle hDecoder, -- unsigned char *buffer, -- unsigned long buffer_size, -- unsigned long *samplerate, -- unsigned char *channels); -+ uint8_t *buffer, -+ uint32_t buffer_size, -+ uint32_t *samplerate, -+ uint8_t *channels); - - /* Init the library using a DecoderSpecificInfo */ --char FAADAPI faacDecInit2(faacDecHandle hDecoder, unsigned char *pBuffer, -- unsigned long SizeOfDecoderSpecificInfo, -- unsigned long *samplerate, unsigned char *channels); -+int8_t FAADAPI faacDecInit2(faacDecHandle hDecoder, uint8_t *pBuffer, -+ uint32_t SizeOfDecoderSpecificInfo, -+ uint32_t *samplerate, uint8_t *channels); - - /* Init the library for DRM */ --char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned long samplerate, -- unsigned char channels); -+int8_t FAADAPI faacDecInitDRM(faacDecHandle hDecoder, uint32_t samplerate, -+ uint8_t channels); - - void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, long frame); - -@@ -199,12 +203,12 @@ - - void* FAADAPI faacDecDecode(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, -- unsigned char *buffer, -- unsigned long buffer_size); -+ uint8_t *buffer, -+ uint32_t buffer_size); - --char FAADAPI AudioSpecificConfig(unsigned char *pBuffer, -- unsigned long buffer_size, -- mp4AudioSpecificConfig *mp4ASC); -+int8_t FAADAPI AudioSpecificConfig(uint8_t *pBuffer, -+ uint32_t buffer_size, -+ mp4AudioSpecificConfig *mp4ASC); - - #ifdef _WIN32 - #pragma pack(pop) -diff -ur faad2/libfaad/common.h faad2-patch/libfaad/common.h ---- faad2/libfaad/common.h 2004-02-06 06:55:24.000000000 -0600 -+++ faad2-patch/libfaad/common.h 2005-05-10 10:45:41.000000000 -0600 -@@ -197,8 +197,16 @@ - #else - # if HAVE_STDINT_H - # include --# else --/* we need these... */ -+# elif defined(__x86_64__) -+typedef unsigned long uint64_t; -+typedef unsigned int uint32_t; -+typedef unsigned short uint16_t; -+typedef unsigned char uint8_t; -+typedef long int64_t; -+typedef int int32_t; -+typedef short int16_t; -+typedef char int8_t; -+#else - typedef unsigned long long uint64_t; - typedef unsigned long uint32_t; - typedef unsigned short uint16_t; -diff -ur faad2/plugins/mpeg4ip/aa_file.cpp faad2-patch/plugins/mpeg4ip/aa_file.cpp ---- faad2/plugins/mpeg4ip/aa_file.cpp 2004-01-05 08:05:12.000000000 -0600 -+++ faad2-patch/plugins/mpeg4ip/aa_file.cpp 2005-05-10 10:58:04.000000000 -0600 -@@ -56,8 +56,8 @@ - aac->m_buffer_size_max, - aac->m_ifile); - -- unsigned long freq; -- unsigned char chans; -+ uint32_t freq; -+ uint8_t chans; - - faacDecInit(aac->m_info, (unsigned char *)aac->m_buffer, - aac->m_buffer_size, &freq, &chans); -diff -ur faad2/plugins/mpeg4ip/faad2.cpp faad2-patch/plugins/mpeg4ip/faad2.cpp ---- faad2/plugins/mpeg4ip/faad2.cpp 2004-01-05 08:05:12.000000000 -0600 -+++ faad2-patch/plugins/mpeg4ip/faad2.cpp 2005-05-10 10:54:29.000000000 -0600 -@@ -76,8 +76,8 @@ - } - - aac->m_info = faacDecOpen(); -- unsigned long srate; -- unsigned char chan; -+ uint32_t srate; -+ uint8_t chan; - if ((userdata == NULL && fmtp == NULL) || - (faacDecInit2(aac->m_info, - (uint8_t *)userdata, -@@ -156,7 +156,7 @@ - void *userdata) - { - aac_codec_t *aac = (aac_codec_t *)ptr; -- unsigned long bytes_consummed; -+ uint32_t bytes_consummed; - int bits = -1; - // struct timezone tz; - -@@ -188,8 +188,8 @@ - * If not initialized, do so. - */ - abort(); -- unsigned long freq; -- unsigned char chans; -+ uint32_t freq; -+ uint8_t chans; - - faacDecInit(aac->m_info, - (unsigned char *)buffer, -@@ -202,7 +202,7 @@ - } - - uint8_t *buff; -- unsigned long samples; -+ uint32_t samples; - bytes_consummed = buflen; - //aa_message(LOG_DEBUG, aaclib, "decoding %d bits", buflen * 8); - faacDecFrameInfo frame_info; -@@ -237,7 +237,7 @@ - aac->m_vft->audio_configure(aac->m_ifptr, - aac->m_freq, - aac->m_chans, -- AUDIO_S16SYS, -+ AUDIO_FMT_S16, - aac->m_output_frame_size); - uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr); - aac->m_audio_inited = 1; -diff -ur faad2/plugins/xmms/src/libmp4.c faad2-patch/plugins/xmms/src/libmp4.c ---- faad2/plugins/xmms/src/libmp4.c 2005-05-10 11:02:04.000000000 -0600 -+++ faad2-patch/plugins/xmms/src/libmp4.c 2005-05-10 10:57:36.000000000 -0600 -@@ -22,6 +22,9 @@ - #define MP4_ABOUT "Written by ciberfred" - #define BUFFER_SIZE FAAD_MIN_STREAMSIZE*64 - -+extern void getMP4info(char* file); -+extern int getAACTrack(MP4FileHandle file); -+ - static void mp4_init(void); - static void mp4_about(void); - static void mp4_play(char *); -@@ -116,14 +119,12 @@ - - extention = strrchr(filename, '.'); - -- if (extention && -- (!strcasecmp(extention, ".mp4") || // official extention -- !strcasecmp(extention, ".m4a") || // Apple mp4 extention -- !strcasecmp(extention, ".aac") // old MPEG2/4-AAC extention -+ if (extention) -+ if( (!strcasecmp(extention, ".mp4") || // official extention -+ !strcasecmp(extention, ".m4a") || // Apple mp4 extention -+ !strcasecmp(extention, ".aac") // old MPEG2/4-AAC extention - )) -- { -- return (1); -- } -+ return (1); - } - return(0); - } diff --git a/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch b/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch deleted file mode 100644 index c91804d39070..000000000000 --- a/media-libs/faad2/files/faad2-2.0-configure-mpeg4ip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2004-03-13 15:24:19.783147336 +0100 -+++ configure.in 2004-03-13 15:24:48.430792232 +0100 -@@ -67,7 +67,7 @@ - [HAVE_FPOS_T_POS]) - - --external_mp4v2=yes -+AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no) - AC_CHECK_LIB(mp4v2, MP4Create, , external_mp4v2=no, -lstdc++) - AC_CHECK_LIB(mp4v2, MP4MetadataDelete, , external_mp4v2=no, -lstdc++) - AC_CHECK_HEADER(mp4.h, , external_mp4v2=no) diff --git a/media-libs/faad2/files/faad2-2.0-gcc34.patch b/media-libs/faad2/files/faad2-2.0-gcc34.patch deleted file mode 100644 index fe11002a1116..000000000000 --- a/media-libs/faad2/files/faad2-2.0-gcc34.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- faad2/common/mp4v2/mp4property.h 2004-04-14 20:53:58.582017392 -0400 -+++ faad2/common/mp4v2/mp4property_.h 2004-04-14 20:51:21.955828192 -0400 -@@ -21,6 +21,7 @@ - - #ifndef __MP4_PROPERTY_INCLUDED__ - #define __MP4_PROPERTY_INCLUDED__ -+#define NULL 0 - - // forward declarations - class MP4Atom; diff --git a/media-libs/faad2/files/faad2-2.0-makefile-space.patch b/media-libs/faad2/files/faad2-2.0-makefile-space.patch deleted file mode 100644 index c8710d9ddb84..000000000000 --- a/media-libs/faad2/files/faad2-2.0-makefile-space.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2004-03-13 14:05:37.008118272 +0100 -+++ Makefile.am 2004-03-13 14:05:42.753244880 +0100 -@@ -1,8 +1,3 @@ - SUBDIRS = libfaad common frontend plugins - - EXTRA_DIST = faad2.spec -- --rpm: Makefile -- make dist -- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz -- rm $(PACKAGE)-$(VERSION).tar.gz diff --git a/media-libs/faad2/files/faad2-gcc4-warnings-and-errors.patch b/media-libs/faad2/files/faad2-gcc4-warnings-and-errors.patch deleted file mode 100644 index ef52728705bf..000000000000 --- a/media-libs/faad2/files/faad2-gcc4-warnings-and-errors.patch +++ /dev/null @@ -1,463 +0,0 @@ ---- faad2/common/mp4ff/mp4atom.c -+++ faad2.patched/common/mp4ff/mp4atom.c -@@ -31,15 +31,15 @@ - #include "drms.h" - - /* parse atom header size */ --static int32_t mp4ff_atom_get_size(const int8_t *data) -+static int32_t mp4ff_atom_get_size(const uint8_t *data) - { - uint32_t result; - uint32_t a, b, c, d; - -- a = (uint8_t)data[0]; -- b = (uint8_t)data[1]; -- c = (uint8_t)data[2]; -- d = (uint8_t)data[3]; -+ a = data[0]; -+ b = data[1]; -+ c = data[2]; -+ d = data[3]; - - result = (a<<24) | (b<<16) | (c<<8) | d; - //if (result > 0 && result < 8) result = 8; -@@ -182,7 +182,7 @@ - { - uint64_t size; - int32_t ret; -- int8_t atom_header[8]; -+ uint8_t atom_header[8]; - - ret = mp4ff_read_data(f, atom_header, 8); - if (ret != 8) ---- faad2/common/mp4ff/mp4ff.h -+++ faad2.patched/common/mp4ff/mp4ff.h -@@ -125,4 +125,4 @@ - } - #endif /* __cplusplus */ - --#endif -\ No newline at end of file -+#endif ---- faad2/common/mp4ff/mp4ffint.h -+++ faad2.patched/common/mp4ff/mp4ffint.h -@@ -226,8 +226,8 @@ - - - /* mp4util.c */ --int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size); --int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size); -+int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size); -+int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size); - uint64_t mp4ff_read_int64(mp4ff_t *f); - uint32_t mp4ff_read_int32(mp4ff_t *f); - uint32_t mp4ff_read_int24(mp4ff_t *f); -@@ -241,7 +241,7 @@ - char * mp4ff_read_string(mp4ff_t * f,uint32_t length); - - /* mp4atom.c */ --static int32_t mp4ff_atom_get_size(const int8_t *data); -+static int32_t mp4ff_atom_get_size(const uint8_t *data); - static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1, - const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2); - static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d); -@@ -301,7 +301,6 @@ - mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f); - #endif - void mp4ff_close(mp4ff_t *ff); --void mp4ff_track_add(mp4ff_t *f); - int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size); - int32_t parse_atoms(mp4ff_t *f); - -@@ -326,4 +325,4 @@ - } - #endif /* __cplusplus */ - --#endif -\ No newline at end of file -+#endif ---- faad2/common/mp4ff/mp4ff_int_types.h -+++ faad2.patched/common/mp4ff/mp4ff_int_types.h -@@ -20,4 +20,4 @@ - #endif - - --#endif -\ No newline at end of file -+#endif ---- faad2/common/mp4ff/mp4meta.c -+++ faad2.patched/common/mp4ff/mp4meta.c -@@ -411,4 +411,4 @@ - return mp4ff_meta_find_by_name(f, "cover", value); - } - --#endif -\ No newline at end of file -+#endif ---- faad2/common/mp4ff/mp4tagupdate.c -+++ faad2.patched/common/mp4ff/mp4tagupdate.c -@@ -143,7 +143,7 @@ - bufptr = membuffer_get_ptr(buf); - if (bufptr==0) return 0; - -- if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes) -+ if ((unsigned)mp4ff_read_data(src,(uint8_t*)bufptr + oldsize,bytes)!=bytes) - { - membuffer_set_error(buf); - return 0; -@@ -398,7 +398,7 @@ - uint64_t atom_offset = base; - for(;;) - { -- char atom_name[4]; -+ uint8_t atom_name[4]; - uint32_t atom_size; - - mp4ff_set_position(f,atom_offset); -@@ -618,7 +618,7 @@ - /* copy moov atom to end of the file */ - if (ff->last_atom != ATOM_MOOV) - { -- char *free_data = "free"; -+ uint8_t *free_data = (uint8_t*)"free"; - - /* rename old moov to free */ - mp4ff_set_position(ff, ff->moov_offset + 4); -@@ -626,14 +626,14 @@ - - mp4ff_set_position(ff, ff->file_size); - mp4ff_write_int32(ff,new_moov_size + 8); -- mp4ff_write_data(ff,"moov",4); -+ mp4ff_write_data(ff,(uint8_t*)"moov",4); - mp4ff_write_data(ff, new_moov_data, new_moov_size); - } - else - { - mp4ff_set_position(ff, ff->moov_offset); - mp4ff_write_int32(ff,new_moov_size + 8); -- mp4ff_write_data(ff,"moov",4); -+ mp4ff_write_data(ff,(uint8_t*)"moov",4); - mp4ff_write_data(ff, new_moov_data, new_moov_size); - } - ---- faad2/common/mp4ff/mp4util.c -+++ faad2.patched/common/mp4ff/mp4util.c -@@ -28,7 +28,7 @@ - #include "mp4ffint.h" - #include - --int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size) -+int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size) - { - int32_t result = 1; - -@@ -44,7 +44,7 @@ - return f->stream->truncate(f->stream->user_data); - } - --int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size) -+int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size) - { - int32_t result = 1; - -@@ -105,13 +105,13 @@ - { - uint32_t result; - uint32_t a, b, c, d; -- int8_t data[4]; -+ uint8_t data[4]; - - mp4ff_read_data(f, data, 4); -- a = (uint8_t)data[0]; -- b = (uint8_t)data[1]; -- c = (uint8_t)data[2]; -- d = (uint8_t)data[3]; -+ a = data[0]; -+ b = data[1]; -+ c = data[2]; -+ d = data[3]; - - result = (a<<24) | (b<<16) | (c<<8) | d; - return (uint32_t)result; -@@ -121,12 +121,12 @@ - { - uint32_t result; - uint32_t a, b, c; -- int8_t data[4]; -+ uint8_t data[4]; - - mp4ff_read_data(f, data, 3); -- a = (uint8_t)data[0]; -- b = (uint8_t)data[1]; -- c = (uint8_t)data[2]; -+ a = data[0]; -+ b = data[1]; -+ c = data[2]; - - result = (a<<16) | (b<<8) | c; - return (uint32_t)result; -@@ -136,11 +136,11 @@ - { - uint32_t result; - uint32_t a, b; -- int8_t data[2]; -+ uint8_t data[2]; - - mp4ff_read_data(f, data, 2); -- a = (uint8_t)data[0]; -- b = (uint8_t)data[1]; -+ a = data[0]; -+ b = data[1]; - - result = (a<<8) | b; - return (uint16_t)result; -@@ -151,7 +151,7 @@ - char * str = (char*)malloc(length + 1); - if (str!=0) - { -- if ((uint32_t)mp4ff_read_data(f,str,length)!=length) -+ if ((uint32_t)mp4ff_read_data(f,(uint8_t*)str,length)!=length) - { - free(str); - str = 0; ---- faad2/common/mp4v2/mp4meta.cpp -+++ faad2.patched/common/mp4v2/mp4meta.cpp -@@ -830,7 +830,6 @@ - MP4BytesProperty *pMetadataProperty = NULL; - char s[256]; - int i = 0; -- bool nameExists = false; - - while (1) - { ---- faad2/common/mp4v2/mp4property.h -+++ faad2.patched/common/mp4v2/mp4property.h -@@ -21,7 +21,6 @@ - - #ifndef __MP4_PROPERTY_INCLUDED__ - #define __MP4_PROPERTY_INCLUDED__ --#define NULL 0 - - // forward declarations - class MP4Atom; -@@ -44,7 +43,7 @@ - - class MP4Property { - public: -- MP4Property(const char *name = NULL); -+ MP4Property(const char *name = 0); - - virtual ~MP4Property() { } - -@@ -59,7 +58,7 @@ - return m_name; - } - -- virtual MP4PropertyType GetType() = NULL; -+ virtual MP4PropertyType GetType() = 0; - - bool IsReadOnly() { - return m_readOnly; -@@ -75,20 +74,20 @@ - m_implicit = value; - } - -- virtual u_int32_t GetCount() = NULL; -- virtual void SetCount(u_int32_t count) = NULL; -+ virtual u_int32_t GetCount() = 0; -+ virtual void SetCount(u_int32_t count) = 0; - - virtual void Generate() { /* default is a no-op */ }; - -- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0; - -- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0; - - virtual void Dump(FILE* pFile, u_int8_t indent, -- bool dumpImplicits, u_int32_t index = 0) = NULL; -+ bool dumpImplicits, u_int32_t index = 0) = 0; - - virtual bool FindProperty(const char* name, -- MP4Property** ppProperty, u_int32_t* pIndex = NULL); -+ MP4Property** ppProperty, u_int32_t* pIndex = 0); - - protected: - MP4Atom* m_pParentAtom; -@@ -460,7 +459,7 @@ - bool dumpImplicits, u_int32_t index = 0); - - bool FindProperty(const char* name, -- MP4Property** ppProperty, u_int32_t* pIndex = NULL); -+ MP4Property** ppProperty, u_int32_t* pIndex = 0); - - protected: - virtual void ReadEntry(MP4File* pFile, u_int32_t index); -@@ -476,7 +475,7 @@ - - class MP4DescriptorProperty : public MP4Property { - public: -- MP4DescriptorProperty(char* name = NULL, -+ MP4DescriptorProperty(char* name = 0, - u_int8_t tagsStart = 0, u_int8_t tagsEnd = 0, - bool mandatory = false, bool onlyOne = false); - -@@ -519,7 +518,7 @@ - bool dumpImplicits, u_int32_t index = 0); - - bool FindProperty(const char* name, -- MP4Property** ppProperty, u_int32_t* pIndex = NULL); -+ MP4Property** ppProperty, u_int32_t* pIndex = 0); - - protected: - virtual MP4Descriptor* CreateDescriptor(u_int8_t tag); -@@ -538,7 +537,7 @@ - - class MP4QosQualifierProperty : public MP4DescriptorProperty { - public: -- MP4QosQualifierProperty(char* name = NULL, -+ MP4QosQualifierProperty(char* name = 0, - u_int8_t tagsStart = 0, u_int8_t tagsEnd = 0, - bool mandatory = false, bool onlyOne = false) : - MP4DescriptorProperty(name, tagsStart, tagsEnd, mandatory, onlyOne) { } ---- faad2/common/mp4v2/rtphint.h -+++ faad2.patched/common/mp4v2/rtphint.h -@@ -35,8 +35,8 @@ - return m_pPacket; - } - -- virtual u_int16_t GetDataSize() = NULL; -- virtual void GetData(u_int8_t* pDest) = NULL; -+ virtual u_int16_t GetDataSize() = 0; -+ virtual void GetData(u_int8_t* pDest) = 0; - - MP4Track* FindTrackFromRefIndex(u_int8_t refIndex); - -@@ -210,7 +210,7 @@ - - MP4RtpPacket* GetCurrentPacket() { - if (m_rtpPackets.Size() == 0) { -- return NULL; -+ return 0; - } - return m_rtpPackets[m_rtpPackets.Size() - 1]; - } -@@ -250,10 +250,10 @@ - } - - void GetPayload( -- char** ppPayloadName = NULL, -- u_int8_t* pPayloadNumber = NULL, -- u_int16_t* pMaxPayloadSize = NULL, -- char **ppEncodingParams = NULL); -+ char** ppPayloadName = 0, -+ u_int8_t* pPayloadNumber = 0, -+ u_int16_t* pMaxPayloadSize = 0, -+ char **ppEncodingParams = 0); - - void SetPayload( - const char* payloadName, -@@ -265,7 +265,7 @@ - - void ReadHint( - MP4SampleId hintSampleId, -- u_int16_t* pNumPackets = NULL); -+ u_int16_t* pNumPackets = 0); - - u_int16_t GetHintNumberOfPackets(); - ---- faad2/frontend/main.c -+++ faad2.patched/frontend/main.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -377,8 +378,8 @@ - float *song_length) - { - int tagsize; -- unsigned long samplerate; -- unsigned char channels; -+ uint32_t samplerate; -+ uint8_t channels; - void *sample_buffer; - - audio_file *aufile; -@@ -656,7 +657,7 @@ - for (i = 0; i < numTracks; i++) - { - unsigned char *buff = NULL; -- int buff_size = 0; -+ uint32_t buff_size = 0; - mp4AudioSpecificConfig mp4ASC; - - mp4ff_get_decoder_config(infile, i, &buff, &buff_size); -@@ -687,8 +688,8 @@ - int infoOnly, int adts_out, float *song_length) - { - int track; -- unsigned long samplerate; -- unsigned char channels; -+ uint32_t samplerate; -+ uint8_t channels; - void *sample_buffer; - - mp4ff_t *infile; -@@ -707,7 +708,7 @@ - mp4AudioSpecificConfig mp4ASC; - - unsigned char *buffer; -- int buffer_size; -+ uint32_t buffer_size; - - char percents[200]; - int percent, old_percent = -1; ---- faad2/libfaad/decoder.c -+++ faad2.patched/libfaad/decoder.c -@@ -50,7 +50,7 @@ - uint16_t dbg_count; - #endif - --int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode) -+char* FAADAPI faacDecGetErrorMessage(uint8_t errcode) - { - if (errcode >= NUM_ERROR_MESSAGES) - return NULL; ---- faad2/libfaad/decoder.h -+++ faad2.patched/libfaad/decoder.h -@@ -76,7 +76,7 @@ - #define LFE_CHANNEL (9) - #define UNKNOWN_CHANNEL (0) - --int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode); -+char* FAADAPI faacDecGetErrorMessage(uint8_t errcode); - - uint32_t FAADAPI faacDecGetCapabilities(void); - ---- faad2/libfaad/error.c -+++ faad2.patched/libfaad/error.c -@@ -28,7 +28,7 @@ - #include "common.h" - #include "error.h" - --int8_t *err_msg[] = { -+char *err_msg[] = { - "No error", - "Gain control not yet implemented", - "Pulse coding not allowed in short blocks", ---- faad2/libfaad/error.h -+++ faad2.patched/libfaad/error.h -@@ -33,7 +33,7 @@ - #endif - - #define NUM_ERROR_MESSAGES 26 --extern int8_t *err_msg[]; -+extern char *err_msg[]; - - #ifdef __cplusplus - } diff --git a/media-libs/faad2/files/mp4atom-sliver.patch b/media-libs/faad2/files/mp4atom-sliver.patch deleted file mode 100644 index 50b6d0e57bd2..000000000000 --- a/media-libs/faad2/files/mp4atom-sliver.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: mp4atom.h -=================================================================== -RCS file: /vws/pan/mpeg4ip/lib/mp4v2/mp4atom.h,v -retrieving revision 1.30 -diff -c -w -r1.30 mp4atom.h -*** mp4atom.h 5 Dec 2001 21:11:20 -0000 1.30 ---- mp4atom.h 3 Dec 2003 21:56:26 -0000 -*************** -*** 88,94 **** - return m_type; - }; - void SetType(const char* type) { -! if (type) { - ASSERT(strlen(type) == 4); - memcpy(m_type, type, 4); - m_type[4] = '\0'; ---- 88,94 ---- - return m_type; - }; - void SetType(const char* type) { -! if (type && *type != '\0') { - ASSERT(strlen(type) == 4); - memcpy(m_type, type, 4); - m_type[4] = '\0'; -- 2.26.2