[gentoo-commits] gentoo-x86 commit in net-www/mplayerplug-in: mplayerplug-in-3.35.ebuild mplayerplug-in-3.45.ebuild ChangeLog mplayerplug-in-3.50.ebuild mplayerplug-in-3.40-r1.ebuild mplayerplug-in-3.21.ebuild mplayerplug-in-3.31-r1.ebuild

[Joseph Jezak (josejx)]

josejx      08/01/06 22:34:22

  Modified:             mplayerplug-in-3.35.ebuild
                        mplayerplug-in-3.45.ebuild ChangeLog
  Added:                mplayerplug-in-3.50.ebuild
  Removed:              mplayerplug-in-3.40-r1.ebuild
                        mplayerplug-in-3.21.ebuild
                        mplayerplug-in-3.31-r1.ebuild
  Log:
  Removed old versions, added new version, closes bug #201257.  Added amd64 multilib changes from bug #178857.
  (Portage version: 2.1.4_rc13)

Revision  Changes    Path
1.11                 net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild?r1=1.10&r2=1.11

Index: mplayerplug-in-3.35.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayerplug-in-3.35.ebuild	22 Jul 2007 07:42:29 -0000	1.10
+++ mplayerplug-in-3.35.ebuild	6 Jan 2008 22:34:21 -0000	1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.35.ebuild,v 1.10 2007/07/22 07:42:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.11 2008/01/06 22:34:21 josejx Exp $
 
 inherit eutils multilib nsplugins
 
@@ -27,16 +27,16 @@
 		)
 		dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+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
