From 7e7ef2f01d56cc1a89b41ee45419075e01bf1ebd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 17 Oct 2015 14:17:49 +0200 Subject: [PATCH] build: bump required libva version 0.34 and 0.35 don't have the buffer API, such as vaAcquireBufferHandle. This is only needed for the EGL interop, but why bother staying compatible for such old things (0.36 was released over a year ago). We also can drop some minor compatibility ifdeffery. --- video/vaapi.h | 6 ------ wscript | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/video/vaapi.h b/video/vaapi.h index 3f4a02b2bb..a3478c018d 100644 --- a/video/vaapi.h +++ b/video/vaapi.h @@ -26,12 +26,6 @@ #ifndef VA_FOURCC_I420 #define VA_FOURCC_I420 VA_FOURCC('I', '4', '2', '0') #endif -#ifndef VA_FOURCC_RGBX -#define VA_FOURCC_RGBX 0x58424752 -#endif -#ifndef VA_FOURCC_BGRX -#define VA_FOURCC_BGRX 0x58524742 -#endif #define VA_STR_FOURCC(fcc) \ (const char[]){(fcc), (fcc) >> 8u, (fcc) >> 16u, (fcc) >> 24u, 0} diff --git a/wscript b/wscript index 7de1c5855d..d9dd156968 100644 --- a/wscript +++ b/wscript @@ -647,22 +647,22 @@ video_output_features = [ 'desc': 'VAAPI acceleration', 'deps': [ 'libdl' ], 'deps_any': [ 'x11', 'wayland' ], - 'func': check_pkg_config('libva', '>= 0.34.0'), + 'func': check_pkg_config('libva', '>= 0.36.0'), }, { 'name': '--vaapi-x11', 'desc': 'VAAPI (X11 support)', 'deps': [ 'vaapi', 'x11' ], - 'func': check_pkg_config('libva-x11', '>= 0.34.0'), + 'func': check_pkg_config('libva-x11', '>= 0.36.0'), }, { 'name': '--vaapi-wayland', 'desc': 'VAAPI (Wayland support)', 'deps': [ 'vaapi', 'wayland' ], - 'func': check_pkg_config('libva-wayland', '>= 0.34.0'), + 'func': check_pkg_config('libva-wayland', '>= 0.36.0'), }, { 'name': '--vaapi-vpp', 'desc': 'VAAPI VPP', 'deps': [ 'vaapi' ], - 'func': check_pkg_config('libva', '>= 0.34.0'), + 'func': check_pkg_config('libva', '>= 0.36.0'), }, { 'name': '--vaapi-glx', 'desc': 'VAAPI GLX',