ubuntu 22.04 base (#385)

* ubuntu 22.04 base * refreshed nvidia base * skip lcb, it's in docker anyway * m-ab-s/media-autobuild_suite#2522 (comment)
jrottenberg · Feb 12, 2024 · f7089aa · f7089aa
1 parent a0cc375
commit f7089aa
Show file tree

Hide file tree

Showing 44 changed files with 2,632 additions and 973 deletions.
diff --git a/docker-images/2.8/nvidia2204/Dockerfile b/docker-images/2.8/nvidia2204/Dockerfile
diff --git a/docker-images/2.8/ubuntu2004/Dockerfile → docker-images/2.8/ubuntu2204/Dockerfile b/docker-images/2.8/ubuntu2004/Dockerfile → docker-images/2.8/ubuntu2204/Dockerfile
@@ -70,7 +70,7 @@ ARG         LIBARIBB24_SHA256SUM="f61560738926e57f9173510389634d8c06cabedfa857db
 
 ARG         MAKEFLAGS="-j2"
 ARG         PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig"
-ARG         PREFIX=/opt/ffmpeg
+ARG         PREFIX="/opt/ffmpeg"
 ARG         LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64"
 
 
@@ -404,29 +404,6 @@ RUN \
         make install && \
         rm -rf ${DIR}
 
-RUN \
-        DIR=/tmp/libxcb-proto && \
-        mkdir -p ${DIR} && \
-        cd ${DIR} && \
-        curl -sLO https://xcb.freedesktop.org/dist/xcb-proto-${XCBPROTO_VERSION}.tar.gz && \
-        tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \
-        ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \
-        ./configure --prefix="${PREFIX}" && \
-        make && \
-        make install && \
-        rm -rf ${DIR}
-
-RUN \
-        DIR=/tmp/libxcb && \
-        mkdir -p ${DIR} && \
-        cd ${DIR} && \
-        curl -sLO https://xcb.freedesktop.org/dist/libxcb-${LIBXCB_VERSION}.tar.gz && \
-        tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \
-        ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \
-        ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \
-        make && \
-        make install && \
-        rm -rf ${DIR}
 
 ## libxml2 - for libbluray
 RUN \
@@ -543,7 +520,6 @@ RUN  \
         --enable-libwebp \
         --enable-libx264 \
         --enable-libx265 \
-        --enable-libxcb \
         --enable-libxvid \
         --enable-libzmq \
         --enable-nonfree \