diff --git a/baselibs.conf b/baselibs.conf index a8cbac7..404b16c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,3 @@ -gstreamer-0_10-plugins-base - provides "gstreamer010-plugins-base- = " - obsoletes "gstreamer010-plugins-base- <= " -libgstinterfaces-0_10-0 -libgstapp-0_10-0 +gstreamer-plugins-base +libgstinterfaces-0_11-0 +libgstapp-0_11-26 diff --git a/gst-plugins-base-0.11.0.tar.bz2 b/gst-plugins-base-0.11.0.tar.bz2 deleted file mode 100644 index 13367d1..0000000 --- a/gst-plugins-base-0.11.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4dc0dc87015c35fccec9a80eadb112276e80ca13796e02b946e7c64b282c0ae -size 2606484 diff --git a/gst-plugins-base-0.11.1.tar.bz2 b/gst-plugins-base-0.11.1.tar.bz2 new file mode 100644 index 0000000..20efb34 --- /dev/null +++ b/gst-plugins-base-0.11.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:799a2d4656baaa327d7dcb77dc897b3b72a70c19fe03731ff6975308db5bed56 +size 2680725 diff --git a/gstreamer-plugins-base-nonvoid.patch b/gstreamer-plugins-base-nonvoid.patch deleted file mode 100644 index c1ce544..0000000 --- a/gstreamer-plugins-base-nonvoid.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2d1ffa68a9970e3f67233bfbeeb5baf1ed913b53 Mon Sep 17 00:00:00 2001 -From: Tim-Philipp Müller -Date: Tue, 09 Aug 2011 15:41:01 +0000 -Subject: xmptag: fix compiler warning in release mode - -Fix compiler warning caused by g_assert_not_reached() being skipped -because releases are compiled with -DG_DISABLE_ASSERT. - -https://bugzilla.gnome.org/show_bug.cgi?id=656264 ---- -diff --git a/gst-libs/gst/tag/gstxmptag.c b/gst-libs/gst/tag/gstxmptag.c -index 4045ef5..0c178b4 100644 ---- a/gst-libs/gst/tag/gstxmptag.c -+++ b/gst-libs/gst/tag/gstxmptag.c -@@ -175,6 +175,7 @@ xmp_tag_type_get_name (GstXmpTagType tagtype) - default: - g_assert_not_reached (); - } -+ return NULL; /* make compiler happy with -DG_DISABLE_ASSERT */ - } - - struct _PendingXmpTag --- -cgit v0.8.3-6-g21f6 - diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes index a8ae897..12ef922 100644 --- a/gstreamer-plugins-base.changes +++ b/gstreamer-plugins-base.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Jan 24 08:34:58 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.11.1: + + Rename GstXOverlay -> GstVideoOverlay + + Reworked audio caps + + Support for multiple frames in buffers + + Add video colorimetry support +- Add zlib-devel BuildRequires: new dependency upstream. +- Add libxml2-devel BuildRequires: needed for subparse plugin. +- Drop gstreamer-plugins-base-nonvoid.patch: fixed upstream. +- Remove Provides/Obsoletes/Conflicts for gstreamer010-*: this is + not needed with this new gstreamer branch. +- Change libgstinterfaces-0_10-0 Requires to + libgstinterfaces-0_11-0: it was missing the version bump for the + new gstreamer branch. +- Rename libgstapp-0_11-25 to libgstapp-0_11-26, following upstream + soversion bump. +- Split typelib files into typelib-1_0-GstApp-0_11 and + typelib-1_0-GstInterfaces-0_11 subpackages. +- Add typelib-1_0-GstApp-0_11 and typelib-1_0-GstInterfaces-0_11 + Requires to devel subpackage. +- Remove explicit Requires for glib2-devel, gstreamer-devel, + libxml2-devel and zlib-devel in devel subpackage: they will + automatically be added the pkgconfig way. +- Update baselibs.conf: it was never updated for this new gstreamer + branch. +- Change group of libgstapp-0_11-26 from + Productivity/Multimedia/Other to System/Libraries. +- Do not uselessly call autogen.sh. + ------------------------------------------------------------------- Wed Aug 10 07:30:55 UTC 2011 - dimstar@opensuse.org diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 3f27a03..cab5f2b 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -1,7 +1,7 @@ # -# spec file for package gstreamer-0_10-plugins-base +# spec file for package gstreamer-plugins-base # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_v4l 0%{?suse_version} <= 1140 %define with_vfs 0 Name: gstreamer-plugins-base %define _name gst-plugins-base -Version: 0.11.0 -Release: 1 +Version: 0.11.1 +Release: 0 %define gst_branch 0.11 BuildRequires: alsa-devel BuildRequires: cdparanoia-devel @@ -31,7 +30,7 @@ BuildRequires: check-devel %if %{with_vfs} BuildRequires: gnome-vfs2-devel %endif -BuildRequires: gstreamer-devel +BuildRequires: gstreamer-devel >= 0.11.1 BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: iso-codes-devel @@ -45,6 +44,7 @@ BuildRequires: libv4l-devel %endif BuildRequires: libvisual-devel BuildRequires: libvorbis-devel +BuildRequires: libxml2-devel BuildRequires: orc BuildRequires: python-devel BuildRequires: sgml-skel @@ -53,32 +53,23 @@ BuildRequires: update-desktop-files %ifarch %ix86 ppc x86_64 BuildRequires: valgrind-devel %endif +BuildRequires: zlib-devel %if %suse_version >= 1120 BuildRequires: gobject-introspection-devel >= 0.9.12 %endif -License: GPLv2+ ; LGPLv2.1+ -Group: Productivity/Multimedia/Other -Source: %{_name}-%{version}.tar.bz2 +Source: http://gstreamer.freedesktop.org/src/gst-plugins-base/%{_name}-%{version}.tar.bz2 Source2: baselibs.conf -# PATCH-FIX-UPSTREAM gstreamer-plugins-base-nonvoid.patch bgo#656264 dimstar@opensuse.org -- Return a value in non-void function -Patch0: gstreamer-plugins-base-nonvoid.patch Url: http://gstreamer.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GStreamer Streaming-Media Framework Plug-Ins +License: GPL-2.0+ ; LGPL-2.1+ +Group: Productivity/Multimedia/Other Supplements: gstreamer -# Name up to 10.3: -Provides: gstreamer010-plugins-base = %{version} -Obsoletes: gstreamer010-plugins-base < %{version} # Generic name, never used in SuSE: Provides: gst-plugins-base = %{version} -# Nanes of splitted subpackages (<=10.2 and ==SLE10): -Provides: gstreamer010-plugins-base-oil = %{version}-%{release} gstreamer010-plugins-base-visual = %{version}-%{release} -Obsoletes: gstreamer010-plugins-base-oil < %{version}-%{release} gstreamer010-plugins-base-visual < %{version}-%{release} Recommends: %{name}-lang = %{version} # Core modules may depend on new enough libraries: -Requires: libgstinterfaces-0_10-0 >= %{version} -# For update from <= 11.1 (gstapp): -Conflicts: gstreamer-0_10-plugins-bad < 0.10.10 +Requires: libgstinterfaces-0_11-0 >= %{version} PreReq: filesystem %define gstreamer_plugins_base_req %(zgrep --text "^GST[_A-Z]*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer >= /') Requires: %gstreamer_plugins_base_req @@ -93,7 +84,6 @@ processing capabilities can be added simply by installing new plug-ins. %if %{with_vfs} %package -n gstreamer-plugin-gnomevfs -License: GPLv2+ ; LGPLv2.1+ Summary: GStreamer Streaming-Media Framework Plug-Ins -- gnome-vfs plugin Group: Productivity/Multimedia/Other # We want to have base modules installed: @@ -109,7 +99,6 @@ processing capabilities can be added simply by installing new plug-ins. %endif %package -n libgstinterfaces-0_11-0 -License: GPLv2+ ; LGPLv2.1+ # This is a library package bundle, which contains more shared # libraries. Use the name of the lowest level one, because libgstbase # may cause confusion (it is a part of libgstreamer-0_11-0). @@ -119,8 +108,6 @@ Summary: GStreamer Streaming-Media Framework Plug-Ins Group: System/Libraries # We want to have base modules installed: Requires: %{name} -# Name of previous branch (<10.1 and = 1120 +%package -n typelib-1_0-GstInterfaces-0_11 +Summary: GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings +Group: System/Libraries -%description -n libgstapp-0_11-25 +%description -n typelib-1_0-GstInterfaces-0_11 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related, from real-time sound processing to playing videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. +This package provides the GObject Introspection bindings for GStreamer +plug-ins. +%endif + +%package -n libgstapp-0_11-26 +Summary: GStreamer Streaming-Media Framework Plug-Ins +Group: System/Libraries +# We want to have base modules installed: +Requires: %{name} + +%description -n libgstapp-0_11-26 +GStreamer is a streaming media framework based on graphs of filters +that operate on media data. Applications using this library can do +anything media-related, from real-time sound processing to playing +videos. Its plug-in-based architecture means that new data types or +processing capabilities can be added simply by installing new plug-ins. + +%if %suse_version >= 1120 +%package -n typelib-1_0-GstApp-0_11 +Summary: GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-GstApp-0_11 +GStreamer is a streaming media framework based on graphs of filters +that operate on media data. Applications using this library can do +anything media-related, from real-time sound processing to playing +videos. Its plug-in-based architecture means that new data types or +processing capabilities can be added simply by installing new plug-ins. + +This package provides the GObject Introspection bindings for GStreamer +plug-ins. +%endif + %package devel -License: GPLv2+ ; LGPLv2.1+ -Summary: Include files and libraries mandatory for development with gstreamer-0_10-plugins-base +Summary: Include files and libraries mandatory for development with gstreamer-plugins-base Group: Development/Libraries/C and C++ -Requires: libgstinterfaces-0_11-0 = %{version} libgstapp-0_11-25 = %{version} gstreamer-devel -Requires: glib2-devel libxml2-devel zlib-devel -# Name up to 10.3: -Provides: gstreamer010-plugins-base-devel = %{version} -Obsoletes: gstreamer010-plugins-base-devel < %{version} -# libgstapp has moved from bad to base (<= 11.1) -Provides: gstreamer-0_10-plugins-bad-devel = 0.10.10 -Obsoletes: gstreamer-0_10-plugins-bad-devel < 0.10.10 -# Name up to 10.3: -Provides: gstreamer010-plugins-bad-devel = 0.10.8 -Obsoletes: gstreamer010-plugins-bad-devel < 0.10.8 +Requires: libgstapp-0_11-26 = %{version} +Requires: libgstinterfaces-0_11-0 = %{version} +%if %suse_version >= 1120 +Requires: typelib-1_0-GstApp-0_11 = %{version} +Requires: typelib-1_0-GstInterfaces-0_11 = %{version} +%endif # Generic name, never used in SuSE: Provides: gst-plugins-base-devel = %{version} %description devel This package contains all necessary include files and libraries needed -to compile and link applications that use gstreamer-0_10-plugins-base. +to compile and link applications that use gstreamer-plugins-base. %package doc -License: GPLv2+ ; LGPLv2.1+ -Summary: Documentation for gstreamer-0_10-plugins-base +Summary: Documentation for gstreamer-plugins-base Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -# Name up to 10.3: -Provides: gstreamer010-plugins-base-doc = %{version} -Obsoletes: gstreamer010-plugins-base-doc < %{version} # Generic name, never used in SuSE: Provides: gst-plugins-base-doc = %{version} %description doc -This package contains documentation for the gstreamer-0_10-plugins-base +This package contains documentation for the gstreamer-plugins-base package. %lang_package %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 #translation-update-upstream po gst-plugins-base-0.10 %build # FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS: # Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS. -%if %suse_version >= 1110 -NOCONFIGURE=1 ./autogen.sh -%endif export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --disable-static\ @@ -215,9 +219,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n libgstinterfaces-0_11-0 -p /sbin/ldconfig -%post -n libgstapp-0_11-25 -p /sbin/ldconfig +%post -n libgstapp-0_11-26 -p /sbin/ldconfig -%postun -n libgstapp-0_11-25 -p /sbin/ldconfig +%postun -n libgstapp-0_11-26 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -272,16 +276,25 @@ rm -rf $RPM_BUILD_ROOT %files -n libgstinterfaces-0_11-0 %defattr(-, root, root) %{_libdir}/*.so.* +%exclude %{_libdir}/libgstapp*.so.* +# Files needed by libgsttag +%dir %{_datadir}/gst-plugins-base +%{_datadir}/gst-plugins-base/license-translations.dict + %if %suse_version >= 1120 +%files -n typelib-1_0-GstInterfaces-0_11 +%defattr(-, root, root) %{_libdir}/girepository-1.0/*.typelib %exclude %{_libdir}/girepository-1.0/GstApp-*.typelib %endif -%exclude %{_libdir}/libgstapp*.so.* -%files -n libgstapp-0_11-25 +%files -n libgstapp-0_11-26 %defattr(-, root, root) %{_libdir}/libgstapp*.so.* + %if %suse_version >= 1120 +%files -n typelib-1_0-GstApp-0_11 +%defattr(-, root, root) %{_libdir}/girepository-1.0/GstApp-*.typelib %endif