From ecf67cfad1cf7c8ef1a9610559c6d1a91965332b Mon Sep 17 00:00:00 2001 From: "John N. Laliberte" Date: Tue, 30 Aug 2005 02:31:45 +0000 Subject: [PATCH] new version, apply patch to fix paths for idl directories, and another patch to fix includes in the mozilla plugin cpp file for finding the headers. Package-Manager: portage-2.0.51.22-r2 --- media-video/totem/ChangeLog | 10 +- media-video/totem/Manifest | 8 +- media-video/totem/files/digest-totem-1.1.5 | 1 + media-video/totem/files/totem-1.1.5-idl.patch | 20 +++ media-video/totem/files/totem-1.1.5-nsi.patch | 13 ++ media-video/totem/totem-1.1.5.ebuild | 115 ++++++++++++++++++ 6 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 media-video/totem/files/digest-totem-1.1.5 create mode 100644 media-video/totem/files/totem-1.1.5-idl.patch create mode 100644 media-video/totem/files/totem-1.1.5-nsi.patch create mode 100644 media-video/totem/totem-1.1.5.ebuild diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index 5ddbdc86f81e..23f4bf4f25e6 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/totem # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.70 2005/08/29 20:57:33 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.71 2005/08/30 02:31:45 allanonjl Exp $ + +*totem-1.1.5 (30 Aug 2005) + + 30 Aug 2005; John N. Laliberte + +files/totem-1.1.5-idl.patch, +files/totem-1.1.5-nsi.patch, + +totem-1.1.5.ebuild: + new version, apply patch to fix paths for idl directories, and another patch + to fix includes in the mozilla plugin cpp file for finding the headers. 29 Aug 2005; Guy Martin totem-1.0.4.ebuild: Stable on hppa. diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index cf24aeb89fd0..616593fb3fc8 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,8 +1,12 @@ -MD5 6f0dfdd1af7866be84a211b49252efd3 ChangeLog 9740 -MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521 MD5 089f804ba17d80ad9dfa04b3974e533a totem-1.0.2-r1.ebuild 2729 +MD5 53ca347e85af9c627ae888fb4d74cd86 totem-1.1.5.ebuild 3254 +MD5 5d2b3a9524de7d11fda5560fcc0a1871 ChangeLog 10066 +MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521 MD5 58a28fb75b8981d2b7bd251107749632 totem-1.0.4.ebuild 2684 MD5 7e5a2048d71f5bd98866aba5531f9012 files/digest-totem-1.0.2-r1 65 +MD5 4a060cda8c0e91e2ea4138c718542fc9 files/totem-1.1.5-nsi.patch 444 MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65 +MD5 e67b309fe444a235befda815f7b3c1c6 files/digest-totem-1.1.5 65 MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190 +MD5 fe046287640b18b65e04be18e3fa7f1e files/totem-1.1.5-idl.patch 826 MD5 35a6d2e3ca24f11ad967a671a008b488 files/totem-1.0.2-xine_no_xxmc.patch 360 diff --git a/media-video/totem/files/digest-totem-1.1.5 b/media-video/totem/files/digest-totem-1.1.5 new file mode 100644 index 000000000000..a61a94b593c2 --- /dev/null +++ b/media-video/totem/files/digest-totem-1.1.5 @@ -0,0 +1 @@ +MD5 cc203683cc2cf7e3585cd0b25de55c7f totem-1.1.5.tar.bz2 1623055 diff --git a/media-video/totem/files/totem-1.1.5-idl.patch b/media-video/totem/files/totem-1.1.5-idl.patch new file mode 100644 index 000000000000..eb2b772948e6 --- /dev/null +++ b/media-video/totem/files/totem-1.1.5-idl.patch @@ -0,0 +1,20 @@ +--- totem-1.1.5/configure.in 2005-08-24 05:33:44.000000000 -0400 ++++ totem-1.1.5.new/configure.in 2005-08-29 22:07:54.000000000 -0400 +@@ -276,15 +276,8 @@ + dnl Search for the idl include directory + if test "x$ENABLE_MOZILLA" = "xyes" ; then + dnl This only works on gecko 1.8 +- MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`" +- dnl Fallback for older versions +- if test "x$MOZILLA_IDLDIR" = "x"; then +- MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`" +- fi +- dnl Some distributions (Gentoo) have it in unusual places +- if test "x$MOZILLA_IDLDIR" = "x"; then +- MOZILLA_IDLDIR="$MOZILLA_INCLUDE_ROOT/idl" +- fi ++ dnl MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`" ++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=libdir $MOZILLA-xpcom`/include/idl" + + AC_SUBST([MOZILLA_IDLDIR]) + fi diff --git a/media-video/totem/files/totem-1.1.5-nsi.patch b/media-video/totem/files/totem-1.1.5-nsi.patch new file mode 100644 index 000000000000..123e85e09214 --- /dev/null +++ b/media-video/totem/files/totem-1.1.5-nsi.patch @@ -0,0 +1,13 @@ +--- totem-1.1.5/src/totem-mozilla-plugin.cpp 2005-08-22 14:20:39.000000000 -0400 ++++ totem-1.1.5.new/src/totem-mozilla-plugin.cpp 2005-08-29 22:12:39.000000000 -0400 +@@ -42,8 +42,8 @@ + #include "npupp.h" + + #include +-#include +-#include ++#include ++#include + #include + #include + #include diff --git a/media-video/totem/totem-1.1.5.ebuild b/media-video/totem/totem-1.1.5.ebuild new file mode 100644 index 000000000000..c1d080119cd2 --- /dev/null +++ b/media-video/totem/totem-1.1.5.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.1.5.ebuild,v 1.1 2005/08/30 02:31:45 allanonjl Exp $ + +inherit gnome2 eutils + +DESCRIPTION="Media player for GNOME" +HOMEPAGE="http://gnome.org/projects/totem/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gnome xine lirc mad mpeg ogg vorbis a52 flac theora dvd debug mozilla firefox win32codecs xv" + +RDEPEND=">=dev-libs/glib-2.6.3 + >=x11-libs/gtk+-2.6 + >=gnome-base/gnome-vfs-2.9.92 + >=gnome-base/libglade-2 + >=gnome-base/gnome-desktop-2.2 + >=gnome-base/libgnomeui-2.4 + >=x11-themes/gnome-icon-theme-2.10 + app-text/iso-codes + gnome? ( >=gnome-base/nautilus-2.10 ) + lirc? ( app-misc/lirc ) + xine? ( >=media-libs/xine-lib-1 + >=gnome-base/gconf-2 ) + !xine? ( >=media-libs/gstreamer-0.8.10 + >=media-libs/gst-plugins-0.8.10 + >=media-plugins/gst-plugins-gnomevfs-0.8.10 + xv? ( >=media-plugins/gst-plugins-xvideo-0.8.10 ) + >=media-plugins/gst-plugins-pango-0.8.10 + >=media-plugins/gst-plugins-ffmpeg-0.8.6 + mad? ( >=media-plugins/gst-plugins-mad-0.8.10 ) + mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.8.10 ) + ogg? ( >=media-plugins/gst-plugins-ogg-0.8.10 ) + vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.10 + >=media-plugins/gst-plugins-vorbis-0.8.10 ) + a52? ( >=media-plugins/gst-plugins-a52dec-0.8.10 ) + flac? ( >=media-plugins/gst-plugins-flac-0.8.10 ) + theora? ( >=media-plugins/gst-plugins-ogg-0.8.10 + >=media-plugins/gst-plugins-theora-0.8.10 ) + mad? ( >=media-plugins/gst-plugins-mad-0.8.10 ) + dvd? ( >=media-plugins/gst-plugins-a52dec-0.8.10 + >=media-plugins/gst-plugins-dvdread-0.8.10 + >=media-plugins/gst-plugins-mpeg2dec-0.8.10 ) + win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 ) + ) + mozilla? ( >=www-client/mozilla-1.7.3 ) + firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 ) + + !gnome-extra/nautilus-media" + +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=dev-util/intltool-0.29 + >=dev-util/pkgconfig-0.12.0" + +DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO" + +pkg_setup() { + # gstreamer is default backend + use xine || G2CONF="${G2CONF} --enable-gstreamer" + + G2CONF="${G2CONF} \ + $(use_enable lirc) \ + $(use_enable debug) \ + $(use_enable gnome nautilus) \ + --disable-gtk" + + if use firefox; then + G2CONF="${G2CONF} \ + --enable-mozilla \ + --with-mozilla=firefox" + elif use mozilla and !use firefox; then + G2CONF="${G2CONF} \ + --enable-mozilla \ + --with-mozilla=mozilla" + else + G2CONF="${G2CONF} + --disable-mozilla" + fi +} + +src_unpack() { + unpack ${A} + + cd ${S} + + gnome2_omf_fix help/C/Makefile.in \ + help/de/Makefile.in \ + help/es/Makefile.in \ + help/ru/Makefile.in + + # fix the IDL path ( AllanonJL ) + epatch ${FILESDIR}/${P}-idl.patch + # fix nsIDOMWindow.h include ( AllanonJL ) + epatch ${FILESDIR}/${P}-nsi.patch + + einfo "Regenerating autotools files..." + export WANT_AUTOMAKE=1.9.5 + export WANT_AUTOCONF=2.5 + + automake; aclocal -I .; libtoolize --copy --force; autoconf +} + +pkg_postinst() { + + gnome2_pkg_postinst + + einfo "Note that the default totem backend has switched to gstreamer." + einfo "DVD menus will only work with the xine backend." + +} + +USE_DESTDIR="1" -- 2.26.2