diff -Nru ../_diff/libva-vdpau-driver-chromium/PKGBUILD ./PKGBUILD --- ../_diff/libva-vdpau-driver-chromium/PKGBUILD 2019-03-08 12:32:14.000000000 -0800 +++ ./PKGBUILD 2019-07-26 17:07:57.797101808 -0700 @@ -22,6 +22,7 @@ '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' 'sigfpe-crash.patch::https://bugs.freedesktop.org/attachment.cgi?id=142296' 'fallback-x.patch' + 'v4l2_stub.patch' 'implement-vaquerysurfaceattributes.patch' ) sha256sums=('155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9' @@ -30,6 +31,7 @@ '1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98' 'ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7' '245dab80e14d7f302c1367ce59c96874b5fc40d253a789c0199130ae99c43599' + '5137926e57c7b47f656caf84207c296c75c90af05495beeef2b367bb07b62df4' 'a91e11d2826715b29c2a08036f0e70ed45df7139987ff37c84b5c04c4a9c132f' ) @@ -40,6 +42,7 @@ 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}/v4l2_stub.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" diff -Nru ../_diff/libva-vdpau-driver-chromium/v4l2_stub.patch ./v4l2_stub.patch --- ../_diff/libva-vdpau-driver-chromium/v4l2_stub.patch 1969-12-31 16:00:00.000000000 -0800 +++ ./v4l2_stub.patch 2019-07-26 17:05:05.977357584 -0700 @@ -0,0 +1,78 @@ +diff -ru ../orig/libva-vdpau-driver-0.7.4/src/vdpau_decode.c libva-vdpau-driver-0.7.4/src/vdpau_decode.c +--- ../orig/libva-vdpau-driver-0.7.4/src/vdpau_decode.c 2019-07-26 17:02:57.051069654 -0700 ++++ libva-vdpau-driver-0.7.4/src/vdpau_decode.c 2019-07-26 15:18:00.366153750 -0700 +@@ -56,6 +56,7 @@ + case VDP_DECODER_PROFILE_H264_BASELINE: + case VDP_DECODER_PROFILE_H264_MAIN: + case VDP_DECODER_PROFILE_H264_HIGH: ++ case VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE: + return VDP_CODEC_H264; + case VDP_DECODER_PROFILE_VC1_SIMPLE: + case VDP_DECODER_PROFILE_VC1_MAIN: +@@ -75,7 +76,7 @@ + case VAProfileMPEG4Simple: return VDP_DECODER_PROFILE_MPEG4_PART2_SP; + case VAProfileMPEG4AdvancedSimple: return VDP_DECODER_PROFILE_MPEG4_PART2_ASP; + #endif +- case VAProfileH264Baseline: return VDP_DECODER_PROFILE_H264_BASELINE; ++ case VAProfileH264ConstrainedBaseline: return VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE; + case VAProfileH264Main: return VDP_DECODER_PROFILE_H264_MAIN; + case VAProfileH264High: return VDP_DECODER_PROFILE_H264_HIGH; + case VAProfileVC1Simple: return VDP_DECODER_PROFILE_VC1_SIMPLE; +@@ -1058,7 +1059,7 @@ + VAProfileMPEG4Simple, + VAProfileMPEG4AdvancedSimple, + VAProfileMPEG4Main, +- VAProfileH264Baseline, ++ VAProfileH264ConstrainedBaseline, + VAProfileH264Main, + VAProfileH264High, + VAProfileVC1Simple, +@@ -1108,7 +1109,7 @@ + case VAProfileMPEG4Main: + entrypoint = VAEntrypointVLD; + break; +- case VAProfileH264Baseline: ++ case VAProfileH264ConstrainedBaseline: + case VAProfileH264Main: + case VAProfileH264High: + entrypoint = VAEntrypointVLD; +diff -ru ../orig/libva-vdpau-driver-0.7.4/src/vdpau_driver.c libva-vdpau-driver-0.7.4/src/vdpau_driver.c +--- ../orig/libva-vdpau-driver-0.7.4/src/vdpau_driver.c 2019-07-26 17:02:57.061069618 -0700 ++++ libva-vdpau-driver-0.7.4/src/vdpau_driver.c 2019-07-26 16:37:10.092170311 -0700 +@@ -185,7 +185,7 @@ + vdpau_common_Initialize(vdpau_driver_data_t *driver_data) + { + /* Create a dedicated X11 display for VDPAU purposes */ +- const char * const x11_dpy_name = XDisplayString(driver_data->x11_dpy); ++ const char * const x11_dpy_name = (driver_data->x11_dpy)? XDisplayString(driver_data->x11_dpy):NULL; + driver_data->vdp_dpy = XOpenDisplay(x11_dpy_name); + /* Fallback to existing X11 display */ + driver_data->x_fallback = false; +diff -ru ../orig/libva-vdpau-driver-0.7.4/src/vdpau_video.c libva-vdpau-driver-0.7.4/src/vdpau_video.c +--- ../orig/libva-vdpau-driver-0.7.4/src/vdpau_video.c 2019-07-26 17:02:57.057736297 -0700 ++++ libva-vdpau-driver-0.7.4/src/vdpau_video.c 2019-07-26 15:18:00.372820405 -0700 +@@ -975,8 +975,8 @@ + vdpau_CreateSurfaceFromV4L2Buf( + VADriverContextP ctx, + int v4l2_fd, +- struct v4l2_format *v4l2_fmt, +- struct v4l2_buffer *v4l2_buf, ++ uintptr_t *v4l2_fmt, ++ uintptr_t *v4l2_buf, + VASurfaceID *surface + ) + { +diff -ru ../orig/libva-vdpau-driver-0.7.4/src/vdpau_video.h libva-vdpau-driver-0.7.4/src/vdpau_video.h +--- ../orig/libva-vdpau-driver-0.7.4/src/vdpau_video.h 2019-07-26 17:02:57.057736297 -0700 ++++ libva-vdpau-driver-0.7.4/src/vdpau_video.h 2019-07-26 15:18:00.372820405 -0700 +@@ -283,8 +283,8 @@ + vdpau_CreateSurfaceFromV4L2Buf( + VADriverContextP ctx, + int v4l2_fd, +- struct v4l2_format *v4l2_fmt, +- struct v4l2_buffer *v4l2_buf, ++ uintptr_t *v4l2_fmt, ++ uintptr_t *v4l2_buf, + VASurfaceID *surface + ) attribute_hidden; +