[packages/gstreamermm] - updated to 1.10.0 - removed obsolete patches
qboosh
qboosh at pld-linux.org
Tue Sep 3 16:27:22 CEST 2019
commit 1f9517009bd9edf59a04199ad6e1e873813b5c02
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 3 16:30:08 2019 +0200
- updated to 1.10.0
- removed obsolete patches
gstreamermm-gcc7.patch | 104 ----------------------------------------------
gstreamermm-gst1.12.patch | 45 --------------------
gstreamermm-link.patch | 8 ----
gstreamermm.spec | 94 ++++++-----------------------------------
4 files changed, 13 insertions(+), 238 deletions(-)
---
diff --git a/gstreamermm.spec b/gstreamermm.spec
index 2bd6165..12670e5 100644
--- a/gstreamermm.spec
+++ b/gstreamermm.spec
@@ -1,28 +1,22 @@
#
# Conditional build:
%bcond_without static_libs # static libraries
-%bcond_with gstpd # gstreamer-plugins-bad library
-%bcond_with opengl # gstreamer-gl library support (in plugins-bad library)
#
Summary: A C++ bindings for the GStreamer library
Summary(pl.UTF-8): Wiązania C++ do biblioteki GStreamera
Name: gstreamermm
-Version: 1.8.0
-Release: 3
+Version: 1.10.0
+Release: 1
License: LGPL v2+
Group: Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 31246cf2f37b7ff48d45c8be98425e93
-Patch0: %{name}-link.patch
-Patch1: %{name}-gst1.12.patch
-Patch2: %{name}-gcc7.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: 57e9300f247ad27a4ef4df4fecc137c9
URL: https://gstreamer.freedesktop.org/bindings/cplusplus.html
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
BuildRequires: glibmm-devel >= 2.48.0
-BuildRequires: gstreamer-devel >= 1.8.0
-%{?with_gstpd:BuildRequires: gstreamer-plugins-bad-devel >= 1.8.0}
-BuildRequires: gstreamer-plugins-base-devel >= 1.8.0
+BuildRequires: gstreamer-devel >= 1.10.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.10.0
# for not packaged examples only
#BuildRequires: gtkmm3-devel >= 3.0
BuildRequires: libstdc++-devel >= 6:4.7
@@ -33,8 +27,9 @@ BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
BuildRequires: xz
Requires: glibmm >= 2.48.0
-Requires: gstreamer >= 1.8.0
-Requires: gstreamer-plugins-base >= 1.8.0
+Requires: gstreamer >= 1.10.0
+Requires: gstreamer-plugins-base >= 1.10.0
+Obsoletes: gstreamermm-plugins-bad < 1.10
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -53,8 +48,9 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gstreamermm
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glibmm-devel >= 2.48.0
-Requires: gstreamer-devel >= 1.8.0
-Requires: gstreamer-plugins-base-devel >= 1.8.0
+Requires: gstreamer-devel >= 1.10.0
+Requires: gstreamer-plugins-base-devel >= 1.10.0
+Obsoletes: gstreamermm-plugins-bad-devel < 1.10
%description devel
Header files for gstreamermm library.
@@ -67,6 +63,7 @@ Summary: Static gstreamermm library
Summary(pl.UTF-8): Biblioteka statyczna gstreamermm
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
+Obsoletes: gstreamermm-plugins-bad-static < 1.10
%description static
Static gstreamermm library.
@@ -74,45 +71,6 @@ Static gstreamermm library.
%description static -l pl.UTF-8
Biblioteka statyczna gstreamermm.
-%package plugins-bad
-Summary: C++ bindings for the GStreamer plugins-bad library
-Summary(pl.UTF-8): Wiązania C++ do biblitoteki GStreamera plugins-bad
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gstreamer-plugins-bad >= 1.8.0
-
-%description plugins-bad
-C++ bindings for the GStreamer plugins-bad library.
-
-%description plugins-bad -l pl.UTF-8
-Wiązania C++ do biblitoteki GStreamera plugins-bad.
-
-%package plugins-bad-devel
-Summary: Header files for gstreamermm-plugins-bad library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gstreamermm-plugins-bad
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-plugins-bad = %{version}-%{release}
-Requires: gstreamer-plugins-bad-devel >= 1.8.0
-
-%description plugins-bad-devel
-Header files for gstreamermm-plugins-bad library.
-
-%description plugins-bad-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki gstreamermm-plugins-bad.
-
-%package plugins-bad-static
-Summary: Static gstreamermm-plugins-bad library
-Summary(pl.UTF-8): Biblioteka statyczna gstreamermm-plugins-bad
-Group: Development/Libraries
-Requires: %{name}-plugins-bad-devel = %{version}-%{release}
-
-%description plugins-bad-static
-Static gstreamermm-plugins-bad library.
-
-%description plugins-bad-static -l pl.UTF-8
-Biblioteka statyczna gstreamermm-plugins-bad.
-
%package doc
Summary: Reference documentation for gstreamermm
Summary(pl.UTF-8): Szczegółowa dokumentacja gstreamermm
@@ -127,9 +85,6 @@ Szczegółowa dokumentacja gstreamermm.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -138,8 +93,6 @@ Szczegółowa dokumentacja gstreamermm.
%{__autoheader}
%{__automake}
%configure \
- %{!?with_opengl:--disable-gl} \
- %{!?with_gstpd:--disable-plugins-bad} \
--disable-silent-rules \
%{?with_static_libs:--enable-static}
%{__make}
@@ -159,9 +112,6 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post plugins-bad -p /sbin/ldconfig
-%postun plugins-bad -p /sbin/ldconfig
-
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
@@ -185,24 +135,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgstreamermm-1.0.a
%endif
-%if %{with gstpd}
-%files plugins-bad
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgstreamermm-plugins-bad-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstreamermm-plugins-bad-1.0.so.1
-
-%files plugins-bad-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgstreamermm-plugins-bad-1.0.so
-%{_pkgconfigdir}/gstreamermm-plugins-bad-1.0.pc
-
-%if %{with static_libs}
-%files plugins-bad-static
-%defattr(644,root,root,755)
-%{_libdir}/libgstreamermm-plugins-bad-1.0.a
-%endif
-%endif
-
%files doc
%defattr(644,root,root,755)
%{_docdir}/gstreamermm-1.0
diff --git a/gstreamermm-gcc7.patch b/gstreamermm-gcc7.patch
deleted file mode 100644
index b723204..0000000
--- a/gstreamermm-gcc7.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Author: Marcin Kolny <marcin.kolny at gmail.com>
-Description: Gst::Iterator: fix iterator build - Fixes build with GCC 7
-Origin: https://bugzilla.gnome.org/show_bug.cgi?id=783678
-Last-update: 2017-07-02
---- gstreamermm-1.8.0.orig/gstreamer/gstreamermm/iterator.h
-+++ gstreamermm-1.8.0.orig/gstreamer/gstreamermm/iterator.h
-@@ -220,9 +220,6 @@ private:
- GstIterator* cobject_; // The underlying C object.
- bool take_ownership; // Whether to destroy C object with the wrapper.
- #endif /* DOXYGEN_SHOULD_SKIP_THIS */
--
--private:
-- void swap(IteratorBase<CppType>& other);
- };
-
- /** A class used to retrieve multiple elements in a thread safe way.
-@@ -338,18 +335,25 @@ template<class CppType>
- IteratorBase<CppType>::IteratorBase()
- : current(G_VALUE_INIT),
- current_result(Gst::ITERATOR_OK),
-- cobject_(0),
-+ cobject_(nullptr),
- take_ownership(true)
- {
- }
-
- template<class CppType>
- IteratorBase<CppType>::IteratorBase(const IteratorBase<CppType>& other)
-- : current(other.current),
-+ : current(G_VALUE_INIT),
- current_result(other.current_result),
-- cobject_(const_cast<GstIterator*>(other.cobj())),
-- take_ownership((other.cobj()) ? false : true)
--{}
-+ take_ownership(other.take_ownership)
-+{
-+ cobject_ = other.take_ownership ? gst_iterator_copy(other.cobject_) : other.cobject_;
-+
-+ if (G_IS_VALUE (&other.current))
-+ {
-+ g_value_init(¤t, G_VALUE_TYPE(&other.current));
-+ g_value_copy(&other.current, ¤t);
-+ }
-+}
-
- template<class CppType>
- IteratorBase<CppType>::IteratorBase(GstIterator* castitem, bool take_ownership)
-@@ -362,8 +366,25 @@ IteratorBase<CppType>::IteratorBase(GstI
- template<class CppType>
- IteratorBase<CppType>& IteratorBase<CppType>::operator=(const IteratorBase<CppType>& other)
- {
-- IteratorBase temp(other);
-- swap(temp);
-+ if (cobject_ && take_ownership)
-+ {
-+ gst_iterator_free(cobject_);
-+ }
-+
-+ if (G_IS_VALUE(¤t))
-+ {
-+ g_value_unset(¤t);
-+ }
-+
-+ current_result = other.current_result;
-+ cobject_ = other.take_ownership ? gst_iterator_copy(other.cobject_) : other.cobject_;
-+
-+ if (G_IS_VALUE (&other.current))
-+ {
-+ g_value_init(¤t, G_VALUE_TYPE(&other.current));
-+ g_value_copy(&other.current, ¤t);
-+ }
-+
- return *this;
- }
-
-@@ -410,28 +431,6 @@ IteratorBase<CppType>::operator bool() c
- return (! G_VALUE_HOLDS_OBJECT(¤t));
- }
-
--template<class CppType>
--void IteratorBase<CppType>::swap(IteratorBase<CppType>& other)
--{
-- GstIterator *const temp_obj = cobject_;
-- cobject_ = other.cobject_;
-- other.cobject_ = temp_obj;
--
-- const bool temp_take_ownership = take_ownership;
-- take_ownership = other.take_ownership;
-- other.take_ownership = temp_take_ownership;
--
-- GValue temp_current = G_VALUE_INIT;
-- g_value_init(&temp_current, G_VALUE_TYPE(current));
-- g_value_copy(¤t, &temp_current);
-- g_value_copy(other.current, ¤t);
-- g_value_copy(&temp_current, other.current);
--
-- const IteratorResult temp_result = current_result;
-- current_result = other.current_result;
-- other.current_result = temp_result;
--}
--
- //virtual
- template<class CppType>
- IteratorBase<CppType>::~IteratorBase()
diff --git a/gstreamermm-gst1.12.patch b/gstreamermm-gst1.12.patch
deleted file mode 100644
index 7e009d7..0000000
--- a/gstreamermm-gst1.12.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Marcin Kolny <marcin.kolny at gmail.com>
-Description: Gst::AudioClock: auto generate some audioclock methods
-Origin: https://bugzilla.gnome.org/show_bug.cgi?id=783628
-Last-update: 2017-07-01
-
---- gstreamermm-1.8.0.orig/gstreamer/gstreamermm/audioclock.cc
-+++ gstreamermm-1.8.0/gstreamer/gstreamermm/audioclock.cc
-@@ -2,6 +2,7 @@
-
-
- #include <glibmm.h>
-+#include <gst/gstversion.h>
-
- #include <gstreamermm/audioclock.h>
- #include <gstreamermm/private/audioclock_p.h>
-@@ -76,17 +77,29 @@ AudioClock::AudioClock(const Glib::ustri
-
- Gst::ClockTime AudioClock::adjust(Gst::ClockTime time)
- {
-+#if GST_VERSION_MAJOR == 1 && GST_VERSION_MINOR >= 12
-+ return ((Gst::ClockTime)(gst_audio_clock_adjust(gobj(), ((GstClockTime)(time)))));
-+#else
- return static_cast<Gst::ClockTime>(gst_audio_clock_adjust(GST_CLOCK_CAST(gobj()), static_cast<GstClockTime>(time)));
-+#endif
- }
-
- Gst::ClockTime AudioClock::get_time() const
- {
-+#if GST_VERSION_MAJOR == 1 && GST_VERSION_MINOR >= 12
-+ return ((Gst::ClockTime)(gst_audio_clock_get_time(const_cast<GstAudioClock*>(gobj()))));
-+#else
- return static_cast<Gst::ClockTime>(gst_audio_clock_get_time(GST_CLOCK_CAST(gobj())));
-+#endif
- }
-
- void AudioClock::invalidate()
- {
-+#if GST_VERSION_MAJOR == 1 && GST_VERSION_MINOR >= 12
-+ gst_audio_clock_invalidate(gobj());
-+#else
- gst_audio_clock_invalidate(GST_CLOCK_CAST(gobj()));
-+#endif
- }
-
- } //namespace Gst
diff --git a/gstreamermm-link.patch b/gstreamermm-link.patch
deleted file mode 100644
index 6c5f609..0000000
--- a/gstreamermm-link.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- gstreamermm-1.8.0/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am.orig 2016-09-17 14:00:56.000000000 +0200
-+++ gstreamermm-1.8.0/gst-plugins-bad/gstreamermm-plugins-bad/Makefile.am 2017-02-19 21:44:45.282971631 +0100
-@@ -30,4 +30,4 @@
-
- libgstreamermm_plugins_bad_ at GSTREAMERMM_API_VERSION@_la_SOURCES = $(binding_sources)
- libgstreamermm_plugins_bad_ at GSTREAMERMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(GSTREAMERMM_SO_VERSION)
--libgstreamermm_plugins_bad_ at GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(local_libadd)
-+libgstreamermm_plugins_bad_ at GSTREAMERMM_API_VERSION@_la_LIBADD = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(GSTREAMERMM_GL_LIBS) $(local_libadd)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamermm.git/commitdiff/1f9517009bd9edf59a04199ad6e1e873813b5c02
More information about the pld-cvs-commit
mailing list