Accepting request 135926 from home:dimstar:branches:GNOME:Factory

Update to 0.30

OBS-URL: https://build.opensuse.org/request/show/135926
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=54

libcanberra-0.29.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72
-size 315728

libcanberra-gst10.patch

@@ -1,76 +0,0 @@
-From 1f367c1171bca28030b53804c1bdef3b9bd77f67 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Mon, 3 Sep 2012 20:27:55 +0200
-Subject: [PATCH] Port to GStreamer 1.0
-
-https://bugs.freedesktop.org/show_bug.cgi?id=54455
----
- configure.ac    |    2 +-
- src/gstreamer.c |   10 +++++-----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7fe044c..0171f70 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gstreamer],
-         [gstreamer=auto])
- 
- if test "x${gstreamer}" != xno ; then
--    PKG_CHECK_MODULES(GST, [ gstreamer-0.10 >= 0.10.15 ],
-+    PKG_CHECK_MODULES(GST, [ gstreamer-1.0 >= 0.10.15 ],
-         [
-             HAVE_GSTREAMER=1
-             AC_DEFINE([HAVE_GSTREAMER], 1, [Have GStreamer?])
-diff --git a/src/gstreamer.c b/src/gstreamer.c
-index 3496e6b..9582b00 100644
---- a/src/gstreamer.c
-+++ b/src/gstreamer.c
-@@ -84,7 +84,7 @@ static void outstanding_free(struct outstanding *o) {
-         if (o->pipeline) {
-                 bus = gst_pipeline_get_bus(GST_PIPELINE (o->pipeline));
-                 if (bus != NULL) {
--                        gst_bus_set_sync_handler(bus, NULL, NULL);
-+                        gst_bus_set_sync_handler(bus, NULL, NULL, NULL);
-                         gst_object_unref(bus);
-                 }
- 
-@@ -307,7 +307,7 @@ static void on_pad_added(GstElement *element, GstPad *pad, gboolean arg1, gpoint
- 
-         sinkelement = GST_ELEMENT(data);
- 
--        caps = gst_pad_get_caps(pad);
-+        caps = gst_pad_query_caps(pad, NULL);
-         if (gst_caps_is_empty(caps) || gst_caps_is_any(caps)) {
-                 gst_caps_unref(caps);
-                 return;
-@@ -316,7 +316,7 @@ static void on_pad_added(GstElement *element, GstPad *pad, gboolean arg1, gpoint
-         structure = gst_caps_get_structure(caps, 0);
-         type = gst_structure_get_name(structure);
-         if (g_str_has_prefix(type, "audio/x-raw") == TRUE) {
--                vpad = gst_element_get_pad(sinkelement, "sink");
-+                vpad = gst_element_get_static_pad(sinkelement, "sink");
-                 gst_pad_link(pad, vpad);
-                 gst_object_unref(vpad);
-         }
-@@ -460,7 +460,7 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-         }
- 
-         bus = gst_pipeline_get_bus(GST_PIPELINE (out->pipeline));
--        gst_bus_set_sync_handler(bus, bus_cb, out);
-+        gst_bus_set_sync_handler(bus, bus_cb, out, NULL);
-         gst_object_unref(bus);
- 
-         g_signal_connect(decodebin, "new-decoded-pad",
-@@ -468,7 +468,7 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-         gst_bin_add_many(GST_BIN (abin), audioconvert, audioresample, sink, NULL);
-         gst_element_link_many(audioconvert, audioresample, sink, NULL);
- 
--        audiopad = gst_element_get_pad(audioconvert, "sink");
-+        audiopad = gst_element_get_static_pad(audioconvert, "sink");
-         gst_element_add_pad(abin, gst_ghost_pad_new("sink", audiopad));
-         gst_object_unref(audiopad);
- 
--- 
-1.7.10.4
-

libcanberra.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep 25 11:52:28 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 0.30:
+  + Minor bug fixes
+  + Explicitly require x11 for GTK linking
+  + Port to GStreamer 1.0.
+- Add pkgconfig(glib-2.0) BuildRequires so it can be versioned.
+- Add pkgconfig(x11) BuildRequires: new explicit dependency.
+- Drop libcanberra-gst10.patch: fixed upstream.
+- Drop libtool BuildRequires and call to ./autogen.sh: no patch
+  requires bootstrapping.
+
 -------------------------------------------------------------------
 Mon Sep  3 16:07:52 UTC 2012 - dimstar@opensuse.org
 

libcanberra.spec

@@ -19,7 +19,7 @@
 %define build_gtk3 1
 
 Name:           libcanberra
-Version:        0.29
+Version:        0.30
 Release:        0
 Summary:        Portable sound event library
 License:        LGPL-2.0+
@@ -30,15 +30,12 @@ Source1:        libcanberra-gtk-module.sh
 Source99:       baselibs.conf
 #PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 fdo#51662 dimstar@opensuse.org -- Set the multi backend as default and allow it actually to work.
 Patch0:         libcanberra-multi-backend.patch
-# PATCH-FEATURE-UPSTREAM libcanberra-gst10.patch fdo#54455 dimstar@opensuse.org -- Port to GStreamer 1.0
-Patch1:         libcanberra-gst10.patch
 BuildRequires:  gtk-doc
 BuildRequires:  libltdl-devel
-# Needed for patch1
-BuildRequires:  libtool
 BuildRequires:  lynx
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
 %if %build_gtk3
@@ -46,6 +43,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 %endif
 BuildRequires:  pkgconfig(libpulse) >= 0.9.11
 BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(x11)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libcanberra0 = %{version}-%{release}
 
@@ -186,11 +184,8 @@ This package provides the development files for libcanberra.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-# Needed for patch1
-./autogen.sh
 %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1
 make %{?_smp_mflags}