Author: patrys Date: Sat Sep 26 13:20:21 2009 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/totem: totem-configure.patch (1.6 -> 1.7) , totem.spec (1.159 -> 1.160) ---- Diffs: ================================================================ Index: packages/totem/totem-configure.patch diff -u packages/totem/totem-configure.patch:1.6 packages/totem/totem-configure.patch:1.7 --- packages/totem/totem-configure.patch:1.6 Wed Mar 18 15:28:45 2009 +++ packages/totem/totem-configure.patch Sat Sep 26 15:20:15 2009 @@ -1,58 +1,75 @@ -diff -urN totem-2.25.91/configure.in totem-2.25.91.new/configure.in ---- totem-2.25.91/configure.in 2009-02-17 13:46:50.000000000 +0100 -+++ totem-2.25.91.new/configure.in 2009-02-21 21:55:48.000000000 +0100 -@@ -123,54 +123,6 @@ - AC_MSG_ERROR(you need the GStreamer or the xine-lib development packages installed) - fi - AC_MSG_RESULT(GStreamer-$GST_MAJORMINOR) -- -- dnl Check for required plugins -- gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10` -- gst010_inspect="$gst010_toolsdir/gst-inspect-0.10" -- -- dnl Give error and exit if we don't have the gst_inspect tool -- AC_MSG_CHECKING([GStreamer 0.10 inspection tool]) -- if test -r "$gst010_inspect"; then +--- totem-2.27.1/configure.in~ 2009-05-06 19:28:37.000000000 +0200 ++++ totem-2.27.1/configure.in 2009-05-28 13:04:36.295330882 +0200 +@@ -97,52 +97,6 @@ + AC_SUBST(GST_LIBS) + EXTRA_BACKEND_LIBS="-lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR" + +-dnl Check for required plugins +-gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10` +-gst010_inspect="$gst010_toolsdir/gst-inspect-0.10" +- +-dnl Give error and exit if we don't have the gst_inspect tool +-AC_MSG_CHECKING([GStreamer 0.10 inspection tool]) +-if test -r "$gst010_inspect"; then +- AC_MSG_RESULT([yes]) +-else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ +- Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. +- It should be part of gstreamer-0_10-utils. Please install it. +- ]) +-fi +- +-dnl Check for elements from gst-plugins-base +-for base_element in playbin2 ffmpegcolorspace videoscale +-do +- AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin]) +- if $gst010_inspect $base_element >/dev/null 2>/dev/null; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([ -- Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. -- It should be part of gstreamer-0_10-utils. Please install it. +- Cannot find required GStreamer-0.10 plugin '$base_element'. +- It should be part of gst-plugins-base. Please install it. - ]) - fi +-done - -- dnl Check for elements from gst-plugins-base -- for base_element in playbin ffmpegcolorspace videoscale -- do -- AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin]) -- if $gst010_inspect $base_element >/dev/null 2>/dev/null; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([ -- Cannot find required GStreamer-0.10 plugin '$base_element'. -- It should be part of gst-plugins-base. Please install it. -- ]) -- fi -- done -- -- dnl Check for elements from gst-plugins-good -- for good_element in gconfaudiosink gconfvideosink goom -- do -- AC_MSG_CHECKING([GStreamer 0.10 $good_element plugin]) -- if $gst010_inspect $good_element >/dev/null 2>/dev/null; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([ -- Cannot find required GStreamer-0.10 plugin '$good_element'. -- It should be part of gst-plugins-good. Please install it. -- ]) -- fi -- done -- +-dnl Check for elements from gst-plugins-good +-for good_element in gconfaudiosink gconfvideosink goom +-do +- AC_MSG_CHECKING([GStreamer 0.10 $good_element plugin]) +- if $gst010_inspect $good_element >/dev/null 2>/dev/null; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ +- Cannot find required GStreamer-0.10 plugin '$good_element'. +- It should be part of gst-plugins-good. Please install it. +- ]) +- fi +-done - - fi + AC_MSG_CHECKING([Whether not to check for iso-codes]) + AC_ARG_ENABLE([iso-codes], + AS_HELP_STRING([--disable-iso-codes],[Whether not to check for iso-codes at build-time]), +--- totem-2.27.1/configure.in~ 2009-05-28 13:09:53.905040655 +0200 ++++ totem-2.27.1/configure.in 2009-05-28 13:11:19.125023987 +0200 +@@ -515,17 +515,6 @@ + add_plugin="0" + fi + +- dnl We need the souphttpsrc element for the YouTube plugin +- AC_MSG_CHECKING([GStreamer 0.10 souphttpsrc plugin]) +- if $gst010_inspect souphttpsrc >/dev/null 2>/dev/null; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ +- Cannot find required GStreamer-0.10 plugin 'souphttpsrc'. +- It should be part of gst-plugins-good. Please install it. +- ]) +- fi + ;; + esac - if test x$ENABLE_XINE = xno && test x$HAVE_GSTREAMER = xno; then ================================================================ Index: packages/totem/totem.spec diff -u packages/totem/totem.spec:1.159 packages/totem/totem.spec:1.160 --- packages/totem/totem.spec:1.159 Tue Jun 30 16:53:02 2009 +++ packages/totem/totem.spec Sat Sep 26 15:20:15 2009 @@ -2,18 +2,17 @@ # # Conditional build %bcond_without bemused # build without bemused plugin -%bcond_without gstreamer # build with xine-lib instead of gstreamer %bcond_without lirc # without lirc support # Summary: Movie player for GNOME 2 based on the gstreamer engine Summary(pl.UTF-8): Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer Name: totem -Version: 2.26.3 +Version: 2.28.0 Release: 1 License: GPL v2 Group: X11/Applications/Multimedia -Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.26/%{name}-%{version}.tar.bz2 -# Source0-md5: f8f7390f5d93268cd200086a1b4f765a +Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.28/%{name}-%{version}.tar.bz2 +# Source0-md5: 481d56b78b351606cf6c75d923776a75 # PLD-specific patches Patch0: %{name}-configure.patch Patch1: %{name}-codegen.patch @@ -23,19 +22,21 @@ BuildRequires: automake >= 1:1.9 %{?with_bemused:BuildRequires: bluez-libs-devel} BuildRequires: dbus-glib-devel >= 0.74 +BuildRequires: docbook-dtd45-xml BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.19.7 BuildRequires: gmyth-devel >= 0.7.1 BuildRequires: gmyth-upnp-devel >= 0.7.1 BuildRequires: gnome-common >= 2.24.0 BuildRequires: gnome-doc-utils >= 0.14.0 -%{?with_gstreamer:BuildRequires: gstreamer-plugins-base-devel >= 0.10.12} +BuildRequires: gstreamer-plugins-base-devel >= 0.10.24 BuildRequires: gtk+2-devel >= 2:2.16.0 BuildRequires: gtk-doc >= 1.11 BuildRequires: intltool >= 0.40.0 BuildRequires: iso-codes BuildRequires: libepc-ui-devel >= 0.3.0 BuildRequires: libgalago-devel >= 0.5.2 +BuildRequires: libgdata-devel >= 0.4.0 BuildRequires: libtool BuildRequires: libtracker-devel BuildRequires: libxml2-devel >= 1:2.6.31 @@ -48,8 +49,8 @@ BuildRequires: sed >= 4.0 BuildRequires: shared-mime-info >= 0.22 BuildRequires: totem-pl-parser-devel >= 2.26.0 -#BuildRequires: vala >= 0.3.5 -%{!?with_gstreamer:BuildRequires: xine-lib-devel >= 2:1.0.2-1} +BuildRequires: totem-pl-parser-devel >= 2.28.0 +BuildRequires: vala >= 0.3.5 BuildRequires: xorg-lib-libSM-devel BuildRequires: xorg-lib-libXv-devel BuildRequires: xorg-lib-libXxf86vm-devel >= 1.0.1 @@ -58,15 +59,10 @@ Requires(post,postun): hicolor-icon-theme Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 -%if %{with gstreamer} Requires: gstreamer-GConf >= 0.10.3 Requires: gstreamer-audiosink >= 0.10 +Requires: gstreamer-soup Requires: gstreamer-videosink >= 0.10 -%else -Requires: xine-plugin-video -# unusable -Conflicts: xine-input-gnome-vfs -%endif Requires: gtk+2 >= 2:2.16.0 Requires: nautilus >= 2.26.0 Requires: python-pygtk-gtk @@ -76,11 +72,13 @@ Suggests: gstreamer-pango # youtube plugin Suggests: gstreamer-plugins-bad -Suggests: gstreamer-soup +Suggests: python-BeautifulSoup Suggests: python-coherence -Suggests: python-gdata +Suggests: python-feedparser Suggests: python-gnome-gconf +Suggests: python-httplib2 Suggests: python-json-py +Suggests: python-listparser Suggests: python-pygobject >= 2.16.0 Suggests: python-pyxdg # s...@latn vs. s...@latin @@ -161,7 +159,6 @@ --disable-scrollkeeper \ --disable-vala \ --enable-nautilus \ - %{!?with_gstreamer:--enable-xine} \ --enable-python \ --enable-gtk-doc \ --with-html-dir=%{_gtkdocdir} @@ -224,8 +221,6 @@ %attr(755,root,root) %{_bindir}/totem-audio-preview %attr(755,root,root) %{_bindir}/totem-video-indexer %attr(755,root,root) %{_bindir}/totem-video-thumbnailer -%attr(755,root,root) %{_libdir}/libbaconvideowidget.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libbaconvideowidget.so.0 %attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so %attr(755,root,root) %{_libdir}/totem/totem-bugreport.py %{_datadir}/%{name} @@ -253,6 +248,10 @@ %{pluginsdir}/coherence_upnp/*.py[co] %{pluginsdir}/coherence_upnp/coherence_upnp.totem-plugin +%dir %{pluginsdir}/dbus +%{pluginsdir}/dbus/*.py[co] +%{pluginsdir}/dbus/dbus-service.totem-plugin + %dir %{pluginsdir}/galago %attr(755,root,root) %{pluginsdir}/galago/libtgp.so %{pluginsdir}/galago/galago.totem-plugin @@ -261,6 +260,11 @@ %attr(755,root,root) %{pluginsdir}/gromit/libgromit.so %{pluginsdir}/gromit/gromit.totem-plugin +%dir %{pluginsdir}/iplayer +%{pluginsdir}/iplayer/*.py[co] +%{pluginsdir}/iplayer/iplayer.ui +%{pluginsdir}/iplayer/iplayer.totem-plugin + %dir %{pluginsdir}/jamendo %{pluginsdir}/jamendo/*.py[co] %{pluginsdir}/jamendo/jamendo.totem-plugin @@ -309,6 +313,7 @@ %dir %{pluginsdir}/screenshot %attr(755,root,root) %{pluginsdir}/screenshot/libscreenshot.so %{pluginsdir}/screenshot/gallery.ui +%{pluginsdir}/screenshot/gnome-screenshot.ui %{pluginsdir}/screenshot/screenshot.totem-plugin %dir %{pluginsdir}/skipto @@ -328,7 +333,7 @@ %{pluginsdir}/totem/__init__.py[co] %dir %{pluginsdir}/youtube -%{pluginsdir}/youtube/youtube.py[co] +%attr(755,root,root) %{pluginsdir}/youtube/libyoutube.so %{pluginsdir}/youtube/youtube.totem-plugin %{pluginsdir}/youtube/youtube.ui @@ -347,9 +352,24 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.160 2009/09/26 13:20:15 patrys +- merged from DEVEL + +Revision 1.158.2.4 2009/09/26 13:18:10 patrys +- 2.28.0 + +Revision 1.158.2.3 2009/09/10 09:17:50 patrys +- 2.27.92 + +Revision 1.158.2.2 2009/08/11 22:49:32 patrys +- 2.27.2 + Revision 1.159 2009/06/30 14:53:02 megabajt - updated to 2.26.3 - disabled vala for now (doesn't build) + +Revision 1.158.2.1 2009/05/28 12:29:28 patrys +- 2.27.1 Revision 1.158 2009/05/07 13:35:37 megabajt - updated to 2.26.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/totem/totem-configure.patch?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/totem/totem.spec?r1=1.159&r2=1.160&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
