From 0065ff3229a11949f1ad476e23610b71ec29606f Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Sat, 10 Jun 2023 09:25:37 -0400
Subject: [PATCH] rearrange libva libs

---
 Dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dbbc09f..5f96c1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG FFMPEG_VERSION
 # common env
 ENV \
   DEBIAN_FRONTEND="noninteractive" \
-  MAKEFLAGS="-j4"
+  MAKEFLAGS="-j8"
 
 # versions
 ENV \
@@ -233,7 +233,7 @@ RUN \
   echo "**** compiling libdrm ****" && \
   cd /tmp/libdrm && \
   meson setup \
-    --prefix=/usr/local --libdir=lib \
+    --prefix=/usr/local/lib --libdir=x86_64-linux-gnu \
     -Dvalgrind=disabled \
     . build && \
   ninja -C build && \
@@ -520,7 +520,7 @@ RUN \
   ldconfig && \
   mkdir -p \
     /buildout/usr/local/bin \
-    /buildout/usr/lib \
+    /buildout/usr/local/lib/x86_64-linux-gnu \
     /buildout/etc/OpenCL/vendors && \
   cp \
     /tmp/ffmpeg/ffmpeg \
@@ -528,9 +528,12 @@ RUN \
   cp \
     /tmp/ffmpeg/ffprobe \
     /buildout/usr/local/bin && \
-  ldd /tmp/ffmpeg/ffmpeg \
-    | awk '/local/ {print $3}' \
-    | xargs -i cp -L {} /buildout/usr/lib/ && \
+  cp -a \
+    /usr/local/lib/lib* \
+    /buildout/usr/local/lib/ && \
+  cp -a \
+    /usr/local/lib/x86_64-linux-gnu/lib* \
+    /buildout/usr/local/lib/x86_64-linux-gnu/ && \
   echo \
     'libnvidia-opencl.so.1' > \
     /buildout/etc/OpenCL/vendors/nvidia.icd