Fixed build problems with 2.6 kernels < 2.6.6

3 files changed, 56 insertions, 29 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ddccff07b170..eb8107e099a6 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.136 2004/05/28 03:38:31 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.137 2004/05/28 09:42:42 phosphan Exp $
+
+  28 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mplayer-1.0_pre4-r3.ebuild:
+  The sandbox fixes were fine for 2.6.6, but failed with 2.6.5. Fixed that, see
+  bug #40616 again.
 
   27 May 2004; Daniel Ostrow <dostrow@gentoo.org> mplayer-1.0_pre4-r3.ebuild:
   Stable on ppc.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7903d1697636..42daaef974e1 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,37 +1,37 @@
-MD5 ce711d0666e7b67b19c14dea4ffdbeed ChangeLog 23709
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
-MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
-MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
 MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
-MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525
-MD5 bafb9c82fa8f3a39f28bb8f1c2eea2f4 mplayer-1.0_pre4-r1.ebuild 11368
+MD5 8ca704b669f89e2d885d627782ed8418 mplayer-1.0_pre4-r3.ebuild 12443
 MD5 744333b8c3656249f927f7a5891c0def mplayer-1.0_pre4.ebuild 11137
+MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
+MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
 MD5 e1ea94156aa7baa33df978435e05e0d1 mplayer-1.0_pre4-r2.ebuild 11548
-MD5 46812110aac2cf3703ce6332491a86d0 mplayer-1.0_pre4-r3.ebuild 11661
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525
+MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
+MD5 46f0ac1b829e4fd20984aeb107afd83a ChangeLog 23894
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 bafb9c82fa8f3a39f28bb8f1c2eea2f4 mplayer-1.0_pre4-r1.ebuild 11368
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 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 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
-MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
-MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
-MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
-MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
index b9535436a80f..dfca769bda8f 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_pre4-r3.ebuild,v 1.4 2004/05/28 03:38:38 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.5 2004/05/28 09:42:42 phosphan 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 samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux"
 
@@ -118,6 +118,7 @@ src_unpack() {
 	# preparing build for 2.6 mga kernel module
 	cp ${KV_OUTPUT}/.config ${T}/
 	ln -s /usr/src/linux/scripts ${T}/
+	ln -s /usr/src/linux/include ${T}/
 	sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \
 		|| die "sed failed setting O=${T}"
 	sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \
@@ -279,8 +280,29 @@ src_compile() {
 	if use matrox
 	then
 		unset ARCH
+		local driverwasbuilt="ok"
+		local dirtytrick="no"
+		local oldwrite="${SANDBOX_WRITE}"
 		cd ${S}/drivers
-		make all || die "Failed to build matrox driver!"
+		if [ ${KV_MAJOR}.${KV_MINOR} = "2.6" -a ${KV_PATCH} -le 5 ]; then
+			einfo "Kernel < 2.6.6, have to remove your include/asm and .config"
+			einfo "temporarily. Putting them into ${T}, will try to restore them later."
+			dirtytrick="yes"
+			addwrite /usr/src/linux/
+			mv /usr/src/linux/.config ${T}/savedconfig
+			mv /usr/src/linux/include/asm ${T}/savedasm
+			SANDBOX_WRITE="${oldwrite}"
+		fi
+		make all || driverwasbuilt="no"
+		if [ ${dirtytrick} = "yes" ]; then
+			addwrite /usr/src/linux
+			mv ${T}/savedconfig /usr/src/linux/.config
+			mv ${T}/savedasm /usr/src/linux/include/asm
+			SANDBOX_WRITE="${oldwrite}"
+		fi
+		if [ ${driverwasbuilt} = "no" ]; then
+			die "Failed to build matrox driver!"
+		fi
 	fi
 }