Hello community,
here is the log from the commit of package libva for openSUSE:Factory checked in at 2016-01-05 21:54:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libva (Old)
and /work/SRC/openSUSE:Factory/.libva.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libva"
Changes:
--------
New Changes file:
--- /dev/null 2015-12-29 16:09:11.912035506 +0100
+++ /work/SRC/openSUSE:Factory/.libva.new/libva-gl.changes 2016-01-05 21:54:33.000000000 +0100
@@ -0,0 +1,352 @@
+-------------------------------------------------------------------
+Mon Dec 21 16:05:31 UTC 2015 - dimstar@opensuse.org
+
+- Use build_gl defines instead of build condition: libva-gl is
+ never meant to be built --without=gl, so bcond is actually the
+ wrong construct here.
+- Add libva-gl.spec as a 2nd spec file to the package to keep them
+ in sync (by means of pre_checkin.sh).
+
+-------------------------------------------------------------------
+Fri Dec 18 19:51:22 UTC 2015 - jimmy@boombatower.com
+
+- Bump up disable wayland support for 13.1 as 1.6.2 is incompatible
+ with such old version of wayland.
+
+-------------------------------------------------------------------
+Thu Dec 17 09:50:26 UTC 2015 - jimmy@boombatower.com
+
+- Rework spec to either gl packages or everything else. By doing so
+ libva-devel can be built without depending on Mesa and Mesa-libva
+ can be build depending on libva-devel without introducing a
+ dependency cycle. A linked package will then produce the libva
+ gl packages.
+
+-------------------------------------------------------------------
+Thu Dec 17 09:41:22 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.6.2:
+ + Bump VA API version to 0.38.1.
+ + Add new RT format for 16 bits per channel memory
+ layout(P010,P016): VA_RT_FORMAT_YUV420_10BPP.
+ + Add new fourcc codes: VA_FOURCC_P010, VA_FOURCC_P016,
+ VA_FOURCC_YV16.
+ + Fix crash if user doesn't have right to access the DRI device.
+ + Fix uninitialized x11_screen driver context member for X11
+ output (fdo#61603).
+ + Fix the issue of not to use LIBVA_DRIVER_NAME (fdo#72822).
+ + Fix build issue with wayland (fdo#79478).
+ + vainfo: Add option '--display'.
+
+-------------------------------------------------------------------
+Thu Dec 17 06:51:07 UTC 2015 - jimmy@boombatower.com
+
+- Replace build requirement Mesa-devel with pkgconfig(egl) to
+ narrow dependency and aid in avoiding cycle when building
+ Mesa-libva.
+
+-------------------------------------------------------------------
+Mon Nov 23 22:04:53 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.6.1:
+ + Add support for VP9 decode and HEVC encode in VA trace module.
+ + Add VP9 profile to vainfo.
+ + Enhance VA trace to dump VP8 encode parameters.
+- Add an explicit pkgconfig(wayland-scanner) BuildRequires:
+ Configure looks for it, and we are already pulling it in
+ automatically.
+
+-------------------------------------------------------------------
+Fri Jul 31 07:56:49 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.6.0:
+ + API:
+ - Bump VA API version to 0.38.
+ - Add support for HEVC Encode.
+ - Add support for VP9 Decode.
+ - Allow user to specify user preferred backend driver.
+ - Add decode attribute to support decode normal and base modes.
+ - Add encode attribute to support skip frame.
+ + Fix quality issue in the JPEG encode demo.
+
+-------------------------------------------------------------------
+Mon Mar 30 09:17:19 UTC 2015 - sndirsch@suse.com
+
+- Update to version 1.5.1
+ * API: correct the comment for num_token_partitions in struct
+ _VAEncPictureParameterBufferVP8
+ * VA/x11: fix double Unlocks/SyncHandle to avoid segmentation fault
+
+-------------------------------------------------------------------
+Sun Feb 8 22:35:09 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.5.0:
+ + API:
+ - Add support for HEVC decoding.
+ - Extend JPEG encoding data structures and add configuration
+ attribute for JPEG encoding.
+ + Add a unit test for JPEG encoding.
+ + Add support for HEVC decoding and JPEG encoding in VA trace
+ utility.
+ + Fix out of tree builds.
+ + VA/X11: fix BadDrawable issue when calling vaTerminate() after
+ the pixmaps have been destroyed.
+
+-------------------------------------------------------------------
+Thu Oct 30 10:34:39 UTC 2014 - sndirsch@suse.com
+
+- added baselibs.conf as source to specfile in order to make factory
+ happy
+
+-------------------------------------------------------------------
+Mon Oct 27 07:59:19 UTC 2014 - sndirsch@suse.com
+
+- update to version 1.4.1; most important features/changes since
+ release 1.2.1:
+ * API: add support for VP8 encoding
+ * API: drop VAEntrypointMax enumeration
+ * API: add STE filter to the VPP pipeline
+ * API: add H.264 MVC profiles for decoding and encoding
+ * API: add buffer export interfaces for interop with 3rdparty APIs (EGL, OCL)
+ * API: add suppor for encoder quality level
+ * API: add attribute usage hint flag
+ * Enhancement for VA trace utility
+ * Add support for DRM Render-Nodes (Andrey Larionov)
+- removed obsolete patch libva-fix-rpmlint-error-no-return-in-non-void.patch
+
+-------------------------------------------------------------------
+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
+
+- updated to version 1.2.1:
+ * fixed namespace issue with one of the new tools introduced as
+ mpeg2enc. fdo#66221
+ * API: new H.264 encoding API for Baseline, Main and High profiles
+ * API: add support for MPEG-2 encoding
+ * API: add video processing interfaces
+ * API: add vaQuerySurfaceAttributes() to query surface attributes
+ supported by the underlying drivers.
+ * API: new version of vaCreateSurfaces(), the old version of
+ vaCreateSurfaces() is still supported if including
+ * API: add new surface attributes to enable VA surface creation
+ from external buffer
+ * API: add new RT formats and fourcc codes
+ * Refine VA trace utility
+ * Refine H.264 encoding test cases {avcenc, h264enc}
+ * A new test case for MPEG-2 encoding
+ * A lot of bug fixes
+
+-------------------------------------------------------------------
+Tue Mar 19 10:43:16 UTC 2013 - kkhere.geo@gmail.com
+
+- Version 1.1.1 - 18.Mar.2013
+ This minor version brings the following changes:
+ * Support wayland 1.0 protocol (Rob Bradford)
+ * Automake 1.13 fixups (Armin K)
+
+-------------------------------------------------------------------
+Tue Nov 13 15:24:27 UTC 2012 - guillaume@opensuse.org
+
+- Remove Exclusive arch on x86*
+
+-------------------------------------------------------------------
+Thu Oct 18 11:09:09 UTC 2012 - kkhere.geo@gmail.com
+
+- fix rpmlint error no-return-in-nonvoid-function
+
+-------------------------------------------------------------------
+Thu Oct 18 10:59:21 UTC 2012 - kkhere.geo@gmail.com
+
+- packaging va backends seperately
+
+-------------------------------------------------------------------
+Thu Oct 18 10:56:48 UTC 2012 - kkhere.geo@gmail.com
+
+- previous bump to 1.1.0 was reverted upstream
+- Version 1.1.0 - 04.Oct.2012
+ * API: add Wayland support
+ * API: add raw DRM support for headless pipelines
+ * Fix generic VA/GLX implementation for newer cluttersink versions
+ * Fix threading issues in VA objects reference code (+Krzysztof Kotlenga)
+ * Fix build on Android Ice Cream Sandwich (+Haitao Huang, Daniel Charles)
+
+
+-------------------------------------------------------------------
+Tue May 29 15:24:49 UTC 2012 - kkhere.geo@gmail.com
+
+- get osc service localrun download_files to run
+
+-------------------------------------------------------------------
+Tue May 29 15:50:36 CEST 2012 - tiwai@suse.de
+
+- updated to version 1.1.0:
+ * support of JPEG decoding
+ * New hooks to create/free native pixmap
+ * VA/EGL interfaces
+ * Remove legacy DRI support
+
++++ 155 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.libva.new/libva-gl.changes
--- /work/SRC/openSUSE:Factory/libva/libva.changes 2015-12-01 09:17:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libva.new/libva.changes 2016-01-05 21:54:33.000000000 +0100
@@ -1,0 +2,52 @@
+Wed Dec 30 10:22:07 UTC 2015 - jimmy@boombatower.com
+
+- Update baselibs.conf to work with new multi-spec file approach.
+
+-------------------------------------------------------------------
+Mon Dec 21 16:05:31 UTC 2015 - dimstar@opensuse.org
+
+- Use build_gl defines instead of build condition: libva-gl is
+ never meant to be built --without=gl, so bcond is actually the
+ wrong construct here.
+- Add libva-gl.spec as a 2nd spec file to the package to keep them
+ in sync (by means of pre_checkin.sh).
+
+-------------------------------------------------------------------
+Fri Dec 18 19:51:22 UTC 2015 - jimmy@boombatower.com
+
+- Bump up disable wayland support for 13.1 as 1.6.2 is incompatible
+ with such old version of wayland.
+
+-------------------------------------------------------------------
+Thu Dec 17 09:50:26 UTC 2015 - jimmy@boombatower.com
+
+- Rework spec to either gl packages or everything else. By doing so
+ libva-devel can be built without depending on Mesa and Mesa-libva
+ can be build depending on libva-devel without introducing a
+ dependency cycle. A linked package will then produce the libva
+ gl packages.
+
+-------------------------------------------------------------------
+Thu Dec 17 09:41:22 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.6.2:
+ + Bump VA API version to 0.38.1.
+ + Add new RT format for 16 bits per channel memory
+ layout(P010,P016): VA_RT_FORMAT_YUV420_10BPP.
+ + Add new fourcc codes: VA_FOURCC_P010, VA_FOURCC_P016,
+ VA_FOURCC_YV16.
+ + Fix crash if user doesn't have right to access the DRI device.
+ + Fix uninitialized x11_screen driver context member for X11
+ output (fdo#61603).
+ + Fix the issue of not to use LIBVA_DRIVER_NAME (fdo#72822).
+ + Fix build issue with wayland (fdo#79478).
+ + vainfo: Add option '--display'.
+
+-------------------------------------------------------------------
+Thu Dec 17 06:51:07 UTC 2015 - jimmy@boombatower.com
+
+- Replace build requirement Mesa-devel with pkgconfig(egl) to
+ narrow dependency and aid in avoiding cycle when building
+ Mesa-libva.
+
+-------------------------------------------------------------------
Old:
----
libva-1.6.1.tar.bz2
New:
----
libva-1.6.2.tar.bz2
libva-gl.changes
libva-gl.spec
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libva-gl.spec ++++++
#
# spec file for package libva-gl
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
%if 0%{?suse_version} <= 1310
%bcond_with wayland
%else
%bcond_without wayland
%endif
%define build_gl 1
Name: libva-gl
%define _name libva
Version: 1.6.2
Release: 0
Summary: Video Acceleration (VA) API for Linux
License: MIT
Group: System/Libraries
Url: http://freedesktop.org/wiki/Software/vaapi
Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{_name}-%{version}.tar.bz2
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xv)
%if %{build_gl}
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gl)
%else
%if %{with wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.0.0
BuildRequires: pkgconfig(wayland-scanner) >= 1.0.0
%endif
%endif
%description
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
%if %{build_gl}
%package -n libva-egl1
Summary: Video Acceleration (VA) API for Linux -- VA/EGL Backend
Group: System/Libraries
Supplements: libva1
%description -n libva-egl1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This is the VA/EGL runtime library
%package -n libva-glx1
Summary: Video Acceleration (VA) API for Linux -- VA/GLX Backend
Group: System/Libraries
Supplements: libva1
%description -n libva-glx1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This is the VA/GLX runtime library
%package devel
Summary: Video Acceleration (VA) API for Linux -- gl development files
Group: Development/Languages/C and C++
BuildRequires: libva-devel = %{version}
Requires: libva-egl1 = %{version}
Requires: libva-glx1 = %{version}
Requires: pkgconfig(egl)
Requires: pkgconfig(gl)
%description devel
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This package provides the development environment for libva gl packages.
%else
%package -n libva1
Summary: Video Acceleration (VA) API for Linux
Group: System/Libraries
Recommends: vaapi-dummy-driver
%description -n libva1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This is the core runtime library
%package -n libva-drm1
Summary: Video Acceleration (VA) API for Linux -- VA/DRM Backend
Group: System/Libraries
Supplements: libva1
%description -n libva-drm1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This is the VA/DRM runtime library
%package -n libva-x11-1
Summary: Video Acceleration (VA) API for Linux -- VA/X11 Backend
Group: System/Libraries
Supplements: libva1
%description -n libva-x11-1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This is the VA/X11 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}
%if %{with wayland}
Requires: libva-wayland1 = %{version}
%endif
Requires: libva-x11-1 = %{version}
Requires: libva1 = %{version}
Requires: pkgconfig(libdrm)
Requires: pkgconfig(x11)
Requires: pkgconfig(xfixes)
Recommends: libva-gl-devel
%description devel
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This package provides the development environment for libva.
%package -n vaapi-tools
Summary: Video Acceleration (VA) API for Linux
Group: System/Libraries
%description -n vaapi-tools
The libva library implements the Video Acceleration (VA) API for Linux.
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
%description -n vaapi-dummy-driver
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
This contains the dummy driver.
%endif
%prep
%setup -q -n %{_name}-%{version}
%build
[ -d m4 ] || mkdir m4
autoreconf -v --install
%configure \
%if %{build_gl}
--enable-glx \
--enable-egl \
--disable-dummy-driver \
--disable-wayland \
%else
--enable-dummy-driver \
%if %{with wayland}
--enable-wayland \
%else
--disable-wayland \
%endif
%endif
--with-drivers-path=%{_libdir}/dri
make %{?_smp_mflags}
%install
%makeinstall
find %{buildroot} -name '*.la' -delete -print
%if %{build_gl}
# remove all files packaged during without gl mode
%{__rm} -rf %{buildroot}%{_bindir}/{avcenc,h264encode,jpegenc,loadjpeg,mpeg2vaenc,mpeg2vldemo,putsurface,vainfo}
%{__rm} -rf `find %{buildroot}%{_includedir}/va/* | grep -v "egl\|glx"`
%{__rm} -rf `find %{buildroot}%{_libdir}/libva* | grep -v "egl\|glx"`
%{__rm} -rf `find %{buildroot}%{_libdir}/pkgconfig/libva*.pc | grep -v "egl\|glx"`
%endif
%if %{build_gl}
%post -n libva-egl1 -p /sbin/ldconfig
%postun -n libva-egl1 -p /sbin/ldconfig
%post -n libva-glx1 -p /sbin/ldconfig
%postun -n libva-glx1 -p /sbin/ldconfig
%else
%post -n libva1 -p /sbin/ldconfig
%postun -n libva1 -p /sbin/ldconfig
%post -n libva-drm1 -p /sbin/ldconfig
%postun -n libva-drm1 -p /sbin/ldconfig
%post -n libva-x11-1 -p /sbin/ldconfig
%postun -n libva-x11-1 -p /sbin/ldconfig
%endif
%if %{build_gl}
%files -n libva-glx1
%defattr(-, root, root)
%{_libdir}/libva-glx.so.*
%files -n libva-egl1
%defattr(-, root, root)
%{_libdir}/libva-egl.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libva-glx.so
%{_libdir}/libva-egl.so
%{_includedir}/va
%{_libdir}/pkgconfig/libva*.pc
%else
%files -n vaapi-tools
%defattr(-,root,root,-)
%{_bindir}/vainfo
%{_bindir}/avcenc
%{_bindir}/h264encode
%{_bindir}/mpeg2vaenc
%{_bindir}/mpeg2vldemo
%{_bindir}/putsurface
%{_bindir}/loadjpeg
%{_bindir}/jpegenc
%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
%{_libdir}/dri/dummy_drv_video.so
%files -n libva1
%defattr(-, root, root)
%{_libdir}/libva.so.*
%{_libdir}/libva-tpi.so.*
%files -n libva-x11-1
%defattr(-, root, root)
%{_libdir}/libva-x11.so.*
%files -n libva-drm1
%defattr(-, root, root)
%{_libdir}/libva-drm.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libva.so
%{_libdir}/libva-tpi.so
%{_libdir}/libva-x11.so
%{_libdir}/libva-drm.so
%if %{with wayland}
%{_libdir}/libva-wayland.so
%endif
%{_includedir}/va
%{_libdir}/pkgconfig/libva*.pc
%endif
%changelog
++++++ libva.spec ++++++
--- /var/tmp/diff_new_pack.Vt0Yq0/_old 2016-01-05 21:54:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Vt0Yq0/_new 2016-01-05 21:54:34.000000000 +0100
@@ -18,28 +18,29 @@
#
-%if 0%{?suse_version} < 1300
+%if 0%{?suse_version} <= 1310
%bcond_with wayland
%else
%bcond_without wayland
%endif
+%define build_gl 0
+
Name: libva
-Version: 1.6.1
+%define _name libva
+Version: 1.6.2
Release: 0
Summary: Video Acceleration (VA) API for Linux
License: MIT
Group: System/Libraries
Url: http://freedesktop.org/wiki/Software/vaapi
-Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{name}-%{version}.tar.bz2
+Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{_name}-%{version}.tar.bz2
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: Mesa-devel
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xz
-BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(x11)
@@ -47,69 +48,91 @@
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xv)
+%if %{build_gl}
+BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(gl)
+%else
%if %{with wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.0.0
BuildRequires: pkgconfig(wayland-scanner) >= 1.0.0
%endif
+%endif
%description
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-%package -n libva1
-Summary: Video Acceleration (VA) API for Linux
+%if %{build_gl}
+%package -n libva-egl1
+Summary: Video Acceleration (VA) API for Linux -- VA/EGL Backend
Group: System/Libraries
-Recommends: vaapi-dummy-driver
+Supplements: libva1
-%description -n libva1
+%description -n libva-egl1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-This is the core runtime library
+This is the VA/EGL runtime library
-%package -n libva-drm1
-Summary: Video Acceleration (VA) API for Linux -- VA/DRM Backend
+%package -n libva-glx1
+Summary: Video Acceleration (VA) API for Linux -- VA/GLX Backend
Group: System/Libraries
Supplements: libva1
-%description -n libva-drm1
+%description -n libva-glx1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-This is the VA/DRM runtime library
+This is the VA/GLX runtime library
-%package -n libva-egl1
-Summary: Video Acceleration (VA) API for Linux -- VA/EGL Backend
+%package devel
+Summary: Video Acceleration (VA) API for Linux -- gl development files
+Group: Development/Languages/C and C++
+BuildRequires: libva-devel = %{version}
+Requires: libva-egl1 = %{version}
+Requires: libva-glx1 = %{version}
+Requires: pkgconfig(egl)
+Requires: pkgconfig(gl)
+
+%description devel
+The libva library implements the Video Acceleration (VA) API for Linux.
+The library loads a hardware dependendent driver.
+
+This package provides the development environment for libva gl packages.
+%else
+
+%package -n libva1
+Summary: Video Acceleration (VA) API for Linux
Group: System/Libraries
-Supplements: libva1
+Recommends: vaapi-dummy-driver
-%description -n libva-egl1
+%description -n libva1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-This is the VA/EGL runtime library
+This is the core runtime library
-%package -n libva-x11-1
-Summary: Video Acceleration (VA) API for Linux -- VA/X11 Backend
+%package -n libva-drm1
+Summary: Video Acceleration (VA) API for Linux -- VA/DRM Backend
Group: System/Libraries
Supplements: libva1
-%description -n libva-x11-1
+%description -n libva-drm1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-This is the VA/X11 runtime library
+This is the VA/DRM runtime library
-%package -n libva-glx1
-Summary: Video Acceleration (VA) API for Linux -- VA/GLX Backend
+%package -n libva-x11-1
+Summary: Video Acceleration (VA) API for Linux -- VA/X11 Backend
Group: System/Libraries
Supplements: libva1
-%description -n libva-glx1
+%description -n libva-x11-1
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
-This is the VA/GLX runtime library
+This is the VA/X11 runtime library
%if %{with wayland}
%package -n libva-wayland1
@@ -125,17 +148,15 @@
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)
Requires: pkgconfig(libdrm)
Requires: pkgconfig(x11)
Requires: pkgconfig(xfixes)
+Recommends: libva-gl-devel
%description devel
The libva library implements the Video Acceleration (VA) API for Linux.
@@ -172,36 +193,44 @@
The library loads a hardware dependendent driver.
This contains the dummy driver.
+%endif
%prep
-%setup -q
+%setup -q -n %{_name}-%{version}
%build
[ -d m4 ] || mkdir m4
autoreconf -v --install
-%configure --enable-dummy-driver \
+%configure \
+%if %{build_gl}
--enable-glx \
--enable-egl \
- --with-drivers-path=%{_libdir}/dri \
+ --disable-dummy-driver \
+ --disable-wayland \
+%else
+ --enable-dummy-driver \
%if %{with wayland}
- --enable-wayland
+ --enable-wayland \
%else
- --disable-wayland
+ --disable-wayland \
+%endif
%endif
+ --with-drivers-path=%{_libdir}/dri
make %{?_smp_mflags}
%install
%makeinstall
find %{buildroot} -name '*.la' -delete -print
-%post -n libva1 -p /sbin/ldconfig
-
-%postun -n libva1 -p /sbin/ldconfig
-
-%post -n libva-drm1 -p /sbin/ldconfig
-
-%postun -n libva-drm1 -p /sbin/ldconfig
+%if %{build_gl}
+# remove all files packaged during without gl mode
+%{__rm} -rf %{buildroot}%{_bindir}/{avcenc,h264encode,jpegenc,loadjpeg,mpeg2vaenc,mpeg2vldemo,putsurface,vainfo}
+%{__rm} -rf `find %{buildroot}%{_includedir}/va/* | grep -v "egl\|glx"`
+%{__rm} -rf `find %{buildroot}%{_libdir}/libva* | grep -v "egl\|glx"`
+%{__rm} -rf `find %{buildroot}%{_libdir}/pkgconfig/libva*.pc | grep -v "egl\|glx"`
+%endif
+%if %{build_gl}
%post -n libva-egl1 -p /sbin/ldconfig
%postun -n libva-egl1 -p /sbin/ldconfig
@@ -209,10 +238,37 @@
%post -n libva-glx1 -p /sbin/ldconfig
%postun -n libva-glx1 -p /sbin/ldconfig
+%else
+
+%post -n libva1 -p /sbin/ldconfig
+
+%postun -n libva1 -p /sbin/ldconfig
+
+%post -n libva-drm1 -p /sbin/ldconfig
+
+%postun -n libva-drm1 -p /sbin/ldconfig
%post -n libva-x11-1 -p /sbin/ldconfig
%postun -n libva-x11-1 -p /sbin/ldconfig
+%endif
+
+%if %{build_gl}
+%files -n libva-glx1
+%defattr(-, root, root)
+%{_libdir}/libva-glx.so.*
+
+%files -n libva-egl1
+%defattr(-, root, root)
+%{_libdir}/libva-egl.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libva-glx.so
+%{_libdir}/libva-egl.so
+%{_includedir}/va
+%{_libdir}/pkgconfig/libva*.pc
+%else
%files -n vaapi-tools
%defattr(-,root,root,-)
@@ -249,14 +305,6 @@
%defattr(-, root, root)
%{_libdir}/libva-x11.so.*
-%files -n libva-glx1
-%defattr(-, root, root)
-%{_libdir}/libva-glx.so.*
-
-%files -n libva-egl1
-%defattr(-, root, root)
-%{_libdir}/libva-egl.so.*
-
%files -n libva-drm1
%defattr(-, root, root)
%{_libdir}/libva-drm.so.*
@@ -266,13 +314,12 @@
%{_libdir}/libva.so
%{_libdir}/libva-tpi.so
%{_libdir}/libva-x11.so
-%{_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
+%endif
%changelog
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.Vt0Yq0/_old 2016-01-05 21:54:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Vt0Yq0/_new 2016-01-05 21:54:34.000000000 +0100
@@ -8,7 +8,8 @@
requires -libva-<targettype>
requires "libva1-<targettype> = <version>"
requires "libva-drm1-<targettype> = <version>"
+ requires "libva-x11-1-<targettype> = <version>"
+libva-gl-devel
+ requires -libva-gl-<targettype>
requires "libva-egl1-<targettype> = <version>"
requires "libva-glx1-<targettype> = <version>"
- requires "libva-x11-1-<targettype> = <version>"
-
++++++ libva-1.6.1.tar.bz2 -> libva-1.6.2.tar.bz2 ++++++
++++ 30637 lines of diff (skipped)
++++++ pre_checkin.sh ++++++
#!/bin/sh
sed -e 's,build_gl 0,build_gl 1,' libva.spec > libva-gl.spec
sed -e 's,^Name:.*,Name: libva-gl,' -i libva-gl.spec
cp libva.changes libva-gl.changes