- updated to 1.8.0

- added link patch (fixes plugins-bad library build with gl support)

diff --git a/gstreamermm-link.patch b/gstreamermm-link.patch
new file mode 100644 (file)
index 0000000..6c5f609
--- /dev/null
+++ b/gstreamermm-link.patch
@@ -0,0 +1,8 @@
+--- 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_@GSTREAMERMM_API_VERSION@_la_SOURCES = $(binding_sources)
+ libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(GSTREAMERMM_SO_VERSION)
+-libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LIBADD  = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(local_libadd)
++libgstreamermm_plugins_bad_@GSTREAMERMM_API_VERSION@_la_LIBADD  = $(GSTREAMERMM_PLUGINS_BAD_LIBS) $(GSTREAMERMM_GL_LIBS) $(local_libadd)

diff --git a/gstreamermm.spec b/gstreamermm.spec
index e4b88e17ae17efb4008284845766b1daf4edd27d..f0767af1edb9d1c9e06492d132fd4f161f8f9769 100644 (file)
--- a/gstreamermm.spec
+++ b/gstreamermm.spec
@@ -1,34 +1,38 @@
 #
 # Conditional build:
-%bcond_without  static_libs    # don't build static libraries
+%bcond_without static_libs     # static libraries
+%bcond_without gstpd           # gstreamer-plugins-bad library
+%bcond_without 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.4.3
-Release:       2
+Version:       1.8.0
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 8f6c4b85083308def933eab1433a1865
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: 31246cf2f37b7ff48d45c8be98425e93
+Patch0:                %{name}-link.patch
 URL:           https://gstreamer.freedesktop.org/bindings/cplusplus.html
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
-BuildRequires: glibmm-devel >= 2.36.0
-BuildRequires: gstreamer-devel >= 1.4.3
-BuildRequires: gstreamer-plugins-base-devel >= 1.4.3
+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
 # for not packaged examples only
 #BuildRequires:        gtkmm3-devel >= 3.0
-BuildRequires: libstdc++-devel >= 6:4.3
+BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: libtool >= 2:1.5
 BuildRequires: m4
-BuildRequires: mm-common >= 0.9.6
+BuildRequires: mm-common >= 0.9.8
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      glibmm >= 2.36.0
-Requires:      gstreamer >= 1.4.3
-Requires:      gstreamer-plugins-base >= 1.4.3
+Requires:      glibmm >= 2.48.0
+Requires:      gstreamer >= 1.8.0
+Requires:      gstreamer-plugins-base >= 1.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,13 +46,13 @@ GStreamer. Za pomocą gstreamermm jest możliwe tworzenie aplikacji
 multimedialnych w C++.
 
 %package devel
-Summary:       gstreamermm header files
+Summary:       Header files for gstreamermm library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gstreamermm
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glibmm-devel >= 2.36.0
-Requires:      gstreamer-devel >= 1.4.3
-Requires:      gstreamer-plugins-base-devel >= 1.4.3
+Requires:      glibmm-devel >= 2.48.0
+Requires:      gstreamer-devel >= 1.8.0
+Requires:      gstreamer-plugins-base-devel >= 1.8.0
 
 %description devel
 Header files for gstreamermm library.
@@ -57,16 +61,55 @@ Header files for gstreamermm library.
 Pliki nagłówkowe biblioteki gstreamermm.
 
 %package static
-Summary:       gstreamermm static libraries
-Summary(pl.UTF-8):     Biblioteki statyczne gstreamermm
+Summary:       Static gstreamermm library
+Summary(pl.UTF-8):     Biblioteka statyczna gstreamermm
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-gstreamermm static libraries.
+Static gstreamermm library.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne gstreamermm.
+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
@@ -82,6 +125,7 @@ Szczegółowa dokumentacja gstreamermm.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -89,8 +133,10 @@ Szczegółowa dokumentacja gstreamermm.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CXXFLAGS="%{rpmcxxflags} -std=c++0x"
 %configure \
+       %{!?with_opengl:--disable-gl} \
+       %{!?with_gstpd:--disable-plugins-bad} \
+       --disable-silent-rules \
        %{?with_static_libs:--enable-static}
 %{__make}
 
@@ -109,18 +155,18 @@ 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
 %attr(755,root,root) %{_libdir}/libgstreamermm-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstreamermm-1.0.so.0
-%attr(755,root,root) %{_libdir}/libgstreamermm_get_plugin_defs-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstreamermm_get_plugin_defs-1.0.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgstreamermm-1.0.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgstreamermm-1.0.so
-%attr(755,root,root) %{_libdir}/libgstreamermm_get_plugin_defs-1.0.so
 %dir %{_libdir}/gstreamermm-1.0
 %dir %{_libdir}/gstreamermm-1.0/gen
 %attr(755,root,root) %{_libdir}/gstreamermm-1.0/gen/generate_plugin_gmmproc_file
@@ -133,7 +179,24 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgstreamermm-1.0.a
-%{_libdir}/libgstreamermm_get_plugin_defs-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