Fixed some live downgrading, patching, stopped the CFLAGS unsetting, saved the whales, promoted world peace, etc.

5 files changed, 79 insertions, 23 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index a714e72bb374..0d05f4a4c6e7 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.54 2004/07/28 20:03:44 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.55 2004/08/10 17:04:43 chriswhite Exp $
+
+*vlc-0.7.2-r1 (10 Aug 2004)
+
+  10 Aug 2004; Chris White <chriswhite@gentoo.org> metadata.xml,
+  +files/vlc-0.7.2-live.patch, vlc-0.7.2-r1.ebuild:
+  Removed CFLAGS unsetting, disabled broken interfaces, added myself as
+  maintainer, and stopped the live downgrading issue.
 
   01 Jul 2004; Joel Martin <kanaka@gentoo.org> :
   Add dts use flag, update dependancy version requirements to more closely match
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7f14858545e7..fd49940b08e7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,24 +1,25 @@
-MD5 fcd14dd61ea3c39c4520c96fdf60ec15 vlc-0.7.1-r1.ebuild 5973
+MD5 758701d56d2bf1a35fb074292ebdcb86 ChangeLog 11337
+MD5 8e0abcb9402b9874a064cedbed2a160c metadata.xml 267
 MD5 455853c508aea8cd6096de365a0bf417 vlc-0.6.0-r1.ebuild 5637
-MD5 1c3b1d2b37e13362061c1b2c0ddcb286 vlc-0.7.1.ebuild 6769
-MD5 52cc3aeaba8a9ec8f23804361038a824 vlc-0.6.2.ebuild 5547
+MD5 91872f800783fd6e01dc0eb628b6f8a2 vlc-0.6.1.ebuild 6116
 MD5 14cd606f4ab9526863d2a98240df803e vlc-0.6.2-r1.ebuild 6508
+MD5 52cc3aeaba8a9ec8f23804361038a824 vlc-0.6.2.ebuild 5547
+MD5 fcd14dd61ea3c39c4520c96fdf60ec15 vlc-0.7.1-r1.ebuild 5973
+MD5 1c3b1d2b37e13362061c1b2c0ddcb286 vlc-0.7.1.ebuild 6769
+MD5 51163d7605adccdb336a8bbdade456cb vlc-0.7.2-r1.ebuild 6457
 MD5 666689d2aebaf76cd0d1e7a298557736 vlc-0.7.2.ebuild 6003
-MD5 e90be3e122a97d4338d57eb28930a9f9 vlc-0.7.2-r1.ebuild 6384
-MD5 91872f800783fd6e01dc0eb628b6f8a2 vlc-0.6.1.ebuild 6116
-MD5 9781cdf497f94e7bb0f8ff8945f0d784 ChangeLog 11064
-MD5 06579cc387999571bc69fadac7f077fa metadata.xml 263
+MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
+MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
-MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
-MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63
-MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63
-MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
-MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
-MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828
 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2 202
+MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
 MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130
+MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63
 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
-MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
+MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
+MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828
+MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065
-MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
+MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63
+MD5 310366968813598e8b0cae64b5dbd19a files/vlc-0.7.2-live.patch 1287
diff --git a/media-video/vlc/files/vlc-0.7.2-live.patch b/media-video/vlc/files/vlc-0.7.2-live.patch
new file mode 100644
index 000000000000..fe23bc6d4ccb
--- /dev/null
+++ b/media-video/vlc/files/vlc-0.7.2-live.patch
@@ -0,0 +1,47 @@
+--- modules/demux/livedotcom.cpp.old	2004-08-08 22:44:54.171817176 +0900
++++ modules/demux/livedotcom.cpp	2004-08-08 22:47:48.793270680 +0900
+@@ -132,7 +132,7 @@
+         }
+         if( ( rtsp = RTSPClient::createNew(*env, 1/*verbose*/, "VLC Media Player" ) ) == NULL )
+         {
+-            delete env;
++            env->reclaim();
+             delete scheduler;
+             msg_Err( p_input, "RTSPClient::createNew failed" );
+             return VLC_EGENERIC;
+@@ -149,7 +149,7 @@
+             msg_Err( p_input, "describeURL failed (%s)", env->getResultMsg() );
+ 
+             free( psz_url );
+-            delete env;
++            env->reclaim();
+             delete scheduler;
+             free( p_sys );
+             return VLC_EGENERIC;
+@@ -160,7 +160,7 @@
+ 
+         //fprintf( stderr, "sdp=%s\n", p_sys->p_sdp );
+ 
+-        delete env;
++        env->reclaim();
+         delete scheduler;
+ 
+         var_Create( p_input, "rtsp-tcp", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
+@@ -670,7 +670,7 @@
+     }
+     if( p_sys->env )
+     {
+-        delete p_sys->env;
++        p_sys->env->reclaim();
+     }
+     if( p_sys->scheduler )
+     {
+@@ -724,7 +724,7 @@
+ 
+     if( p_sys->env )
+     {
+-        delete p_sys->env;
++        p_sys->env->reclaim();
+     }
+     if( p_sys->scheduler )
+     {
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 2e58af207e7e..b1b5b0eca95c 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>media-video</herd>
   <maintainer>
-    <email>raker@gentoo.org</email>
-    <name>Nick Hadaway</name>
+    <email>chriswhite@gentoo.org</email>
+    <name>Chris White</name>
   </maintainer>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild
index ce99e04efede..d278510cf072 100644
--- a/media-video/vlc/vlc-0.7.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.1 2004/07/28 20:03:44 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.2 2004/08/10 17:04:44 chriswhite Exp $
 
 inherit libtool gcc eutils
 
@@ -64,7 +64,7 @@ RDEPEND="X? ( virtual/x11 )
 	>=media-libs/a52dec-0.7.4
 	>=media-libs/libmpeg2-0.4.0
 	>=media-video/ffmpeg-0.4.8.20040222
-	=media-plugins/live-2004.03*
+	>=media-plugins/live-2004.03.27
 	>=media-libs/flac-1.1.0"
 
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8
@@ -87,6 +87,9 @@ src_unpack() {
 	epatch ${FILESDIR}/glide.patch
 	cd ${S}
 
+	# conforms vlc to recent api changes
+	epatch ${FILESDIR}/${P}-live.patch
+
 }
 
 src_compile() {
@@ -98,7 +101,7 @@ src_compile() {
 			--disable-qt --disable-kde --disable-gnome --disable-gtk \
 			--disable-libcdio --disable-libcddb --disable-vcdx \
 			--enable-ffmpeg --with-ffmpeg-mp3lame \
-			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live"
+			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live --disable-skins --disable-skins2"
 
 	# qt, kde, gnome and gtk interfaces are deprecated and in a bad condition
 	# the same for mga video, libdv and xvid decoders 
@@ -132,8 +135,6 @@ src_compile() {
 
 	# vlc uses its own ultraoptimizaed CXXFLAGS
 	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
 	export WANT_AUTOCONF_2_5=1
 	export WANT_AUTOMAKE_1_6=1