Index: Manifest =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/gxine/Manifest,v retrieving revision 1.157 diff -u -B -r1.157 Manifest --- Manifest 24 Oct 2010 13:15:58 -0000 1.157 +++ Manifest 2 Jan 2011 17:55:49 -0000 @@ -1,5 +1,8 @@ AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2125 SHA1 b4a327db63dc99a755a34cb60b15e03a7b3d39d9 SHA256 e0051e9737382b3c21e2d3e6f0d9eacd1fb5d589f480a155a396e1924512d7a5 +AUX gxine-0.5.905-fix-nspr-useage.patch 1175 RMD160 dd21fc91ecc76d68f23bc7af18a6df3539a3b671 SHA1 60fc555e972f8a4157942d3b755822542d62e5e3 SHA256 18e44b0e4192ace74121080ea37409ae900b580378dedd52974e8581b248da93 +AUX gxine-0.5.905-spidermonkey-update.patch 674 RMD160 de859a4e370271edcb9b3fc18a3f896596a88dc7 SHA1 efa8619defd5af20cd7e57fcb8364ba491e374dd SHA256 c054c12984ddf6fd07ad029a52fcbce209bd443de9d44e827cbf4e9e4b8144d7 DIST gxine-0.5.905.tar.bz2 1203720 RMD160 3dc30ba9f402d20e3ad3f469cc753607ccc3d194 SHA1 dc01b617641d6eac4152259c592f15f31b9d9bf0 SHA256 9dcca3e581fddfc4cea8f9e45c99652f4dd336c1ca7726e910870b9c778b0cbf +EBUILD gxine-0.5.905-r1.ebuild 2317 RMD160 e44e4af467a46b5248c374fdb39ced3b0416c8e4 SHA1 4ade3c9e82ce52ea7da97b14f6b84cf7cae33a54 SHA256 23d9e925b315f86d0eb064747fcc800096e6343c392bce47e362974de714de7b EBUILD gxine-0.5.905.ebuild 2212 RMD160 9665c2e99927b05d181f46e39bef0028aebfeee0 SHA1 2878c4cfa775f55c3de803e3948f1258286ab25a SHA256 ee95f2d0a24cb8c8878fb5179c71b1619c183f21ef4dbb4e2172703086b952b9 MISC ChangeLog 14617 RMD160 3316dcd74c2af15e382b2467949604b8202e4f38 SHA1 436782821b84c35ab87fd9fc00dc6c006cdff494 SHA256 ac1dd98b513ccb6a3eb47982f04bcf6a3dbf86712f5b501df47bdcfefeca0670 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a Index: gxine-0.5.905-r1.ebuild =================================================================== RCS file: gxine-0.5.905-r1.ebuild diff -N gxine-0.5.905-r1.ebuild --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gxine-0.5.905-r1.ebuild 2 Jan 2011 17:55:49 -0000 @@ -0,0 +1,92 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.905.ebuild,v 1.6 2010/05/24 19:01:19 pacho Exp $ + +EAPI=2 +inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins + +DESCRIPTION="GTK+ Front-End for libxine" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="gnome lirc nls nsplugin udev xcb xinerama" + +RDEPEND=">=media-libs/xine-lib-1.1.17 + >=x11-libs/gtk+-2.8:2 + >=dev-libs/glib-2.10:2 + >=x11-libs/pango-1.12 + >=dev-lang/spidermonkey-1.9.2.13 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + gnome? ( dev-libs/dbus-glib + gnome-extra/gnome-screensaver ) + lirc? ( app-misc/lirc ) + nls? ( virtual/libintl ) + nsplugin? ( dev-libs/nspr + x11-libs/libXaw + x11-libs/libXt ) + udev? ( >=sys-fs/udev-143[extras] ) + xcb? ( x11-libs/libxcb ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-desktop.patch + epatch "${FILESDIR}"/${P}-spidermonkey-update.patch + epatch "${FILESDIR}"/${P}-fix-nspr-useage.patch + + # need to disable calling of xine-list when running without + # userpriv, otherwise we get sandbox violations (bug #233847) + if [[ ${EUID} == "0" ]]; then + sed -i 's:^XINE_LIST=.*$:XINE_LIST=:' "${S}/configure.ac" + fi + + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + $(use_enable nls) \ + $(use_enable lirc) \ + --enable-watchdog \ + $(use_with xcb) \ + --with-spidermonkey=/usr/include/js \ + $(use_with nsplugin browser-plugin) \ + $(use_with udev gudev) \ + --without-hal \ + $(use_with gnome dbus) \ + $(use_with xinerama) +} + +src_install() { + emake DESTDIR="${D}" \ + docdir=/usr/share/doc/${PF} \ + docsdir=/usr/share/doc/${PF} \ + install || die + + dodoc AUTHORS BUGS ChangeLog NEWS README{,.{cs,de},_l10n} TODO + use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} Index: files/gxine-0.5.905-fix-nspr-useage.patch =================================================================== RCS file: files/gxine-0.5.905-fix-nspr-useage.patch diff -N files/gxine-0.5.905-fix-nspr-useage.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/gxine-0.5.905-fix-nspr-useage.patch 2 Jan 2011 17:55:49 -0000 @@ -0,0 +1,26 @@ +--- a/src/Makefile.in 2011-01-02 11:27:17.871000001 -0600 ++++ b/src/Makefile.in 2011-01-02 11:27:50.743000001 -0600 +@@ -104,10 +104,10 @@ + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(NSPR_CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CPPFLAGS) $(NSPR_CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +--- a/src/Makefile.am 2011-01-02 11:33:09.675000001 -0600 ++++ b/src/Makefile.am 2011-01-02 11:34:05.205000001 -0600 +@@ -4,7 +4,7 @@ + -I$(top_builddir)/pixmaps $(LIRC_INCLUDE) + + AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \ +- $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \ ++ $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) $(NSPR_CFLAGS) \ + $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" + Index: files/gxine-0.5.905-spidermonkey-update.patch =================================================================== RCS file: files/gxine-0.5.905-spidermonkey-update.patch diff -N files/gxine-0.5.905-spidermonkey-update.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/gxine-0.5.905-spidermonkey-update.patch 2 Jan 2011 17:55:49 -0000 @@ -0,0 +1,24 @@ +--- a/m4/_js.m4 2011-01-02 10:54:36.821000001 -0600 ++++ b/m4/_js.m4 2011-01-02 10:55:45.368000001 -0600 +@@ -103,7 +103,7 @@ + # Failed... + + if test x"$JS_CFLAGS" = x; then +- AC_MSG_ERROR([libjs not found]) ++ AC_MSG_ERROR([libmozjs not found]) + fi + else + saved_CFLAGS="$CFLAGS" +@@ -118,10 +118,10 @@ + echo moz + ;; + esac`" +- JS_LIBS="`spidermonkey_locate_lib([$JS_LIBS])`js" ++ JS_LIBS="`spidermonkey_locate_lib([$JS_LIBS])`mozjs" + AC_DEFINE(HAVE_LIBSMJS, 1, [Define if you have jsapi.h]) + ], +- [AC_MSG_ERROR([libjs not found])], ++ [AC_MSG_ERROR([libmozjs not found])], + [#define XP_UNIX]) + CFLAGS="$saved_CFLAGS" + fi