backport patch from trunk for 0.8.6c to have a much cleaner directfb detection, closes bug #196144

(Portage version: 2.1.3.15)

3 files changed, 11 insertions, 18 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 955c15776b4c..b388c08689e1 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.269 2007/10/22 17:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.270 2007/10/22 19:16:29 aballier Exp $
+
+  22 Oct 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6c.ebuild:
+  backport patch from trunk for 0.8.6c to have a much cleaner directfb
+  detection, closes bug #196144
 
 *vlc-0.9.0_alpha20071022 (22 Oct 2007)
 
diff --git a/media-video/vlc/files/digest-vlc-0.8.6c b/media-video/vlc/files/digest-vlc-0.8.6c
index feffa3d6ed5c..bf5896733c3e 100644
--- a/media-video/vlc/files/digest-vlc-0.8.6c
+++ b/media-video/vlc/files/digest-vlc-0.8.6c
@@ -1,6 +1,6 @@
 MD5 c207f931f768e4dcde4bfaffdbf378cd vlc-0.8.6c.tar.bz2 11147601
 RMD160 6245419e39401b1ee138a5be3ea0375cdedcb17e vlc-0.8.6c.tar.bz2 11147601
 SHA256 5fc24d7bbd2c1f715af1860e39207b857662fea5d0f6f212df4794688c7db6ae vlc-0.8.6c.tar.bz2 11147601
-MD5 6216343ac13af1f43c44cf5241295c4a vlc-patches-41.tar.bz2 11926
-RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 vlc-patches-41.tar.bz2 11926
-SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c vlc-patches-41.tar.bz2 11926
+MD5 a4e2022d5e333f611833682af2c8ae85 vlc-patches-44.tar.bz2 9091
+RMD160 00aa48418061fc37c20bf8400c4dd60b1bfb4479 vlc-patches-44.tar.bz2 9091
+SHA256 c34b5f161e6447bb91c69407778d71e28a023d4be91de0f9f9eec0d40027d3b4 vlc-patches-44.tar.bz2 9091
diff --git a/media-video/vlc/vlc-0.8.6c.ebuild b/media-video/vlc/vlc-0.8.6c.ebuild
index 4dbcba8178e4..cfa96af43971 100644
--- a/media-video/vlc/vlc-0.8.6c.ebuild
+++ b/media-video/vlc/vlc-0.8.6c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.11 2007/10/13 00:12:21 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.12 2007/10/22 19:16:29 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -11,7 +11,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-PATCHLEVEL="41"
+PATCHLEVEL="44"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -149,11 +149,6 @@ src_unpack() {
 	has_version '>=dev-libs/libcdio-0.78' || \
 		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
 
-	# Drop patches that have been merged
-	EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 260_all_format-string-sa23592.patch
-	270_all_libtar-automagic.patch 280_all_sdl-image-automagic.patch
-	300_all_fullscreen_amd64.patch 240_all_flac-1.1.3.patch"
-
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	AT_M4DIR="m4" eautoreconf
 }
@@ -166,13 +161,6 @@ 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
-
 	if use nsplugin; then
 		if use seamonkey; then
 			XPIDL=/usr/lib/seamonkey
@@ -263,6 +251,7 @@ src_compile () {
 		$(use_enable musepack mpc) \
 		$(use_enable x264) \
 		$(use_enable dc1394) \
+		$(use_enable directfb) \
 		--enable-ffmpeg \
 		--disable-faad \
 		--disable-dv \