diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2004-05-28 09:42:42 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2004-05-28 09:42:42 +0000 |
| commit | 1138156a7c9c61ab2b99d6d3f5bca941c046f463 (patch) | |
| tree | a1069e9c0aee93e99a3b9688f17ffeda78f6a557 /media-video | |
| parent | Fixed something wrong with the digest (diff) | |
| download | gentoo-2-1138156a7c9c61ab2b99d6d3f5bca941c046f463.tar.gz gentoo-2-1138156a7c9c61ab2b99d6d3f5bca941c046f463.tar.bz2 gentoo-2-1138156a7c9c61ab2b99d6d3f5bca941c046f463.zip | |
Fixed build problems with 2.6 kernels < 2.6.6
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r3.ebuild | 26 |
2 files changed, 30 insertions, 3 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/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 } |