Spring Clean

svn path=/; revision=112

6 files changed, 24 insertions, 136 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
deleted file mode 100644
index 0437b3e..0000000
--- a/media-video/avidemux/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for media-video/avidemux
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  13 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
-  Added avidemux 2.3.0 (ebuild based on the kpex-media one)
-
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
deleted file mode 100644
index 762ca56..0000000
--- a/media-video/avidemux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avidemux_2.3.0.tar.gz 4750919 RMD160 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e SHA1 40a51db22593d910224dac91b512489a6af499fb SHA256 ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623
-EBUILD avidemux-2.3.0.ebuild 3087 RMD160 8d58da6d7e8f64ec62ce0d29c8e263e62a47b8a0 SHA1 fc7e8cbb422b77fa13898c245ee47fa24566438e SHA256 40a7e466406196a3afe52c5be5598f91d9ac81b8ae3a44ac885cdebba1fcd873
-MISC ChangeLog 245 RMD160 be7f1b241e103e34c63ccfb763428adac3a846b6 SHA1 0bcbf64e0b352c2c220d195aff5f0b00df06f98a SHA256 ef0e894ea3a11c218165dc994476b91f921538eb05d8db6ea4b1955482d9260d
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
deleted file mode 100644
index f1760a5..0000000
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=1.9
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Great Video editing/encoding tool"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://download.berlios.de/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-S="${WORKDIR}/${PN}_${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="a52 aac alsa altivec arts encode esd mad nls vorbis sdl truetype x264 xvid xv oss"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.6
-	>=dev-libs/libxml2-2.6.7
-	>=dev-lang/spidermonkey-1.5_rc6-r1
-	a52? ( >=media-libs/a52dec-0.7.4 )
-	encode? ( >=media-sound/lame-3.93 )
-	aac? ( >=media-libs/faac-1.23.5
-	       >=media-libs/faad2-2.0-r7 )
-	esd? ( media-sound/esound )
-	mad? ( media-libs/libmad )
-	xvid? ( >=media-libs/xvid-1.0.0 )
-	x264? ( media-libs/x264-svn )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	vorbis? ( >=media-libs/libvorbis-1.0.1 )
-	arts? ( >=kde-base/arts-1.2.3 )
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	sdl? ( media-libs/libsdl )
-	|| ( (
-			xv? ( x11-libs/libXv )
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		) virtual/x11 )"
-# media-sound/toolame is supported as well
-
-DEPEND="$RDEPEND
-	|| ( (
-			x11-base/xorg-server
-			x11-libs/libXt
-			x11-proto/xextproto
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if ! built_with_use dev-lang/spidermonkey threadsafe; then
-		echo
-		eerror "Avidemux needs dev-lang/spidermonkey to be"
-		eerror "built with the 'threadsafe' useflag. Please"
-		eerror "re-emerge spidermonkey with USE=\"threadsafe\""
-		echo
-		die "spidermonkey needs threadsafe use flag"
-	fi
-
-	if ! ( use oss || use arts || use alsa ); then
-		die "You must select at least one between oss, arts and alsa audio output."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags "-fno-default-inline"
-	filter-flags "-funroll-loops"
-	filter-flags "-funroll-all-loops"
-	filter-flags "-fforce-addr"
-	econf \
-		$(use_enable nls) \
-		$(use_enable altivec) \
-		$(use_enable xv) \
-		$(use_with mad libmad) \
-		$(use_with arts) \
-		$(use_with alsa) \
-		$(use_with esd) \
-		$(use_with oss) \
-		$(use_with vorbis) \
-		$(use_with a52 a52dec) \
-		$(use_with sdl libsdl) \
-		$(use_with truetype freetype2) \
-		$(use_with aac faac) $(use_with aac faad2) \
-		$(use_with xvid) \
-		$(use_with x264) \
-		$(use_with encode lame) \
-		--with-newfaad --with-jsapi-include=/usr/include/js \
-		--disable-warnings --disable-dependency-tracking \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog History README TODO
-	insinto /usr/share/pixmaps
-	doins ${S}/avidemux_icon.png avidemux.png
-	make_desktop_entry avidemux2 "Avidemux2" avidemux.png
-}
-
-pkg_postinst() {
-	if use ppc && use oss; then
-		echo
-		einfo "OSS sound output may not work on ppc"
-		einfo "If your hear only static noise, try"
-		einfo "changing the sound device to ALSA or arts"
-	fi
-}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4acf609..31bcedc 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,7 @@
 AUX ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161 RMD160 c3e17a8e8a3e501ae9ce8b8e455063444d1bc15f SHA1 e4f280a2934e238529ca8b0d8d2abec2638d9fb1 SHA256 f993ac1ad11e254d846fbd0b3f73f81043551fce90438fdd196374ca9ece6c9c
+AUX ffmpeg-libdir-2007.patch 313 RMD160 88b86d34eaf976db25db70449b0d4a3238a16a32 SHA1 43486a328913beec5ae1f38eb6fd987b2d756995 SHA256 08df45ff041269c1226eda787e9a30373ed7b5a469e06b6b30bd6a81e781f863
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
 DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA1 b22dbe895991c23fad446c3c4ff7b6db12673778 SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
 DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA1 9ca910295c2888fba95a98da83762a22aaf34651 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
-EBUILD ffmpeg-9999.ebuild 5513 RMD160 155060c4fbdf92ca94a2dfe6cf691ec6ca32f4f7 SHA1 af5de3b7780ed07255e55d2804316ae061c56b4d SHA256 ab033ee87a7dba76d0d9dea137ae9361442ca3b1dd30626240526136d70062cb
+EBUILD ffmpeg-9999.ebuild 5658 RMD160 2989e64dc2c4e8349197a76818ab968fa489b7a6 SHA1 1cec7a10f74b9591baa25a55b67f029c3fd278ec SHA256 a8cbdf6b1db1cd64e59a946b8378c5198545b62de0b9fd7f56ec01c22c5e76f5
 MISC ChangeLog 210 RMD160 2812f001d2afd918862c5265c6e3cb7614c9dbd7 SHA1 8f7710ce038a84161408f4432510672f07d72ea6 SHA256 07dccfb895c00d33d8b6fb3164152715a8274a30406da36eed3cce280ceeb1d9
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 109b6f6..e99b9bc 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -8,7 +8,7 @@ ESVN_PROJECT="ffmpeg"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
+HOMEPAGE="http://ffmpeg.org/"
 MY_P=${P/_/-}
 S=${WORKDIR}/ffmpeg
 
@@ -45,6 +45,7 @@ src_unpack() {
 	unpack ${A}
 	subversion_src_unpack
 
+	# amr (float) support
 	if use amr; then
 		einfo "Including amr wide and narrow band (float) support ... "
 
@@ -68,6 +69,10 @@ src_unpack() {
 	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
 
+	# .pc files contain wrong libdir path
+	epatch "${FILESDIR}"/${PN}-libdir-2007.patch
+	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
+
 	# Make it use pic always since we don't need textrels
 	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
 
@@ -75,7 +80,7 @@ src_unpack() {
 	sed -i -e "s:-e debug=off::" tests/server-regression.sh
 
 	# CC is not always gcc
-	sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure
+#	sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure
 
 	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
 }
@@ -88,7 +93,7 @@ src_compile() {
 
 	#disable mmx accelerated code if not requested, or if PIC is required
 	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
+	if ( gcc-specs-pie || ! use mmx ) ; then
 		myconf="${myconf} --disable-mmx"
 	fi
 
@@ -105,20 +110,20 @@ src_compile() {
 	myconf="${myconf} --disable-opts"
 
 	# disabled by default
-	use encode && myconf="${myconf} --enable-mp3lame"
+	use encode && myconf="${myconf} --enable-libmp3lame"
 	use a52 && myconf="${myconf} --enable-a52"
 	use ieee1394 && myconf="${myconf} --enable-dc1394"
 	use threads && myconf="${myconf} --enable-pthreads"
 	use xvid && myconf="${myconf} --enable-xvid"
 	if use vorbis
 	then
-		myconf="${myconf} --enable-vorbis --enable-libogg"
+		myconf="${myconf} --enable-libvorbis --enable-libogg"
 	else
 		use ogg && myconf="${myconf} --enable-libogg"
 	fi
 	use dts && myconf="${myconf} --enable-dts"
 	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-faad --enable-faac"
+	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
 	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
 
 	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
new file mode 100644
index 0000000..ca3f202
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
@@ -0,0 +1,11 @@
+--- ffmpeg/configure.orig	2007-01-29 15:24:05.000000000 +0100
++++ ffmpeg/configure	2007-01-29 15:37:23.000000000 +0100
+@@ -2166,7 +2166,7 @@
+ cat <<EOF >$name.pc
+ prefix=$PREFIX
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+ 
+ Name: $name