Skip to content

Commit 3d86734

Browse files
committed
update vaapi
1 parent 8b95893 commit 3d86734

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

build-ffmpeg

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ mkdir -p "$PACKAGES"
220220
mkdir -p "$WORKSPACE"
221221

222222
export PATH="${WORKSPACE}/bin:$PATH"
223+
export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig"
223224

224225
if ! command_exists "make"; then
225226
echo "make not installed.";
@@ -338,7 +339,7 @@ if build "libvpx"; then
338339
sed "s/-Wl,--no-undefined -Wl,-soname/-Wl,-undefined,error -Wl,-install_name/g" build/make/Makefile.patched > build/make/Makefile
339340
fi
340341

341-
execute ./configure --prefix="${WORKSPACE}" --disable-unit-tests --disable-shared
342+
execute ./configure --prefix="${WORKSPACE}" --disable-unit-tests --disable-shared --as=yasm
342343
execute make -j $MJOBS
343344
execute make install
344345

@@ -367,7 +368,7 @@ CONFIGURE_OPTIONS+=("--enable-libxvid")
367368

368369
if build "vid_stab"; then
369370
download "https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz" "vid.stab-1.1.0.tar.gz"
370-
execute cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH="${WORKSPACE}" -DUSE_OMP=OFF -DENABLE_SHARED:bool=off .
371+
execute cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DUSE_OMP=OFF -DENABLE_SHARED=off .
371372
execute make
372373
execute make install
373374

@@ -380,7 +381,7 @@ if build "av1"; then
380381
download "https://aomedia.googlesource.com/aom/+archive/430d58446e1f71ec2283af0d6c1879bc7a3553dd.tar.gz" "av1.tar.gz" "av1"
381382
make_dir "$PACKAGES"/aom_build
382383
cd "$PACKAGES"/aom_build || exit
383-
execute cmake -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX:PATH="${WORKSPACE}" "$PACKAGES"/av1
384+
execute cmake -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib "$PACKAGES"/av1
384385
execute make -j $MJOBS
385386
execute make install
386387

@@ -474,7 +475,7 @@ if build "srt"; then
474475
export OPENSSL_ROOT_DIR="${WORKSPACE}"
475476
export OPENSSL_LIB_DIR="${WORKSPACE}"/lib
476477
export OPENSSL_INCLUDE_DIR="${WORKSPACE}"/include/
477-
execute cmake . -DCMAKE_INSTALL_PREFIX:PATH="${WORKSPACE}" -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_APPS=OFF -DUSE_STATIC_LIBSTDCXX=ON
478+
execute cmake . -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_APPS=OFF -DUSE_STATIC_LIBSTDCXX=ON
478479
execute make install
479480

480481
if [ -n "$LDEXEFLAGS" ]; then
@@ -512,7 +513,11 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
512513

513514
# Vaapi doesn't work well with static links ffmpeg.
514515
if [ -z "$LDEXEFLAGS" ]; then
516+
# If the libva development SDK is installed, enable vaapi.
515517
if library_exists "libva" ; then
518+
if build "vaapi"; then
519+
build_done "vaapi"
520+
fi
516521
CONFIGURE_OPTIONS+=("--enable-vaapi")
517522
fi
518523
fi

cuda-centos.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM nvidia/cuda:11.1-devel-centos${VER} AS build
55
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
66

77
RUN yum group install -y "Development Tools" \
8-
&& yum install -y curl python3 libva \
8+
&& yum install -y curl libva-devel \
99
&& rm -rf /var/cache/yum/* \
1010
&& yum clean all
1111

0 commit comments

Comments
 (0)