Hello community,
here is the log from the commit of package gnome-applets
checked in at Sat Apr 8 02:22:50 CEST 2006.
--------
--- GNOME/gnome-applets/gnome-applets.changes 2006-04-05 14:05:34.000000000 +0200
+++ gnome-applets/gnome-applets.changes 2006-04-08 02:17:11.000000000 +0200
@@ -6,0 +7,5 @@
+Tue Apr 4 00:59:28 CEST 2006 - jpr@suse.de
+
+- Backport upstream patch for gstreamer 0.10 support
+
+-------------------------------------------------------------------
New:
----
gnome-applets-gstreamer-0-10.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-applets.spec ++++++
--- /var/tmp/diff_new_pack.7WoG9e/_old 2006-04-08 02:21:08.000000000 +0200
+++ /var/tmp/diff_new_pack.7WoG9e/_new 2006-04-08 02:21:08.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: gnome-applets
-BuildRequires: docbook-toys gail-devel gnome-common gnome-desktop-devel gnome-doc-utils gnome-panel-devel gnome-patch-translation gnutls-devel gstreamer-plugins-devel gucharmap-devel intltool kdelibs3-doc libgnomeprintui-devel libgtop-devel libnotify-devel libwnck-devel libxklavier-devel mDNSResponder-devel perl-XML-Parser powersave scrollkeeper
+BuildRequires: docbook-toys gail-devel gnome-common gnome-desktop-devel gnome-doc-utils gnome-panel-devel gnome-patch-translation gnutls-devel gstreamer010-plugins-base-devel gucharmap-devel intltool kdelibs3-doc libgnomeprintui-devel libgtop-devel libnotify-devel libwnck-devel libxklavier-devel mDNSResponder-devel perl-XML-Parser powersave scrollkeeper
%ifarch %ix86
BuildRequires: apmd
%endif
@@ -27,7 +27,7 @@
%endif
Autoreqprov: on
Version: 2.12.2
-Release: 36
+Release: 37
Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel
Source: %{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -48,6 +48,7 @@
Patch23: gnome-applets-modemlights-potfiles.patch
Patch24: gnome-applets-modemlights-smpppd.patch
Patch25: gnome-applets-no-nfs-block.patch
+Patch26: gnome-applets-gstreamer-0-10.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem /usr/bin/touch gconf2
@@ -154,6 +155,7 @@
%patch23
%patch24
%patch25
+%patch26
gnome-patch-translation-update
%build
@@ -262,6 +264,8 @@
%changelog -n gnome-applets
* Wed Apr 05 2006 - sbrabec@suse.cz
- Fixed in-process applets I18N (144946#27).
+* Tue Apr 04 2006 - jpr@suse.de
+- Backport upstream patch for gstreamer 0.10 support
* Sun Mar 19 2006 - danw@suse.de
- Apply patch from bgo 316455 to fix bnc 158615
(hang with NFS if disk enabled in system monitor)
++++++ gnome-applets-gstreamer-0-10.patch ++++++
Index: configure.in
================================================================================
--- configure.in
+++ configure.in
@@ -315,28 +315,63 @@
dnl ** mixer applet check **
dnl *******************************************
-P_MIXER=
-MIXER_CFLAGS=
-MIXER_LIBS=
-
-GST_MAJORMINOR=0.8
-GST_REQ=0.8.2
-PKG_CHECK_MODULES(MIXER, gstreamer-interfaces-$GST_MAJORMINOR >= $GST_REQ \
- gstreamer-$GST_MAJORMINOR >= $GST_REQ,
- HAVE_GST="yes", HAVE_GST="no")
-if test "x$HAVE_GST" = "xyes"; then
- P_MIXER=mixer
+GST_MAJORMINOR=auto
+AC_ARG_WITH(gstreamer,
+ AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
+ [case "${withval}" in
+ 0.8) GST_MAJORMINOR=0.8 ;;
+ 0.10) GST_MAJORMINOR=0.10 ;;
+ *) AC_MSG_ERROR([
+ *** Bad value ${withval} for --with-gstreamer
+ *** Please use one of the following:
+ *** --with-gstreamer=0.8
+ *** --with-gstreamer=0.10
+ ]);;
+ esac])
+
+GST10_REQS=0.10.2
+GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
+GST8_REQS=0.8.0
+GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
+
+if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
+ # try for GStreamer 0.10
+ PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
+fi
+
+if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
+ # try for GStreamer 0.8
+ PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
fi
+
+
+case $HAVE_GST_VER in
+ 0.8)
+ HAVE_GST="yes"
+ AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend])
+ ;;
+ 0.10)
+ HAVE_GST="yes"
+ AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend])
+ MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-$HAVE_GST_VER -lgstaudio-$HAVE_GST_VER"
+ ;;
+ none)
+ HAVE_GST="no"
+ AC_MSG_RESULT([GStreamer not found])
+ AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
+ ;;
+ *)
+ AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
+ ;;
+esac
+
AC_SUBST(MIXER_CFLAGS)
AC_SUBST(MIXER_LIBS)
-AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
-if test x"$P_MIXER" == x"mixer"; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
-fi
+AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
+AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
+AC_DEFINE(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10", [Using Gstreamer 0.10])
dnl ***************************************
dnl ** Check for libnotify **
--- mixer/applet.c
+++ mixer/applet.c
@@ -258,7 +258,12 @@
active_track_name_list = NULL;
if (reset_state) {
+#ifdef HAVE_GST10
+ gst_element_set_state (element, GST_STATE_READY);
+ if (gst_element_get_state(element, NULL, NULL, -1) != GST_STATE_CHANGE_SUCCESS)
+#else
if (gst_element_set_state (element, GST_STATE_READY) != GST_STATE_SUCCESS)
+#endif
return NULL;
}
@@ -1157,8 +1162,12 @@
if (new_element != old_element) {
/* change element */
- if (gst_element_set_state (item->data,
- GST_STATE_READY) != GST_STATE_SUCCESS)
+#ifdef HAVE_GST10
+ gst_element_set_state (item->data, GST_STATE_READY);
+ if (gst_element_get_state (item->data, NULL, NULL, -1) != GST_STATE_CHANGE_SUCCESS)
+#else
+ if (gst_element_set_state (item->data, GST_STATE_READY) != GST_STATE_SUCCESS)
+#endif
continue;
/* save */
--- mixer/applet.h
+++ mixer/applet.h
@@ -31,7 +31,11 @@
#include