Bump patchset to fix directfb support, and make ebuild handle that, too.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 28 insertions, 19 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 5f2af2bd74f1..689734533457 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.153 2006/04/20 03:03:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.154 2006/04/20 04:29:05 flameeyes Exp $
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.5_beta3.ebuild:
+  Bump patchset to fix directfb support, and make ebuild handle that, too.
 
 *vlc-0.8.5_beta3 (20 Apr 2006)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9e78c260e0e7..7f053556554f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0bd6180e06ba2e87d1354d3e7df649cd ChangeLog 29971
-RMD160 3e602c43f3eca97d81c88d1c7ab2567b2b2d1c12 ChangeLog 29971
-SHA256 9180e39f5bb9c8bf8327de201f0c77a15599f5802a97169f3f0fceeef283a730 ChangeLog 29971
+MD5 b478aede638030ccfb47c270aa1e5eae ChangeLog 30124
+RMD160 effb00970ac015823ee7ee58e525b208cc386c65 ChangeLog 30124
+SHA256 cb723d1bbf20bfa0f8e703e2e07bb6cb7c8e924dc1ff5b1b5f84377b211f4c07 ChangeLog 30124
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 RMD160 5f9576b5ac77c3eb86228d9246b7d1e45db20e25 files/digest-vlc-0.8.1-r1 127
 SHA256 62acf5be95fea3c68450279d0a4fb55461d7841e9b4f28ed4c28f9e6cba23250 files/digest-vlc-0.8.1-r1 127
@@ -22,9 +22,9 @@ SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/di
 MD5 e2a8abbea3b2029b00b9b1bf0f9877c0 files/digest-vlc-0.8.5_beta2 494
 RMD160 e35c21c49c6a9c2be6eb4dd7989e578fbb99d713 files/digest-vlc-0.8.5_beta2 494
 SHA256 6e0bd5420943d18d28014ace4827c1f94e884b6eb26649e557f246ab946e54b0 files/digest-vlc-0.8.5_beta2 494
-MD5 a88d3a2792f6593ca49ecd7898f54f0f files/digest-vlc-0.8.5_beta3 494
-RMD160 c25a858157a5a77d9488eb6778f56d12b2082b13 files/digest-vlc-0.8.5_beta3 494
-SHA256 f97d59dc270444b4e8148224128a7e4192af7228d974f6ca23ec0861f203bc54 files/digest-vlc-0.8.5_beta3 494
+MD5 b7672fa1e6482d0fd1167a77c9346f99 files/digest-vlc-0.8.5_beta3 494
+RMD160 eeebc8c237afbbe0737fb4119b840ba5a5194c7f files/digest-vlc-0.8.5_beta3 494
+SHA256 41b15399a6fc125d8de765b1cc0be22cf76acf169992b6f02e5a8c491e0d555b files/digest-vlc-0.8.5_beta3 494
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 metadata.xml 249
@@ -46,13 +46,13 @@ SHA256 3ec83bb2d6d256ddeb663f762bdd42ef29b54cf3e8872acae631e9c35826e063 vlc-0.8.
 MD5 6fc75ee19e7e0ff5fcb7d12ed3a531c5 vlc-0.8.5_beta2.ebuild 7008
 RMD160 ecf89514646b1bbe9d9a09d1931fbd0a712bd42e vlc-0.8.5_beta2.ebuild 7008
 SHA256 8b57df3a8a670c5a4eb2efb9dd569540bc97081240204071bdc1cb423e3df553 vlc-0.8.5_beta2.ebuild 7008
