diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | fallback-x.patch | 51 |
4 files changed, 17 insertions, 59 deletions
@@ -1,7 +1,7 @@ pkgbase = libva-vdpau-driver-chromium pkgdesc = VDPAU backend for VA API. (special version for chromium) pkgver = 0.7.4 - pkgrel = 6 + pkgrel = 7 url = http://freedesktop.org/wiki/Software/vaapi arch = x86_64 license = GPL @@ -18,15 +18,19 @@ pkgbase = libva-vdpau-driver-chromium 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 = libva-vdpau-driver-0.7.4-fallback-x.patch::https://raw.githubusercontent.com/sjnewbury/gentoo-playground/0999f9c8544ba29c012dd5d5e5c45a6235c3721a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-fallback-x.patch source = implement-vaquerysurfaceattributes.patch + source = libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch::https://raw.githubusercontent.com/gentoo/gentoo/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch + source = https://raw.githubusercontent.com/jstkdng/libva-vdpau-driver-chromium/master/vdpau-driver-template.patch sha256sums = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 sha256sums = 776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c sha256sums = 5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d sha256sums = 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 sha256sums = ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7 - sha256sums = 245dab80e14d7f302c1367ce59c96874b5fc40d253a789c0199130ae99c43599 + sha256sums = b923dc60ad49459ca480a56af075d954b2678a8c7f433fd03f1aa49e58cfe838 sha256sums = a91e11d2826715b29c2a08036f0e70ed45df7139987ff37c84b5c04c4a9c132f + sha256sums = 0ddf889850c54ccace8ec61a232f04ab77495c495949f952363ad28e2fc9891d + sha256sums = 5684b9520bbbe232322b33b313dff9457e339019c3f7e551b78e92adcd354902 pkgname = libva-vdpau-driver-chromium diff --git a/.gitignore b/.gitignore index afd9c1eefdea..c5144583bff5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ !.gitignore !.SRCINFO !PKGBUILD -!fallback-x.patch !implement-vaquerysurfaceattributes.patch @@ -3,7 +3,7 @@ pkgname=libva-vdpau-driver-chromium pkgver=0.7.4 -pkgrel=6 +pkgrel=7 pkgdesc="VDPAU backend for VA API. (special version for chromium)" arch=('x86_64') url='http://freedesktop.org/wiki/Software/vaapi' @@ -23,16 +23,20 @@ source=("https://freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libv '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' 'sigfpe-crash.patch::https://bugs.freedesktop.org/attachment.cgi?id=142296' - 'fallback-x.patch' + 'libva-vdpau-driver-0.7.4-fallback-x.patch::https://raw.githubusercontent.com/sjnewbury/gentoo-playground/0999f9c8544ba29c012dd5d5e5c45a6235c3721a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-fallback-x.patch' 'implement-vaquerysurfaceattributes.patch' + 'libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch::https://raw.githubusercontent.com/gentoo/gentoo/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch' + 'https://raw.githubusercontent.com/jstkdng/libva-vdpau-driver-chromium/master/vdpau-driver-template.patch' ) sha256sums=('155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9' '776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c' '5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d' '1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98' 'ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7' - '245dab80e14d7f302c1367ce59c96874b5fc40d253a789c0199130ae99c43599' + 'b923dc60ad49459ca480a56af075d954b2678a8c7f433fd03f1aa49e58cfe838' 'a91e11d2826715b29c2a08036f0e70ed45df7139987ff37c84b5c04c4a9c132f' + '0ddf889850c54ccace8ec61a232f04ab77495c495949f952363ad28e2fc9891d' + '5684b9520bbbe232322b33b313dff9457e339019c3f7e551b78e92adcd354902' ) prepare() { @@ -41,9 +45,11 @@ prepare() { 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}/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch" patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/implement-vaquerysurfaceattributes.patch" + patch -d "libva-vdpau-driver-${pkgver}" -p1 -i "${srcdir}/libva-vdpau-driver-0.7.4-fallback-x.patch" + patch -d "libva-vdpau-driver-${pkgver}" -p2 -i "${srcdir}/vdpau-driver-template.patch" # https://bbs.archlinux.org/viewtopic.php?id=247933 sed -e '/v4l2_buffer/d' \ diff --git a/fallback-x.patch b/fallback-x.patch deleted file mode 100644 index 8e44098782e9..000000000000 --- a/fallback-x.patch +++ /dev/null @@ -1,51 +0,0 @@ -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) { - XCloseDisplay(driver_data->vdp_dpy); - driver_data->vdp_dpy = NULL; - } -@@ -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); -- if (!driver_data->vdp_dpy) -- return VA_STATUS_ERROR_UNKNOWN; -- -+ /* Fallback to existing X11 display */ -+ driver_data->x_fallback = false; -+ if (!driver_data->vdp_dpy) { -+ driver_data->x_fallback = true; -+ driver_data->vdp_dpy = driver_data->x11_dpy; -+ printf("Failed to create dedicated X11 display!\n"); -+ } -+ - VdpStatus vdp_status; - driver_data->vdp_device = VDP_INVALID_HANDLE; - vdp_status = vdp_device_create_x11( -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 - -+#include <stdbool.h> - #include <va/va_backend.h> - #include "vaapi_compat.h" - #include "vdpau_gate.h" -@@ -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]; -+ bool x_fallback; - }; - - typedef struct object_config *object_config_p; |