Added new patches to make vlc work with wxGTK 2.6. Need more testing before unmasking.

4 files changed, 24 insertions, 16 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 04050d99997d..20ce9743df43 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2005/05/17 20:04:41 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.87 2005/05/18 14:39:00 flameeyes Exp $
+
+  18 May 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r3.ebuild:
+  Added new patches to make vlc work with wxGTK 2.6. Need more testing before
+  unmasking.
 
   17 May 2005; Fernando J. Pereda <ferdy@gentoo.org> vlc-0.8.1-r1.ebuild:
   keyworded ~alpha, wrt #90506
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 20a1f2e0d25e..387ed5893b64 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 48627f165aac98e8c7c73824a3b1172d vlc-0.8.1-r1.ebuild 6953
-MD5 652bc3bbeeeb343edfed07a13e2ecb7a vlc-0.6.2.ebuild 5551
-MD5 0d57e2340db158db187d70fa0da5d0f9 vlc-0.8.1-r3.ebuild 7148
+MD5 93b4055795ac04b7d3f33977ea8bcbfa ChangeLog 17812
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 2fbab31179d6bdf6dafb6aa263fe492f vlc-0.6.2-r1.ebuild 6503
+MD5 652bc3bbeeeb343edfed07a13e2ecb7a vlc-0.6.2.ebuild 5551
 MD5 c4bb9e3867d1992d598670b74551ebf5 vlc-0.7.2.ebuild 6014
-MD5 30ee51be21fb0bb07e84bfc0eca31f72 ChangeLog 17642
+MD5 48627f165aac98e8c7c73824a3b1172d vlc-0.8.1-r1.ebuild 6953
 MD5 58d97b5bbcee3500e6b8880bb6fb4364 vlc-0.8.1-r2.ebuild 7164
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d3adc2c49b439476d0470ed268d29fa3 vlc-0.8.1-r3.ebuild 7228
+MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
+MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
+MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r2 127
-MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r3 127
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
-MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
-MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065
-MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
+MD5 1047cf43de2ff9156978d79e7a7bab05 files/digest-vlc-0.8.1-r3 127
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCik55ViELBEf1JB0RAnkQAJwK1SW5Cu64w8tnu4Gv1BtpnoCTWgCeKW5b
-hfs6m1FVhEdKSRPH12AMqjk=
-=QjOM
+iD8DBQFCi1LGj5H05b2HAEkRAtKLAJ4p4hLje1XwuLXn+VWtv9PJndrAiQCfUNCA
+O6WYuc6UvviA5zmEt0dwFLI=
+=mnVD
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.1-r3 b/media-video/vlc/files/digest-vlc-0.8.1-r3
index 7bf5ab8b833c..5c8602d30d0d 100644
--- a/media-video/vlc/files/digest-vlc-0.8.1-r3
+++ b/media-video/vlc/files/digest-vlc-0.8.1-r3
@@ -1,2 +1,2 @@
 MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791
-MD5 2c417872741c9eefc3987b461100a12c vlc-patches-1.tar.bz2 2149
+MD5 e4a74525fb9d4e2e04dfa137d6409e59 vlc-patches-2.tar.bz2 7792
diff --git a/media-video/vlc/vlc-0.8.1-r3.ebuild b/media-video/vlc/vlc-0.8.1-r3.ebuild
index ef4fee43556d..fd8dba9411bc 100644
--- a/media-video/vlc/vlc-0.8.1-r3.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r3.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-r3.ebuild,v 1.1 2005/05/14 23:36:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r3.ebuild,v 1.2 2005/05/18 14:39:00 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -8,7 +8,7 @@
 
 inherit libtool toolchain-funcs eutils wxwidgets
 
-PATCHLEVEL="1"
+PATCHLEVEL="2"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
@@ -139,6 +139,10 @@ src_compile () {
 		myconf="${myconf} --disable-mozilla"
 	fi
 
+	if use wxwindows; then
+		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	fi
+
 	# Portaudio support needs at least v19
 	# pth (threads) support is quite unstable with latest ffmpeg/libmatroska.
 	econf \