Hello community,
here is the log from the commit of package gstreamer-plugins-vaapi for
openSUSE:Factory checked in at 2015-11-24 22:29:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-vaapi (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-vaapi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-vaapi"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-vaapi/gstreamer-plugins-vaapi.changes
2015-10-22 12:59:44.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-vaapi.new/gstreamer-plugins-vaapi.changes
2015-11-24 22:29:20.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Oct 27 10:23:24 UTC 2015 - [email protected]
+
+- Stop using wayland bcond, it does not work out for us.
+- Add new %define gst_so and %define gst_ver and use suse_version
+ to decide the value of these. Allowing package to be built with
+ the different branches of gstreamer existing in older versions of
+ openSUSE.
+- Following this, subpackages get new name depending on what
+ gst-branch they are built against.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-vaapi.spec ++++++
--- /var/tmp/diff_new_pack.KYPVew/_old 2015-11-24 22:29:21.000000000 +0100
+++ /var/tmp/diff_new_pack.KYPVew/_new 2015-11-24 22:29:21.000000000 +0100
@@ -15,14 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-%define soname 2
-
-%if 0%{suse_version} == 1315
-%bcond_with wayland
-%else
-%bcond_without wayland
-%endif
+#if 0%{?suse_version} >= 1310
+%define gst_so 1.6
+%define gst_ver 1_6
+%define soname 1
+#else
+#define gst_so 1.4
+#define gst_ver 1_4
+#define soname 2
+#endif
Name: gstreamer-plugins-vaapi
Version: 0.6.1
@@ -43,9 +44,7 @@
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
-%if %{with wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.0.0
-%endif
ExclusiveArch: %ix86 x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -56,19 +55,18 @@
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
-%if %{with wayland}
-Requires: libgstvaapi-wayland-1_4-%{soname} = %{version}
-%endif
+Requires: libgstvaapi-wayland-%{gst_ver}-%{soname} = %{version}
+
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.
-%package -n libgstvaapi-1_4-%{soname}
+%package -n libgstvaapi-%{gst_ver}-%{soname}
Summary: Gstreamer VA-API plugins
Group: System/Libraries
-%description -n libgstvaapi-1_4-%{soname}
+%description -n libgstvaapi-%{gst_ver}-%{soname}
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
%package -n libgstcodecparsers_vpx0
@@ -78,35 +76,43 @@
%description -n libgstcodecparsers_vpx0
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
-%package -n libgstvaapi-glx-1_4-%{soname}
+%package -n libgstvaapi-glx-%{gst_ver}-%{soname}
Summary: Gstreamer GLX VA-API plugins
Group: System/Libraries
-%description -n libgstvaapi-glx-1_4-%{soname}
+%description -n libgstvaapi-glx-%{gst_ver}-%{soname}
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
-%package -n libgstvaapi-x11-1_4-%{soname}
+%package -n libgstvaapi-x11-%{gst_ver}-%{soname}
Summary: Gstreamer X11 VA-API plugins
Group: System/Libraries
-%description -n libgstvaapi-x11-1_4-%{soname}
+%description -n libgstvaapi-x11-%{gst_ver}-%{soname}
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
-%package -n libgstvaapi-drm-1_4-%{soname}
+%package -n libgstvaapi-drm-%{gst_ver}-%{soname}
Summary: Gstreamer DRM VA-API plugins
Group: System/Libraries
-%description -n libgstvaapi-drm-1_4-%{soname}
+%description -n libgstvaapi-drm-%{gst_ver}-%{soname}
+gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
+
+#if 0%{?suse_version} > 1310
+%package -n libgstvaapi-egl-%{gst_ver}-%{soname}
+Summary: Gstreamer EGL VA-API plugins
+Group: System/Libraries
+
+%description -n libgstvaapi-egl-%{gst_ver}-%{soname}
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
+#endif
-%if %{with wayland}
-%package -n libgstvaapi-wayland-1_4-%{soname}
+%package -n libgstvaapi-wayland-%{gst_ver}-%{soname}
Summary: Gstreamer WAYLAND VA-API plugins
Group: System/Libraries
-%description -n libgstvaapi-wayland-1_4-%{soname}
+%description -n libgstvaapi-wayland-%{gst_ver}-%{soname}
gstreamer-vaapi is a collection of GStreamer plugins and helper libraries that
allow hardware accelerated video decoding through VA-API.
-%endif
+
%prep
%setup -q -n gstreamer-vaapi-%{version}
@@ -121,26 +127,30 @@
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
-%post -n libgstvaapi-1_4-%{soname} -p /sbin/ldconfig
-%postun -n libgstvaapi-1_4-%{soname} -p /sbin/ldconfig
+%post -n libgstvaapi-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-%{gst_ver}-%{soname} -p /sbin/ldconfig
%post -n libgstcodecparsers_vpx0 -p /sbin/ldconfig
%postun -n libgstcodecparsers_vpx0 -p /sbin/ldconfig
-%post -n libgstvaapi-glx-1_4-%{soname} -p /sbin/ldconfig
-%postun -n libgstvaapi-glx-1_4-%{soname} -p /sbin/ldconfig
+%post -n libgstvaapi-glx-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-glx-%{gst_ver}-%{soname} -p /sbin/ldconfig
-%post -n libgstvaapi-x11-1_4-%{soname} -p /sbin/ldconfig
-%postun -n libgstvaapi-x11-1_4-%{soname} -p /sbin/ldconfig
+%post -n libgstvaapi-x11-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-x11-%{gst_ver}-%{soname} -p /sbin/ldconfig
-%post -n libgstvaapi-drm-1_4-%{soname} -p /sbin/ldconfig
-%postun -n libgstvaapi-drm-1_4-%{soname} -p /sbin/ldconfig
+%post -n libgstvaapi-drm-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-drm-%{gst_ver}-%{soname} -p /sbin/ldconfig
-%if %{with wayland}
-%post -n libgstvaapi-wayland-1_4-%{soname} -p /sbin/ldconfig
-%postun -n libgstvaapi-wayland-1_4-%{soname} -p /sbin/ldconfig
+%if 0%{?suse_version} > 1320
+%post -n libgstvaapi-egl-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-egl-%{gst_ver}-%{soname} -p /sbin/ldconfig
%endif
+%post -n libgstvaapi-wayland-%{gst_ver}-%{soname} -p /sbin/ldconfig
+%postun -n libgstvaapi-wayland-%{gst_ver}-%{soname} -p /sbin/ldconfig
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -153,27 +163,32 @@
%defattr(-,root,root,0755)
%{_libdir}/libgstcodecparsers_vpx.so.*
-%files -n libgstvaapi-1_4-%{soname}
+%files -n libgstvaapi-%{gst_ver}-%{soname}
%defattr(-,root,root,0755)
-%{_libdir}/libgstvaapi-1.4.so.*
+%{_libdir}/libgstvaapi-%{gst_so}.so.*
-%files -n libgstvaapi-glx-1_4-%{soname}
+%files -n libgstvaapi-glx-%{gst_ver}-%{soname}
%defattr(-,root,root,0755)
-%{_libdir}/libgstvaapi-glx-1.4.so.*
+%{_libdir}/libgstvaapi-glx-%{gst_so}.so.*
-%files -n libgstvaapi-x11-1_4-%{soname}
+%files -n libgstvaapi-x11-%{gst_ver}-%{soname}
%defattr(-,root,root,0755)
-%{_libdir}/libgstvaapi-x11-1.4.so.*
+%{_libdir}/libgstvaapi-x11-%{gst_so}.so.*
-%files -n libgstvaapi-drm-1_4-%{soname}
+%files -n libgstvaapi-drm-%{gst_ver}-%{soname}
%defattr(-,root,root,0755)
-%{_libdir}/libgstvaapi-drm-1.4.so.*
+%{_libdir}/libgstvaapi-drm-%{gst_so}.so.*
-%if %{with wayland}
-%files -n libgstvaapi-wayland-1_4-%{soname}
+#if 0%{?suse_version} == 1315 && != %is_opensuse
+%files -n libgstvaapi-egl-%{gst_ver}-%{soname}
+%defattr(-,root,root,0755)
+%{_libdir}/libgstvaapi-egl-%{gst_so}.so.*
+#endif
+
+%files -n libgstvaapi-wayland-%{gst_ver}-%{soname}
%defattr(-,root,root)
-%{_libdir}/libgstvaapi-wayland-1.4.so.*
-%endif
+%{_libdir}/libgstvaapi-wayland-%{gst_so}.so.*
+
%files devel
%defattr(-,root,root,0755)
