[packages/gupnp-dlna] - updated to 0.8.0 (note: new soname, parallel installable with gupnp-dlna-0.6.x, which I've left
qboosh
qboosh at pld-linux.org
Wed Dec 12 20:02:34 CET 2012
commit bbbe782ea61997a605e34f1427f05c50b95a71ff
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Dec 12 20:03:25 2012 +0100
- updated to 0.8.0 (note: new soname, parallel installable with gupnp-dlna-0.6.x,
which I've left on gupnp-dlna-0.6 branch, to be forked if needed)
- removed obsolete glib2,gstreamer-1.0 patches
- vala binding is now built from this spec
gupnp-dlna-glib2.patch | 81 -----------------
gupnp-dlna-gstreamer-1.0.patch | 191 -----------------------------------------
gupnp-dlna.spec | 79 +++++++++++------
3 files changed, 52 insertions(+), 299 deletions(-)
---
diff --git a/gupnp-dlna.spec b/gupnp-dlna.spec
index eeafdf2..50fa2ce 100644
--- a/gupnp-dlna.spec
+++ b/gupnp-dlna.spec
@@ -1,34 +1,39 @@
#
# Conditional build:
%bcond_without apidocs # do not build and package API docs
+%bcond_without vala # Vala binding
#
Summary: GUPnP utility library to ease tasks related to DLNA
Summary(pl.UTF-8): Biblioteka narzędziowa GUPnP ułatwiająca zadania związane z DLNA
Name: gupnp-dlna
-# note: 0.6.x is stable, 0.7.x unstable
-Version: 0.6.6
-Release: 2
+# note: 0.8.x is stable, 0.9.x unstable
+Version: 0.8.0
+Release: 1
License: LGPL v2+
Group: Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/%{name}-%{version}.tar.xz
-# Source0-md5: 4e3151125de991f474f728c1c5343ab1
-Patch0: %{name}-glib2.patch
-Patch1: %{name}-gstreamer-1.0.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.8/%{name}-%{version}.tar.xz
+# Source0-md5: 84fc9815c13fa7b6cfc15b9d6ce00415
URL: http://gupnp.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
BuildRequires: docbook-dtd412-xml
+BuildRequires: glib2-devel >= 1:2.24
BuildRequires: gobject-introspection-devel >= 0.6.4
-BuildRequires: gstreamer-devel >= 0.10.29.2
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.32
-BuildRequires: gtk-doc >= 1.0
+BuildRequires: gstreamer-devel >= 1.0.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
+BuildRequires: gtk-doc >= 1.11
BuildRequires: libtool >= 2:2.2
BuildRequires: libxml2-devel >= 1:2.5.0
BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
+%{?with_vala:BuildRequires: vala >= 2:0.18}
+%{?with_vala:BuildRequires: vala-gupnp >= 0.10}
BuildRequires: xz
-Requires: gstreamer >= 0.10.29.2
-Requires: gstreamer-plugins-base >= 0.10.32
+# no --disable-vala option; build fails if vala is present, but vala-gupnp is not
+%{!?with_vala:BuildConflicts: vala}
+Requires: glib2 >= 1:2.24
+Requires: gstreamer >= 1.0.0
+Requires: gstreamer-plugins-base >= 1.0.0
Requires: libxml2 >= 1:2.5.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,8 +53,9 @@ Summary: Header files for GUPnP DLNA library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki GUPnP DLNA
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gstreamer-devel >= 0.10.29.2
-Requires: gstreamer-plugins-base-devel >= 0.10.32
+Requires: glib2-devel >= 1:2.24
+Requires: gstreamer-devel >= 1.0.0
+Requires: gstreamer-plugins-base-devel >= 1.0.0
Requires: libxml2-devel >= 1:2.5.0
%description devel
@@ -82,10 +88,22 @@ API and internal documentation for GUPnP DLNA library.
%description apidocs -l pl.UTF-8
Dokumentacja API biblioteki GUPnP DLNA.
+%package -n vala-gupnp-dlna
+Summary: Vala binding for GUPnP DLNA library
+Summary(pl.UTF-8): Wiązanie języka Vala do biblioteki GUPnP DLNA
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: vala >= 2:0.18
+Requires: vala-gupnp >= 0.10
+
+%description -n vala-gupnp-dlna
+Vala binding for GUPnP DLNA library.
+
+%description -n vala-gupnp-dlna -l pl.UTF-8
+Wiązanie języka Vala do biblioteki GUPnP DLNA.
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%{__gtkdocize}
@@ -109,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
%{!?with_apidocs:%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}}
# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgupnp-dlna-1.0.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgupnp-dlna-1.1.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -120,26 +138,33 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gupnp-dlna-info
-%attr(755,root,root) %{_bindir}/gupnp-dlna-ls-profiles
-%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-1.0.so.2
-%{_libdir}/girepository-1.0/GUPnPDLNA-1.0.typelib
+%attr(755,root,root) %{_bindir}/gupnp-dlna-info-1.1
+%attr(755,root,root) %{_bindir}/gupnp-dlna-ls-profiles-1.1
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-1.1.so.3
+%{_libdir}/girepository-1.0/GUPnPDLNA-1.1.typelib
%{_datadir}/gupnp-dlna
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.0.so
-%{_datadir}/gir-1.0/GUPnPDLNA-1.0.gir
-%{_includedir}/gupnp-dlna-1.0
-%{_pkgconfigdir}/gupnp-dlna-1.0.pc
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.1.so
+%{_datadir}/gir-1.0/GUPnPDLNA-1.1.gir
+%{_includedir}/gupnp-dlna-1.1
+%{_pkgconfigdir}/gupnp-dlna-1.1.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/libgupnp-dlna-1.0.a
+%{_libdir}/libgupnp-dlna-1.1.a
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
%{_gtkdocdir}/gupnp-dlna
%endif
+
+%if %{with vala}
+%files -n vala-gupnp-dlna
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gupnp-dlna-1.1.deps
+%{_datadir}/vala/vapi/gupnp-dlna-1.1.vapi
+%endif
diff --git a/gupnp-dlna-glib2.patch b/gupnp-dlna-glib2.patch
deleted file mode 100644
index 846c521..0000000
--- a/gupnp-dlna-glib2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From bdd1a01c829dfd61d0b823a358492974fbe75c8a Mon Sep 17 00:00:00 2001
-From: Riko Yamada <rik0yamada at yahoo.co.jp>
-Date: Sun, 03 Jun 2012 03:44:29 +0000
-Subject: Remove explicit calls to g_thread_init()
-
-With recent glib, g_type_init() initializes the thread system for us and
-g_thread_init() has been deprecated in GLib-2.32.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673472
----
-diff --git a/configure.ac b/configure.ac
-index f6b5c54..9db94d4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,6 +50,8 @@ AC_SUBST(GST_MAJORMINOR)
- GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
- AC_SUBST(GST_CFLAGS)
-
-+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24)
-+
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
- AC_SUBST(GLIB_GENMARSHAL)
-diff --git a/tests/dlna-encoding.c b/tests/dlna-encoding.c
-index 95e4f3f..e819801 100644
---- a/tests/dlna-encoding.c
-+++ b/tests/dlna-encoding.c
-@@ -199,8 +199,7 @@ main (int argc, char **argv)
- GUPnPDLNAProfile *profile;
- gchar *inputuri;
-
-- if (!g_thread_supported ())
-- g_thread_init (NULL);
-+ g_type_init ();
-
- ctx = g_option_context_new ("- encode URIs with GstProfile and encodebin");
- g_option_context_add_main_entries (ctx, options, NULL);
-diff --git a/tests/dlna-profile-parser.c b/tests/dlna-profile-parser.c
-index ee45d10..3115519 100644
---- a/tests/dlna-profile-parser.c
-+++ b/tests/dlna-profile-parser.c
-@@ -103,8 +103,7 @@ main (int argc, char **argv)
-
- GOptionContext *ctx;
-
-- if (!g_thread_supported ())
-- g_thread_init (NULL);
-+ g_type_init ();
-
- ctx = g_option_context_new (" - test to parse dlna profiles");
- g_option_context_add_main_entries (ctx, options, NULL);
-diff --git a/tools/gupnp-dlna-info.c b/tools/gupnp-dlna-info.c
-index 961cc76..399c3e2 100644
---- a/tools/gupnp-dlna-info.c
-+++ b/tools/gupnp-dlna-info.c
-@@ -452,8 +452,7 @@ main (int argc, char **argv)
-
- GOptionContext *ctx;
-
-- if (!g_thread_supported ())
-- g_thread_init(NULL);
-+ g_type_init ();
-
- ctx = g_option_context_new (" - program to extract DLNA and related metadata");
- g_option_context_add_main_entries (ctx, options, NULL);
-diff --git a/tools/gupnp-dlna-ls-profiles.c b/tools/gupnp-dlna-ls-profiles.c
-index 567ef8d..ecaa98b 100644
---- a/tools/gupnp-dlna-ls-profiles.c
-+++ b/tools/gupnp-dlna-ls-profiles.c
-@@ -103,8 +103,7 @@ main (int argc, char **argv)
-
- GOptionContext *ctx;
-
-- if (!g_thread_supported ())
-- g_thread_init(NULL);
-+ g_type_init ();
-
- ctx = g_option_context_new (" - program to list all the DLNA profiles supported by gupnp-dlna");
- g_option_context_add_main_entries (ctx, options, NULL);
---
-cgit v0.9.0.2
diff --git a/gupnp-dlna-gstreamer-1.0.patch b/gupnp-dlna-gstreamer-1.0.patch
deleted file mode 100644
index f0eafb9..0000000
--- a/gupnp-dlna-gstreamer-1.0.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From ecad90c58ec74849e782cf4db6eb41675ce7cfa9 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail at jensge.org>
-Date: Mon, 23 Jan 2012 18:21:33 +0000
-Subject: 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);
---
-cgit v0.9.0.2
-From f665ee10afdcf0d9ce4706b6ac0058e38e549681 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail at jensge.org>
-Date: Wed, 25 Jul 2012 06:59:15 +0000
-Subject: 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;
---
-cgit v0.9.0.2
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gupnp-dlna.git/commitdiff/bbbe782ea61997a605e34f1427f05c50b95a71ff
More information about the pld-cvs-commit
mailing list