mozilla-1.5 fix

4 files changed, 62 insertions, 20 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 82cdd1fb3e7d..38581ff47aed 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,13 +1,17 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.36 2003/11/21 18:04:57 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.37 2003/11/22 05:17:07 lu_zero Exp $
+
+  22 Nov 2003; Luca Barbato <lu_zero@gentoo.org> vlc-0.6.2.ebuild,
+  files/0.6.2-mozilla-fix.patch:
+  Patch to build mozilla plugin on mozilla-1.5*
 
   21 Nov 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
   The Mozilla plugin only works with Mozilla 1.4 currently.
 
   19 Oct 2003; Max Kalika <max@gentoo.org> vlc-0.6.2.ebuild:
-  Revert location of libdvd, it belongs in media-libs but was only partly moved
-  there previously.
+  Revert location of libdvd, it belongs in media-libs but was only 
+  partly moved there previously.
 
   17 Oct 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
   Fixed portage location of libdvb.  Marked stable for x86.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 593cebf8ef6a..9c3cec266649 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,21 +1,21 @@
-MD5 b0f05c5c4ed72cfd1264c786f7c26364 vlc-0.6.0-r1.ebuild 5641
-MD5 e3d3beec835ea8693d8d3c841de6f706 vlc-0.4.4.ebuild 3837
+MD5 a28c65345cf74b646ed398cdff1b54a0 vlc-0.6.1.ebuild 6093
 MD5 eb3b00a8c4043b2e652c311223980bfb vlc-0.5.2.ebuild 3863
-MD5 413d9228231f51808168f16e4b6c5ce6 vlc-0.6.0.ebuild 5041
-MD5 8c9941428f88ebdda0a06f49d2050762 vlc-0.5.2-r1.ebuild 4463
-MD5 2b4737ee9e1a267a393e5df02b251911 vlc-0.6.2.ebuild 6241
+MD5 06a8dad48609b22fb46b5f3369fc3353 ChangeLog 7575
 MD5 7c774a2b9d465d101f738022312eff63 vlc-0.4.5.ebuild 3837
-MD5 a28c65345cf74b646ed398cdff1b54a0 vlc-0.6.1.ebuild 6093
-MD5 dacab5597e63ce0e1d9a2b9359c43596 ChangeLog 7423
 MD5 1eabb88c18a1821e01eab0a586de02d9 metadata.xml 259
+MD5 e3d3beec835ea8693d8d3c841de6f706 vlc-0.4.4.ebuild 3837
+MD5 8c9941428f88ebdda0a06f49d2050762 vlc-0.5.2-r1.ebuild 4463
+MD5 0daa748a621e36c12110e6ad4537387f vlc-0.6.2.ebuild 6321
+MD5 413d9228231f51808168f16e4b6c5ce6 vlc-0.6.0.ebuild 5041
+MD5 b0f05c5c4ed72cfd1264c786f7c26364 vlc-0.6.0-r1.ebuild 5641
+MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
+MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
+MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0 63
 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2-r1 63
+MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2 63
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
-MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
-MD5 70c6a90f7ec8790625d24e0b15cfa6b5 files/digest-vlc-0.4.4 63
-MD5 36b957169001a5ba78c09d813f23b550 files/digest-vlc-0.4.5 63
-MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2 63
-MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0 63
 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
-MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
-MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
+MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
+MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
+MD5 36b957169001a5ba78c09d813f23b550 files/digest-vlc-0.4.5 63
diff --git a/media-video/vlc/files/0.6.2-mozilla-fix.patch b/media-video/vlc/files/0.6.2-mozilla-fix.patch
new file mode 100644
index 000000000000..9b71f7145f2a
--- /dev/null
+++ b/media-video/vlc/files/0.6.2-mozilla-fix.patch
@@ -0,0 +1,33 @@
+diff -ruN vlc-0.6.2.orig/mozilla/vlcpeer.cpp vlc-0.6.2/mozilla/vlcpeer.cpp
+--- vlc-0.6.2.orig/mozilla/vlcpeer.cpp	2003-11-22 05:27:06.000000000 +0100
++++ vlc-0.6.2/mozilla/vlcpeer.cpp	2003-11-22 05:27:53.000000000 +0100
+@@ -26,6 +26,7 @@
+  *****************************************************************************/
+ #include <vlc/vlc.h>
+ 
++#include <mozilla-config.h>
+ #include <nsISupports.h>
+ #include <nsMemory.h>
+ #include <npapi.h>
+diff -ruN vlc-0.6.2.orig/mozilla/vlcplugin.cpp vlc-0.6.2/mozilla/vlcplugin.cpp
+--- vlc-0.6.2.orig/mozilla/vlcplugin.cpp	2003-11-22 05:27:06.000000000 +0100
++++ vlc-0.6.2/mozilla/vlcplugin.cpp	2003-11-22 05:28:04.000000000 +0100
+@@ -26,6 +26,7 @@
+  *****************************************************************************/
+ #include <vlc/vlc.h>
+ 
++#include <mozilla-config.h>
+ #include <nsISupports.h>
+ #include <nsMemory.h>
+ #include <npapi.h>
+diff -ruN vlc-0.6.2.orig/mozilla/vlcshell.cpp vlc-0.6.2/mozilla/vlcshell.cpp
+--- vlc-0.6.2.orig/mozilla/vlcshell.cpp	2003-11-22 05:27:06.000000000 +0100
++++ vlc-0.6.2/mozilla/vlcshell.cpp	2003-11-22 05:28:15.000000000 +0100
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ /* Mozilla stuff */
++#include <mozilla-config.h>
+ #include <nsISupports.h>
+ #include <nsMemory.h>
+ #include <npapi.h>
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 06bcbe315785..b739b5c51595 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.9 2003/11/21 18:04:57 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.10 2003/11/22 05:17:07 lu_zero Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -40,7 +40,7 @@ DEPEND="X? ( virtual/x11 )
 	lirc? ( app-misc/lirc )
 	mad? ( >=media-sound/mad-0.14.2b )
 	matroska? ( >=media-libs/libmatroska-0.4.4 )
-	mozilla? ( =net-www/mozilla-1.4* )
+	mozilla? ( >=net-www/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
@@ -56,7 +56,7 @@ DEPEND="X? ( virtual/x11 )
 	>=media-libs/flac-1.1.0
 	>=media-libs/libdv-0.98
 	>=media-libs/libdvbpsi-0.1.3
-	=media-video/ffmpeg-0.4.7*
+	>=media-video/ffmpeg-0.4.7
 	>media-libs/libmpeg2-0.3.1
 	>=media-video/mplayer-0.90"
 
@@ -64,6 +64,7 @@ DEPEND="X? ( virtual/x11 )
 # a separate packages or until ffmpeg gets support for installing
 # the library.
 
+
 # get kde and arts paths
 if [ -n "`use kde`" -o -n "`use arts`" ]; then
 	inherit kde-functions
@@ -73,6 +74,10 @@ fi
 
 src_unpack() {
 	unpack ${A}
+
+	# Mozilla plugin related fix
+	epatch ${FILESDIR}/${PV}-mozilla-fix.patch
+
 	cd ${S}
 
 	# if qt3 is installed, patch vlc to work with it instead of qt2