-	epatch ${FILESDIR}/${P}-firefox.patch
-	epatch ${FILESDIR}/${P}-seamonkey.patch
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/3.30-fix-cflags.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-X.patch"
+	epatch "${FILESDIR}/${P}-firefox.patch"
+	epatch "${FILESDIR}/${P}-seamonkey.patch"
 }
 
 src_compile() {



1.6                  net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild?r1=1.5&r2=1.6

Index: mplayerplug-in-3.45.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayerplug-in-3.45.ebuild	22 Nov 2007 18:56:24 -0000	1.5
+++ mplayerplug-in-3.45.ebuild	6 Jan 2008 22:34:21 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.45.ebuild,v 1.5 2007/11/22 18:56:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.6 2008/01/06 22:34:21 josejx Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="gtk divx gmedia mplayer-bin nls realmedia quicktime wmp"
 
 LANGS="da de en_US es fr hu it ja ko nb pl pt_BR nl ru se zh_CN"
@@ -37,18 +37,18 @@
 		!mplayer-bin? ( >=media-video/mplayer-1.0_pre5 )
 		dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.40-cflags.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
 	### Adds support for 32 bit binary mplayer on amd64
 	if use mplayer-bin; then
-		epatch ${FILESDIR}/${PN}-mplayer-bin.patch
+		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
 	fi
-	epatch ${FILESDIR}/${PN}-3.35-seamonkey.patch
+	epatch "${FILESDIR}/${PN}-3.35-seamonkey.patch"
 }
 
 src_compile() {



1.101                net-www/mplayerplug-in/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/ChangeLog?r1=1.100&r2=1.101

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ChangeLog	22 Nov 2007 18:56:24 -0000	1.100
+++ ChangeLog	6 Jan 2008 22:34:21 -0000	1.101
@@ -1,6 +1,18 @@
 # ChangeLog for net-www/mplayerplug-in
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.100 2007/11/22 18:56:24 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.101 2008/01/06 22:34:21 josejx Exp $
+
+*mplayerplug-in-3.50 (06 Jan 2008)
+
+  06 Jan 2008; Joseph Jezak <josejx@g.o>
+  -files/mplayerplug-in-3.31-firefox.patch,
+  -files/mplayerplug-in-3.31-seamonkey.patch,
+  +files/mplayerplug-in-3.50-seamonkey.patch, -mplayerplug-in-3.21.ebuild,
+  -mplayerplug-in-3.31-r1.ebuild, mplayerplug-in-3.35.ebuild,
+  -mplayerplug-in-3.40-r1.ebuild, mplayerplug-in-3.45.ebuild,
+  +mplayerplug-in-3.50.ebuild:
+  Removed old versions, added new version, closes bug #201257. Added amd64
+  multilib changes from bug #178857.
 
   22 Nov 2007; Raúl Porcel <armin76@g.o> mplayerplug-in-3.45.ebuild:
   sparc stable wrt #192696, thanks to Alex Maclean for testing



1.1                  net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild?rev=1.1&content-type=text/plain

Index: mplayerplug-in-3.50.ebuild
===================================================================
# 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.1 2008/01/06 22:34:21 josejx Exp $

inherit eutils multilib autotools

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 ~ppc64 ~sparc ~x86"
IUSE="gtk divx firefox gmedia mplayer-bin nls quicktime realmedia seamonkey wmp"

LANGS="da de en_US es fr hu it ja ko nb pl pt_BR nl ru se zh_CN"
for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done

DEPEND="
		firefox? ( www-client/mozilla-firefox )
		!firefox? (
			seamonkey? ( www-client/seamonkey )
			!seamonkey? ( net-libs/xulrunner )
		)
		|| ( ( 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
		)
		mplayer-bin? ( media-video/mplayer-bin )
		!mplayer-bin? ( >=media-video/mplayer-1.0_pre7 )
		dev-util/pkgconfig"

		if has_multilib_profile; then
			DEPEND="${DEPEND}
				amd64? (
					app-emulation/emul-linux-x86-xlibs
					app-emulation/emul-linux-x86-baselibs
					app-emulation/emul-linux-x86-gtklibs
				)"
		fi

S="${WORKDIR}/${PN}"

src_unpack() {
	unpack "${A}"
	cd "${S}"
	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
	epatch "${FILESDIR}/${PN}-gcc4.patch"
	### Adds support for 32 bit binary mplayer on amd64
	if use mplayer-bin; then
		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
	fi
	epatch "${FILESDIR}/${P}-seamonkey.patch"
	eautoconf
}

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

	# Build the 32bit plugin
	if use amd64 && has_multilib_profile; then
		einfo "Building 32-bit plugin"
		oldabi="${ABI}"
		ABI="x86"
		econf \
			${myconf} \
			--x-libraries=/emul/linux/x86/usr/lib/ \
			--enable-x86_64 \
			${myconf2} \
			$(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"

		# Save the 32bit plugins
		mkdir lib32
		mv mplayerplug-in*.so lib32
		mv mplayerplug-in*.xpt lib32
		ABI="${oldabi}"
		emake -j1 clean || die "emake clean failed"

		einfo "Building 64-bit plugin"
	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() {
	PLUGINS="in in-gmp in-rm in-qt in-wmp in-dvx"
	plugindir="nsbrowser/plugins"

	exeinto /usr/$(get_libdir)/${plugindir}
	insinto /usr/$(get_libdir)/${plugindir}

	for plugin in ${PLUGINS}; do
		if [ -e "mplayerplug-${plugin}.so" ]; then
			doexe "mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
		    doins "mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
		fi
	done

	if use amd64 && has_multilib_profile; then
		oldabi="${ABI}"
		ABI="x86"
		exeinto /usr/$(get_libdir)/${plugindir}
		insinto /usr/$(get_libdir)/${plugindir}

		for plugin in ${PLUGINS}; do
			if [ -e "mplayerplug-${plugin}.so" ]; then
				doexe "lib32/mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
				doins "lib32/mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
			fi
		done
		ABI="${oldabi}"
	fi

	if use nls; then
		local WANT_LANGS
		for X in ${LANGS}; do
			if use linguas_${X}; then
				WANT_LANGS="${WANT_LANGS} ${X}"
			fi
		done
		emake -C po LANGUAGES="${WANT_LANGS# }" DESTDIR="${D}" install \
			|| die "Translation installation failed"
	fi

	insinto /etc
	doins mplayerplug-in.conf

	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
}



-- 
gentoo-commits@l.g.o mailing list