diff options
Diffstat (limited to 'chromium_vaapi-other.patch')
| -rw-r--r-- | chromium_vaapi-other.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/chromium_vaapi-other.patch b/chromium_vaapi-other.patch index eaaa2252d591..4987c5adf3ea 100644 --- a/chromium_vaapi-other.patch +++ b/chromium_vaapi-other.patch @@ -3,7 +3,7 @@ Attempt to load these VA-API drivers before sandbox. diff -aur chromium-53.0.2785.101/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-53.0.2785.101.new/content/common/sandbox_linux/bpf_gpu_policy_linux.cc --- chromium-53.0.2785.101/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2016-09-07 18:02:39.000000000 -0700 -+++ chromium-53.0.2785.101.new/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2016-09-16 11:46:20.339655906 -0700 ++++ chromium-53.0.2785.101.new/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2016-09-17 20:29:48.271901245 -0700 @@ -96,7 +96,7 @@ bool IsAcceleratedVaapiVideoEncodeEnabled() { @@ -13,7 +13,7 @@ diff -aur chromium-53.0.2785.101/content/common/sandbox_linux/bpf_gpu_policy_lin const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); accelerated_encode_enabled = -@@ -302,19 +302,49 @@ +@@ -302,19 +302,50 @@ // inside the sandbox, so preload them now. if (IsAcceleratedVaapiVideoEncodeEnabled() || IsAcceleratedVideoDecodeEnabled()) { @@ -24,17 +24,18 @@ diff -aur chromium-53.0.2785.101/content/common/sandbox_linux/bpf_gpu_policy_lin + const char* NVIDIA_Drv_Video_Path = NULL; + const char* LIB_VA_Path = NULL; + const char* LIB_VA_X11_Path = NULL; -+ const char* R600_Drv_VideoPath = NULL; -+ const char* RADEONSI_Drv_VideoPath = NULL; -+ const char* VDPAU_Drv_VideoPath = NULL; ++ const char* R600_Drv_Video_Path = NULL; ++ const char* RADEONSI_Drv_Video_Path = NULL; ++ const char* VDPAU_Drv_Video_Path = NULL; ++ const char* NOUVEAU_Drv_VideoPath = NULL; + + if (IsArchitectureX86_64() || IsArchitectureI386() ) { + I965_Drv_Video_Path = "/usr/lib/dri/i965_drv_video.so"; + I965_Hybrid_Drv_Video_Path = "/usr/lib/dri/hybrid_drv_video.so"; + NVIDIA_Drv_Video_Path = "/usr/lib/dri/nvidia_drv_video.so"; -+ R600_Drv_VideoPath = "/usr/lib/dri/r600_drv_video.so"; -+ VDPAU_Drv_VideoPath = "/usr/lib/dri/vdpau_drv_video.so"; -+ RADEONSI_Drv_VideoPath = "/usr/lib/dri/radeonsi_drv_video.so"; ++ R600_Drv_Video_Path = "/usr/lib/dri/r600_drv_video.so"; ++ VDPAU_Drv_Video_Path = "/usr/lib/dri/vdpau_drv_video.so"; ++ RADEONSI_Drv_Video_Path = "/usr/lib/dri/radeonsi_drv_video.so"; + NOUVEAU_Drv_VideoPath = "/usr/lib/dri/nouveau_drv_video.so"; - if (IsArchitectureX86_64()) { @@ -51,17 +52,17 @@ diff -aur chromium-53.0.2785.101/content/common/sandbox_linux/bpf_gpu_policy_lin + if ( access(I965_Hybrid_Drv_Video_Path , X_OK|R_OK ) != -1 ) { + dlopen(I965_Hybrid_Drv_Video_Path, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); + } -+ if ( access(VDPAU_Drv_VideoPath , X_OK|R_OK ) != -1 ) { -+ dlopen(VDPAU_Drv_VideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); ++ if ( access(VDPAU_Drv_Video_Path , X_OK|R_OK ) != -1 ) { ++ dlopen(VDPAU_Drv_Video_Path, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); + } + if ( access(NVIDIA_Drv_Video_Path , X_OK|R_OK ) != -1 ) { + dlopen(NVIDIA_Drv_Video_Path, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); + } -+ if ( access(R600_Drv_VideoPath , X_OK|R_OK ) != -1 ) { -+ dlopen(R600_Drv_VideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); ++ if ( access(R600_Drv_Video_Path , X_OK|R_OK ) != -1 ) { ++ dlopen(R600_Drv_Video_Path, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); + } -+ if ( access(RADEONSI_Drv_VideoPath , X_OK|R_OK ) != -1 ) { -+ dlopen(RADEONSI_Drv_VideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); ++ if ( access(RADEONSI_Drv_Video_Path , X_OK|R_OK ) != -1 ) { ++ dlopen(RADEONSI_Drv_Video_Path, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); + } + if ( access(NOUVEAU_Drv_VideoPath , X_OK|R_OK ) != -1 ) { + dlopen(NOUVEAU_Drv_VideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE); |