summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-07-17 16:23:16 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-07-17 16:23:16 +0000
commit272d69eddc68af8e55c3ea2dd7fa99df68d1fe11 (patch)
tree7ac571aae5203e5860f3d3e9d7173c1883fd2260 /media-video
parentfixed download location to not dowload some beta anymore (diff)
downloadgentoo-2-272d69eddc68af8e55c3ea2dd7fa99df68d1fe11.tar.gz
gentoo-2-272d69eddc68af8e55c3ea2dd7fa99df68d1fe11.tar.bz2
gentoo-2-272d69eddc68af8e55c3ea2dd7fa99df68d1fe11.zip
Final fix.
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/Manifest18
-rw-r--r--media-video/mplayer/mplayer-0.90-r3.ebuild35
3 files changed, 36 insertions, 22 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a3c42b0746dc..bcb78ee1d81d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# 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.67 2003/07/16 17:17:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.68 2003/07/17 16:23:04 mholzer Exp $
+
+ 18 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r3.ebuild:
+ Final fix.
16 Jul 2003; Luca Barbato<lu_zero@gentoo.org> mplayer-0.90-r2.ebuild,
mplayer-0.90-r3.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ba76e4f80501..9f4f7fe99262 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,15 +1,15 @@
-MD5 3daaf6d4bbef08041d618a4faae7cf56 ChangeLog 12396
-MD5 c299a62704fcb831f04fe8b6c7a40af6 mplayer-0.90-r3.ebuild 12063
-MD5 ef45b71625683ce7f5e3bf69aea68a20 mplayer-0.90-r2.ebuild 11650
+MD5 22e125fb2369ebbf604a1c34a83e28cd ChangeLog 12484
+MD5 fb352e9d5e250ed892474a49630b06c3 mplayer-0.90-r3.ebuild 12422
MD5 9c8668f190a57619c04d9046719ac33b mplayer-0.90_rc4.ebuild 10313
MD5 5d3c8a5d6f58f269b5ecd8e7db1852e6 mplayer-0.90_rc5.ebuild 10314
+MD5 ef45b71625683ce7f5e3bf69aea68a20 mplayer-0.90-r2.ebuild 11650
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
-MD5 707fe95066bbd1ab7f2185a4b4d6e83e files/digest-mplayer-0.90-r3 363
+MD5 5acc0011a4730f2f9b83777d607d655b files/digest-mplayer-0.90_rc4 286
+MD5 c85d870e468ad99ad402ce4716827af7 files/digest-mplayer-0.90_rc5 286
MD5 889423ecc224e52910bb0df6c78ca037 files/mplayer-0.90-fix-version.patch 261
-MD5 c2d1a4c1e84abf704a7b9686ea9309ae files/digest-mplayer-0.90-r2 283
+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 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 5acc0011a4730f2f9b83777d607d655b files/digest-mplayer-0.90_rc4 286
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 c85d870e468ad99ad402ce4716827af7 files/digest-mplayer-0.90_rc5 286
+MD5 c2d1a4c1e84abf704a7b9686ea9309ae files/digest-mplayer-0.90-r2 283
+MD5 707fe95066bbd1ab7f2185a4b4d6e83e files/digest-mplayer-0.90-r3 363
diff --git a/media-video/mplayer/mplayer-0.90-r3.ebuild b/media-video/mplayer/mplayer-0.90-r3.ebuild
index 463897466f00..2dde4a71f3f0 100644
--- a/media-video/mplayer/mplayer-0.90-r3.ebuild
+++ b/media-video/mplayer/mplayer-0.90-r3.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.90-r3.ebuild,v 1.4 2003/07/16 17:16:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r3.ebuild,v 1.5 2003/07/17 16:23:04 mholzer 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"
@@ -71,12 +71,28 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86 ~ppc ~sparc"
-pkg_setup() {
- if [ "`use svga`" ]
- then
- einfo "Modprobing svgalib_helper"
- modprobe svgalib_helper
+svgalib_helper_setup() {
+ einfo "Compiling svgalib_helper to enable vidix non-root mode."
+ # Unpack source archive and patch Makefile
+ unpack svgalib_helper-1.9.17-mplayer.tar.bz2
+ mv ${WORKDIR}/svgalib_helper ${S}/libdha
+ cd ${S}/libdha
+ mv Makefile Makefile.orig
+ sed -e "s/^#CFLAGS/CFLAGS/" Makefile.orig > Makefile
+
+ # Build svgalib_helper
+ cd svgalib_helper
+ make
+
+ # Modprobe svgalib_helper
+ if([ "`grep '^svgalib_helper' /proc/modules`" ]) ; then
+ ewarn "Unloading already loaded svgalib_helper"
+ modprobe -r svgalib_helper
fi
+ ewarn "Modprobing svgalib_helper"
+ addwrite /proc/sys/kernel/tainted
+ insmod svgalib_helper.o
+ cd ${WORKDIR}
}
src_unpack() {
@@ -85,12 +101,7 @@ src_unpack() {
if [ "`use svga`" ]
then
- unpack svgalib_helper-1.9.17-mplayer.tar.bz2
- mv ${WORKDIR}/svgalib_helper ${S}/libdha
- cd ${S}/libdha
- mv Makefile Makefile.orig
- sed -e "s/^#CFLAGS/CFLAGS/" Makefile.orig > Makefile
- cd ${WORKDIR}
+ svgalib_helper_setup
fi
use truetype || \