Accepting request 201037 from home:dimstar:branches:X11:XOrg

A bit more complex... but fix build on Factory without breaking on older releases

OBS-URL: https://build.opensuse.org/request/show/201037
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=45

baselibs.conf

@@ -2,6 +2,7 @@ libva1
 libva-drm1
 libva-egl1
 libva-glx1
+libva-wayland1
 libva-x11-1
 libva-devel
  requires -libva-<targettype>

libva.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep 27 07:24:35 UTC 2013 - dimstar@opensuse.org
+
+- Introduce bcond_with wayland to easily control if the wayland
+  support is to be built:
+  + On openSUSE 13.1+ defaults to true
+  + Create new subpackage vaapi-wayland-tools and libva-wayland1,
+    containing the respective wayland support of libva.
+  + BuilkdRequire pkgconfig(wayland-client).
+  + Pass --enable/--disable-wayland to configure as appropriate.
+
 -------------------------------------------------------------------
 Wed Jul 10 14:47:19 UTC 2013 - hrvoje.senjan@gmail.com
 

libva.spec

@@ -18,6 +18,12 @@
 
 #
 
+%if 0%{?suse_version} < 1300
+%bcond_with wayland
+%else
+%bcond_without wayland
+%endif
+
 Name:           libva
 Version:        1.2.1
 Release:        0
@@ -41,6 +47,9 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xv)
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client) >= 1.0.0
+%endif
 
 %description
 The libva library implements the Video Acceleration (VA) API for Linux.
@@ -101,12 +110,25 @@ The library loads a hardware dependendent driver.
 
 This is the VA/GLX runtime library
 
+%if %{with wayland}
+%package -n libva-wayland1
+Summary:        Video Acceleration (VA) API for Linux -- Wayland support
+Group:          System/Libraries
+
+%description -n libva-wayland1
+The libva library implements the Video Acceleration (VA) API for Linux.
+The library loads a hardware dependendent driver.
+%endif
+
 %package devel
 Summary:        Video Acceleration (VA) API for Linux -- development files
 Group:          Development/Languages/C and C++
 Requires:       libva-drm1 = %{version}
 Requires:       libva-egl1 = %{version}
 Requires:       libva-glx1 = %{version}
+%if %{with wayland}
+Requires:       libva-wayland1 = %{version}
+%endif
 Requires:       libva-x11-1 = %{version}
 Requires:       libva1 = %{version}
 Requires:       pkgconfig(gl)
@@ -130,6 +152,16 @@ The library loads a hardware dependendent driver.
 
 This is a set of tools around vaapi livrary.
 
+%if %{with wayland}
+%package -n vaapi-wayland-tools
+Summary:        Video Acceleration (VA) API for Linux - Wayland support
+Group:          System/Libraries
+
+%description -n vaapi-wayland-tools
+The libva library implements the Video Acceleration (VA) API for Linux.
+The library loads a hardware dependendent driver.
+%endif
+
 %package -n vaapi-dummy-driver
 Summary:        Video Acceleration (VA) API for Linux
 Group:          System/Libraries
@@ -150,7 +182,12 @@ autoreconf -v --install
 %configure --enable-dummy-driver \
            --enable-glx \
            --enable-egl \
-           --with-drivers-path=%{_libdir}/dri
+           --with-drivers-path=%{_libdir}/dri \
+%if %{with wayland}
+           --enable-wayland
+%else
+           --disable-wayland
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -187,6 +224,16 @@ find %{buildroot} -name '*.la' -delete -print
 %{_bindir}/putsurface
 %{_bindir}/loadjpeg
 
+%if %{with wayland}
+%files -n vaapi-wayland-tools
+%defattr(-,root,root)
+%{_bindir}/putsurface_wayland
+
+%files -n libva-wayland1
+%defattr(-, root, root)
+%{_libdir}/libva-wayland.so.*
+%endif
+
 %files -n vaapi-dummy-driver
 %defattr(-,root,root,-)
 %dir %{_libdir}/dri
@@ -221,6 +268,9 @@ find %{buildroot} -name '*.la' -delete -print
 %{_libdir}/libva-glx.so
 %{_libdir}/libva-egl.so
 %{_libdir}/libva-drm.so
+%if %{with wayland}
+%{_libdir}/libva-wayland.so
+%endif
 %{_includedir}/va
 %{_libdir}/pkgconfig/libva*.pc