Added latest version and patch for building with -gtk.

Package-Manager: portage-2.1.2_rc3-r5

5 files changed, 137 insertions, 9 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 8effe2701a35..7a5cdb20709b 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.80 2006/11/01 20:07:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.81 2006/12/19 15:24:53 josejx Exp $
+
+*mplayerplug-in-3.35 (19 Dec 2006)
+
+  19 Dec 2006; Joseph Jezak <josejx@gentoo.org>
+  +files/mplayerplug-in-3.35-X.patch, +mplayerplug-in-3.35.ebuild:
+  Added latest version and patch for building with -gtk.
 
   01 Nov 2006; Joseph Jezak <josejx@gentoo.org>
   mplayerplug-in-3.31-r1.ebuild:
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index 6b026e8348e4..5bbac437d26a 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -5,12 +5,17 @@ AUX 3.30-fix-cflags.patch 675 RMD160 a79585c461ec6fad65d4c5e3c7b24c3a65934680 SH
 MD5 d3f87010153bde38ce56a0f95b0ae318 files/3.30-fix-cflags.patch 675
 RMD160 a79585c461ec6fad65d4c5e3c7b24c3a65934680 files/3.30-fix-cflags.patch 675
 SHA256 619f5a86c083ed16119f483c65f702ba28e62ab7d55753ff42c407be882ee3fc files/3.30-fix-cflags.patch 675
+AUX mplayerplug-in-3.35-X.patch 357 RMD160 24c5629330d8ed10fa04a7bb042e0661545ae13e SHA1 3c7127ec4d1f2d567cdde440c66bc76faadfa8e7 SHA256 6cd78f9b927f88a0b693f6b26a61e76be4709956b20efe563de19caba1bb14d8
+MD5 4413416453bc49e9f171ecc98de3675f files/mplayerplug-in-3.35-X.patch 357
+RMD160 24c5629330d8ed10fa04a7bb042e0661545ae13e files/mplayerplug-in-3.35-X.patch 357
+SHA256 6cd78f9b927f88a0b693f6b26a61e76be4709956b20efe563de19caba1bb14d8 files/mplayerplug-in-3.35-X.patch 357
 AUX mplayerplug-in-gcc4.patch 549 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 SHA1 aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e
 MD5 c9acf1aec483abcafc30c9bef1dbd714 files/mplayerplug-in-gcc4.patch 549
 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 files/mplayerplug-in-gcc4.patch 549
 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e files/mplayerplug-in-gcc4.patch 549
 DIST mplayerplug-in-3.21.tar.gz 209865 RMD160 7dece576be3c13031df8de47f16c2f6800c7c155 SHA1 91f2cbb5e01c7d43ac2c6fc29196b8e926ef5073 SHA256 d72142236ee88a143325003eb47bcb5d41b11e0c66795f753b9f626202297193
 DIST mplayerplug-in-3.31.tar.gz 211714 RMD160 eea819f428dd8797387b11e5dbfda010cc36a2e9 SHA1 42c881e994b86f3cc85beea7e5db14711869ab42 SHA256 359b33927eb2837a544592afc00b55671e02694a8c54d3e7af3c81600bc38885
+DIST mplayerplug-in-3.35.tar.gz 217776 RMD160 fea5640a5931af93cc85907b219a3765f79f4a51 SHA1 462dbda841f41c21cac34a902d8d3477d231368e SHA256 bc91513b874716ee30d73cf48d2571e4537fb6a42498d6ecccc91259ad15ad7f
 EBUILD mplayerplug-in-3.21.ebuild 2039 RMD160 5410f8ad81c709a9a5031ad540e5d18b47a1ccb4 SHA1 f4eab8c2d28052d524375f77449c3982bd7a3a54 SHA256 1997f014432a7e6fd8699163b30e6d7c7cb5b0d19d5036728597f29bf5b12986
 MD5 cf1435f97cf7c68511ce0ccaa09fb2ad mplayerplug-in-3.21.ebuild 2039
 RMD160 5410f8ad81c709a9a5031ad540e5d18b47a1ccb4 mplayerplug-in-3.21.ebuild 2039
