Removed mga buiding in MPlayer due to reasons in bug #28846.

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2beaf639ff73e04d4d7edd04f62486f5a8ec078a..d98ae16eb766fc97f772542ceb97a7fcd9ab9278 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.230 2004/11/09 22:15:45 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.231 2004/11/11 02:25:22 chriswhite Exp $
+
+  11 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Removed mga buiding in MPlayer due to reasons in bug #28846.
 
   10 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
   Lots of fancy bash scripting to make MPlayer deal with the normal (and proper)

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e9dfc0534a4435abbde72d9332e09679f26ebc63..c30f7de1c1ed60ab889fe1ef1ed1e0359ed3ac82 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 73a56cddc780c4889fb266a7d97d0bea ChangeLog 42857
+MD5 5a6c37b87824060d4bc7ca348757dee8 ChangeLog 43030
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
-MD5 7b3d6f8c50162d684190424cf0204409 mplayer-1.0_pre4-r7.ebuild 12498
+MD5 c014768260e641ecce0e0101976f95b7 mplayer-1.0_pre4-r7.ebuild 12233
 MD5 7f21528ccfbe447640072fedef9ed751 mplayer-1.0_pre5-r2.ebuild 14058
 MD5 ce04980bd31a5121057431003181a885 mplayer-1.0_pre5-r3.ebuild 14889
-MD5 32a1efc7dd4de455b42ec51de3e89d8c mplayer-1.0_pre5-r4.ebuild 16981
+MD5 9a877568a162fac9bb7ebcfd4c2b4b11 mplayer-1.0_pre5-r4.ebuild 16198
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510
@@ -30,13 +30,13 @@ MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
 MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkUGqFdQwWVoAgN4RAjv2AKCf+7Q+2GL42uBQ3tPFDYvvUYTjgwCg0IWG
-MyjFcuDyUWAI25WshaQYtP8=
-=U4s+
+iD8DBQFBks2hFdQwWVoAgN4RAuoqAJ0do7DhUT9hjyLDYwxoFzRzX4oKpQCfRT7K
+/Yixbi4ccp74sh7SSRyKXXk=
+=nPQa
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
index 55d2adb2a0e5c068ebcfd75b6f76dc8551f19f06..18d8bea4d6eddcd051ed80e171bcad25b6f76f4d 100644 (file)
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
@@ -1,6 +1,5 @@
 MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
 MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
 MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 62d4d7af62f1081e2849d4a0a44463de mplayer-1.0_pre4-mga-kernel2.6.patch.tar.bz2 9848
 MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
 MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734

diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index 11029c4dd3174b6a6fdee45aa3feebe0b4af75a7..6b3b6189b180825c000ff9bbf173a2e518a5bb37 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.24 2004/11/09 15:07:49 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.25 2004/11/11 02:25:22 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -15,7 +15,6 @@ S="${WORKDIR}/MPlayer-${MY_PV}"
 SRC_URI="mirror://mplayer/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
        mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
        mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-       mirror://gentoo/${P}-mga-kernel2.6.patch.tar.bz2
        svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
        gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
 # Only install Skin if GUI should be build (gtk as USE flag)
@@ -132,11 +131,6 @@ src_unpack() {
        #bug #58082.  Fixes LANGUAGE variable issues
        epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
 
-       #Setup the matrox makefile
-       if use matrox; then
-               epatch ${DISTDIR}/${P}-mga-kernel2.6.patch.tar.bz2
-       fi # end of matrox related stuff
-
        # Fix hppa compilation
        if use hppa; then
                sed -i -e "s/-O4/-O1/" "${S}/configure" || die "failed to sed configure"
@@ -217,6 +211,7 @@ src_compile() {
                myconf="${myconf} --disable-svga --disable-vidix"
        fi
 
+       myconf="${myconf} $(use_enable matrox mga)"
        myconf="${myconf} $(use_enable 3dnow)"
        myconf="${myconf} $(use_enable 3dnowex)"
        myconf="${myconf} $(use_enable sse)"
@@ -326,12 +321,6 @@ src_install() {
             MANDIR=${D}/usr/share/man \
             install || die "Failed to install MPlayer!"
 
-       if use matrox; then
-               cd ${S}/drivers
-               insinto "/lib/modules/${KV}/kernel/drivers/char"
-               doins "mga_vid.${KV_OBJ}"
-       fi
-
        dodoc AUTHORS ChangeLog README
 
        # Install the documentation; DOCS is all mixed up not just html

diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index 36df4ea401a71607637b80f8aee68f68ab69d60f..303a31086af786f381fa1ed9455a475c0bca3fc3 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.21 2004/11/09 22:15:45 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.22 2004/11/11 02:25:22 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -140,11 +140,6 @@ src_unpack() {
        #gmplayer.  Fixes Bug #58619.
        use alsa && epatch ${DISTDIR}/${P}-alsa-gui.patch.tar.bz2
 
-       #Setup the matrox makefile
-       if use matrox; then
-               epatch ${FILESDIR}/${P}-mga-kernel-2.6.patch
-       fi # end of matrox related stuff
-
        # Fix hppa compilation
        [ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
 
@@ -324,6 +319,7 @@ src_compile() {
        if use matrox && use X; then
                myconf="${myconf} $(use_enable matrox xmga)"
        fi
+       myconf="${myconf} $(use_enable matrox mga)"
        myconf="${myconf} $(use_enable opengl gl)"
        myconf="${myconf} $(use_enable sdl)"
 
@@ -410,21 +406,7 @@ src_compile() {
                myconf="${myconf} --enable-linux-devfs"
        fi
 
-       # Build the matrox driver before mplayer configuration.
-       # That way the configure script sees it and builds the support
-       #build the matrox driver before the 
-       if use matrox ; then
-               if use x86 ; then
-                       cd ${S}/drivers
-                       unset ARCH
-                       make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
-                       cd ${S}
-               else
-                       einfo "Not building matrox driver.  It doesn't seem to like other archs.  Please let me know at chriswhite@gentoo.org if you find out otherwise."
-               fi
-       fi
-
-       # leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
+       #leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
        # it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
        # it *will* be removed asap; in the meantime, doesn't hurt anything.
        echo "${myconf}" > ${T}/configure-options
@@ -470,12 +452,6 @@ src_install() {
             install || die "Failed to install MPlayer!"
        einfo "Make install completed"
 
-       if use matrox; then
-               cd ${S}/drivers
-               insinto /$(get_libdir)/modules/${KV}/kernel/drivers/char
-               doins mga_vid.${KV_OBJ}
-       fi
-
        dodoc AUTHORS ChangeLog README
        # Install the documentation; DOCS is all mixed up not just html
        if use doc ; then