update vaapi

Author: AkashiSN

.github/workflows/build.yml

@@ -15,6 +15,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: install libva-drm2
+        run: |
+          apt update
+          apt install -y libva-drm2
+
       - name: build ffmpeg
         run: |
           while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &

README.md

@@ -172,6 +172,8 @@ $ sudo docker run --gpus all ffmpeg-cuda -hwaccel cuvid -c:v h264_cuvid -i https
 
 If you want to enable CUDA, please refer to [these](#Cuda-installation) and install the SDK.
 
+If you want to enable Vaapi, please refer to [these](#Vaapi-installation) and install the driver.
+
 ```bash
 $ ./build-ffmpeg --build
 ```

build-ffmpeg

@@ -590,11 +590,11 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 
 	# Vaapi doesn't work well with static links ffmpeg.
 	if [ -z "$LDEXEFLAGS" ]; then
-		if library_exists "libdrm" ; 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-static --enable-shared CFLAGS=-fPIC
+				execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static CFLAGS=-fPIC
 				execute make -j $MJOBS
 				execute make install
 				build_done "libpciaccess"
@@ -617,14 +617,6 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 				execute make install
 				build_done "libva"
 			fi
-
-			if build "intel-vaapi-driver"; then
-				download "https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2"
-				execute ./configure --prefix="${WORKSPACE}" --disable-static --enable-shared
-				execute make -j $MJOBS
-				execute make install
-				build_done "intel-vaapi-driver"
-			fi
 			CONFIGURE_OPTIONS+=("--enable-vaapi")
 		fi
 	fi

cuda-centos.dockerfile

@@ -4,8 +4,8 @@ FROM nvidia/cuda:11.1-devel-centos${VER} AS build
 
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
 
-RUN yum groupinstall -y "Development Tools" \
-    && yum install -y kernel-devel kernel-headers curl python3 vaapi-driver-i965 \
+RUN yum group install -y "Development Tools" \
+    && yum install -y curl python3 libva \
     && rm -rf /var/cache/yum/* \
     && yum clean all
 

cuda-ubuntu.dockerfile

@@ -5,7 +5,7 @@ FROM nvidia/cuda:11.1-devel-ubuntu${VER} AS build
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
 
 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 python3 libva-drm2 \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates