Skip to content

Commit 5d501b0

Browse files
committed
build: use vpl instead of mfx
1 parent 1bb2e2c commit 5d501b0

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

ffmpeg/cppbuild.sh

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ X265=3.4
4040
VPX_VERSION=1.14.0
4141
ALSA_VERSION=1.2.11
4242
FREETYPE_VERSION=2.13.2
43-
MFX_VERSION=1.35.1
43+
VPL_VERSION=2.12.0
4444
NVCODEC_VERSION=12.2.72.0
4545
XML2=libxml2-2.9.12
4646
LIBSRT_VERSION=1.5.3
@@ -63,7 +63,7 @@ download https://github.com/videolan/x265/archive/$X265.tar.gz x265-$X265.tar.gz
6363
download https://github.com/webmproject/libvpx/archive/v$VPX_VERSION.tar.gz libvpx-$VPX_VERSION.tar.gz
6464
download https://ftp.osuosl.org/pub/blfs/conglomeration/alsa-lib/alsa-lib-$ALSA_VERSION.tar.bz2 alsa-lib-$ALSA_VERSION.tar.bz2
6565
download https://ftp.osuosl.org/pub/blfs/conglomeration/freetype/freetype-$FREETYPE_VERSION.tar.xz freetype-$FREETYPE_VERSION.tar.xz
66-
download https://github.com/lu-zero/mfx_dispatch/archive/$MFX_VERSION.tar.gz mfx_dispatch-$MFX_VERSION.tar.gz
66+
download https://github.com/intel/libvpl/archive/v$VPL_VERSION.tar.gz libvpl-$VPL_VERSION.tar.gz
6767
download http://xmlsoft.org/sources/$XML2.tar.gz $XML2.tar.gz
6868
download https://github.com/Haivision/srt/archive/refs/tags/v$LIBSRT_VERSION.tar.gz srt-$LIBSRT_VERSION.tar.gz
6969
download https://github.com/FFmpeg/nv-codec-headers/archive/n$NVCODEC_VERSION.tar.gz nv-codec-headers-$NVCODEC_VERSION.tar.gz
@@ -91,7 +91,7 @@ tar --totals -xzf ../$X264.tar.gz
9191
tar --totals -xzf ../x265-$X265.tar.gz
9292
tar --totals -xzf ../libvpx-$VPX_VERSION.tar.gz
9393
tar --totals -xJf ../freetype-$FREETYPE_VERSION.tar.xz
94-
tar --totals -xzf ../mfx_dispatch-$MFX_VERSION.tar.gz
94+
tar --totals -xzf ../libvpl-$VPL_VERSION.tar.gz
9595
tar --totals -xzf ../nv-codec-headers-$NVCODEC_VERSION.tar.gz
9696
tar --totals -xzf ../$XML2.tar.gz
9797
tar --totals -xzf ../libwebp-$WEBP_VERSION.tar.gz
@@ -861,12 +861,11 @@ EOF
861861
make install
862862
LIBS=
863863
if [[ ! -z $(ldconfig -p | grep libva-drm) ]]; then
864-
cd ../mfx_dispatch-$MFX_VERSION
865-
autoreconf -fiv
866-
PKG_CONFIG_PATH="../lib/pkgconfig" ./configure --prefix=$INSTALL_PATH --disable-shared --enable-static --enable-fast-install --with-pic --host=i686-linux CFLAGS="-m32 -D__ILP32__" CXXFLAGS="-m32 -D__ILP32__ -std=c++11"
867-
make -j $MAKEJ
868-
make install
869-
ENABLE="$ENABLE --enable-libmfx"
864+
cd ../libvpl-$VPL_VERSION
865+
PKG_CONFIG_PATH=../lib/pkgconfig cmake -B _build -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-m64" -DCMAKE_CXX_FLAGS="-m64"
866+
cmake --build _build
867+
cmake --install _build
868+
ENABLE="$ENABLE --enable-libvpl"
870869
LIBS="-lva-drm -lva-x11 -lva"
871870
fi
872871
cd ../nv-codec-headers-n$NVCODEC_VERSION
@@ -1010,13 +1009,11 @@ EOF
10101009
make install
10111010
LIBS=
10121011
if [[ ! -z $(ldconfig -p | grep libva-drm) ]]; then
1013-
cd ../mfx_dispatch-$MFX_VERSION
1014-
patch -Np1 < ../../../mfx_dispatch.patch
1015-
autoreconf -fiv
1016-
PKG_CONFIG_PATH="../lib/pkgconfig" ./configure --prefix=$INSTALL_PATH --disable-shared --enable-static --enable-fast-install --with-pic --host=x86_64-linux CFLAGS="-m64" CXXFLAGS="-m64"
1017-
make -j $MAKEJ
1018-
make install
1019-
ENABLE="$ENABLE --enable-libmfx"
1012+
cd ../libvpl-$VPL_VERSION
1013+
PKG_CONFIG_PATH=../lib/pkgconfig cmake -B _build -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-m64" -DCMAKE_CXX_FLAGS="-m64"
1014+
cmake --build _build
1015+
cmake --install _build
1016+
ENABLE="$ENABLE --enable-libvpl"
10201017
LIBS="-lva-drm -lva-x11 -lva"
10211018
fi
10221019
cd ../nv-codec-headers-n$NVCODEC_VERSION
@@ -1037,7 +1034,7 @@ EOF
10371034
make install
10381035
cd ..
10391036
cd ../ffmpeg-$FFMPEG_VERSION
1040-
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE $ENABLE_VULKAN --enable-libdrm --enable-cuda --enable-cuvid --enable-nvenc --enable-pthreads --enable-libxcb --enable-libpulse --cc="gcc -m64" --extra-cflags="-I../include/ -I../include/libxml2 -I../include/mfx -I../include/svt-av1" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -lpthread -ldl -lz -lm $LIBS" || cat ffbuild/config.log
1037+
LDEXEFLAGS='-Wl,-rpath,\$$ORIGIN/' PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE $ENABLE_VULKAN --enable-libdrm --enable-cuda --enable-cuvid --enable-nvenc --enable-pthreads --enable-libxcb --enable-libpulse --cc="gcc -m64" --extra-cflags="-I../include/ -I../include/libxml2 -I../include/vpl -I../include/svt-av1" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -lpthread -ldl -lz -lm $LIBS" || cat ffbuild/config.log
10411038
make -j $MAKEJ
10421039
make install
10431040
;;

0 commit comments

Comments
 (0)