update vaapi

Author: AkashiSN

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:20.04 AS build
 
 RUN apt-get update \
-    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 i965-va-driver \
+    && apt-get -y --no-install-recommends install build-essential curl ca-certificates libdrm-dev \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates
 

README.md

@@ -48,10 +48,6 @@ because I don't have the resources and the time to maintain other systems.
     * Encoders
         * H264 `nvenc_h264`
         * H265 `nvenc_hevc`
-* `amf`: [Advanced Media Framework SDK](https://gpuopen.com/advanced-media-framework/). Optimal access to AMD GPUs for multimedia processing. Supported codecs in amf:
-    * Encoders
-        * H264 `h264_amf`
-        * H265 `hevc_amf`
 * `vaapi`: [Video Acceleration API](https://trac.ffmpeg.org/wiki/Hardware/VAAPI). Installation is triggered only if libva driver installation is detected, follow [these](#Vaapi-installation) instructions for installation. Supported codecs in vaapi:
     * Encoders
         * H264 `h264_vaapi`
@@ -194,10 +190,10 @@ You will need the libva driver, so please install it below.
 
 ```bash
 # Debian and Ubuntu
-$ sudo apt install vainfo
+$ sudo apt install libva-dev vainfo
 
 # Fedora and CentOS
-$ sudo dnf install libva libva-intel-driver libva-utils
+$ sudo dnf install libva-devel libva-intel-driver libva-utils
 ```
 
 ## Usage

build-ffmpeg

@@ -132,11 +132,9 @@ command_exists () {
 }
 
 library_exists () {
-	if ! command_exists "ldconfig"; then
-		return 1
-	fi
-
-	if ! [ -n "$(ldconfig -p | grep "$1")" ]; then
+	local result=0
+	local output=$(pkg-config --exists --print-errors "$1" 2>&1 > /dev/null) || result=$?
+	if [ ! "$result" = "0" ]; then
 		return 1
 	fi
 
@@ -238,62 +236,11 @@ if ! command_exists "curl"; then
 	exit 1
 fi
 
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	if ! command_exists "python3" ; then
-		echo "python3 not installed.";
-		exit 1
-	fi
-fi
 
 ##
 ## build tools
 ##
 
-if build "m4"; then
-	download "https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz"
-	# https://lists.gnu.org/archive/html/bug-m4/2018-08/msg00000.html
-	# No new version of M4 has been released, so a patch has been applied.
-	execute curl -sLJO https://github.com/easybuilders/easybuild-easyconfigs/raw/master/easybuild/easyconfigs/m/M4/M4-1.4.18_glibc_2.28.patch
-	execute patch -p1 -d . < M4-1.4.18_glibc_2.28.patch
-	execute ./configure --prefix="${WORKSPACE}"
-	execute make -j $MJOBS
-	execute make install
-	build_done "m4"
-fi
-
-if build "autoconf"; then
-	download "https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz"
-	execute ./configure --prefix="${WORKSPACE}"
-	execute make -j $MJOBS
-	execute make install
-	build_done "autoconf"
-fi
-
-if build "automake"; then
-	download "https://ftp.gnu.org/gnu/automake/automake-1.16.tar.xz"
-	execute ./configure --prefix="${WORKSPACE}"
-	execute make -j $MJOBS
-	execute make install
-	build_done "automake"
-fi
-
-if build "libtool"; then
-	download "https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz"
-	execute ./configure --prefix="${WORKSPACE}"  --disable-shared --enable-static
-	execute make -j $MJOBS
-	execute make install
-	build_done "libtool"
-fi
-
-if build "util-macros"; then
-	download "https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-1.19.2/macros-util-macros-1.19.2.tar.bz2" "util-macros-1.19.2.tar.bz2"
-	execute autoreconf --force --verbose --install
-	execute ./configure --prefix="${WORKSPACE}"
-	execute make -j $MJOBS
-	execute make install
-	build_done "util-macros"
-fi
-
 if build "yasm"; then
 	download "https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-1.3.0.tar.gz"
 	execute ./configure --prefix="${WORKSPACE}"
@@ -311,7 +258,7 @@ if build "nasm"; then
 fi
 
 if build "pkg-config"; then
-	download "https://gitlab.freedesktop.org/pkg-config/pkg-config/-/archive/pkg-config-0.29.2/pkg-config-pkg-config-0.29.2.tar.bz2" "pkg-config-0.29.2.tar.bz2"
+	download "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
 	execute autoreconf --force --verbose --install
 	execute ./configure --silent --prefix="${WORKSPACE}" --with-pc-path="${WORKSPACE}"/lib/pkgconfig --with-internal-glib
 	execute make -j $MJOBS
@@ -345,23 +292,6 @@ if build "cmake"; then
 	build_done "cmake"
 fi
 
-# Required for building vaapi tools so linux only
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	if build "meson"; then
-		download "https://github.com/mesonbuild/meson/releases/download/0.55.3/meson-0.55.3.tar.gz"
-		execute ln -s $(pwd)/meson.py ${WORKSPACE}/bin/meson
-		build_done "meson"
-	fi
-
-	if build "ninja"; then
-		download "https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz" "ninja-1.10.1.tar.gz"
-		execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" .
-		execute make -j $MJOBS
-		execute make install
-		build_done "ninja"
-	fi
-fi
-
 
 ##
 ## video library
@@ -580,43 +510,9 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 		CONFIGURE_OPTIONS+=("--nvccflags=-gencode arch=compute_52,code=sm_52")
 	fi
 
-	if build "amf"; then
-		download "https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/1.4.16.1.tar.gz" "amf-1.4.16.1.tar.gz"
-		execute mkdir -p "${WORKSPACE}"/include/AMF
-		execute cp -r amf/public/include/* "${WORKSPACE}"/include/AMF/
-		build_done "amf"
-	fi
-	CONFIGURE_OPTIONS+=("--enable-amf")
-
 	# Vaapi doesn't work well with static links ffmpeg.
 	if [ -z "$LDEXEFLAGS" ]; then
 		if library_exists "libva" ; then
-			if build "libpciaccess"; then
-				download "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/archive/libpciaccess-0.16/libpciaccess-libpciaccess-0.16.tar.bz2" "libpciaccess-0.16.tar.bz2"
-				execute autoreconf --force --verbose --install
-				execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static CFLAGS=-fPIC
-				execute make -j $MJOBS
-				execute make install
-				build_done "libpciaccess"
-			fi
-
-			# https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/28
-			# Since libdrm should not be statically linked, neither should libva or intel-vaapi-driver, on which it depends, be statically linked.
-			# They should be installed as drivers in your host OS.
-			if build "libdrm"; then
-				download "https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-2.4.102/drm-libdrm-2.4.102.tar.bz2" "libdrm-2.4.102.tar.bz2"
-				execute meson --prefix="${WORKSPACE}" --libdir="${WORKSPACE}"/lib builddir/
-				execute ninja -C builddir/ install
-				build_done "libdrm"
-			fi
-
-			if build "libva"; then
-				download "https://github.com/intel/libva/releases/download/2.9.0/libva-2.9.0.tar.bz2"
-				execute ./configure --prefix="${WORKSPACE}" --disable-static --enable-shared
-				execute make -j $MJOBS
-				execute make install
-				build_done "libva"
-			fi
 			CONFIGURE_OPTIONS+=("--enable-vaapi")
 		fi
 	fi

cuda-ubuntu.dockerfile

@@ -2,10 +2,11 @@ ARG VER=20.04
 
 FROM nvidia/cuda:11.1-devel-ubuntu${VER} AS build
 
+ENV DEBIAN_FRONTEND noninteractive
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
 
 RUN apt-get update \
-    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 libva-drm2 \
+    && apt-get -y --no-install-recommends install build-essential curl ca-certificates libdrm-dev \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates