From 28a65164a97f09cfc2545c06c61495e33ae2c0239bc32a074faad6b7f89f69c7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 4 Jan 2013 09:01:00 +0000 Subject: [PATCH] Accepting request 146409 from home:Zaitor:branches:GNOME:Factory Update OBS-URL: https://build.opensuse.org/request/show/146409 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-dlna?expand=0&rev=29 --- gupnp-dlna-0.6.6.tar.xz | 3 - gupnp-dlna-0.8.0.tar.xz | 3 + gupnp-dlna-GSTPort.patch | 208 --------------------------------------- gupnp-dlna.changes | 21 ++++ gupnp-dlna.spec | 45 ++++----- 5 files changed, 43 insertions(+), 237 deletions(-) delete mode 100644 gupnp-dlna-0.6.6.tar.xz create mode 100644 gupnp-dlna-0.8.0.tar.xz delete mode 100644 gupnp-dlna-GSTPort.patch diff --git a/gupnp-dlna-0.6.6.tar.xz b/gupnp-dlna-0.6.6.tar.xz deleted file mode 100644 index a48f68e..0000000 --- a/gupnp-dlna-0.6.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047 -size 263936 diff --git a/gupnp-dlna-0.8.0.tar.xz b/gupnp-dlna-0.8.0.tar.xz new file mode 100644 index 0000000..c5aab1f --- /dev/null +++ b/gupnp-dlna-0.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31535cb8ee290dd7a9df4448e796a6d3a338ea2ecd03c5a97245a52724929704 +size 267004 diff --git a/gupnp-dlna-GSTPort.patch b/gupnp-dlna-GSTPort.patch deleted file mode 100644 index 355c200..0000000 --- a/gupnp-dlna-GSTPort.patch +++ /dev/null @@ -1,208 +0,0 @@ -commit ecad90c58ec74849e782cf4db6eb41675ce7cfa9 -Author: Jens Georg -Date: Mon Jan 23 19:21:33 2012 +0100 - - Port to 0.11 API - -diff --git a/configure.ac b/configure.ac -index 9db94d4..921d1c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,7 +39,7 @@ LT_INIT([win32-dll]) - - PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.5.0) - --GST_MAJORMINOR=0.10 -+GST_MAJORMINOR=0.11 - GST_REQ=0.10.29.2 - GSTPBU_REQ=0.10.32 - -diff --git a/libgupnp-dlna/gupnp-dlna-discoverer.c b/libgupnp-dlna/gupnp-dlna-discoverer.c -index faf21ff..87cab52 100644 ---- a/libgupnp-dlna/gupnp-dlna-discoverer.c -+++ b/libgupnp-dlna/gupnp-dlna-discoverer.c -@@ -224,7 +224,7 @@ gupnp_dlna_discoverer_class_init (GUPnPDLNADiscovererClass *klass) - NULL, NULL, - gupnp_dlna_marshal_VOID__OBJECT_BOXED, - G_TYPE_NONE, 2, GUPNP_TYPE_DLNA_INFORMATION, -- GST_TYPE_G_ERROR); -+ G_TYPE_ERROR); - - /* Load DLNA profiles from disk */ - if (g_type_from_name ("GstElement")) { -diff --git a/libgupnp-dlna/gupnp-dlna-information.c b/libgupnp-dlna/gupnp-dlna-information.c -index 5585893..250d817 100644 ---- a/libgupnp-dlna/gupnp-dlna-information.c -+++ b/libgupnp-dlna/gupnp-dlna-information.c -@@ -76,8 +76,8 @@ gupnp_dlna_information_get_property (GObject *object, - break; - - case PROP_DISCOVERER_INFO: -- gst_value_set_mini_object (value, -- GST_MINI_OBJECT(priv->info)); -+ g_value_set_object (value, -+ G_OBJECT (priv->info)); - - break; - -@@ -116,7 +116,7 @@ gupnp_dlna_information_set_property (GObject *object, - if (priv->info) - gst_discoverer_info_unref (priv->info); - priv->info = GST_DISCOVERER_INFO -- (gst_value_dup_mini_object (value)); -+ (g_value_dup_object (value)); - - break; - -@@ -174,13 +174,13 @@ gupnp_dlna_information_class_init (GUPnPDLNAInformationClass *klass) - G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_DLNA_MIME, pspec); - -- pspec = gst_param_spec_mini_object ("info", -- "Stream metadata", -- "Metadata of the stream in a " -- "GstDiscovererInfo structure", -- GST_TYPE_DISCOVERER_INFO, -- G_PARAM_READWRITE | -- G_PARAM_CONSTRUCT_ONLY); -+ pspec = g_param_spec_object ("info", -+ "Stream metadata", -+ "Metadata of the stream in a " -+ "GstDiscovererInfo structure", -+ GST_TYPE_DISCOVERER_INFO, -+ G_PARAM_READWRITE | -+ G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, - PROP_DISCOVERER_INFO, - pspec); -diff --git a/libgupnp-dlna/gupnp-dlna-profile.c b/libgupnp-dlna/gupnp-dlna-profile.c -index b88fed6..804d28e 100644 ---- a/libgupnp-dlna/gupnp-dlna-profile.c -+++ b/libgupnp-dlna/gupnp-dlna-profile.c -@@ -79,8 +79,8 @@ gupnp_dlna_profile_get_property (GObject *object, - break; - - case PROP_ENCODING_PROFILE: -- gst_value_set_mini_object (value, -- GST_MINI_OBJECT (priv->enc_profile)); -+ g_value_set_object (value, -+ G_OBJECT (priv->enc_profile)); - break; - - case PROP_DLNA_EXTENDED: -@@ -176,13 +176,13 @@ gupnp_dlna_profile_class_init (GUPnPDLNAProfileClass *klass) - G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_DLNA_MIME, pspec); - -- pspec = gst_param_spec_mini_object ("encoding-profile", -- "Encoding Profile for the " -- "DLNA Profile", -- "GstEncodingProfile object" -- "corresponding to the DLNA profile", -- GST_TYPE_ENCODING_PROFILE, -- G_PARAM_READABLE); -+ pspec = g_param_spec_object ("encoding-profile", -+ "Encoding Profile for the DLNA Profile", -+ "GstEncodingProfile object corresponding " -+ "to the DLNA profile", -+ GST_TYPE_ENCODING_PROFILE, -+ G_PARAM_READABLE); -+ - g_object_class_install_property (object_class, - PROP_ENCODING_PROFILE, - pspec); -diff --git a/tests/dlna-encoding.c b/tests/dlna-encoding.c -index e819801..714cc1b 100644 ---- a/tests/dlna-encoding.c -+++ b/tests/dlna-encoding.c -@@ -41,7 +41,7 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstElement * encodebin) - GstCaps *caps; - - /* Ask encodebin for a compatible pad */ -- caps = gst_pad_get_caps (pad); -+ caps = gst_pad_query_caps (pad, NULL); - g_signal_emit_by_name (encodebin, "request-pad", caps, &sinkpad); - if (caps) - gst_caps_unref (caps); - -commit f665ee10afdcf0d9ce4706b6ac0058e38e549681 -Author: Jens Georg -Date: Wed Jul 25 08:59:15 2012 +0200 - - More 1.0 fixes - -diff --git a/configure.ac b/configure.ac -index 921d1c1..f403377 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,7 +39,7 @@ LT_INIT([win32-dll]) - - PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.5.0) - --GST_MAJORMINOR=0.11 -+GST_MAJORMINOR=1.0 - GST_REQ=0.10.29.2 - GSTPBU_REQ=0.10.32 - -diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am -index 55f4ed2..4c93cc5 100644 ---- a/libgupnp-dlna/Makefile.am -+++ b/libgupnp-dlna/Makefile.am -@@ -65,9 +65,9 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) - - if HAVE_INTROSPECTION - GUPnPDLNA-1.0.gir: libgupnp-dlna-1.0.la --GUPnPDLNA_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-0.10 -+GUPnPDLNA_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-1.0 - GUPnPDLNA_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CFLAGS) --GUPnPDLNA_1_0_gir_LIBS = libgupnp-dlna-1.0.la gstreamer-0.10 -+GUPnPDLNA_1_0_gir_LIBS = libgupnp-dlna-1.0.la gstreamer-1.0 - GUPnPDLNA_1_0_gir_FILES = $(introspection_sources) - GUPnPDLNA_1_0_gir_NAMESPACE = GUPnPDLNA - GUPnPDLNA_1_0_gir_VERSION = 1.0 -diff --git a/libgupnp-dlna/profile-loading.c b/libgupnp-dlna/profile-loading.c -index 874fe44..783aa1e 100644 ---- a/libgupnp-dlna/profile-loading.c -+++ b/libgupnp-dlna/profile-loading.c -@@ -57,7 +57,7 @@ merge_caps (GstCaps *caps1, GstCaps *caps2) - if (!gst_caps_is_any (caps1) && !gst_caps_is_any (caps2)) { - any = TRUE; - gst_caps_merge (caps1, gst_caps_copy (caps2)); -- gst_caps_do_simplify (caps1); -+ gst_caps_simplify (caps1); - } - - ret = gst_caps_make_writable (caps1); -diff --git a/tests/dlna-encoding.c b/tests/dlna-encoding.c -index 714cc1b..8dc89b8 100644 ---- a/tests/dlna-encoding.c -+++ b/tests/dlna-encoding.c -@@ -104,7 +104,7 @@ transcode_file (gchar * uri, gchar * outputuri, GstEncodingProfile * prof) - g_print (" Input URI : %s\n", uri); - g_print (" Output URI : %s\n", outputuri); - -- sink = gst_element_make_from_uri (GST_URI_SINK, outputuri, "sink"); -+ sink = gst_element_make_from_uri (GST_URI_SINK, outputuri, "sink", NULL); - if (G_UNLIKELY (sink == NULL)) { - g_print ("Can't create output sink, most likely invalid output URI !\n"); - return; -diff --git a/gupnp-dlna-1.0-uninstalled.pc.in b/gupnp-dlna-1.0-uninstalled.pc.in -index f706b1a..6ab739c 100644 ---- a/gupnp-dlna-1.0-uninstalled.pc.in -+++ b/gupnp-dlna-1.0-uninstalled.pc.in -@@ -8,4 +8,4 @@ Description: GObject-based AV specific UPnP library - Version: @VERSION@ - Libs: ${libdir}/libgupnp-dlna-1.0.la - Cflags: -I${includedir} -I$(top_srcdir)/gst-convenience/gst-libs --Requires: gstreamer-0.10 gstreamer-base-0.10 gstreamer-video-0.10 -+Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-video-@GST_MAJORMINOR@ -diff --git a/gupnp-dlna-1.0.pc.in b/gupnp-dlna-1.0.pc.in -index 7f7c74a..7b03986 100644 ---- a/gupnp-dlna-1.0.pc.in -+++ b/gupnp-dlna-1.0.pc.in -@@ -8,4 +8,4 @@ Description: GObject-based AV specific UPnP library - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-dlna-1.0 - Cflags: -I${includedir}/gupnp-dlna-1.0 --Requires: gstreamer-0.10 gstreamer-base-0.10 gstreamer-video-0.10 -+Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-video-@GST_MAJORMINOR@ diff --git a/gupnp-dlna.changes b/gupnp-dlna.changes index 397018d..635833c 100644 --- a/gupnp-dlna.changes +++ b/gupnp-dlna.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Dec 26 10:57:37 UTC 2012 - zaitor@opensuse.org + +- Update to version 0.8.0: + + Relax PNG depth requirements to work around a GStreamer issue. + +------------------------------------------------------------------- +Sun Nov 25 19:06:48 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.7.0: + + Port to GStreamer 1.0. + + Add parallel installability with gstreamer-0.10-based + gupnp-dlna. +- Drop gupnp-dlna-GSTPort.patch: fixed upstream. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh, + as we no longer carry patches. +- Rename typelib-1_0-GUPnPDLNA-1_0 subpackage to + typelib-1_0-GUPnPDLNA-1_1, followin upstream. +- Rename libgupnp-dlna-1_0-2 subpackage to libgupnp-dlna-1_1-3, + followin upstreams soname change. + ------------------------------------------------------------------- Fri Aug 31 14:51:19 UTC 2012 - dimstar@opensuse.org diff --git a/gupnp-dlna.spec b/gupnp-dlna.spec index 497dac8..f24a848 100644 --- a/gupnp-dlna.spec +++ b/gupnp-dlna.spec @@ -17,17 +17,13 @@ Name: gupnp-dlna -Version: 0.6.6 +Version: 0.8.0 Release: 0 Summary: A collection of helpers for building DLNA applications License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.gupnp.org/ -Source: http://download.gnome.org/sources/gupnp-dlna/0.6/%{name}-%{version}.tar.xz -# PATCH-FEATURE-UPSTREAM gupnp-dlna-GSTPort.patch -- Port to GStreamer 1.0. Patch taken from upstream git branch. -Patch0: gupnp-dlna-GSTPort.patch -# Needed for patch0 -BuildRequires: gnome-common +Source: http://download.gnome.org/sources/gupnp-dlna/0.8/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel @@ -38,19 +34,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. -%package -n libgupnp-dlna-1_0-2 +%package -n libgupnp-dlna-1_1-3 Summary: A collection of helpers for building DLNA applications Group: Development/Libraries/C and C++ -%description -n libgupnp-dlna-1_0-2 +%description -n libgupnp-dlna-1_1-3 GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. -%package -n typelib-1_0-GUPnPDLNA-1_0 +%package -n typelib-1_0-GUPnPDLNA-1_1 Summary: A collection of helpers for building DLNA applications -- Introspection bindings Group: Development/Libraries/C and C++ -%description -n typelib-1_0-GUPnPDLNA-1_0 +%description -n typelib-1_0-GUPnPDLNA-1_1 GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. @@ -59,8 +55,8 @@ This package provides the GObject Introspection bindings for GUPnP-DLNA. %package -n libgupnp-dlna-devel Summary: A collection of helpers for building DLNA applications - Development Files Group: Development/Libraries/C and C++ -Requires: libgupnp-dlna-1_0-2 = %{version} -Requires: typelib-1_0-GUPnPDLNA-1_0 = %{version} +Requires: libgupnp-dlna-1_1-3 = %{version} +Requires: typelib-1_0-GUPnPDLNA-1_1 = %{version} %description -n libgupnp-dlna-devel GUPnP-DLNA is a collection of helpers for building DLNA media sharing @@ -76,11 +72,8 @@ applications using GUPnP. %prep %setup -q -%patch0 -p1 %build -# Needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static %__make %{?_smp_mflags} @@ -92,32 +85,32 @@ find %{buildroot} -type f -name "*.la" -delete -print %clean rm -rf %{buildroot} -%post -n libgupnp-dlna-1_0-2 -p /sbin/ldconfig +%post -n libgupnp-dlna-1_1-3 -p /sbin/ldconfig -%postun -n libgupnp-dlna-1_0-2 -p /sbin/ldconfig +%postun -n libgupnp-dlna-1_1-3 -p /sbin/ldconfig -%files -n libgupnp-dlna-1_0-2 +%files -n libgupnp-dlna-1_1-3 %defattr(-,root,root) %doc AUTHORS COPYING README TODO # This directory contains DLNA profiles, needed by the library %{_datadir}/%{name}/ -%{_libdir}/lib*.so.2* +%{_libdir}/lib*.so.3* -%files -n typelib-1_0-GUPnPDLNA-1_0 +%files -n typelib-1_0-GUPnPDLNA-1_1 %defattr(-,root,root) -%{_libdir}/girepository-1.0/GUPnPDLNA-1.0.typelib +%{_libdir}/girepository-1.0/GUPnPDLNA-1.1.typelib %files -n libgupnp-dlna-devel %defattr(-,root,root) -%{_includedir}/%{name}-1.0/ +%{_includedir}/%{name}-1.1/ %{_libdir}/lib*.so -%{_libdir}/pkgconfig/gupnp-dlna-1.0.pc -%{_datadir}/gir-1.0/GUPnPDLNA-1.0.gir +%{_libdir}/pkgconfig/gupnp-dlna-1.1.pc +%{_datadir}/gir-1.0/GUPnPDLNA-1.1.gir %doc %{_datadir}/gtk-doc/html/%{name}/ %files -n gupnp-dlna-tools %defattr(-,root,root) -%{_bindir}/gupnp-dlna-info -%{_bindir}/gupnp-dlna-ls-profiles +%{_bindir}/gupnp-dlna-info-1.1 +%{_bindir}/gupnp-dlna-ls-profiles-1.1 %changelog