From 90a6695ce72e7aa9f39cc1978fa579cdce54977ee1adc966cb00ca37d90d0efe Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 15:35:03 +0000 Subject: [PATCH] Accepting request 132750 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132750 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=53 --- libcanberra-gst10.patch | 76 +++++++++++++++++++++++++++++++++++++++++ libcanberra.changes | 9 +++++ libcanberra.spec | 11 ++++-- 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 libcanberra-gst10.patch diff --git a/libcanberra-gst10.patch b/libcanberra-gst10.patch new file mode 100644 index 0000000..a704c16 --- /dev/null +++ b/libcanberra-gst10.patch @@ -0,0 +1,76 @@ +From 1f367c1171bca28030b53804c1bdef3b9bd77f67 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +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 + diff --git a/libcanberra.changes b/libcanberra.changes index 3364ab4..b5a2a32 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 3 16:07:52 UTC 2012 - dimstar@opensuse.org + +- Add libcanberra-gst10.patch: Port libcanberra to GStreamer 1.0. +- Add libtool BuildRequires and call ./autogen.sh in build, as + above patch touches the build system +- Replace pkgconfig(gstreamer-0.10) BuildRequires with + pkgconfig(gstreamer-1.0). + ------------------------------------------------------------------- Mon Jul 2 19:19:56 UTC 2012 - dimstar@opensuse.org diff --git a/libcanberra.spec b/libcanberra.spec index d6527f5..5dd7f6a 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -28,14 +28,18 @@ Url: http://0pointer.de/lennart/projects/libcanberra/ Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1: libcanberra-gtk-module.sh Source99: baselibs.conf -#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 dimstar@opensuse.org -- Set the multi backend as default and allow it actually to work. +#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(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-2.0) %if %build_gtk3 BuildRequires: pkgconfig(gtk+-3.0) @@ -182,8 +186,11 @@ 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}