Update to 1.8.0

This commit is contained in:
Nicolas Chauvet 2017-03-31 15:44:08 +02:00
parent 27e9184e8d
commit a336507eb3
4 changed files with 17 additions and 60 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/libva-*.tar.bz2
/libva-1.8.0.tar.gz

View File

@ -1,29 +0,0 @@
diff -up libva-1.7.3/va/wayland/va_wayland_drm.c~ libva-1.7.3/va/wayland/va_wayland_drm.c
--- libva-1.7.3/va/wayland/va_wayland_drm.c~ 2016-11-10 02:06:57.000000000 +0100
+++ libva-1.7.3/va/wayland/va_wayland_drm.c 2017-02-15 10:45:17.079528725 +0100
@@ -38,7 +38,10 @@
#include "wayland-drm-client-protocol.h"
/* XXX: Wayland/DRM support currently lives in Mesa libEGL.so.* library */
-#define LIBWAYLAND_DRM_NAME "libEGL.so.1"
+/* First try the soname of a glvnd enabled mesa build */
+#define LIBWAYLAND_DRM_NAME "libEGL_mesa.so.0"
+/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
+#define LIBWAYLAND_DRM_NAME_FALLBACK "libEGL.so.1"
typedef struct va_wayland_drm_context {
struct va_wayland_context base;
@@ -207,8 +210,11 @@ va_wayland_drm_create(VADisplayContextP
vtable->has_prime_sharing = 0;
wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
- if (!wl_drm_ctx->handle)
- return false;
+ if (!wl_drm_ctx->handle) {
+ wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME_FALLBACK, RTLD_LAZY|RTLD_LOCAL);
+ if (!wl_drm_ctx->handle)
+ return false;
+ }
wl_drm_ctx->drm_interface =
dlsym(wl_drm_ctx->handle, "wl_drm_interface");

View File

@ -1,12 +1,12 @@
Name: libva
Version: 1.7.3
Release: 3%{?dist}
Version: 1.8.0
Release: 1%{?dist}
Summary: Video Acceleration (VA) API for Linux
Group: System Environment/Libraries
License: MIT
URL: http://freedesktop.org/wiki/Software/vaapi
Source0: http://www.freedesktop.org/software/vaapi/releases/libva/libva-%{version}.tar.bz2
Patch0: libva-1.7.3-glvnd-fix.patch
URL: https://01.org/linuxmedia
Source0: https://github.com/01org/libva/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: libtool
BuildRequires: libudev-devel
BuildRequires: libXext-devel
@ -30,7 +30,6 @@ Libva is a library providing the VA API video acceleration API.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{_isa} = %{version}-%{release}
Requires: pkgconfig
@ -38,19 +37,10 @@ Requires: pkgconfig
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package utils
Summary: Tools for %{name} (including vainfo)
Group: Development/Libraries
Requires: %{name}%{_isa} = %{version}-%{release}
%description utils
The %{name}-utils package contains tools that are provided as part
of %{name}, including the vainfo tool for determining what (if any)
%{name} support is available on a system.
%prep
%autosetup -p1
autoreconf -vif
%build
%configure --disable-static \
@ -61,10 +51,10 @@ of %{name}, including the vainfo tool for determining what (if any)
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=%{buildroot} INSTALL="install -p"
%make_install INSTALL="install -p"
find %{buildroot} -regex ".*\.la$" | xargs rm -f --
@ -83,18 +73,13 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
%{_libdir}/libva*.so
%{_libdir}/pkgconfig/libva*.pc
%files utils
%{_bindir}/vainfo
%{_bindir}/loadjpeg
%{_bindir}/jpegenc
%{_bindir}/avcenc
%{_bindir}/h264encode
%{_bindir}/mpeg2vldemo
%{_bindir}/mpeg2vaenc
%{_bindir}/putsurface
%{!?_without_wayland:%{_bindir}/putsurface_wayland}
%changelog
* Fri Mar 31 2017 Nicolas Chauvet <kwizart@gmail.com> - 1.8.0-1
- Update to 1.8.0
- Switch upstream URL to 01.org and github
- Split libva-utils into it's own package
- Clean-up groups
* Wed Feb 15 2017 Hans de Goede <hdegoede@redhat.com> - 1.7.3-3
- Fix libva not working when using with libglvnd + wayland (rhbz#1422151)

View File

@ -1 +1 @@
dafb1d7d6449e850e9eb1a099895c683 libva-1.7.3.tar.bz2
SHA512 (libva-1.8.0.tar.gz) = 0f1b527d67497bc501f2f1acdddcb2519f12a8682a6d98303e7d86dd88b6270eb25e3b0789179aaf5f3b4c70b7e8448eb5505cbadeb0b44c9727ac7cf77a51d6