From: Chris White Date: Tue, 9 Nov 2004 15:07:49 +0000 (+0000) Subject: Fixed tdfxvid output logic as per bug #64218. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04ae5dbc0d9148d73dd6ed677aaac70e03f871af;p=gentoo.git Fixed tdfxvid output logic as per bug #64218. --- diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 8c8e2da80a90..d92b2aef2a01 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # 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.227 2004/11/06 01:08:52 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.228 2004/11/09 15:07:49 chriswhite Exp $ + + 10 Nov 2004; Chris White mplayer-1.0_pre4-r7.ebuild, + mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r3.ebuild, + mplayer-1.0_pre5-r4.ebuild: + Fixed tdfxvid output logic as per bug #64218. 06 Nov 2004; Chris White mplayer-1.0_pre5-r4.ebuild: Added a real USE flag warning to -pre5-r4. diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index d92f74a3cfab..588429efdda3 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,9 +1,12 @@ -MD5 abce27b31353d22ff50401599eb784ad ChangeLog 42283 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 51feeb2a1285fbf11ab99b2929ac8085 ChangeLog 42499 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 -MD5 55f7cc5d3f03ad8eeb10215b4d316a56 mplayer-1.0_pre4-r7.ebuild 12510 -MD5 eb22cb7ad1909bb99a27bee98dba2bdc mplayer-1.0_pre5-r2.ebuild 14070 -MD5 2049c0de9dbd427d32b4beadab319be8 mplayer-1.0_pre5-r3.ebuild 14898 -MD5 034f9da500a8227ccbc05a791fef3e99 mplayer-1.0_pre5-r4.ebuild 15040 +MD5 7b3d6f8c50162d684190424cf0204409 mplayer-1.0_pre4-r7.ebuild 12498 +MD5 7f21528ccfbe447640072fedef9ed751 mplayer-1.0_pre5-r2.ebuild 14058 +MD5 ce04980bd31a5121057431003181a885 mplayer-1.0_pre5-r3.ebuild 14889 +MD5 63cf1e1e7b164480903fbe07cbd15cff mplayer-1.0_pre5-r4.ebuild 15028 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,3 +33,10 @@ MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445 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) + +iD8DBQFBkN1dFdQwWVoAgN4RAk46AJ9+pDTGKdrUvWKK/DJObgLzJw5T2QCghmJT +Zq/7mVJ380z3h9ZJM0a0O2o= +=1//M +-----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild index fc7ab62e9d1a..11029c4dd317 100644 --- 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.23 2004/11/06 00:46:30 chriswhite Exp $ +# $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 $ inherit eutils flag-o-matic kernel-mod @@ -201,7 +201,7 @@ src_compile() { myconf="${myconf} $(use_enable theora)" fi - if use xvid && use 3dfx; then + if use 3dfx; then myconf="${myconf} --enable-tdfxvid" else myconf="${myconf} --disable-tdfxvid" diff --git a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild index b04129d0a3d0..220829b7652a 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r2.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-r2.ebuild,v 1.21 2004/10/31 00:47:14 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.22 2004/11/09 15:07:49 chriswhite Exp $ inherit eutils flag-o-matic kmod @@ -228,7 +228,7 @@ src_compile() { # Video Output # ############# myconf="${myconf} $(use_enable 3dfx)" - if use xvid && use 3dfx; then + if use 3dfx; then myconf="${myconf} --enable-tdfxvid" else myconf="${myconf} --disable-tdfxvid" diff --git a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild index b8ee35c1d07b..6e929e97f177 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r3.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-r3.ebuild,v 1.12 2004/10/24 14:12:51 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild,v 1.13 2004/11/09 15:07:49 chriswhite Exp $ inherit eutils flag-o-matic kmod @@ -249,7 +249,7 @@ src_compile() { # Video Output # ############# myconf="${myconf} $(use_enable 3dfx)" - if use xvid && use 3dfx; then + if use 3dfx; then myconf="${myconf} --enable-tdfxvid" else myconf="${myconf} --disable-tdfxvid" diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild index 9f348b28887b..7b1f4d8e06b3 100644 --- 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.18 2004/11/06 01:08:52 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.19 2004/11/09 15:07:49 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -243,7 +243,7 @@ src_compile() { # Video Output # ############# myconf="${myconf} $(use_enable 3dfx)" - if use xvid && use 3dfx; then + if use 3dfx; then myconf="${myconf} --enable-tdfxvid" else myconf="${myconf} --disable-tdfxvid"