From 9573e153bce74185d9bf2e6ea42c987bf4216a4a Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Tue, 27 Mar 2007 22:07:07 +0000 Subject: [PATCH] gnome 2.18.0 Package-Manager: portage-2.1.2.2 --- media-video/totem/ChangeLog | 8 +- media-video/totem/Manifest | 28 ++- media-video/totem/files/digest-totem-2.18.0 | 3 + .../files/totem-2.17.5-browser-plugins.patch | 76 +++++++++ media-video/totem/totem-2.18.0.ebuild | 161 ++++++++++++++++++ 5 files changed, 267 insertions(+), 9 deletions(-) create mode 100644 media-video/totem/files/digest-totem-2.18.0 create mode 100644 media-video/totem/files/totem-2.17.5-browser-plugins.patch create mode 100644 media-video/totem/totem-2.18.0.ebuild diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index 504ef1debe79..884e1ea2cb06 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/totem # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.154 2007/02/26 00:35:01 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.155 2007/03/27 22:07:07 dang Exp $ + +*totem-2.18.0 (27 Mar 2007) + + 27 Mar 2007; Daniel Gryniewicz + +files/totem-2.17.5-browser-plugins.patch, +totem-2.18.0.ebuild: + gnome 2.18.0 *totem-2.16.5 (26 Feb 2007) diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index b8093293428e..d150a155f35c 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -25,10 +25,15 @@ AUX totem-1.5.91-mozilla-firefox-include-fix.patch 418 RMD160 a36ea215be46b51a77 MD5 27f4418deb332b1c0874764e2bf02450 files/totem-1.5.91-mozilla-firefox-include-fix.patch 418 RMD160 a36ea215be46b51a772377cf150f76401ed4080e files/totem-1.5.91-mozilla-firefox-include-fix.patch 418 SHA256 04c41d398c6f5a2765090b9607e4df5b879a06c6f9eab4a6573dbad2858027d4 files/totem-1.5.91-mozilla-firefox-include-fix.patch 418 +AUX totem-2.17.5-browser-plugins.patch 2177 RMD160 0d11c1e26f615769e9d7382420294ba22562d078 SHA1 10ca71549fbe887e031a64fb983eda76ac720903 SHA256 367afe097c86c07e459ee9caece16a8066d0fd3f6b87b6d87b263faebede9c81 +MD5 31e5d70ed3520575a93700aec0b94cb2 files/totem-2.17.5-browser-plugins.patch 2177 +RMD160 0d11c1e26f615769e9d7382420294ba22562d078 files/totem-2.17.5-browser-plugins.patch 2177 +SHA256 367afe097c86c07e459ee9caece16a8066d0fd3f6b87b6d87b263faebede9c81 files/totem-2.17.5-browser-plugins.patch 2177 DIST totem-1.2.1.tar.bz2 1411347 RMD160 7d7e69003cd73e060c3e0f9f8b25e23ac484db63 SHA1 644096e976cd48a45d6f845c97e540cbc17d2f46 SHA256 569c265cd184ef559cf2e266812f09f93d1642c6fd612c92e1a639e0f91c6621 DIST totem-1.4.2.tar.bz2 1707854 RMD160 87d844ac490adf6210f47a652e17b6fb17c10d3f SHA1 0d19052858ddf981b98de3143bf5ccd60bbee1e4 SHA256 31141a6c55f3252ea01742aecba4c01cb438d7fc93d71a18b53bf06f2e65c03b DIST totem-2.16.4.tar.bz2 1820381 RMD160 e3329834482b9efd2ba049191919be93f6b1071f SHA1 9e586eac620b2792a1e7fc5461ff2edf8f6f0312 SHA256 b459e1c01c124f6876b3a00b32f9272571e86395f4a6ee3b3ff8d60aac5d4848 DIST totem-2.16.5.tar.bz2 1820880 RMD160 1a93768600860dc1dec7782039cfd27c45577bef SHA1 9f5d646207bff371744d63f376d891bad5da85af SHA256 7dab6a72cbf9d242a8eb13e4fce70aa3e730f7f74dad84181034022edfbb37df +DIST totem-2.18.0.tar.bz2 2050182 RMD160 2b8cf5583ac31f88c3eb5cccb414b5b1561ed93f SHA1 28b2a41fa97e367659215e3d76ca3abfa7ea93ca SHA256 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca EBUILD totem-1.2.1-r1.ebuild 3333 RMD160 0a3ee2f8457f527bb177117942d5dbcb4bf9c0fc SHA1 caac3fa22f1b02bc9e45701fedf6c821f24d4107 SHA256 fd92ecb10ae3ff36747f64c24720d87b66fdf25443651122cb372c175d803f13 MD5 57bb436948fc3aa3af54b6ca4549b497 totem-1.2.1-r1.ebuild 3333 RMD160 0a3ee2f8457f527bb177117942d5dbcb4bf9c0fc totem-1.2.1-r1.ebuild 3333 @@ -45,10 +50,14 @@ EBUILD totem-2.16.5.ebuild 4579 RMD160 13692eb963c84ff25f3a727ab6dea2de468e670d MD5 6462f3af68530db2438c30fda6e0d78a totem-2.16.5.ebuild 4579 RMD160 13692eb963c84ff25f3a727ab6dea2de468e670d totem-2.16.5.ebuild 4579 SHA256 3169dfa03f84b531585ae61d330e5e4ece820e8780406eef6b3704c98e0a5370 totem-2.16.5.ebuild 4579 -MISC ChangeLog 21388 RMD160 426c4a6ee9cd59b6f8c89751ad8eb786423d1271 SHA1 8a67c10981b86ca699b0b23968ef3ae05a3d05a5 SHA256 3290fba7149e6815df564f96e66ac0a58786be34f3ea714452065c44a391f972 -MD5 a552d732781148a4da56d49b1b10479f ChangeLog 21388 -RMD160 426c4a6ee9cd59b6f8c89751ad8eb786423d1271 ChangeLog 21388 -SHA256 3290fba7149e6815df564f96e66ac0a58786be34f3ea714452065c44a391f972 ChangeLog 21388 +EBUILD totem-2.18.0.ebuild 4382 RMD160 2f3b8c8960a718edef4646be8201567579b45852 SHA1 4e31473edf83a91c1dfe5f13c5d2808240bfcc55 SHA256 c9ea39e79595ea13fa25055f65126ca8f55e0fcb4716dee671522aa92b2742c6 +MD5 c4de0802e3a4a7cd74672778b33b2e23 totem-2.18.0.ebuild 4382 +RMD160 2f3b8c8960a718edef4646be8201567579b45852 totem-2.18.0.ebuild 4382 +SHA256 c9ea39e79595ea13fa25055f65126ca8f55e0fcb4716dee671522aa92b2742c6 totem-2.18.0.ebuild 4382 +MISC ChangeLog 21547 RMD160 55b2b005f17adf04d95e9fe04dffbe7ec51020cd SHA1 2f803af18d294c1868bd943403364fe78d59be65 SHA256 1125bdfc2cb8250a0b48dc4d5b96d97a3497350d9ead6203d632a322d9d09688 +MD5 1923743892bf8538384d9cffc6b182a9 ChangeLog 21547 +RMD160 55b2b005f17adf04d95e9fe04dffbe7ec51020cd ChangeLog 21547 +SHA256 1125bdfc2cb8250a0b48dc4d5b96d97a3497350d9ead6203d632a322d9d09688 ChangeLog 21547 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c metadata.xml 521 @@ -65,10 +74,13 @@ SHA256 dcd58ed98b6426d5ac56544ee86805d2ac21515edf4c7b6c14a1e00f1b921dc6 files/di MD5 d0760d5645ad29a473fb12e8aa7d888d files/digest-totem-2.16.5 244 RMD160 261b5430e3d754952a5bdc68b566f8b2fa2078fa files/digest-totem-2.16.5 244 SHA256 46a23f411a2192670f130b321c3447e460439306c7d70339badfdfad426de7c1 files/digest-totem-2.16.5 244 +MD5 b1367f5dbd5faf5a80d29898cea44472 files/digest-totem-2.18.0 244 +RMD160 7d741e640cfb9885362990f4555f15d51f7723f7 files/digest-totem-2.18.0 244 +SHA256 1d28e0cbdf0f7019f998ad9205b3da055c98a9f7d23e6280921c0f6fbccd1d6b files/digest-totem-2.18.0 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF4itBwUpWvClEHQoRAntOAJ4s0u4Q54TVC8Df5fZzRlskt6+dIACffyrz -DMxIIQmwbHvnPINzHOPQm4Q= -=GZzl +iD8DBQFGCZUmomPajV0RnrERApnaAJ0S+mC9sYF4KaBuPClSBgAUbfc8MACfbSz1 +zNnzFJKpZGxdB9pEQU+2WDk= +=nczt -----END PGP SIGNATURE----- diff --git a/media-video/totem/files/digest-totem-2.18.0 b/media-video/totem/files/digest-totem-2.18.0 new file mode 100644 index 000000000000..f8fa7c8a1f75 --- /dev/null +++ b/media-video/totem/files/digest-totem-2.18.0 @@ -0,0 +1,3 @@ +MD5 1a3bfeaac6297b259967f5d79896b0e7 totem-2.18.0.tar.bz2 2050182 +RMD160 2b8cf5583ac31f88c3eb5cccb414b5b1561ed93f totem-2.18.0.tar.bz2 2050182 +SHA256 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca totem-2.18.0.tar.bz2 2050182 diff --git a/media-video/totem/files/totem-2.17.5-browser-plugins.patch b/media-video/totem/files/totem-2.17.5-browser-plugins.patch new file mode 100644 index 000000000000..9868d16a9098 --- /dev/null +++ b/media-video/totem/files/totem-2.17.5-browser-plugins.patch @@ -0,0 +1,76 @@ +--- configure.in.orig 2007-01-28 14:48:08.000000000 -0600 ++++ configure.in 2007-01-28 14:48:38.000000000 -0600 +@@ -580,6 +580,10 @@ + [],[enable_mully_plugin=yes]) + AC_MSG_RESULT([$enable_mully_plugin]) + ++PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ]) ++AC_SUBST([SN_CFLAGS]) ++AC_SUBST([SN_LIBS]) ++ + fi + + AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"]) +--- browser-plugin/Makefile.am.orig 2007-01-09 08:26:48.000000000 -0600 ++++ browser-plugin/Makefile.am 2007-01-28 14:53:09.000000000 -0600 +@@ -80,6 +80,7 @@ + $(WARN_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(NVTV_CFLAGS) \ ++ $(SN_CFLAGS) \ + $(AM_CFLAGS) + + totem_plugin_viewer_LDADD = \ +@@ -93,6 +94,7 @@ + $(DBUS_LIBS) \ + $(NVTV_LIBS) \ + $(XTEST_LIBS) \ ++ $(SN_LIBS) \ + $(X_LIBS) + + BUILT_SOURCES += \ +@@ -152,7 +154,7 @@ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_basic_plugin_la_LDFLAGS = \ +@@ -211,7 +213,7 @@ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_gmp_plugin_la_LDFLAGS = \ +@@ -270,7 +272,7 @@ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_complex_plugin_la_LDFLAGS = \ +@@ -329,7 +331,7 @@ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_narrowspace_plugin_la_LDFLAGS = \ +@@ -388,7 +390,7 @@ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_mully_plugin_la_LDFLAGS = \ diff --git a/media-video/totem/totem-2.18.0.ebuild b/media-video/totem/totem-2.18.0.ebuild new file mode 100644 index 000000000000..66e6906d622f --- /dev/null +++ b/media-video/totem/totem-2.18.0.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.0.ebuild,v 1.1 2007/03/27 22:07:07 dang Exp $ + +inherit autotools eutils gnome2 multilib + +DESCRIPTION="Media player for GNOME" +HOMEPAGE="http://gnome.org/projects/totem/" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" + +# No 0.10.0 release for gst-plugins-pitdfdll yet +# IUSE="win32codecs" + +IUSE="a52 debug dvd ffmpeg firefox flac gnome hal lirc mad mpeg nsplugin nvtv ogg theora vorbis xulrunner xv" + +RDEPEND=">=dev-libs/glib-2.12 + >=x11-libs/gtk+-2.10 + >=gnome-base/gconf-2.0 + >=gnome-base/libglade-2.0 + >=gnome-base/gnome-vfs-2.10 + >=x11-themes/gnome-icon-theme-2.10 + >=x11-libs/startup-notification-0.8 + app-text/iso-codes + dev-libs/libxml2 + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.60 ) + ) + + >=media-libs/gstreamer-0.10.6 + >=media-libs/gst-plugins-good-0.10 + >=media-libs/gst-plugins-base-0.10.7 + >=media-plugins/gst-plugins-pango-0.10 + >=media-plugins/gst-plugins-gconf-0.10 + >=media-plugins/gst-plugins-gnomevfs-0.10 + + x11-libs/libX11 + x11-libs/libXtst + >=x11-libs/libXrandr-1.1.1 + >=x11-libs/libXxf86vm-1.0.1 + + gnome? ( + >=gnome-base/libgnome-2.4 + >=gnome-base/libgnomeui-2.4 + >=gnome-base/gnome-desktop-2.2 + >=gnome-base/nautilus-2.10 + ) + hal? ( =sys-apps/hal-0.5* ) + lirc? ( app-misc/lirc ) + nsplugin? ( + firefox? ( www-client/mozilla-firefox ) + !firefox? ( + xulrunner? ( net-libs/xulrunner ) + !xulrunner? ( www-client/seamonkey ) + ) + >=x11-misc/shared-mime-info-0.17 + >=x11-libs/startup-notification-0.8 + ) + nvtv? ( >=media-tv/nvtv-0.4.5 ) + + a52? ( >=media-plugins/gst-plugins-a52dec-0.10 ) + !sparc? ( dvd? ( + >=media-libs/gst-plugins-ugly-0.10 + >=media-plugins/gst-plugins-a52dec-0.10 + >=media-plugins/gst-plugins-dvdread-0.10 + >=media-plugins/gst-plugins-mpeg2dec-0.10 + ) + ) + !sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) ) + flac? ( >=media-plugins/gst-plugins-flac-0.10 ) + mad? ( >=media-plugins/gst-plugins-mad-0.10 ) + !sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) ) + ogg? ( >=media-plugins/gst-plugins-ogg-0.10 ) + theora? ( + >=media-plugins/gst-plugins-ogg-0.10 + >=media-plugins/gst-plugins-theora-0.10 + ) + vorbis? ( + >=media-plugins/gst-plugins-ogg-0.10 + >=media-plugins/gst-plugins-vorbis-0.10 + ) + xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )" + +# this belongs above xv? above. +# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 ) + +DEPEND="${RDEPEND} + x11-proto/xproto + app-text/scrollkeeper + gnome-base/gnome-common + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.20" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +pkg_setup() { + if ! built_with_use 'media-libs/gst-plugins-base' 'X' ; then + einfo "Build gst-plugins-base with the X useflag" + einfo "echo \"media-libs/gst-plugins-base X\" >> /etc/portage/package.use" + einfo "emerge -1 gst-plugins-base" + die "gst-plugins-base requires X useflag" + fi + + # use global mozilla plugin dir + G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser" + + G2CONF="${G2CONF} --disable-vanity --enable-gstreamer --with-dbus" + + if use gnome ; then + G2CONF="--disable-gtk --enable-nautilus" + else + G2CONF="${G2CONF} --enable-gtk" + fi + + if use nsplugin ; then + G2CONF="${G2CONF} --enable-browser-plugins" + + if use firefox || use sparc ; then + G2CONF="${G2CONF} --with-gecko=firefox" + elif use xulrunner || use sparc; then + G2CONF="${G2CONF} --with-gecko=xulrunner" + else + G2CONF="${G2CONF} --with-gecko=seamonkey" + fi + else + G2CONF="${G2CONF} --disable-browser-plugins" + fi + + G2CONF="${G2CONF} \ + $(use_enable debug) \ + $(use_with hal) \ + $(use_enable lirc) \ + $(use_enable nvtv)" +} + +src_unpack() { + gnome2_src_unpack + + if use nsplugin ; then + epatch ${FILESDIR}/${PN}-2.17.5-browser-plugins.patch + eautoreconf + fi +} + +src_install() { + gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins +} + +src_compile() { + #fixme: why does it need write access here, probably need to set up a fake + #home in /var/tmp like other pkgs do + + addpredict "/root/.gconfd" + addpredict "/root/.gconf" + addpredict "/root/.gnome2" + + gnome2_src_compile +} -- 2.26.2