-MD5 38ca79af2c5bb2671cfb919bc2c7a1ea vlc-0.8.5_beta3.ebuild 7012
-RMD160 e5a5279fc1e559d48ae8f20e70d46523a6201074 vlc-0.8.5_beta3.ebuild 7012
-SHA256 be3accd5bb43642c89e98fc8dd9ff00c3902230d3426d44f17e6a89334714542 vlc-0.8.5_beta3.ebuild 7012
+MD5 4ce2655b5ec963cdafdc884ac0c6e7a5 vlc-0.8.5_beta3.ebuild 7161
+RMD160 55bc68e6591cf52726c140c925455e24fcf75658 vlc-0.8.5_beta3.ebuild 7161
+SHA256 c9f16859f8bb970a7465e54d6e1eb1a52c768c8442df4bb40a1656f13a4d5d7d vlc-0.8.5_beta3.ebuild 7161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFERvk6AiZjviIA2XgRAp2TAJ4mL5reGq++imhZeFk2p8zIwy4yGQCfXerI
-NCX/Tfs7dYmqN3+5yQWlDHg=
-=J7Fb
+iD8DBQFERw1hAiZjviIA2XgRAgfSAKCMfEqhPxKWzHcMwaj5py6wTLdfRwCcDhkF
+2QrtDFCeHv9CTI399GaKDqg=
+=pFzA
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.5_beta3 b/media-video/vlc/files/digest-vlc-0.8.5_beta3
index 21ffa28b5f72..52930e852d99 100644
--- a/media-video/vlc/files/digest-vlc-0.8.5_beta3
+++ b/media-video/vlc/files/digest-vlc-0.8.5_beta3
@@ -1,6 +1,6 @@
 MD5 549366839dc456510636b387d5aec926 vlc-0.8.5-test3.tar.bz2 8519721
 RMD160 309a1b035b2fc53996f050d2507a7951d5cbb02a vlc-0.8.5-test3.tar.bz2 8519721
 SHA256 0344dc9f5a2f14b896e5f9c67b68568fc824b12d1ee41d23ac77a673c7925b55 vlc-0.8.5-test3.tar.bz2 8519721
-MD5 cd7a8c873e80acd2619e4c1911ae5de2 vlc-patches-17.tar.bz2 6243
-RMD160 05a5722e38ff2f40df44d11672455fd2ec0a779a vlc-patches-17.tar.bz2 6243
-SHA256 9d177a688661416ae3761500a5fb22e20f87a843ebee06e7092799a13da23750 vlc-patches-17.tar.bz2 6243
+MD5 e62b5ff825fd72028902c46db7ba9bc8 vlc-patches-18.tar.bz2 6400
+RMD160 cb990d1fe7372b3ddbd9bd5eccdf98aa1464a73d vlc-patches-18.tar.bz2 6400
+SHA256 9584e0f5068b64174df99edd5c82a6fa2e9898ed435951ea8f3e504ac85760f7 vlc-patches-18.tar.bz2 6400
diff --git a/media-video/vlc/vlc-0.8.5_beta3.ebuild b/media-video/vlc/vlc-0.8.5_beta3.ebuild
index d22f7abbe2c9..06a0dfae262e 100644
--- a/media-video/vlc/vlc-0.8.5_beta3.ebuild
+++ b/media-video/vlc/vlc-0.8.5_beta3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5_beta3.ebuild,v 1.1 2006/04/20 03:03:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5_beta3.ebuild,v 1.2 2006/04/20 04:29:05 flameeyes Exp $
 
 inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs
 
 MY_P="${P/_beta/-test}"
 
-PATCHLEVEL="17"
+PATCHLEVEL="18"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -136,6 +136,13 @@ src_compile () {
 		myconf="${myconf} --enable-vlm --enable-sout" || \
 		myconf="${myconf} --disable-vlm"
 
+	if use directfb; then
+		myconf="${myconf} --enable-directfb --with-directfb=/usr"
+		append-flags "-I /usr/include/directfb"
+	else
+		myconf="${myconf} --disable-directfb"
+	fi
+
 	econf \
 		$(use_enable altivec) \
 		$(use_enable stream sout) \
@@ -195,7 +202,6 @@ src_compile () {
 		$(use_enable hal) \
 		$(use_enable avahi bonjour) \
 		$(use_enable ffmpeg) \
-		$(use_enable directfb) \
 		$(use_enable upnp) \
 		--disable-jack \
 		--disable-dv \