Add gmodule depend. Fixup autoconf stuff, and move omf stuff to last.
authorMartin Schlemmer <azarah@gentoo.org>
Wed, 2 Nov 2005 12:30:21 +0000 (12:30 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Wed, 2 Nov 2005 12:30:21 +0000 (12:30 +0000)
Package-Manager: portage-2.0.53_rc7

media-video/totem/ChangeLog
media-video/totem/Manifest
media-video/totem/files/digest-totem-1.2.0-r2 [new file with mode: 0644]
media-video/totem/files/totem-1.2.0-gmoduledep.patch [new file with mode: 0644]
media-video/totem/totem-1.2.0-r2.ebuild [new file with mode: 0644]

index c22c68d9a5240bb8b774f754904ed101ad4a957f..677dc649e844669120527e51588d49ab754117a6 100644 (file)
@@ -1,6 +1,12 @@
 # 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.84 2005/10/11 15:12:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.85 2005/11/02 12:30:21 azarah Exp $
+
+*totem-1.2.0-r2 (02 Nov 2005)
+
+  02 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/totem-1.2.0-gmoduledep.patch, +totem-1.2.0-r2.ebuild:
+  Add gmodule depend.  Fixup autoconf stuff, and move omf stuff to last.
 
   11 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.2.0-r1.ebuild:
   Back to ~sparc hand-masking dvd here since gst-plugins-dvdnav is b0rked for us
index 239f5f2b251a1e91c24713c519119790aa51dbff..549e6bf0b57e24ac69ffe6167523b19ecdacdc77 100644 (file)
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2250a3fdce33223654f06cdaaf12d2c2 ChangeLog 11835
+MD5 84c8713b6707e48dba696827bc2d2bfa ChangeLog 12053
 MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65
+MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r2 65
 MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
 MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
+MD5 faed9bfdf2ea1835a17c9e56e7738ac1 files/totem-1.2.0-gmoduledep.patch 1535
 MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 MD5 06d52fc007ef24fa66f1a352be6f3ee3 totem-1.0.4.ebuild 2682
 MD5 0b7293c95190806607f6788c7a399aff totem-1.2.0-r1.ebuild 3134
+MD5 61db78dc45c1fecc7d8a052d09be0ab0 totem-1.2.0-r2.ebuild 3038
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDS9aOKRy60XGEcJIRApA7AJ4jiCqSg0SYotxk6Z4AVhQ9Bi7k1QCbBEdp
-LUFhaG3iFCDDemT8ZUAx4yU=
-=XIFz
+iD8DBQFDaLI11ZcsMnZjRyIRAi18AJ4pZvsXOqhUTCdAwPudb5tC2XvmMgCfZi2N
+20rmXGvgkuQfIRUGxro7efM=
+=wPrQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/files/digest-totem-1.2.0-r2 b/media-video/totem/files/digest-totem-1.2.0-r2
new file mode 100644 (file)
index 0000000..0762d3d
--- /dev/null
@@ -0,0 +1 @@
+MD5 e07aded62a929779a4cd28c16fdb2efd totem-1.2.0.tar.bz2 1720687
diff --git a/media-video/totem/files/totem-1.2.0-gmoduledep.patch b/media-video/totem/files/totem-1.2.0-gmoduledep.patch
new file mode 100644 (file)
index 0000000..5de68e8
--- /dev/null
@@ -0,0 +1,15 @@
+--- totem-1.2.0/configure.in.gmoduledep        2005-10-28 11:22:19.000000000 -0400
++++ totem-1.2.0/configure.in   2005-10-28 11:22:47.000000000 -0400
+@@ -139,10 +139,10 @@
+ dnl Seems that the order matters because libtool blows
+ dnl Also check if we're going to be using GTK+ only
+ if test x$ENABLE_GTK = "xno" ; then
+-      PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS iso-codes libmusicbrainz $MM)
++      PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 iso-codes libmusicbrainz $MM)
+       HAVE_GNOME=yes
+ else
+-      PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS iso-codes libmusicbrainz $MM)
++      PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 iso-codes libmusicbrainz $MM)
+       AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
+       AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
+       HAVE_GNOME=no
diff --git a/media-video/totem/totem-1.2.0-r2.ebuild b/media-video/totem/totem-1.2.0-r2.ebuild
new file mode 100644 (file)
index 0000000..e0791b7
--- /dev/null
@@ -0,0 +1,104 @@
+# 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-r2.ebuild,v 1.1 2005/11/02 12:30:21 azarah Exp $
+
+inherit autotools eutils multilib gnome2
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+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
+       >=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.0.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
+               >=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 )
+               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 )
+               mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
+               !sparc? ( 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 ) )
+       nsplugin? (
+               >=net-libs/gecko-sdk-1.7
+               >=sys-apps/dbus-0.35 )"
+
+DEPEND="${RDEPEND}
+       app-text/scrollkeeper
+       >=dev-util/intltool-0.28
+       >=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+
+
+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"
+
+       # Use global nsplugins dir
+       G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+}
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       # 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}/${PN}-1.2.0-lang_it_fix.patch
+       # Add gmodule depend
+       epatch ${FILESDIR}/${PN}-1.2.0-gmoduledep.patch
+
+       eautoreconf
+
+       gnome2_omf_fix help/*/Makefile.in
+}
+
+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."
+
+}