@@ -19,10 +24,14 @@ EBUILD mplayerplug-in-3.31-r1.ebuild 2394 RMD160 2ea69dd1a3c9384c2e526fb6d1b9135
 MD5 643211d8607def03fafbec1a058f504c mplayerplug-in-3.31-r1.ebuild 2394
 RMD160 2ea69dd1a3c9384c2e526fb6d1b913510463ebe6 mplayerplug-in-3.31-r1.ebuild 2394
 SHA256 de43dbcd1bbb8a9853af980200cac14e9c3367b1ea96b2318fd140f993d25546 mplayerplug-in-3.31-r1.ebuild 2394
-MISC ChangeLog 12650 RMD160 ace89bcf3051de563b68170008585f5aa478ebf5 SHA1 76427b2beb955a89dcb5f11dd0707e332bbd5a10 SHA256 31b8611d7fc427a98f95127b557491b538a40c45fa422b1f806fab19fa4c23cb
-MD5 579de210efd2578f9eddacc923ca3d89 ChangeLog 12650
-RMD160 ace89bcf3051de563b68170008585f5aa478ebf5 ChangeLog 12650
-SHA256 31b8611d7fc427a98f95127b557491b538a40c45fa422b1f806fab19fa4c23cb ChangeLog 12650
+EBUILD mplayerplug-in-3.35.ebuild 2428 RMD160 2f1c2f7dad4d9957761eb68c51e1a1fc7d7d8100 SHA1 29d5dba5be8083135ed8abd3cc6f4626dff8121c SHA256 ea856056d3447ad6c18107e3920b5ad8173aefc6e5d3c45ad649d27e4858e785
+MD5 6d085ed321293f44ad2a68f3e9fa3a9c mplayerplug-in-3.35.ebuild 2428
+RMD160 2f1c2f7dad4d9957761eb68c51e1a1fc7d7d8100 mplayerplug-in-3.35.ebuild 2428
+SHA256 ea856056d3447ad6c18107e3920b5ad8173aefc6e5d3c45ad649d27e4858e785 mplayerplug-in-3.35.ebuild 2428
+MISC ChangeLog 12859 RMD160 7de992747f8c2822eb8d379e84024d5e2251644f SHA1 360b6293ceb6a7f5d6598bfbec1d1b9cf8296b9d SHA256 f5473a2f31cac4186c11762cb09f508bd996750782c49639dde8e8b152fd925f
+MD5 773945cc474716a402f277e26fa8496d ChangeLog 12859
+RMD160 7de992747f8c2822eb8d379e84024d5e2251644f ChangeLog 12859
+SHA256 f5473a2f31cac4186c11762cb09f508bd996750782c49639dde8e8b152fd925f ChangeLog 12859
 MISC metadata.xml 250 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f SHA1 f2daa68d53d4780a8470a790b1bbc9ae124ef587 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f metadata.xml 250
@@ -33,10 +42,13 @@ SHA256 fd7b514038022a2168b807ccefba8a4afffb74f2e527da472ac0cc6d06628564 files/di
 MD5 2c347d464bb2f1f23a79aef18f345f83 files/digest-mplayerplug-in-3.31-r1 259
 RMD160 56b0dd8d68599668c17b5e58d24164f08f8ea67a files/digest-mplayerplug-in-3.31-r1 259
 SHA256 236b482010c4dc22d782aa07ba3d90919efec6b5e2ead7ef51681a10de35934e files/digest-mplayerplug-in-3.31-r1 259
