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

Package-Manager: portage-2.1.4.4

4 files changed, 29 insertions, 5 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/Manifest b/net-www/mplayerplug-in/Manifest
index 25c28c020240..a40a0618bf7a 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -6,11 +6,12 @@ AUX mplayerplug-in-3.40-cflags.patch 662 RMD160 fd888c192db5c19209895d592e9b60be
 AUX mplayerplug-in-3.50-seamonkey.patch 678 RMD160 c0e78c924738cd262d2a69021f6861b76feddc56 SHA1 3617ad7aa47a8735f22bdd7fbab14e2c6ec877b8 SHA256 e691dcb0f50f7a0ea5bdc5a8fbb94f90067035c57831140026729179c91dca26
 AUX mplayerplug-in-gcc4.patch 549 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 SHA1 aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e
 AUX mplayerplug-in-mplayer-bin.patch 375 RMD160 eb27e4694c51bd3c8cc1edad7d084de1d6aaf78e SHA1 831657459e22b332cecb718d00fbef3c3a7619ab SHA256 be0a8393d56ebd0b296127c676c55baa16988f8239ab24ae29d96baff7a93edc
+AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0acf648662d69 SHA1 f1ac5d22f655aa5c10407353b41d660d54d935c6 SHA256 37581f5b52860442ce4e4f58220f193f2488ec2897e0519b4ec41d1aa7a56b98
 DIST mplayerplug-in-3.35.tar.gz 217776 RMD160 fea5640a5931af93cc85907b219a3765f79f4a51 SHA1 462dbda841f41c21cac34a902d8d3477d231368e SHA256 bc91513b874716ee30d73cf48d2571e4537fb6a42498d6ecccc91259ad15ad7f
 DIST mplayerplug-in-3.45.tar.gz 228032 RMD160 6a9700860397a6c7952b8e2ea8a9a610376a1528 SHA1 39a888c6e65b83f862abef83f5e0381ec7a6a6ea SHA256 3fcab891adf1b32374e5f525b0e91e1a2393ba85429f9ec654edadb08f06d431
 DIST mplayerplug-in-3.50.tar.gz 452730 RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 SHA1 54e5d7a3b33f503830183545f7bc278d37cb89d5 SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02
 EBUILD mplayerplug-in-3.35.ebuild 2500 RMD160 104b169e4ae14b15c6232ccd5b3492d9bb57fc8e SHA1 9eea13b4b55f417bcc76e784472361df68face2f SHA256 aacb1a7bef8eff0b5d317877e6e88567ea6c96fc490f2d27e977cc95e48174e5
 EBUILD mplayerplug-in-3.45.ebuild 2898 RMD160 704dc9b6abe233bf648a27fd92bda213a7e51f93 SHA1 caf83e1a184c3cc44fb67782ff8dd6626a6defe4 SHA256 49187f9aa978ad871cf702c5d1d8954e71105477432ea0ae22627efa43e2aadd
-EBUILD mplayerplug-in-3.50.ebuild 4092 RMD160 7d9103830ee07db82452e13e9fe9fd0bae4c96e5 SHA1 0168f3a96a244e3f0753c066044099b55fc049a5 SHA256 4f42288a222cdf55c62b1da8959fd464abb1f3792221e78fc9aff2e702651aac
-MISC ChangeLog 16875 RMD160 ef5d0d778275d018f7224e99942d810da84c2e8b SHA1 86ceed435384b58fcb56c3a798907f6c43306b6b SHA256 1da2be88ff94161d648e972406d08c2f06edca30c68f4ffaf883e1832091214a
+EBUILD mplayerplug-in-3.50.ebuild 4130 RMD160 f7a1e0f97ce9c540d3decd4e3a8d23655672b59f SHA1 01e468e160b229ff2d7c9de6165e60b2deb7b3a7 SHA256 41fd4c99e2d5ce8365cf6d9d9b178a363fbf3e736d507fa78881eda85320df6b
+MISC ChangeLog 17147 RMD160 a5fe095133b22daafea0ddb5b41ffd2044aae908 SHA1 211526996a3966c3d9e8ee722e68920ce3bfcbb5 SHA256 79573cce2828d4ffbb9a6064469399fe017381d58f68e7340449b317635d044e
 MISC metadata.xml 250 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f SHA1 f2daa68d53d4780a8470a790b1bbc9ae124ef587 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324
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) \