Add a patch to make it compile if xulrunner-1.9 is installed, bug #213461, patch by Nirbheek Chauhan, fix amd64 compilation failure, bug #208262

(Portage version: 2.1.4.4)

3 files changed, 26 insertions, 3 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 8fe00234981b..7d35acd83012 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.104 2008/03/14 17:40:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.105 2008/06/12 16:44:19 armin76 Exp $
+
+  12 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/mplayerplug-in_xulrunner-1.9.patch, mplayerplug-in-3.50.ebuild:
+  Add a patch to make it compile if xulrunner-1.9 is installed, bug #213461,
+  patch by Nirbheek Chauhan, fix amd64 compilation failure, bug #208262
 
   14 Mar 2008; Raúl Porcel <armin76@gentoo.org> mplayerplug-in-3.35.ebuild,
   mplayerplug-in-3.45.ebuild, mplayerplug-in-3.50.ebuild:
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in_xulrunner-1.9.patch b/net-www/mplayerplug-in/files/mplayerplug-in_xulrunner-1.9.patch
new file mode 100644
index 000000000000..e5499bef1c58
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in_xulrunner-1.9.patch
@@ -0,0 +1,17 @@
+diff -Naur mplayerplug-in.orig/configure.in mplayerplug-in/configure.in
+--- mplayerplug-in.orig/configure.in	2007-12-02 04:53:04.000000000 +0530
++++ mplayerplug-in/configure.in	2008-04-11 00:30:26.000000000 +0530
+@@ -54,9 +54,10 @@
+ 
+ ],[
+ 	AC_MSG_NOTICE([Determining mozilla/firefox packages to build against])
+-	PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
+-],[AC_MSG_WARN([mozilla-plugin not found])])
++	# There's no www-client/mozilla anymore, and this interferes with =net-libs/xulrunner-1.9* now
++#	PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
++#MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
++#],[AC_MSG_WARN([mozilla-plugin not found])])
+ 
+ 	if test "$MOZPLUG_CFLAGS" = ""; then
+ 		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
index 5e2e2144efc9..e6acec533487 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.5 2008/05/18 13:31:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.6 2008/06/12 16:44:19 armin76 Exp $
 
 inherit eutils multilib autotools
 
@@ -55,6 +55,7 @@ src_unpack() {
 	if use mplayer-bin; then
 		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
 	fi
+	epatch "${FILESDIR}/${PN}_xulrunner-1.9.patch"
 	epatch "${FILESDIR}/${P}-seamonkey.patch"
 	eautoconf
 }
@@ -77,7 +78,7 @@ src_compile() {
 		ABI="x86"
 		econf \
 			${myconf} \
-			--x-libraries=/emul/linux/x86/usr/lib/ \
+			--x-libraries=/usr/lib32/ \
 			--enable-x86_64 \
 			${myconf2} \
 			$(use_enable divx dvx) \