cleanup libpostproc

4 files changed, 24 insertions, 32 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ba4cdb2bea38..4065668697d0 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.76 2003/09/06 18:23:55 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.77 2003/09/06 18:43:31 azarah Exp $
 
   06 Sep 2003; Alexander Gabert <pappy@gentoo.org> mplayer-0.91.ebuild,
   mplayer-1.0_pre1.ebuild:
   added support for hardened-gcc, see bug 27507
 
+  06 Sep 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-1.0_pre1.ebuild:
+  Cleanup libpostproc stuff a bit. Last time I checked, we should not need to
+  install the static version of the library.
+
   04 Sep 2003; Heinrich Wendel <lanius@gentoo.org> mplayer-0.90-r2.ebuild,
   mplayer-0.90-r5.ebuild, mplayer-0.90_rc4.ebuild, mplayer-0.91.ebuild,
   mplayer-1.0_pre1.ebuild, files/mplayer-0.90-fix-version.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 6338feda20a1..539dd15cd236 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,13 +1,13 @@
-MD5 a92242704f3282f08f73f5c7963e0e24 ChangeLog 14248
-MD5 ac8b056a5eabd91441a2724c28938266 mplayer-1.0_pre1.ebuild 11181
-MD5 87d81c330d408e2c163fa54c065ecaaa mplayer-0.91.ebuild 11270
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 3a99e8f86899fc5356ae8d563af2ac9c files/digest-mplayer-1.0_pre1 358
+MD5 62167c3bc26b40a16bd8c3d83fc6d031 ChangeLog 14450
+MD5 f11e84b384afb3e23e263bcaa1b2d677 mplayer-0.91.ebuild 11262
+MD5 039fcc5073a9137bf22e269a91690c14 mplayer-1.0_pre1.ebuild 10836
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 611354a9a8c185e9ae1cda37d197c073 files/digest-mplayer-0.91 355
+MD5 3a99e8f86899fc5356ae8d563af2ac9c files/digest-mplayer-1.0_pre1 358
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
diff --git a/media-video/mplayer/mplayer-0.91.ebuild b/media-video/mplayer/mplayer-0.91.ebuild
index ca9a2efa3da2..f1fc6f552930 100644
--- a/media-video/mplayer/mplayer-0.91.ebuild
+++ b/media-video/mplayer/mplayer-0.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.91.ebuild,v 1.5 2003/09/06 18:23:55 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.91.ebuild,v 1.6 2003/09/06 18:43:31 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba"
 
@@ -265,9 +265,10 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-    if has_version 'sys-devel/hardened-gcc' && [ ${CC}="gcc" ] ; then
-        CC="${CC} -yet_exec"
-    fi
+	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
+	then
+		CC="${CC} -yet_exec"
+	fi
 
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
diff --git a/media-video/mplayer/mplayer-1.0_pre1.ebuild b/media-video/mplayer/mplayer-1.0_pre1.ebuild
index ff1bda755d02..5a31a366c3f7 100644
--- a/media-video/mplayer/mplayer-1.0_pre1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1.ebuild,v 1.5 2003/09/06 18:23:55 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1.ebuild,v 1.6 2003/09/06 18:43:31 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba"
 
@@ -103,8 +103,6 @@ src_unpack() {
 		cd ${S}/libdha
 		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
 	fi
-
-	cp -r ${S}/postproc ${S}/postproc.so
 }
 
 src_compile() {
@@ -256,9 +254,10 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-    if has_version 'sys-devel/hardened-gcc' && [ ${CC}="gcc" ] ; then
-        CC="${CC} -yet_exec"
-    fi
+	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
+	then
+		CC="${CC} -yet_exec"
+	fi
 
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
@@ -288,7 +287,7 @@ src_compile() {
 	# We build the shared libpostproc.so here so that our
 	# mplayer binary is not linked to it, ensuring that we
 	# do not run into issues ... (bug #14479)
-	cd ${S}/postproc.so
+	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
 	if [ -n "`use matrox`" ]
@@ -317,18 +316,6 @@ src_install() {
 	     install || die "Failed to install libpostproc.so!"
 	cd ${S}
 
-	# Some stuff like transcode can use this one.
-	if [ -f ${S}/libavcodec/libpostproc/libpostproc.a ]
-	then
-		dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-		if [ ! -f ${D}/usr/include/postproc/postprocess.h ]
-		then
-			insinto /usr/include/postproc
-			doins ${S}/libavcodec/postproc/postprocess.h
-		fi
-	fi
-
 	dodoc AUTHORS ChangeLog README
 	# Install the documentation; DOCS is all mixed up not just html
 	cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die