summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO9
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD36
-rw-r--r--fallback-x.patch (renamed from libva-vdpau-driver-0.7.4-fallback-x.patch)0
-rw-r--r--implement-vaquerysurfaceattributes.patch105
5 files changed, 24 insertions, 129 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4bef85a9be9c..24fe2ca9c083 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
# Generated by mksrcinfo v8
-# Sat Sep 2 18:48:37 UTC 2017
+# Sun May 27 19:11:10 UTC 2018
pkgbase = libva-vdpau-driver-chromium
pkgdesc = VDPAU backend for VA API. (special version for chromium)
pkgver = 0.7.4
pkgrel = 3
url = http://freedesktop.org/wiki/Software/vaapi
- arch = i686
arch = x86_64
license = GPL
makedepends = mesa
@@ -19,9 +18,9 @@ pkgbase = libva-vdpau-driver-chromium
source = libva-vdpau-driver-0.7.4-glext-missing-definition.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-glext-missing-definition.patch?h=packages/libva-vdpau-driver
source = libva-vdpau-driver-0.7.4-libvdpau-0.8.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?h=packages/libva-vdpau-driver
source = libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?h=packages/libva-vdpau-driver
- source = libva-vdpau-driver-0.7.4-fallback-x.patch
- source = http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/vdpau-video/vivid/download/head:/sigfpecrash.patch-20140602223430-b42d97uv6vf2c3p7-1/sigfpe-crash.patch
- source = implement-vaquerysurfaceattributes.patch
+ source = fallback-x.patch
+ source = https://raw.githubusercontent.com/RussianFedora/libva-vdpau-driver/f28/fixes/sigfpe-crash.patch
+ source = https://raw.githubusercontent.com/RussianFedora/libva-vdpau-driver/f28/fixes/implement-vaquerysurfaceattributes.patch
sha256sums = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9
sha256sums = 776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c
sha256sums = 5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d
diff --git a/.gitignore b/.gitignore
index 7cd6885e2071..e4bec95d3872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
!.gitignore
!.SRCINFO
!PKGBUILD
-!libva-vdpau-driver-0.7.4-fallback-x.patch
-!implement-vaquerysurfaceattributes.patch
+!fallback-x.patch
diff --git a/PKGBUILD b/PKGBUILD
index b31d4fbd3703..8710e01afa0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libva-vdpau-driver-chromium
pkgver=0.7.4
pkgrel=3
pkgdesc="VDPAU backend for VA API. (special version for chromium)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
url='http://freedesktop.org/wiki/Software/vaapi'
license=('GPL')
depends=('libva'
@@ -20,9 +20,9 @@ source=("http://freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva
'libva-vdpau-driver-0.7.4-glext-missing-definition.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-glext-missing-definition.patch?h=packages/libva-vdpau-driver'
'libva-vdpau-driver-0.7.4-libvdpau-0.8.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?h=packages/libva-vdpau-driver'
'libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?h=packages/libva-vdpau-driver'
- 'libva-vdpau-driver-0.7.4-fallback-x.patch' # original http://www.snewbury.org.uk/libva-vdpau-driver-0.7.4-fallback-x.patch
- 'http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/vdpau-video/vivid/download/head:/sigfpecrash.patch-20140602223430-b42d97uv6vf2c3p7-1/sigfpe-crash.patch'
- 'implement-vaquerysurfaceattributes.patch'
+ 'fallback-x.patch' # original http://www.snewbury.org.uk/libva-vdpau-driver-0.7.4-fallback-x.patch
+ 'https://raw.githubusercontent.com/RussianFedora/libva-vdpau-driver/f28/fixes/sigfpe-crash.patch'
+ 'https://raw.githubusercontent.com/RussianFedora/libva-vdpau-driver/f28/fixes/implement-vaquerysurfaceattributes.patch'
)
sha256sums=('155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9'
'776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c'
@@ -34,24 +34,26 @@ sha256sums=('155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9'
)
prepare() {
- cd "libva-vdpau-driver-${pkgver}"
- patch -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-glext-missing-definition.patch"
- patch -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"
- patch -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch"
- patch -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-fallback-x.patch"
- patch -p1 -i "${srcdir}/sigfpe-crash.patch"
- patch -p1 -i "${srcdir}/implement-vaquerysurfaceattributes.patch"
-}
+ mkdir -p build
-build() {
- cd "libva-vdpau-driver-${pkgver}"
- ./configure \
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-glext-missing-definition.patch"
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch"
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/fallback-x.patch"
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/sigfpe-crash.patch"
+ patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/implement-vaquerysurfaceattributes.patch"
+
+ cd build
+ ../"libva-vdpau-driver-${pkgver}"/configure \
--prefix=/usr
- make
+}
+
+build() {
+ make -C build
}
package() {
- make -C "libva-vdpau-driver-${pkgver}" DESTDIR="${pkgdir}" install
+ make -C build DESTDIR="${pkgdir}" install
}
diff --git a/libva-vdpau-driver-0.7.4-fallback-x.patch b/fallback-x.patch
index 7015eac732f1..7015eac732f1 100644
--- a/libva-vdpau-driver-0.7.4-fallback-x.patch
+++ b/fallback-x.patch
diff --git a/implement-vaquerysurfaceattributes.patch b/implement-vaquerysurfaceattributes.patch
deleted file mode 100644
index d3267495cf16..000000000000
--- a/implement-vaquerysurfaceattributes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: vdpau-video-0.7.4/src/vdpau_driver_template.h
-===================================================================
---- vdpau-video-0.7.4.orig/src/vdpau_driver_template.h
-+++ vdpau-video-0.7.4/src/vdpau_driver_template.h
-@@ -115,6 +115,13 @@ struct VA_DRIVER_VTABLE {
- int *num_attribs /* out */
- );
-
-+ VAStatus (*vaQuerySurfaceAttributes) (
-+ VADisplay dpy,
-+ VAConfigID config_id,
-+ VASurfaceAttrib *attrib_list, /* out */
-+ unsigned int *num_attribs /* out */
-+ );
-+
- VAStatus (*vaCreateSurfaces) (
- VADriverContextP ctx,
- int width,
-@@ -589,6 +596,7 @@ static VAStatus FUNC(Initialize)(VA_DRIV
- vtable->vaCreateConfig = vdpau_CreateConfig;
- vtable->vaDestroyConfig = vdpau_DestroyConfig;
- vtable->vaGetConfigAttributes = vdpau_GetConfigAttributes;
-+ vtable->vaQuerySurfaceAttributes = vdpau_QuerySurfaceAttributes;
- vtable->vaCreateSurfaces = vdpau_CreateSurfaces;
- vtable->vaDestroySurfaces = vdpau_DestroySurfaces;
- vtable->vaCreateContext = vdpau_CreateContext;
-Index: vdpau-video-0.7.4/src/vdpau_video.c
-===================================================================
---- vdpau-video-0.7.4.orig/src/vdpau_video.c
-+++ vdpau-video-0.7.4/src/vdpau_video.c
-@@ -309,6 +309,54 @@ int surface_remove_association(
- return -1;
- }
-
-+// vaQuerySurfaceAttributes
-+VAStatus
-+vdpau_QuerySurfaceAttributes(
-+ VADriverContextP ctx,
-+ VAConfigID config_id,
-+ VASurfaceAttrib *attrib_list,
-+ unsigned int *num_attribs
-+)
-+{
-+ VDPAU_DRIVER_DATA_INIT;
-+
-+ object_config_p obj_config;
-+ if ((obj_config = VDPAU_CONFIG(config_id)) == NULL)
-+ return VA_STATUS_ERROR_INVALID_CONFIG;
-+
-+ if (!attrib_list && !num_attribs)
-+ return VA_STATUS_ERROR_INVALID_PARAMETER;
-+
-+ if (!attrib_list) {
-+ *num_attribs = 2;
-+ return VA_STATUS_SUCCESS;
-+ }
-+
-+ if (*num_attribs < 2) {
-+ *num_attribs = 2;
-+ return VA_STATUS_ERROR_MAX_NUM_EXCEEDED;
-+ }
-+
-+ VdpDecoderProfile vdp_profile;
-+ uint32_t max_width, max_height;
-+ vdp_profile = get_VdpDecoderProfile(obj_config->profile);
-+ if (!get_max_surface_size(driver_data, vdp_profile, &max_width, &max_height))
-+ return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
-+
-+ if (attrib_list) {
-+ attrib_list[0].type = VASurfaceAttribMaxWidth;
-+ attrib_list[0].flags = VA_SURFACE_ATTRIB_GETTABLE;
-+ attrib_list[0].value.type = VAGenericValueTypeInteger;
-+ attrib_list[0].value.value.i = max_width;
-+ attrib_list[1].type = VASurfaceAttribMaxHeight;
-+ attrib_list[1].flags = VA_SURFACE_ATTRIB_GETTABLE;
-+ attrib_list[1].value.type = VAGenericValueTypeInteger;
-+ attrib_list[1].value.value.i = max_height;
-+ }
-+
-+ return VA_STATUS_SUCCESS;
-+}
-+
- // vaDestroySurfaces
- VAStatus
- vdpau_DestroySurfaces(
-Index: vdpau-video-0.7.4/src/vdpau_video.h
-===================================================================
---- vdpau-video-0.7.4.orig/src/vdpau_video.h
-+++ vdpau-video-0.7.4/src/vdpau_video.h
-@@ -165,6 +165,15 @@ vdpau_QueryConfigAttributes(
- int *num_attribs
- ) attribute_hidden;
-
-+// vaQuerySurfaceAttributes
-+VAStatus
-+vdpau_QuerySurfaceAttributes(
-+ VADriverContextP ctx,
-+ VAConfigID config_id,
-+ VASurfaceAttrib *attrib_list,
-+ unsigned int *num_attribs
-+) attribute_hidden;
-+
- // vaCreateSurfaces
- VAStatus
- vdpau_CreateSurfaces(