[packages/gstreamer/DEVEL] - updated to 0.11.93 - new API version and library filenames; it is available to install different
kiesiu
kiesiu at pld-linux.org
Wed Sep 5 21:53:57 CEST 2012
commit c44ba6d0084b7a1afdd0fab5473aaff66bea591d
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date: Wed Sep 5 21:46:00 2012 +0200
- updated to 0.11.93
- new API version and library filenames; it is available to install
different versions of GStreamer with different API version in
parallel; when stable version will be available, 0.10 packages should
be renamed (and moved to some branch) to allow installation of both
versions
gstreamer-inspect-rpm-format.patch | 86 ++++++++++++---------------
gstreamer.spec | 118 ++++++++++++++++++-------------------
2 files changed, 95 insertions(+), 109 deletions(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index 97b73af..abb104f 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -1,18 +1,21 @@
+#
+%define vmajor 1.0
+#
Summary: GStreamer Streaming-media framework runtime
Summary(pl.UTF-8): GStreamer - biblioteki środowiska do obróbki strumieni
Name: gstreamer
-Version: 0.10.36
-Release: 3
+Version: 0.11.93
+Release: 1
License: LGPL v2+
Group: Libraries
Source0: http://gstreamer.freedesktop.org/src/gstreamer/%{name}-%{version}.tar.xz
-# Source0-md5: 15389c73e091b1dda915279c388b9cb2
+# Source0-md5: b6f4970c80026d5f28598fbba8b6d521
Source1: %{name}-rpmdeps.sh
Patch0: %{name}-without_ps_pdf.patch
Patch1: %{name}-eps.patch
Patch2: %{name}-inspect-rpm-format.patch
URL: http://gstreamer.net/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11
BuildRequires: bison >= 1.875
BuildRequires: docbook-dtd30-sgml
@@ -20,13 +23,12 @@ BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-utils >= 0.6.10
BuildRequires: flex >= 2.5.31
BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.24
+BuildRequires: glib2-devel >= 1:2.32.0
BuildRequires: glibc-misc
BuildRequires: gnome-doc-tools
-BuildRequires: gobject-introspection-devel >= 0.6.8
+BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: gtk-doc >= 1.6
BuildRequires: libtool >= 1.4
-BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: nasm
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.9.0
@@ -38,7 +40,6 @@ BuildRequires: xz
Requires: glib2 >= 1:2.24
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define vmajor %(echo %{version} | cut -d. -f1,2)
%define _gstlibdir %{_libdir}/gstreamer-%{vmajor}
%define _gstincludedir %{_includedir}/gstreamer-%{vmajor}
@@ -65,8 +66,7 @@ Summary: Include files for GStreamer streaming-media framework
Summary(pl.UTF-8): Pliki nagłówkowe do środowiska obróbki strumieni GStreamer
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 1:2.24
-Requires: libxml2-devel >= 1:2.6.26
+Requires: glib2-devel >= 1:2.32
Obsoletes: gstreamer-plugins-bad-devel < 0.10.10
%description devel
@@ -122,7 +122,8 @@ Dokumentacja API Gstreamera.
--disable-tests \
--enable-docbook \
--enable-gtk-doc \
- --with-html-dir=%{_gtkdocdir}
+ --with-html-dir=%{_gtkdocdir} \
+ --enable-static
%{__make}
@@ -155,70 +156,63 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/gst-*
-%attr(755,root,root) %{_libdir}/libgstbase-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstbase-0.10.so.0
-%attr(755,root,root) %{_libdir}/libgstcheck-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstcheck-0.10.so.0
-%attr(755,root,root) %{_libdir}/libgstcontroller-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstcontroller-0.10.so.0
-%attr(755,root,root) %{_libdir}/libgstdataprotocol-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstdataprotocol-0.10.so.0
-%attr(755,root,root) %{_libdir}/libgstnet-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstnet-0.10.so.0
-%attr(755,root,root) %{_libdir}/libgstreamer-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstreamer-0.10.so.0
+%attr(755,root,root) %{_libdir}/libgstbase-%{vmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstbase-%{vmajor}.so.0
+%attr(755,root,root) %{_libdir}/libgstcheck-%{vmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstcheck-%{vmajor}.so.0
+%attr(755,root,root) %{_libdir}/libgstcontroller-%{vmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstcontroller-%{vmajor}.so.0
+%attr(755,root,root) %{_libdir}/libgstnet-%{vmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstnet-%{vmajor}.so.0
+%attr(755,root,root) %{_libdir}/libgstreamer-%{vmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgstreamer-%{vmajor}.so.0
%dir %{_gstlibdir}
%attr(755,root,root) %{_gstlibdir}/gst-plugin-scanner
%attr(755,root,root) %{_gstlibdir}/libgstcoreelements.so
-%attr(755,root,root) %{_gstlibdir}/libgstcoreindexers.so
%{_mandir}/man1/gst-*.1*
-%{_libdir}/girepository-1.0/Gst-0.10.typelib
-%{_libdir}/girepository-1.0/GstBase-0.10.typelib
-%{_libdir}/girepository-1.0/GstCheck-0.10.typelib
-%{_libdir}/girepository-1.0/GstController-0.10.typelib
-%{_libdir}/girepository-1.0/GstNet-0.10.typelib
+%{_libdir}/girepository-1.0/Gst-%{vmajor}.typelib
+%{_libdir}/girepository-1.0/GstBase-%{vmajor}.typelib
+%{_libdir}/girepository-1.0/GstCheck-%{vmajor}.typelib
+%{_libdir}/girepository-1.0/GstController-%{vmajor}.typelib
+%{_libdir}/girepository-1.0/GstNet-%{vmajor}.typelib
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgstbase-0.10.so
-%attr(755,root,root) %{_libdir}/libgstcheck-0.10.so
-%attr(755,root,root) %{_libdir}/libgstcontroller-0.10.so
-%attr(755,root,root) %{_libdir}/libgstdataprotocol-0.10.so
-%attr(755,root,root) %{_libdir}/libgstnet-0.10.so
-%attr(755,root,root) %{_libdir}/libgstreamer-0.10.so
-%{_libdir}/libgstbase-0.10.la
-%{_libdir}/libgstcheck-0.10.la
-%{_libdir}/libgstcontroller-0.10.la
-%{_libdir}/libgstdataprotocol-0.10.la
-%{_libdir}/libgstnet-0.10.la
-%{_libdir}/libgstreamer-0.10.la
+%attr(755,root,root) %{_libdir}/libgstbase-%{vmajor}.so
+%attr(755,root,root) %{_libdir}/libgstcheck-%{vmajor}.so
+%attr(755,root,root) %{_libdir}/libgstcontroller-%{vmajor}.so
+%attr(755,root,root) %{_libdir}/libgstnet-%{vmajor}.so
+%attr(755,root,root) %{_libdir}/libgstreamer-%{vmajor}.so
+%{_libdir}/libgstbase-%{vmajor}.la
+%{_libdir}/libgstcheck-%{vmajor}.la
+%{_libdir}/libgstcontroller-%{vmajor}.la
+%{_libdir}/libgstnet-%{vmajor}.la
+%{_libdir}/libgstreamer-%{vmajor}.la
%{_docdir}/%{name}-devel-%{version}
%{_gstincludedir}
-%{_pkgconfigdir}/gstreamer-0.10.pc
-%{_pkgconfigdir}/gstreamer-base-0.10.pc
-%{_pkgconfigdir}/gstreamer-check-0.10.pc
-%{_pkgconfigdir}/gstreamer-controller-0.10.pc
-%{_pkgconfigdir}/gstreamer-dataprotocol-0.10.pc
-%{_pkgconfigdir}/gstreamer-net-0.10.pc
-%{_aclocaldir}/gst-element-check-0.10.m4
+%{_pkgconfigdir}/gstreamer-%{vmajor}.pc
+%{_pkgconfigdir}/gstreamer-base-%{vmajor}.pc
+%{_pkgconfigdir}/gstreamer-check-%{vmajor}.pc
+%{_pkgconfigdir}/gstreamer-controller-%{vmajor}.pc
+%{_pkgconfigdir}/gstreamer-net-%{vmajor}.pc
+%{_aclocaldir}/gst-element-check-%{vmajor}.m4
%attr(755,root,root) %{rpmlibdir}/gstreamerdeps.sh
-%{_datadir}/gir-1.0/Gst-0.10.gir
-%{_datadir}/gir-1.0/GstBase-0.10.gir
-%{_datadir}/gir-1.0/GstCheck-0.10.gir
-%{_datadir}/gir-1.0/GstController-0.10.gir
-%{_datadir}/gir-1.0/GstNet-0.10.gir
+%{_datadir}/gir-1.0/Gst-%{vmajor}.gir
+%{_datadir}/gir-1.0/GstBase-%{vmajor}.gir
+%{_datadir}/gir-1.0/GstCheck-%{vmajor}.gir
+%{_datadir}/gir-1.0/GstController-%{vmajor}.gir
+%{_datadir}/gir-1.0/GstNet-%{vmajor}.gir
%files static
%defattr(644,root,root,755)
-%{_libdir}/libgstbase-0.10.a
-%{_libdir}/libgstcheck-0.10.a
-%{_libdir}/libgstcontroller-0.10.a
-%{_libdir}/libgstdataprotocol-0.10.a
-%{_libdir}/libgstnet-0.10.a
-%{_libdir}/libgstreamer-0.10.a
+%{_libdir}/libgstbase-%{vmajor}.a
+%{_libdir}/libgstcheck-%{vmajor}.a
+%{_libdir}/libgstcontroller-%{vmajor}.a
+%{_libdir}/libgstnet-%{vmajor}.a
+%{_libdir}/libgstreamer-%{vmajor}.a
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/gstreamer-0.10
-%{_gtkdocdir}/gstreamer-libs-0.10
-%{_gtkdocdir}/gstreamer-plugins-0.10
+%{_gtkdocdir}/gstreamer-%{vmajor}
+%{_gtkdocdir}/gstreamer-libs-%{vmajor}
+%{_gtkdocdir}/gstreamer-plugins-%{vmajor}
diff --git a/gstreamer-inspect-rpm-format.patch b/gstreamer-inspect-rpm-format.patch
index caf6e28..ad8b211 100644
--- a/gstreamer-inspect-rpm-format.patch
+++ b/gstreamer-inspect-rpm-format.patch
@@ -1,17 +1,8 @@
-From e4a4294f53d25bc3b5699cace74de4f49062a2ee Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Wed, 11 Nov 2009 13:53:46 +0000
-Subject: [PATCH] Add RPM provides output to gst-inspect
-
----
- tools/gst-inspect.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 260 insertions(+), 15 deletions(-)
-
-diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
-index c86285e..80b2456 100644
---- a/tools/gst-inspect.c
-+++ b/tools/gst-inspect.c
-@@ -1408,9 +1408,225 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
+Index: gstreamer-0.11.92/tools/gst-inspect.c
+===================================================================
+--- gstreamer-0.11.92.orig/tools/gst-inspect.c
++++ gstreamer-0.11.92/tools/gst-inspect.c
+@@ -1350,9 +1350,225 @@ print_element_info (GstElementFactory *
return 0;
}
@@ -26,8 +17,9 @@ index c86285e..80b2456 100644
+ g_string_append (s->data, field);
+ }
+}
-+
-+static void
+
+ static void
+-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_gst_structure_append_field_index (GList * strings, const char *field,
+ guint num_items, guint offset)
+{
@@ -105,9 +97,8 @@ index c86285e..80b2456 100644
+ return 1;
+ return 0;
+}
-
- static void
--print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
++
++static void
+print_gst_structure_for_rpm (const char *type_name, GstStructure * s)
+{
+ guint i, num_fields;
@@ -238,20 +229,22 @@ index c86285e..80b2456 100644
{
GstPadDirection direction;
const gchar *type_name;
-@@ -1435,6 +1651,12 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -1377,6 +1593,14 @@ print_plugin_automatic_install_info_code
return;
}
++#if 0
+ if (rpm_format) {
+ /* Ignore NONE ranked plugins */
+ if (GST_PLUGIN_FEATURE (factory)->rank == GST_RANK_NONE)
+ return;
+ }
++#endif
+
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
-@@ -1471,15 +1693,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -1413,15 +1637,20 @@ print_plugin_automatic_install_info_code
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
@@ -274,39 +267,41 @@ index c86285e..80b2456 100644
+print_plugin_automatic_install_info_protocols (GstElementFactory * factory,
+ gboolean rpm_format)
{
- gchar **protocols, **p;
+ const gchar *const *protocols;
-@@ -1488,11 +1715,17 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -1430,13 +1659,19 @@ print_plugin_automatic_install_info_prot
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
- for (p = protocols; *p != NULL; ++p)
-- g_print ("urisink-%s\n", *p);
+ while (*protocols != NULL) {
+- g_print ("urisink-%s\n", *protocols);
+ if (!rpm_format)
-+ g_print ("urisink-%s\n", *p);
++ g_print ("urisink-%s\n", *protocols);
+ else
-+ g_print ("gstreamer0.10(urisink-%s)\n", *p);
++ g_print ("gstreamer0.10(urisink-%s)\n", *protocols);
+ ++protocols;
+ }
break;
case GST_URI_SRC:
- for (p = protocols; *p != NULL; ++p)
-- g_print ("urisource-%s\n", *p);
+ while (*protocols != NULL) {
+- g_print ("urisource-%s\n", *protocols);
+ if (!rpm_format)
-+ g_print ("urisource-%s\n", *p);
++ g_print ("urisource-%s\n", *protocols);
+ else
-+ g_print ("gstreamer0.10(urisource-%s)\n", *p);
- break;
- default:
++ g_print ("gstreamer0.10(urisource-%s)\n", *protocols);
+ ++protocols;
+ }
break;
-@@ -1502,7 +1735,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -1447,7 +1682,7 @@ print_plugin_automatic_install_info_prot
}
static void
-print_plugin_automatic_install_info (GstPlugin * plugin)
+print_plugin_automatic_install_info (GstPlugin * plugin, gboolean rpm_format)
{
- const gchar *plugin_name;
GList *features, *l;
-@@ -1522,11 +1755,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
- if (g_str_equal (plugin_name, feature->plugin_name)) {
+
+@@ -1466,11 +1701,15 @@ print_plugin_automatic_install_info (Gst
+ if (feature_plugin == plugin) {
GstElementFactory *factory;
- g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
@@ -322,9 +317,9 @@ index c86285e..80b2456 100644
+ print_plugin_automatic_install_info_protocols (factory, rpm_format);
+ print_plugin_automatic_install_info_codecs (factory, rpm_format);
}
- }
-
-@@ -1546,7 +1783,7 @@ print_all_plugin_automatic_install_info (void)
+ if (feature_plugin)
+ gst_object_unref (feature_plugin);
+@@ -1492,7 +1731,7 @@ print_all_plugin_automatic_install_info
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
@@ -333,7 +328,7 @@ index c86285e..80b2456 100644
}
gst_plugin_list_free (orig_plugins);
}
-@@ -1558,6 +1795,7 @@ main (int argc, char *argv[])
+@@ -1504,6 +1743,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
@@ -341,7 +336,7 @@ index c86285e..80b2456 100644
gboolean uri_handlers = FALSE;
#ifndef GST_DISABLE_OPTION_PARSING
GOptionEntry options[] = {
-@@ -1570,6 +1808,9 @@ main (int argc, char *argv[])
+@@ -1516,6 +1756,9 @@ main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@@ -351,7 +346,7 @@ index c86285e..80b2456 100644
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"uri-handlers", 'u', 0, G_OPTION_ARG_NONE, &uri_handlers,
-@@ -1658,7 +1899,7 @@ main (int argc, char *argv[])
+@@ -1602,7 +1845,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@@ -360,7 +355,7 @@ index c86285e..80b2456 100644
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
-@@ -1671,13 +1912,17 @@ main (int argc, char *argv[])
+@@ -1615,13 +1858,17 @@ main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
@@ -380,6 +375,3 @@ index c86285e..80b2456 100644
g_error_free (error);
return -1;
}
---
-1.7.4.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer.git/commitdiff/c44ba6d0084b7a1afdd0fab5473aaff66bea591d
More information about the pld-cvs-commit
mailing list