# 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.81 2005/10/02 15:00:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.82 2005/10/08 12:26:19 leonardop Exp $
+
+*totem-1.2.0-r1 (08 Oct 2005)
+
+ 08 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+ -files/totem-1.1.5-idl.patch, -files/totem-1.1.5-nsi.patch,
+ +files/totem-1.2.0-gecko-sdk.patch, -totem-1.2.0.ebuild,
+ +totem-1.2.0-r1.ebuild:
+ Use gecko-sdk to build browser plugin. Dropped 'mozilla' and 'firefox' USE
+ flags and added 'nsplugin'. Updated dependencies.
02 Oct 2005; Aron Griffis <agriffis@gentoo.org> totem-1.0.4.ebuild:
Mark 1.0.4 stable on ia64
-MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
-MD5 073bfd54d428b5832440f8d76bd42dba ChangeLog 11161
-MD5 06d52fc007ef24fa66f1a352be6f3ee3 totem-1.0.4.ebuild 2682
-MD5 df80fca2806ec6c59745677c4fc701bf totem-1.1.5.ebuild 3292
-MD5 287f6fe0cea52edef8be43a94e43a35e totem-1.2.0.ebuild 3569
-MD5 089f804ba17d80ad9dfa04b3974e533a totem-1.0.2-r1.ebuild 2729
-MD5 7e5a2048d71f5bd98866aba5531f9012 files/digest-totem-1.0.2-r1 65
-MD5 fe046287640b18b65e04be18e3fa7f1e files/totem-1.1.5-idl.patch 826
+MD5 35ed1ec0f3b8bb5e8b5f94e14318d22e ChangeLog 11525
+MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
+MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65
MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
+MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834
-MD5 4a060cda8c0e91e2ea4138c718542fc9 files/totem-1.1.5-nsi.patch 444
-MD5 e67b309fe444a235befda815f7b3c1c6 files/digest-totem-1.1.5 65
-MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
-MD5 35a6d2e3ca24f11ad967a671a008b488 files/totem-1.0.2-xine_no_xxmc.patch 360
-MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0 65
+MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
+MD5 06d52fc007ef24fa66f1a352be6f3ee3 totem-1.0.4.ebuild 2682
+MD5 ddacbd725d36de0c66617d7e51f467b1 totem-1.2.0-r1.ebuild 3154
+++ /dev/null
-MD5 a69626273a14d747f836610f9de1fc0b totem-1.0.2.tar.bz2 1438134
+++ /dev/null
-MD5 cc203683cc2cf7e3585cd0b25de55c7f totem-1.1.5.tar.bz2 1623055
+++ /dev/null
---- src/bacon-video-widget-xine.c 2005/04/27 16:11:37 1.184
-+++ src/bacon-video-widget-xine.c 2005/05/02 16:06:02 1.185
-@@ -551,7 +551,7 @@
- x11_visual_t vis;
- const char *video_driver_id;
- xine_video_port_t *vo_driver;
-- static char *drivers[] = { "xxmc", "xv", "xshm" };
-+ static char *drivers[] = { "xv", "xshm" };
- guint i;
-
- if (null_out != FALSE)
-
+++ /dev/null
---- 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
+++ /dev/null
---- 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 <nsCOMPtr.h>
--#include <nsIDOMWindow.h>
--#include <nsIURI.h>
-+#include <dom/nsIDOMWindow.h>
-+#include <necko/nsIURI.h>
- #include <nsEmbedString.h>
- #include <nsIInterfaceRequestorUtils.h>
- #include <docshell/nsIWebNavigation.h>
--- /dev/null
+diff -NurdB totem-1.2.0/configure.in totem-1.2.0-patched/configure.in
+--- totem-1.2.0/configure.in 2005-09-05 05:00:30.000000000 -0500
++++ totem-1.2.0-patched/configure.in 2005-10-07 20:12:09.000000000 -0500
+@@ -189,7 +189,7 @@
+ AC_ARG_WITH([mozilla],
+ AS_HELP_STRING([--with-mozilla],[Which gecko engine to use (default: autodetect)]))
+
+- GECKOS="firefox mozilla-firefox seamonkey mozilla"
++ GECKOS="gecko-sdk firefox mozilla-firefox seamonkey mozilla"
+ gecko=$with_mozilla
+
+ if test "x$gecko" = "x"; then
+@@ -219,6 +219,7 @@
+ AC_MSG_RESULT([$gecko])
+
+ case "$gecko" in
++ gecko-sdk) MOZILLA_VERSION_MIN=1.7 ;;
+ mozilla) MOZILLA_VERSION_MIN=1.7 ;;
+ seamonkey) MOZILLA_VERSION_MIN=1.0 ;;
+ *firefox) MOZILLA_VERSION_MIN=1.0 ;;
+@@ -261,7 +262,8 @@
+ MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+ MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-$MOZILLA_LIBDIR}"
+
+- AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
++ AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no],
++ [$MOZILLA_LIBDIR:$MOZILLA_LIBDIR/../bin:$PATH])
+ if test "x$MOZILLA_XPIDL" = "xno"; then
+ ENABLE_MOZILLA=no
+ AC_MSG_WARN([xpidl compiler not found])
+++ /dev/null
-# 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.0.2-r1.ebuild,v 1.15 2005/08/24 19:18:01 gustavoz 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 win32codecs xv"
-
-RDEPEND=">=dev-libs/glib-2.6.3
- >=x11-libs/gtk+-2.6
- >=gnome-base/gnome-vfs-2.2
- >=gnome-base/libglade-2
- >=gnome-extra/nautilus-cd-burner-2.9
- >=gnome-base/gnome-desktop-2.2
- >=gnome-base/libgnomeui-2.4
- 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.9-r3
- >=media-libs/gst-plugins-0.8.8
- >=media-plugins/gst-plugins-gnomevfs-0.8.8
- xv? ( >=media-plugins/gst-plugins-xvideo-0.8.8 )
- >=media-plugins/gst-plugins-pango-0.8.8
- >=media-plugins/gst-plugins-ffmpeg-0.8.3
- mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
- mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.8.8 )
- ogg? ( >=media-plugins/gst-plugins-ogg-0.8.8 )
- vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.8
- >=media-plugins/gst-plugins-vorbis-0.8.8 )
- a52? ( >=media-plugins/gst-plugins-a52dec-0.8.8 )
- flac? ( >=media-plugins/gst-plugins-flac-0.8.8 )
- theora? ( >=media-plugins/gst-plugins-ogg-0.8.8
- >=media-plugins/gst-plugins-theora-0.8.8 )
- mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
- dvd? ( >=media-plugins/gst-plugins-a52dec-0.8.8
- >=media-plugins/gst-plugins-dvdread-0.8.8
- >=media-plugins/gst-plugins-mpeg2dec-0.8.8 )
- win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 )
- )
- !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"
-
-# gstreamer is default backend
-use xine || G2CONF="${G2CONF} --enable-gstreamer"
-
-# gtk only support broken
-#use gnome \
-# && G2CONF="${G2CONF} --disable-gtk" \
-# || G2CONF="${G2CONF} --enable-gtk"
-
-G2CONF="${G2CONF} \
- $(use_enable lirc) \
- $(use_enable debug) \
- $(use_enable gnome nautilus) \
- --disable-gtk \
- --disable-mozilla"
-
-src_unpack() {
-
- unpack ${A}
-
- cd ${S}
- # use the omf_fix for scrollkeeper sandbox
- # violations, see bug #48800 <obz@gentoo.org>
- gnome2_omf_fix
-
- # fix #91168 xine backend problem
- epatch ${FILESDIR}/${P}-xine_no_xxmc.patch
-
-}
-
-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"
+++ /dev/null
-# 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.3 2005/09/05 00:43:14 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
- media-libs/musicbrainz
- 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 )
- )
- firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
- !firefox? ( mozilla? ( >=www-client/mozilla-1.7.3 ) )
-
- !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"
# 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.2.0.ebuild,v 1.5 2005/09/16 22:14:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r1.ebuild,v 1.1 2005/10/08 12:26:19 leonardop Exp $
-inherit gnome2 eutils multilib
+inherit eutils multilib gnome2
DESCRIPTION="Media player for GNOME"
HOMEPAGE="http://gnome.org/projects/totem/"
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-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"
+IUSE="a52 dvd flac gnome lirc mad mpeg nsplugin ogg theora vorbis win32codecs xine xv"
RDEPEND=">=dev-libs/glib-2.6.3
>=x11-libs/gtk+-2.6
media-libs/musicbrainz
gnome? ( >=gnome-base/nautilus-2.10 )
lirc? ( app-misc/lirc )
- xine? ( >=media-libs/xine-lib-1
+ xine? (
+ >=media-libs/xine-lib-1.0.1
>=gnome-base/gconf-2 )
- !xine? ( >=media-libs/gstreamer-0.8.10
+ !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
+ xv? ( >=media-plugins/gst-plugins-xvideo-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 )
+ 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
+ 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
>=media-plugins/gst-plugins-dvdnav-0.8.11 )
- win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 )
- )
- firefox? ( >=www-client/mozilla-firefox-1.0.2-r1
- sys-apps/dbus )
- !firefox? ( mozilla? ( >=www-client/mozilla-1.7.3
- sys-apps/dbus ) )
-
- !gnome-extra/nautilus-media"
+ win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 ) )
+ nsplugin? (
+ >=net-libs/gecko-sdk-1.7
+ >=sys-apps/dbus-0.35 )"
DEPEND="${RDEPEND}
app-text/scrollkeeper
- >=dev-util/intltool-0.29
- >=dev-util/pkgconfig-0.12.0"
+ >=dev-util/intltool-0.28
+ >=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
pkg_setup() {
+ G2CONF="--disable-gtk \
+ $(use_enable lirc) \
+ $(use_enable gnome nautilus) \
+ $(use_enable nsplugin mozilla) \
+ $(use_with nsplugin mozilla gecko-sdk)"
+
# 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
# Use global nsplugins dir
G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
}
src_unpack() {
- unpack ${A}
-
- cd ${S}
+ unpack "${A}"
+ cd "${S}"
- gnome2_omf_fix help/C/Makefile.in \
- help/de/Makefile.in \
- help/es/Makefile.in \
- help/ru/Makefile.in
+ gnome2_omf_fix help/*/Makefile.in
- # fix the IDL path ( AllanonJL )
- epatch ${FILESDIR}/totem-1.1.5-idl.patch
- # fix nsIDOMWindow.h include ( AllanonJL )
- epatch ${FILESDIR}/totem-1.1.5-nsi.patch
+ # Recognize gecko-sdk as a valid toolkit to compile the plugin
+ epatch ${FILESDIR}/${PN}-1.2.0-gecko-sdk.patch
# fix for italian translation
- epatch ${FILESDIR}/totem-1.2.0-lang_it_fix.patch
-
- einfo "Regenerating autotools files..."
- export WANT_AUTOMAKE=1.9.5
- export WANT_AUTOCONF=2.5
+ epatch ${FILESDIR}/${PN}-1.2.0-lang_it_fix.patch
- automake; aclocal -I .; libtoolize --copy --force; autoconf
+ export WANT_AUTOMAKE=1.9
+ aclocal -I . || die "aclocal failed"
+ automake || die "automake failed"
+ autoconf || die "autoconf failed"
+ libtoolize --copy --force || die "libtoolize failed"
}
pkg_postinst() {
einfo "DVD menus will only work with the xine backend."
}
-
-USE_DESTDIR="1"
projects / gentoo.git / commitdiff