+MD5 8fddadeede0acb4f5e4ef528be3a8313 files/digest-mplayerplug-in-3.35 259
+RMD160 f3b7e1f97a378cb3a5b4b17e1c11f46d6084d6f0 files/digest-mplayerplug-in-3.35 259
+SHA256 904676b752e5ef5edc36fad3248f3c5624052729ba4c28efa3e109149e12b4b3 files/digest-mplayerplug-in-3.35 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFSP5+csIHjyDViGQRAvIIAKDKzb5saGupS6vnkSn4Vrx7soEl3QCfV64P
-gai6cUsVcpx7dE5Vh1puBzQ=
-=4Vzf
+iD8DBQFFiAROcsIHjyDViGQRAhcxAJ0SSZCwAcpgZcqvb4oGzyTqOYmP8ACgg0Cs
+fjaNfIJEt7k11629/I/Nbh8=
+=Dlp/
 -----END PGP SIGNATURE-----
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.35 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.35
new file mode 100644
index 000000000000..bd1e68c973cf
--- /dev/null
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.35
@@ -0,0 +1,3 @@
+MD5 5efa01fa433ee4c7118e534c36198e72 mplayerplug-in-3.35.tar.gz 217776
+RMD160 fea5640a5931af93cc85907b219a3765f79f4a51 mplayerplug-in-3.35.tar.gz 217776
+SHA256 bc91513b874716ee30d73cf48d2571e4537fb6a42498d6ecccc91259ad15ad7f mplayerplug-in-3.35.tar.gz 217776
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch
new file mode 100644
index 000000000000..a3dade8d8572
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch
@@ -0,0 +1,12 @@
+--- Source/plugin-threads.cpp.bak	2006-12-19 09:24:36.000000000 -0500
++++ Source/plugin-threads.cpp	2006-12-19 09:25:11.000000000 -0500
+@@ -1068,7 +1068,9 @@
+ 	    if (DEBUG)
+ 		printf("Volume = %i\n",
+ 		       local_td->instance->volume);
++#ifdef GTK_ENABLED
+ 	    g_idle_add(gtkgui_setvolumetip,local_td->instance);
++#endif
+ 	}
+ 
+ 	pthread_testcancel();
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
new file mode 100644
index 000000000000..b0946b2f7c6a
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 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.35.ebuild,v 1.1 2006/12/19 15:24:53 josejx Exp $
+
+inherit eutils multilib nsplugins
+
+DESCRIPTION="mplayer plug-in for Gecko based browsers"
+HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gtk divx gmedia realmedia quicktime wmp"
+
+DEPEND=">=media-video/mplayer-1.0_pre5
+		|| ( www-client/mozilla-firefox
+				www-client/seamonkey
+		)
+		|| ( ( x11-libs/libXpm
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+		gtk? (
+			>=x11-libs/gtk+-2.2.0
+			dev-libs/atk
+			>=dev-libs/glib-2.2.0
+			>=x11-libs/pango-1.2.1
+		)
+		dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/3.30-fix-cflags.patch
+	epatch ${FILESDIR}/${PN}-gcc4.patch
+	epatch ${FILESDIR}/${P}-X.patch
+}
+
+src_compile() {
+	local myconf
+
+	# We force gtk2 now because moz only compiles against gtk2
+	if use gtk; then
+		myconf="${myconf} --enable-gtk2"
+	else
+		ewarn "For playback controls, you must enable gtk support."
+		myconf="${myconf} --enable-x"
+	fi
+
+	# Media Playback Support (bug #145517)
+	econf \
+		${myconf} \
+		$(use_enable divx dvx) \
+		$(use_enable gmedia gmp) \
+		$(use_enable realmedia rm) \
+		$(use_enable quicktime qt) \
+		$(use_enable wmp) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	exeinto /opt/netscape/plugins
+	doexe mplayerplug-in.so || die "plugin failed"
+	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
+
+	insinto /opt/netscape/plugins
+	doins mplayerplug-in.xpt || die "xpt failed"
+	inst_plugin /opt/netscape/plugins/mplayerplug-in.xpt
+
+	PLUGINS="gmp rm qt wmp dvx"
+
+	for plugin in ${PLUGINS}; do
+		if [ -e "mplayerplug-in-${plugin}.so" ]; then
+			### Install the plugin
+			exeinto /opt/netscape/plugins
+			doexe "mplayerplug-in-${plugin}.so" || die "plugin ${plugin} failed"
+			inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.so"
+			### Install the xpt
+			insinto /opt/netscape/plugins
+		    doins "mplayerplug-in-${plugin}.xpt" || die "plugin ${plugin} xpt failed"
+			inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.xpt"
+		fi
+	done
+
+	insinto /etc
+	doins mplayerplug-in.conf
+
+	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
+}