From: Diego Elio Pettenò Date: Mon, 31 Oct 2005 09:47:21 +0000 (+0000) Subject: Disable divx4linux in every version, not just the last one, to avoid breakage now... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c023e9ca275911ad24df7ee48bf379868987fac4;p=gentoo.git Disable divx4linux in every version, not just the last one, to avoid breakage now that the package is gone. Package-Manager: portage-2.0.53_rc6 --- diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 2ff38a83f8f7..b4e8129d904b 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.328 2005/10/30 19:27:51 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.329 2005/10/31 09:47:21 flameeyes Exp $ + + 31 Oct 2005; Diego Pettenò + mplayer-1.0_pre6-r4.ebuild, mplayer-1.0_pre6-r5.ebuild, + mplayer-1.0_pre6-r6.ebuild, mplayer-1.0_pre7.ebuild: + Disable divx4linux in every version, not just the last one, to avoid + breakage now that the package is gone. 30 Oct 2005; Luca Barbato mplayer-1.0_pre7-r1.ebuild: Removed ancient divx4linux support, internal support if far better anyway. diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index ad197fde0753..b046f1546ac9 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,4 +1,7 @@ -MD5 1273007c4795e2e3b53e47ee1257aea0 ChangeLog 60428 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 5f3a97201b2d310dd8f87b12a0ca4644 ChangeLog 60709 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r5 429 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429 @@ -20,8 +23,15 @@ MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673 MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794 MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -MD5 f61b143e75e30cdba4019237e32d4de2 mplayer-1.0_pre6-r4.ebuild 18372 -MD5 0929553017cf92b1bc65d12df2bf6b21 mplayer-1.0_pre6-r5.ebuild 18458 -MD5 a1059d3d7970cd21dbbcb9c89d0bed8d mplayer-1.0_pre6-r6.ebuild 18368 +MD5 ccbdd321ba9b7a55d8639595d8eba9cb mplayer-1.0_pre6-r4.ebuild 18306 +MD5 208d770ca540bb94744fe9d853c19bf2 mplayer-1.0_pre6-r5.ebuild 18392 +MD5 05078a9dddec9d095ecfcc94dbb7113f mplayer-1.0_pre6-r6.ebuild 18303 MD5 9db4da1d181f02f73446918de28d3955 mplayer-1.0_pre7-r1.ebuild 15976 -MD5 a7ee6a7da902ae3aab61ef0f6c00cea9 mplayer-1.0_pre7.ebuild 17868 +MD5 2a78fe5aac657d3fd54db3bcba903f55 mplayer-1.0_pre7.ebuild 17803 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDZehKj5H05b2HAEkRAnsaAKCby/TZMBTsEZkMIIZBpKc8m6DD0wCfaX1s +e2R/wzwvBthn0qRKYbV6sD4= +=/tBB +-----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild index f4db497fbc8d..d5545c5fe456 100644 --- a/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild,v 1.8 2005/07/09 19:01:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r4.ebuild,v 1.9 2005/10/31 09:47:21 flameeyes Exp $ inherit eutils flag-o-matic kernel-mod RESTRICT="nostrip" -IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc" +IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc" BLUV=1.4 SVGV=1.9.17 @@ -28,7 +28,6 @@ HOMEPAGE="http://www.mplayerhq.hu/" # 'encode' in USE for MEncoder. RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) x86? ( - divx4linux? ( >=media-libs/divx4linux-20030428 ) avi? ( >=media-libs/win32codecs-20040916 ) real? ( >=media-video/realplayer-10.0.3 ) ) @@ -344,7 +343,7 @@ src_compile() { ######### # Codecs # ######## - myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} --disable-divx4linux" myconf="${myconf} $(use_enable gif)" myconf="${myconf} $(use_enable jpeg)" #myconf="${myconf} $(use_enable ladspa)" diff --git a/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild index 3ab39ae4d496..c1c25efad384 100644 --- a/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild,v 1.4 2005/07/09 19:01:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r5.ebuild,v 1.5 2005/10/31 09:47:21 flameeyes Exp $ inherit eutils flag-o-matic kernel-mod RESTRICT="nostrip" -IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi bl debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc" +IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi bl debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc" BLUV=1.4 SVGV=1.9.17 @@ -28,7 +28,6 @@ HOMEPAGE="http://www.mplayerhq.hu/" # 'encode' in USE for MEncoder. RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) x86? ( - divx4linux? ( >=media-libs/divx4linux-20030428 ) avi? ( >=media-libs/win32codecs-20040916 ) real? ( >=media-video/realplayer-10.0.3 ) ) @@ -343,7 +342,7 @@ src_compile() { ######### # Codecs # ######## - myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} --disable-divx4linux" myconf="${myconf} $(use_enable gif)" myconf="${myconf} $(use_enable jpeg)" #myconf="${myconf} $(use_enable ladspa)" diff --git a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild index 2a5350085880..bd704cedce76 100644 --- a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.13 2005/07/09 19:01:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.14 2005/10/31 09:47:21 flameeyes Exp $ inherit eutils flag-o-matic kernel-mod RESTRICT="nostrip" IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection -custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv +custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 @@ -32,7 +32,6 @@ HOMEPAGE="http://www.mplayerhq.hu/" # 'encode' in USE for MEncoder. RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) - divx4linux? ( >=media-libs/divx4linux-20030428 ) win32codecs? ( >=media-libs/win32codecs-20040916 ) x86? ( real? ( >=media-video/realplayer-10.0.3 ) ) aalib? ( media-libs/aalib ) @@ -341,7 +340,7 @@ src_compile() { ######### # Codecs # ######## - myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} --disable-divx4linux" myconf="${myconf} $(use_enable gif)" myconf="${myconf} $(use_enable jpeg)" #myconf="${myconf} $(use_enable ladspa)" diff --git a/media-video/mplayer/mplayer-1.0_pre7.ebuild b/media-video/mplayer/mplayer-1.0_pre7.ebuild index abf462a01160..ced4df35a540 100644 --- a/media-video/mplayer/mplayer-1.0_pre7.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre7.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.17 2005/08/25 20:01:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.18 2005/10/31 09:47:21 flameeyes Exp $ inherit eutils flag-o-matic kernel-mod RESTRICT="nostrip" IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection -custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv +custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 @@ -32,7 +32,6 @@ HOMEPAGE="http://www.mplayerhq.hu/" # 'encode' in USE for MEncoder. RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) - divx4linux? ( >=media-libs/divx4linux-20030428 ) win32codecs? ( >=media-libs/win32codecs-20040916 ) x86? ( real? ( >=media-video/realplayer-10.0.3 ) ) aalib? ( media-libs/aalib ) @@ -320,7 +319,7 @@ src_compile() { ######### # Codecs # ######## - myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} --disable-divx4linux" myconf="${myconf} $(use_enable gif)" myconf="${myconf} $(use_enable jpeg)" #myconf="${myconf} $(use_enable ladspa)"