From fe36f7a6bfdbe50209fe8683db85539e597d4cc7 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 17 Apr 2007 03:51:51 +0000 Subject: [PATCH] Version bump for 2.18.1 Package-Manager: portage-2.1.2.4 --- media-video/totem/ChangeLog | 8 +- media-video/totem/Manifest | 30 ++-- media-video/totem/files/digest-totem-2.18.1 | 3 + .../files/totem-2.18.1-browser-plugins.patch | 69 ++++++++ media-video/totem/totem-2.18.1.ebuild | 161 ++++++++++++++++++ 5 files changed, 256 insertions(+), 15 deletions(-) create mode 100644 media-video/totem/files/digest-totem-2.18.1 create mode 100644 media-video/totem/files/totem-2.18.1-browser-plugins.patch create mode 100644 media-video/totem/totem-2.18.1.ebuild diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index cc0b4166a7c4..071cd07de61f 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.156 2007/04/16 17:23:11 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.157 2007/04/17 03:51:51 compnerd Exp $ + +*totem-2.18.1 (17 Apr 2007) + + 17 Apr 2007; Saleem Abdulrasool + +files/totem-2.18.1-browser-plugins.patch, +totem-2.18.1.ebuild: + Version bump for 2.18.1 16 Apr 2007; Daniel Gryniewicz totem-2.16.4.ebuild, totem-2.16.5.ebuild: diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index f720dc507295..f8508eb5d77c 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 SHA1 a637293d27af9c3a1c7044aa15813b1637c1e269 SHA256 d198c31c00563798468abfa7d6de8329d208bb71c830599176ba355649a9c24b MD5 6c254a486d447e680d77048262dfe78d files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 @@ -29,11 +26,16 @@ AUX totem-2.17.5-browser-plugins.patch 2177 RMD160 0d11c1e26f615769e9d7382420294 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 +AUX totem-2.18.1-browser-plugins.patch 2354 RMD160 bf6848064f870120462ad2c877142496b0bee53a SHA1 03cb04a700ffcfc205429ab9ad2594a92dc3787d SHA256 ae6d8ba52b4b30e746d628b057d2274e03a7d9ff5e91bfb5f4c76f3eeb18363f +MD5 992993d07fb60425e1c85aea26a8206c files/totem-2.18.1-browser-plugins.patch 2354 +RMD160 bf6848064f870120462ad2c877142496b0bee53a files/totem-2.18.1-browser-plugins.patch 2354 +SHA256 ae6d8ba52b4b30e746d628b057d2274e03a7d9ff5e91bfb5f4c76f3eeb18363f files/totem-2.18.1-browser-plugins.patch 2354 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 +DIST totem-2.18.1.tar.bz2 2074935 RMD160 bf648b1306d4eb6cfbe7403e4bd2b5c43b058392 SHA1 64e174d0ef3f6857ed29e9e0dfd64a16125436f3 SHA256 205b4f4c318d29fdb21d5bfc2416038d55c79f1bbccd85ef4333f5963b38e7be 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 @@ -54,10 +56,14 @@ EBUILD totem-2.18.0.ebuild 4382 RMD160 2f3b8c8960a718edef4646be8201567579b45852 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 21713 RMD160 511bf1985a219e70b49efaad8a91f0ee2d41ef5a SHA1 1195681c42a6a9d1f3f0af4d9cf55e021801053e SHA256 efe99682ed8525e04923ad99c4ed5ccd2c314d3cc5e966e419f5f51e96fbfc3a -MD5 597bce7ae25f5fbb1bcf70e0831ec573 ChangeLog 21713 -RMD160 511bf1985a219e70b49efaad8a91f0ee2d41ef5a ChangeLog 21713 -SHA256 efe99682ed8525e04923ad99c4ed5ccd2c314d3cc5e966e419f5f51e96fbfc3a ChangeLog 21713 +EBUILD totem-2.18.1.ebuild 4374 RMD160 eba800bc22f470d087c30094c7fdc948e92bce63 SHA1 4303e0012fca1cf4adef320faad0ae7a21e41341 SHA256 1bf1e9e971837d0fe8e121fd6b1790b2753cb97a71943850c132c40d501394b9 +MD5 52ef6798fb48ae5f85cd5d44d6c13bfa totem-2.18.1.ebuild 4374 +RMD160 eba800bc22f470d087c30094c7fdc948e92bce63 totem-2.18.1.ebuild 4374 +SHA256 1bf1e9e971837d0fe8e121fd6b1790b2753cb97a71943850c132c40d501394b9 totem-2.18.1.ebuild 4374 +MISC ChangeLog 21896 RMD160 8429a47e668f8a4a57f44c48647d2ba32ca722fc SHA1 b2968cbc3bc58c61c8166cd94ffd80e95b2e078a SHA256 e8ba9fda67be7e50aa65abf2d0b7a488b2dd81e8f2068fb044c383aa1e3a4453 +MD5 6c45d3a3ce0157e125b5b327d899625a ChangeLog 21896 +RMD160 8429a47e668f8a4a57f44c48647d2ba32ca722fc ChangeLog 21896 +SHA256 e8ba9fda67be7e50aa65abf2d0b7a488b2dd81e8f2068fb044c383aa1e3a4453 ChangeLog 21896 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c metadata.xml 521 @@ -77,10 +83,6 @@ SHA256 46a23f411a2192670f130b321c3447e460439306c7d70339badfdfad426de7c1 files/di 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.3 (GNU/Linux) - -iD8DBQFGI7EEomPajV0RnrERAlolAJ9MfRreR6IIohQTYRq12unYkxF31wCeKB+z -2QQQL/UMEjUJVBgnyyiO5Ho= -=pdOa ------END PGP SIGNATURE----- +MD5 56dae3e182a06eda20367d16ba9c4da8 files/digest-totem-2.18.1 244 +RMD160 3b94341ca15922b7c0859fc3bd56d9ed5289111e files/digest-totem-2.18.1 244 +SHA256 e7ff4ab52f9f9d33cfaaf94dc238b6869e2f6cf1e679807b0c020295d67c38ef files/digest-totem-2.18.1 244 diff --git a/media-video/totem/files/digest-totem-2.18.1 b/media-video/totem/files/digest-totem-2.18.1 new file mode 100644 index 000000000000..a690f5de9b1c --- /dev/null +++ b/media-video/totem/files/digest-totem-2.18.1 @@ -0,0 +1,3 @@ +MD5 c8faa37112cfd2edfebdd1df88519f36 totem-2.18.1.tar.bz2 2074935 +RMD160 bf648b1306d4eb6cfbe7403e4bd2b5c43b058392 totem-2.18.1.tar.bz2 2074935 +SHA256 205b4f4c318d29fdb21d5bfc2416038d55c79f1bbccd85ef4333f5963b38e7be totem-2.18.1.tar.bz2 2074935 diff --git a/media-video/totem/files/totem-2.18.1-browser-plugins.patch b/media-video/totem/files/totem-2.18.1-browser-plugins.patch new file mode 100644 index 000000000000..78f149b38faa --- /dev/null +++ b/media-video/totem/files/totem-2.18.1-browser-plugins.patch @@ -0,0 +1,69 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN totem-2.18.1.orig/browser-plugin/Makefile.am totem-2.18.1/browser-plugin/Makefile.am +--- totem-2.18.1.orig/browser-plugin/Makefile.am 2007-03-25 20:50:03.000000000 -0400 ++++ totem-2.18.1/browser-plugin/Makefile.am 2007-04-16 10:01:41.000000000 -0400 +@@ -80,6 +80,7 @@ totem_plugin_viewer_CFLAGS = \ + $(WARN_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(NVTV_CFLAGS) \ ++ $(SN_CFLAGS) \ + $(AM_CFLAGS) + + totem_plugin_viewer_LDADD = \ +@@ -93,6 +94,7 @@ totem_plugin_viewer_LDADD = \ + $(DBUS_LIBS) \ + $(NVTV_LIBS) \ + $(XTEST_LIBS) \ ++ $(SN_LIBS) \ + $(X_LIBS) + + BUILT_SOURCES += \ +@@ -155,7 +157,7 @@ libtotem_basic_plugin_la_LIBADD = \ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_basic_plugin_la_LDFLAGS = \ +@@ -223,7 +225,7 @@ libtotem_gmp_plugin_la_LIBADD = \ + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_gmp_plugin_la_LDFLAGS = \ +@@ -285,7 +287,7 @@ libtotem_complex_plugin_la_LIBADD = + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_complex_plugin_la_LDFLAGS = \ +@@ -347,7 +349,7 @@ libtotem_narrowspace_plugin_la_LIBADD = + $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + libtotempluginviewer_marshal.la \ + $(DBUS_LIBS) \ +- $(MOZILLA_LIBS) \ ++ $(BROWSER_PLUGIN_LIBS) \ + $(LIBXPCOMGLUE_S) + + libtotem_narrowspace_plugin_la_LDFLAGS = \ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN totem-2.18.1.orig/configure.in totem-2.18.1/configure.in +--- totem-2.18.1.orig/configure.in 2007-04-04 10:40:41.000000000 -0400 ++++ totem-2.18.1/configure.in 2007-04-16 09:58:58.000000000 -0400 +@@ -575,6 +575,10 @@ AC_ARG_ENABLE([mully-plugin], + [],[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"]) diff --git a/media-video/totem/totem-2.18.1.ebuild b/media-video/totem/totem-2.18.1.ebuild new file mode 100644 index 000000000000..64f774fa7388 --- /dev/null +++ b/media-video/totem/totem-2.18.1.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.1.ebuild,v 1.1 2007/04/17 03:51:51 compnerd 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}/${P}-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