From 38da3b3dd6abcbb6ffe8cd4db6f1372b97816483 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 29 Nov 2006 11:49:10 +0000 Subject: [PATCH] Remove faad2 2.5 till the legal standing is cleared. Package-Manager: portage-2.1.2_rc2-r2 --- media-libs/faad2/Manifest | 32 ++----- media-libs/faad2/faad2-2.5.ebuild | 75 ---------------- media-libs/faad2/files/digest-faad2-2.5 | 3 - .../files/faad2-2.5-missing-include.patch | 11 --- .../files/faad2-2.5-no-xmms-or-bmp.patch | 87 ------------------- 5 files changed, 8 insertions(+), 200 deletions(-) delete mode 100644 media-libs/faad2/faad2-2.5.ebuild delete mode 100644 media-libs/faad2/files/digest-faad2-2.5 delete mode 100644 media-libs/faad2/files/faad2-2.5-missing-include.patch delete mode 100644 media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest index 951a3fd13b45..746b2fb1e7a4 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -21,14 +21,6 @@ AUX faad2-2.0-makefile-space.patch 326 RMD160 df335a6b9de3d9f9c1e3a1aa26542878c5 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-2.5-missing-include.patch 342 RMD160 46ad8d495e9a64728c9c4907a3b41f99f9862c86 SHA1 5be80fb8f72e283deb24fdaae0ac4c69d10496ad SHA256 1269a6adc685d9b0f5344772c110a55f72d4e0a270239ea6599e04c59ecdf9a5 -MD5 e63deda4ede6ab7a7e9eb1a868c35107 files/faad2-2.5-missing-include.patch 342 -RMD160 46ad8d495e9a64728c9c4907a3b41f99f9862c86 files/faad2-2.5-missing-include.patch 342 -SHA256 1269a6adc685d9b0f5344772c110a55f72d4e0a270239ea6599e04c59ecdf9a5 files/faad2-2.5-missing-include.patch 342 -AUX faad2-2.5-no-xmms-or-bmp.patch 2868 RMD160 99f6ff6d2f68157f1bfc0b87b3f143c6966176bf SHA1 fb422405bbd3d5fdad4b46b7dbbbadb51b665927 SHA256 66d266f9a874fb422d4e7b5d0c8debb6a42a101a007c3e4df2fa04a83eb63e42 -MD5 6119db081ac1bb251637ee761935ed59 files/faad2-2.5-no-xmms-or-bmp.patch 2868 -RMD160 99f6ff6d2f68157f1bfc0b87b3f143c6966176bf files/faad2-2.5-no-xmms-or-bmp.patch 2868 -SHA256 66d266f9a874fb422d4e7b5d0c8debb6a42a101a007c3e4df2fa04a83eb63e42 files/faad2-2.5-no-xmms-or-bmp.patch 2868 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 @@ -38,7 +30,6 @@ MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659 RMD160 08e3104023bc9288d83f450d1b4442e41e8ac271 files/mp4atom-sliver.patch 659 SHA256 8f37bd575870e33001d05bd60a8a9d1fc353e8cf6f25bce835478ee6ce37d88a files/mp4atom-sliver.patch 659 DIST faad2-2.0.tar.gz 766660 RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 SHA1 fc9f8d0812a9f46bbd851880045131e0e4ab08b8 SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861 -DIST faad2-2.5.tar.gz 751675 RMD160 4031786df0aded272bc4603ef18e80128e5e9063 SHA1 3805d32c9d0033572eced93482f81c1dd198cd2c SHA256 a75f9642f85030d60c332b02e53fa04e3b4677f73914da2dc1b000689f5f67bb 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 @@ -56,14 +47,10 @@ EBUILD faad2-2.0-r7.ebuild 1957 RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c MD5 554c3c256e3c9c8ba19cd5cd138bab44 faad2-2.0-r7.ebuild 1957 RMD160 a1532eebfbcc7546346f9837d907d4e951d1cc6c faad2-2.0-r7.ebuild 1957 SHA256 97ef83943cec14d205c00ff9b13eb12f91856603bb0975ed92fc2eb881ab089b faad2-2.0-r7.ebuild 1957 -EBUILD faad2-2.5.ebuild 1868 RMD160 125b3b181dcf94e6dd64d1bae12d5f29d3a3b9b0 SHA1 22c3dba379a545772818f5944ceedfc834e0007f SHA256 3ac78f1fcb4b796591a1f615ee77c547034ed39a6c41e04aa8be4603b0fe0627 -MD5 dba4280a778495a74a3ae596a00e3366 faad2-2.5.ebuild 1868 -RMD160 125b3b181dcf94e6dd64d1bae12d5f29d3a3b9b0 faad2-2.5.ebuild 1868 -SHA256 3ac78f1fcb4b796591a1f615ee77c547034ed39a6c41e04aa8be4603b0fe0627 faad2-2.5.ebuild 1868 -MISC ChangeLog 11431 RMD160 8c9b9643730a48e275e04d281f99e49f4a9a5a2b SHA1 ba3dc607424820b2c508ff1ebef5b92cc0a77677 SHA256 d066495ab68f24e4e3acd767cf6effc82dc6926da9d761c156b35ffe1bb20289 -MD5 82b87cc1f1898946a58f18ea2492069e ChangeLog 11431 -RMD160 8c9b9643730a48e275e04d281f99e49f4a9a5a2b ChangeLog 11431 -SHA256 d066495ab68f24e4e3acd767cf6effc82dc6926da9d761c156b35ffe1bb20289 ChangeLog 11431 +MISC ChangeLog 11643 RMD160 ee1fc231a696f47c3ef5697f1e84832b27c87513 SHA1 fd9f1448719fa517491ba32e977a9555446040fa SHA256 539d66641e108345db025e33bc499142854fc989213578ee6d770e9a216c2d74 +MD5 64dda5a4bd9563a5b3fdb5ba08e368a5 ChangeLog 11643 +RMD160 ee1fc231a696f47c3ef5697f1e84832b27c87513 ChangeLog 11643 +SHA256 539d66641e108345db025e33bc499142854fc989213578ee6d770e9a216c2d74 ChangeLog 11643 MISC metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace SHA1 f013305de22423b585f4138b1a5e9d67ca45c17f SHA256 b96036a098648c1ad5fb2105bd2997bed79a5df723389e892627ae2523aae356 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387 RMD160 891f0392b255f261ca75a0e8541d453579313ace metadata.xml 387 @@ -80,13 +67,10 @@ SHA256 9c8116b90e712da479a939c9ceff861534435b08f59136e0cce99eb2b5f3ccc2 files/di 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 -MD5 d74eec83471dee1c48898200601383f6 files/digest-faad2-2.5 229 -RMD160 40b33c7286395e8f6cbb8900453003cbc154c74c files/digest-faad2-2.5 229 -SHA256 6df7cb06df17b4ababd767b6b16a399f9dd8eb969c222679c56a311cf8da50af files/digest-faad2-2.5 229 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFbW2fp5vW4rUFj5oRAiVeAJ0aBgETZAYfx5zm/gFIOR4878QjfwCeNKPn -LjHr9Zo4vYqA2Off2AeyhKQ= -=bCqq +iD8DBQFFbXOxAiZjviIA2XgRAgSsAJ43ODMYJC+rKUKwSWtTWde/4Kii0ACgpzQO +Vg15b3Tx1R39Ll1lq1o/nYM= +=vH89 -----END PGP SIGNATURE----- diff --git a/media-libs/faad2/faad2-2.5.ebuild b/media-libs/faad2/faad2-2.5.ebuild deleted file mode 100644 index e19bda962f65..000000000000 --- a/media-libs/faad2/faad2-2.5.ebuild +++ /dev/null @@ -1,75 +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.5.ebuild,v 1.2 2006/11/29 11:22:30 chainsaw 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}-no-xmms-or-bmp.patch - epatch ${FILESDIR}/${P}-missing-include.patch -} - -src_compile() { - # see #34392 - filter-flags -mfpmath=sse - - # Fix for bug #67510 - ebegin "Rebuilding configure scripts (this will take a while)" - WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.7 \ - aclocal -I . &> /dev/null && \ - autoheader &> /dev/null && \ - libtoolize --automake --copy &> /dev/null && \ - automake --add-missing --copy &> /dev/null && \ - autoconf &> /dev/null || die "Couldn't build configuration file" - eend $? - elibtoolize - - # mp4v2 needed for rhythmbox - # drm needed for nothing but doesn't hurt - - econf \ - --with-mp4v2 \ - --with-drm \ - || 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.5 b/media-libs/faad2/files/digest-faad2-2.5 deleted file mode 100644 index 26571d43d5f3..000000000000 --- a/media-libs/faad2/files/digest-faad2-2.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 696490935bf65b2ace4aafaff79e2396 faad2-2.5.tar.gz 751675 -RMD160 4031786df0aded272bc4603ef18e80128e5e9063 faad2-2.5.tar.gz 751675 -SHA256 a75f9642f85030d60c332b02e53fa04e3b4677f73914da2dc1b000689f5f67bb faad2-2.5.tar.gz 751675 diff --git a/media-libs/faad2/files/faad2-2.5-missing-include.patch b/media-libs/faad2/files/faad2-2.5-missing-include.patch deleted file mode 100644 index ab41fd55349c..000000000000 --- a/media-libs/faad2/files/faad2-2.5-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr faad2.ORIG/frontend/main.c faad2/frontend/main.c ---- faad2.ORIG/frontend/main.c 2006-11-29 11:12:09.000000000 +0000 -+++ faad2/frontend/main.c 2006-11-29 11:15:56.000000000 +0000 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch b/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch deleted file mode 100644 index 1d200bab4609..000000000000 --- a/media-libs/faad2/files/faad2-2.5-no-xmms-or-bmp.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -uNr faad2.ORIG/configure.in faad2/configure.in ---- faad2.ORIG/configure.in 2006-11-29 11:06:17.000000000 +0000 -+++ faad2/configure.in 2006-11-29 11:06:48.000000000 +0000 -@@ -4,7 +4,6 @@ - dnl - libfaad.so - dnl - libmp4ff.a (only static for moment) - dnl - faad --dnl - xmms input mp4/aac plugin - dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed) - - AC_INIT -@@ -26,12 +25,6 @@ - - AM_CONFIG_HEADER(config.h) - --AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin], -- WITHXMMS=$withval, WITHXMMS=no) -- --AC_ARG_WITH(bmp,[ --with-bmp compile beep media player plugin], -- [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no]) -- - AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support], - WITHDRM=$withval, WITHDRM=no) - -@@ -94,32 +87,6 @@ - fi - fi - --if test x$WITHXMMS = xyes; then -- AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found") -- if test "$XMMS_CONFIG" = "not_found"; then -- AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build") -- fi -- AC_CHECK_HEADER(pthread.h,, -- AC_MSG_ERROR(*** pthread headers support not installed or not found)) -- AC_CHECK_HEADER(id3.h,, -- AC_MSG_ERROR(*** id3lib headers support not installed or not found)) -- AC_CHECK_PROGS(GTK_CONFIG, gtk-config, "not_found") -- if test "$XGTK_CONFIG" = "not_found"; then -- AC_MSG_ERROR("*** gtk-config not found - xmms plugin can't be build without") -- fi -- -- AM_CONDITIONAL(HAVE_XMMS, true) --else -- AC_MSG_NOTICE(no xmms build configured) -- AM_CONDITIONAL(HAVE_XMMS, false) --fi -- --if test x$WITHBMP = xyes; then -- AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built]) -- AM_CONDITIONAL([HAVE_XMMS], true) -- AM_CONDITIONAL([HAVE_BMP], true) --fi -- - if test x$WITHDRM = xyes; then - AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)]) - AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo]) -@@ -129,8 +96,6 @@ - AC_CONFIG_FILES(common/Makefile) - AC_CONFIG_FILES(common/mp4ff/Makefile) - AC_CONFIG_FILES(plugins/Makefile) --AC_CONFIG_FILES(plugins/xmms/Makefile) --AC_CONFIG_FILES(plugins/xmms/src/Makefile) - AC_CONFIG_FILES(plugins/mpeg4ip/Makefile) - AC_CONFIG_FILES(faad2.spec) - AC_CONFIG_FILES(frontend/Makefile) -diff -uNr faad2.ORIG/plugins/Makefile.am faad2/plugins/Makefile.am ---- faad2.ORIG/plugins/Makefile.am 2006-11-29 11:06:17.000000000 +0000 -+++ faad2/plugins/Makefile.am 2006-11-29 11:07:07.000000000 +0000 -@@ -1,17 +1,5 @@ - if HAVE_MPEG4IP_PLUG --if HAVE_XMMS --SUBDIRS = xmms mpeg4ip --else - SUBDIRS = mpeg4ip --endif #HAVE_XMMS --else --if HAVE_XMMS --SUBDIRS = xmms --else --if HAVE_BMP --SUBDIRS = bmp - else - SUBDIRS = --endif #HAVE_BMP --endif #HAVE_XMMS - endif #HAVE_MPEG4IP_PLUG -- 2.26.2