From 302648c5bf53f14fc88515c30eb0d7031ee9180feaed2018dd5a4adc3bc3cbb9 Mon Sep 17 00:00:00 2001 From: Kshitij Kulshreshtha Date: Thu, 18 Oct 2012 10:59:08 +0000 Subject: [PATCH] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=35 --- baselibs.conf | 10 +++- libva-1.1.0.tar.xz | 4 +- libva-compile-warning-fixes.diff | 27 --------- libva.changes | 12 ++++ libva.spec | 94 +++++++++++++++++++++++++++----- 5 files changed, 104 insertions(+), 43 deletions(-) delete mode 100644 libva-compile-warning-fixes.diff diff --git a/baselibs.conf b/baselibs.conf index f19269f..bce0b6b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,13 @@ libva1 +libva-drm1 +libva-egl1 +libva-glx1 +libva-x11-1 libva-devel requires -libva- requires "libva1- = " - \ No newline at end of file + requires "libva-drm1- = " + requires "libva-egl1- = " + requires "libva-glx1- = " + requires "libva-x11-1- = " + diff --git a/libva-1.1.0.tar.xz b/libva-1.1.0.tar.xz index d8c21be..d00b3c4 100644 --- a/libva-1.1.0.tar.xz +++ b/libva-1.1.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de7638a9298135996cd9f9442605f6f7e1317c9ba110658f6f716d0f1e4313c8 -size 556252 +oid sha256:f39540a8023d9c3e7eadf9a69ad27002b78bc8ec7b48147ba1e838a51190a1ad +size 563020 diff --git a/libva-compile-warning-fixes.diff b/libva-compile-warning-fixes.diff deleted file mode 100644 index ea2b09b..0000000 --- a/libva-compile-warning-fixes.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/test/v4l_h264/decode/TCPSocketServer.cpp b/test/v4l_h264/decode/TCPSocketServer.cpp -index ad33d77..287bf27 100644 ---- a/test/v4l_h264/decode/TCPSocketServer.cpp -+++ b/test/v4l_h264/decode/TCPSocketServer.cpp -@@ -150,7 +150,7 @@ ssize_t TCPSocketServer::send(const void *buffer, const int &bufferLen) throw (s - - ssize_t TCPSocketServer::send(const string &message) throw (std::runtime_error) - { -- send(message.c_str(), message.length()); -+ return send(message.c_str(), message.length()); - } - - -diff --git a/va/egl/va_egl.c b/va/egl/va_egl.c -index 48ff7a1..71904a0 100644 ---- a/va/egl/va_egl.c -+++ b/va/egl/va_egl.c -@@ -56,6 +56,9 @@ - #include "va_egl_private.h" - #include "va_egl_impl.h" - -+#include -+VADisplay vaGetDisplay(Display *dpy); -+ - #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) - #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; } - diff --git a/libva.changes b/libva.changes index 707a95f..b07cdc3 100644 --- a/libva.changes +++ b/libva.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/libva.spec b/libva.spec index dfbeddd..f6a6759 100644 --- a/libva.spec +++ b/libva.spec @@ -26,7 +26,6 @@ License: MIT Group: System/Libraries Url: http://freedesktop.org/wiki/Software/vaapi Source0: http://cgit.freedesktop.org/libva/snapshot/%{name}-%{version}.tar.xz -Patch1: libva-compile-warning-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: gcc-c++ @@ -57,9 +56,59 @@ Recommends: vaapi-dummy-driver 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-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-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 + +%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 -- development files Group: Development/Languages/C and C++ +Requires: libva-drm1 = %{version} +Requires: libva-egl1 = %{version} +Requires: libva-glx1 = %{version} +Requires: libva-x11-1 = %{version} Requires: libva1 = %{version} Requires: pkgconfig(gl) Requires: pkgconfig(libdrm) @@ -94,14 +143,11 @@ This contains the dummy driver. %prep %setup -q -%patch1 -p1 %build +[ -d m4 ] || mkdir m4 autoreconf -v --install %configure --enable-dummy-driver \ -%if 0%{?suse_version} >= 01120 - --enable-dummy-backend \ -%endif --enable-glx \ --enable-egl \ --with-drivers-path=%{_libdir}/dri @@ -110,12 +156,27 @@ make %{?_smp_mflags} %install %makeinstall find %{buildroot} -name '*.la' -delete -print -grep -r include %{buildroot}%{_includedir} %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-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 + +%post -n libva-x11-1 -p /sbin/ldconfig + +%postun -n libva-x11-1 -p /sbin/ldconfig + %files -n vaapi-tools %defattr(-,root,root,-) %{_bindir}/vainfo @@ -124,7 +185,6 @@ grep -r include %{buildroot}%{_includedir} %{_bindir}/mpeg2vldemo %{_bindir}/putsurface %{_bindir}/loadjpeg -%{_bindir}/va_egl %files -n vaapi-dummy-driver %defattr(-,root,root,-) @@ -135,12 +195,22 @@ grep -r include %{buildroot}%{_includedir} %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-glx1 +%defattr(-, root, root) %{_libdir}/libva-glx.so.* + +%files -n libva-egl1 +%defattr(-, root, root) %{_libdir}/libva-egl.so.* -%if 0%{?suse_version} >= 01120 -%{_libdir}/libva-dummy.so.* -%endif + +%files -n libva-drm1 +%defattr(-, root, root) +%{_libdir}/libva-drm.so.* %files devel %defattr(-,root,root,-) @@ -149,9 +219,7 @@ grep -r include %{buildroot}%{_includedir} %{_libdir}/libva-x11.so %{_libdir}/libva-glx.so %{_libdir}/libva-egl.so -%if 0%{?suse_version} >= 01120 -%{_libdir}/libva-dummy.so -%endif +%{_libdir}/libva-drm.so %{_includedir}/va %{_libdir}/pkgconfig/libva*.pc