Forcefully disable x264 support, so that installed x264 library does not get detected...

Package-Manager: portage-2.0.53_rc7

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 405df697014c5bbd3b3a1fd2564078db3ef05051..6be5ab5505d73d8b24cb63a7777c7423ec4aaff2 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.112 2005/11/05 17:54:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.113 2005/11/16 10:52:20 flameeyes Exp $
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild,
+  vlc-0.8.4_beta2.ebuild:
+  Forcefully disable x264 support, so that installed x264 library does not get
+  detected and the build does not fail. See bug #112670.
 
 *vlc-0.8.4_beta2 (05 Nov 2005)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 80846d9e49542a4ea148b66cc0b5a13590b0e6fd..bd647c6c84e19a0159b9a6f2da73d2d67cb5b2de 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 43f2c1591fc511e256c060643dc9265b ChangeLog 22207
+MD5 5319bb2bc47d9bd6e871be9abb4db7d1 ChangeLog 22512
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
 MD5 b0d542494faed30ebb0281e6dc7fcfe2 files/digest-vlc-0.8.4_beta1 133
 MD5 f7f70c38d36f117d8859250d3100cd63 files/digest-vlc-0.8.4_beta2 133
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 685d23f82f6cae5446c1086f634446a4 vlc-0.8.1-r1.ebuild 6878
-MD5 72e9093b2e635badab9dbe04e62f00e4 vlc-0.8.2-r1.ebuild 7913
-MD5 e7c4b0e374a1b7648ef9b12acf726fe2 vlc-0.8.2-r2.ebuild 7793
-MD5 312d69e901e792fa03397b4a3ec33ae1 vlc-0.8.4_beta1.ebuild 8161
-MD5 5d01b4f0bf25cbb399edad1b27b27100 vlc-0.8.4_beta2.ebuild 8194
+MD5 d10edd44d3decd557b52af8ba542966a vlc-0.8.1-r1.ebuild 6897
+MD5 3cee96c6294614dfe28b9d217b0855d1 vlc-0.8.2-r1.ebuild 7932
+MD5 3addc0943113c964ca7d163b2ff9e0b4 vlc-0.8.2-r2.ebuild 7814
+MD5 cf81ffaef7aab622439f4cab0d06a85d vlc-0.8.4_beta1.ebuild 8182
+MD5 327d3a854e8a01812ba17476fbcb61c2 vlc-0.8.4_beta2.ebuild 8213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDbPIKj5H05b2HAEkRAvoGAJ9FpGnWLUDeHBYXrCle9PjLTS/9EwCgi+7A
-S45PBBR1VK60dIQ/crQhn5o=
-=ifg/
+iD8DBQFDew+DAiZjviIA2XgRAs3mAKDpR48pLt7O4plpD6MFaxBgWqNHMgCcC0A6
+9tq1SFEbp47ljPctxKvT6h8=
+=GBBe
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 9c0e042d90dcbdbd85962862b6a0ab13a91e8c77..5b1cf091561ea4dbc4de2eb2a1e12fd6984cf479 100644 (file)
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.18 2005/10/30 23:04:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.19 2005/11/16 10:52:20 flameeyes Exp $
 
 # Missing support for...
 #      tarkin - package not in portage yet - experimental
@@ -177,6 +177,7 @@ src_compile () {
                $(use_enable sdl) \
                $(use_enable ssl gnutls) \
                --disable-ncurses --disable-portaudio --disable-pth --disable-hal \
+               --disable-x264 \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then

diff --git a/media-video/vlc/vlc-0.8.2-r1.ebuild b/media-video/vlc/vlc-0.8.2-r1.ebuild
index f1b2b195af43d8d80c8d60eee341ea8d85974288..34f6eb4a117e0c83e2a256279d7a3410effdb8f3 100644 (file)
--- a/media-video/vlc/vlc-0.8.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.6 2005/10/30 23:04:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.7 2005/11/16 10:52:20 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -214,6 +214,7 @@ src_compile () {
                --disable-portaudio \
                --disable-slp \
                --disable-hal \
+               --disable-x264 \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then

diff --git a/media-video/vlc/vlc-0.8.2-r2.ebuild b/media-video/vlc/vlc-0.8.2-r2.ebuild
index 208a9f8402d9ad240a677f7e73a77c7e5ee05b9a..1f3df6b42ddce547259a1da43f2db6c0c035563e 100644 (file)
--- a/media-video/vlc/vlc-0.8.2-r2.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.3 2005/10/30 20:32:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.4 2005/11/16 10:52:20 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -210,6 +210,7 @@ src_compile () {
                --disable-portaudio \
                --disable-slp \
                --disable-hal \
+               --disable-x264 \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then

diff --git a/media-video/vlc/vlc-0.8.4_beta1.ebuild b/media-video/vlc/vlc-0.8.4_beta1.ebuild
index e6ccf660ce0bf67d21352e0c1ae111ec8191a57e..9264ddeb3ab1b2af4b2ad57d6517ff17f3d93f98 100644 (file)
--- a/media-video/vlc/vlc-0.8.4_beta1.ebuild
+++ b/media-video/vlc/vlc-0.8.4_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta1.ebuild,v 1.3 2005/10/30 20:32:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta1.ebuild,v 1.4 2005/11/16 10:52:20 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -221,6 +221,7 @@ src_compile () {
                --disable-portaudio \
                --disable-slp \
                --disable-hal \
+               --disable-x264 \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then

diff --git a/media-video/vlc/vlc-0.8.4_beta2.ebuild b/media-video/vlc/vlc-0.8.4_beta2.ebuild
index 14a175304de4b0d6b5945d93afa0a654b14fd43a..4884e3bb4a8dc648159eca8a32af50e796d28eb2 100644 (file)
--- a/media-video/vlc/vlc-0.8.4_beta2.ebuild
+++ b/media-video/vlc/vlc-0.8.4_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta2.ebuild,v 1.1 2005/11/05 17:54:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta2.ebuild,v 1.2 2005/11/16 10:52:20 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -223,6 +223,7 @@ src_compile () {
                --disable-portaudio \
                --disable-slp \
                --disable-hal \
+               --disable-x264 \
                ${myconf} || die "configuration failed"
 
        if [[ $(gcc-major-version) == 2 ]]; then