update patches(?)

5 files changed, 128 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d47868a751b4..3b11977d78c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Aug 19 20:13:57 UTC 2018
+# Fri Mar  8 20:31:59 UTC 2019
 pkgbase = libva-vdpau-driver-chromium
 	pkgdesc = VDPAU backend for VA API. (special version for chromium)
 	pkgver = 0.7.4
-	pkgrel = 3
+	pkgrel = 4
 	url = http://freedesktop.org/wiki/Software/vaapi
 	arch = x86_64
 	license = GPL
@@ -18,15 +18,15 @@ 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 = sigfpe-crash.patch::https://bugs.freedesktop.org/attachment.cgi?id=142296
 	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
+	source = implement-vaquerysurfaceattributes.patch
 	sha256sums = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9
 	sha256sums = 776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c
 	sha256sums = 5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d
 	sha256sums = 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98
-	sha256sums = b923dc60ad49459ca480a56af075d954b2678a8c7f433fd03f1aa49e58cfe838
 	sha256sums = ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7
+	sha256sums = 245dab80e14d7f302c1367ce59c96874b5fc40d253a789c0199130ae99c43599
 	sha256sums = a91e11d2826715b29c2a08036f0e70ed45df7139987ff37c84b5c04c4a9c132f
 
 pkgname = libva-vdpau-driver-chromium
diff --git a/.gitignore b/.gitignore
index e4bec95d3872..afd9c1eefdea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 !.SRCINFO
 !PKGBUILD
 !fallback-x.patch
+!implement-vaquerysurfaceattributes.patch
diff --git a/PKGBUILD b/PKGBUILD
index a4ce4fc125d7..e3ced0cb2a1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libva-vdpau-driver-chromium
 pkgver=0.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="VDPAU backend for VA API. (special version for chromium)"
 arch=('x86_64')
 url='http://freedesktop.org/wiki/Software/vaapi'
@@ -20,16 +20,16 @@ source=("https://freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libv
         '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'
-        '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'
+        'sigfpe-crash.patch::https://bugs.freedesktop.org/attachment.cgi?id=142296'
+        'fallback-x.patch'
+        'implement-vaquerysurfaceattributes.patch'
         )
 sha256sums=('155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9'
             '776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c'
             '5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d'
             '1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98'
-            'b923dc60ad49459ca480a56af075d954b2678a8c7f433fd03f1aa49e58cfe838'
             'ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7'
+            '245dab80e14d7f302c1367ce59c96874b5fc40d253a789c0199130ae99c43599'
             'a91e11d2826715b29c2a08036f0e70ed45df7139987ff37c84b5c04c4a9c132f'
             )
 
diff --git a/fallback-x.patch b/fallback-x.patch
index 7015eac732f1..8e44098782e9 100644
--- a/fallback-x.patch
+++ b/fallback-x.patch
@@ -1,16 +1,17 @@
-diff -urN libva-vdpau-driver-0.7.4/src/vdpau_driver.c libva-vdpau-driver-0.7.4.chromium/src/vdpau_driver.c
---- libva-vdpau-driver-0.7.4/src/vdpau_driver.c	2012-10-05 16:02:58.000000000 +0100
-+++ libva-vdpau-driver-0.7.4.chromium/src/vdpau_driver.c	2016-10-05 18:47:12.937566583 +0100
-@@ -174,7 +174,7 @@
+Index: vdpau-video-0.7.4/src/vdpau_driver.c
+===================================================================
+--- vdpau-video-0.7.4.orig/src/vdpau_driver.c
++++ vdpau-video-0.7.4/src/vdpau_driver.c
+@@ -174,7 +174,7 @@ vdpau_common_Terminate(vdpau_driver_data
      }
      vdpau_gate_exit(driver_data);
  
 -    if (driver_data->vdp_dpy) {
-+    if ((!driver_data->x_fallback) && driver_data->vdp_dpy) {
++    if (!driver_data->x_fallback && driver_data->vdp_dpy) {
          XCloseDisplay(driver_data->vdp_dpy);
          driver_data->vdp_dpy = NULL;
      }
-@@ -187,9 +187,14 @@
+@@ -187,9 +187,14 @@ vdpau_common_Initialize(vdpau_driver_dat
      /* Create a dedicated X11 display for VDPAU purposes */
      const char * const x11_dpy_name = XDisplayString(driver_data->x11_dpy);
      driver_data->vdp_dpy = XOpenDisplay(x11_dpy_name);
@@ -28,9 +29,10 @@ diff -urN libva-vdpau-driver-0.7.4/src/vdpau_driver.c libva-vdpau-driver-0.7.4.c
      VdpStatus vdp_status;
      driver_data->vdp_device = VDP_INVALID_HANDLE;
      vdp_status = vdp_device_create_x11(
-diff -urN libva-vdpau-driver-0.7.4/src/vdpau_driver.h libva-vdpau-driver-0.7.4.chromium/src/vdpau_driver.h
---- libva-vdpau-driver-0.7.4/src/vdpau_driver.h	2012-10-05 16:02:58.000000000 +0100
-+++ libva-vdpau-driver-0.7.4.chromium/src/vdpau_driver.h	2016-10-05 18:48:33.701593155 +0100
+Index: vdpau-video-0.7.4/src/vdpau_driver.h
+===================================================================
+--- vdpau-video-0.7.4.orig/src/vdpau_driver.h
++++ vdpau-video-0.7.4/src/vdpau_driver.h
 @@ -21,6 +21,7 @@
  #ifndef VDPAU_DRIVER_H
  #define VDPAU_DRIVER_H
@@ -39,7 +41,7 @@ diff -urN libva-vdpau-driver-0.7.4/src/vdpau_driver.h libva-vdpau-driver-0.7.4.c
  #include <va/va_backend.h>
  #include "vaapi_compat.h"
  #include "vdpau_gate.h"
-@@ -100,6 +101,7 @@
+@@ -100,6 +101,7 @@ struct vdpau_driver_data {
      uint64_t                    va_display_attrs_mtime[VDPAU_MAX_DISPLAY_ATTRIBUTES];
      unsigned int                va_display_attrs_count;
      char                        va_vendor[256];
diff --git a/implement-vaquerysurfaceattributes.patch b/implement-vaquerysurfaceattributes.patch
new file mode 100644
index 000000000000..d3267495cf16
--- /dev/null
+++ b/implement-vaquerysurfaceattributes.patch
@@ -0,0 +1,105 @@
+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(