Skip to content

Commit

Permalink
Improvement: library updates and ensure we pull in libva for QSV supp…
Browse files Browse the repository at this point in the history
…ort. (#67)

Library updates and QSV improvements (libva).
  • Loading branch information
hjdhjd authored Oct 22, 2023
1 parent 7303558 commit 4fa8f5d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 13 deletions.
39 changes: 27 additions & 12 deletions build-ffmpeg
Original file line number Diff line number Diff line change
Expand Up @@ -506,23 +506,24 @@ if [[ "${TARGET_OS}" == "raspbian" ]]; then
CONFIGURE_OPTIONS+=("--enable-omx-rpi")
fi

if build "giflib" "5.2.1"; then
if ! isLinux; then

download "https://downloads.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz"
if build "giflib" "5.2.1"; then

if [[ "${TARGET_OS}" == "darwin" ]]; then
download "https://downloads.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz"

download "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
execute patch -p0 --forward "${PACKAGES}/giflib-5.2.1/Makefile" "${PACKAGES}/Makefile.patch" || true
fi
#multicore build disabled for this library
execute make
execute make PREFIX="${WORKSPACE}" install
if [[ "${TARGET_OS}" == "darwin" ]]; then

build_done "giflib" "5.2.1"
fi
download "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
execute patch -p0 --forward "${PACKAGES}/giflib-5.2.1/Makefile" "${PACKAGES}/Makefile.patch" || true
fi
#multicore build disabled for this library
execute make
execute make PREFIX="${WORKSPACE}" install

build_done "giflib" "5.2.1"
fi

if ! isLinux; then

if build "pkg-config" "0.29.2"; then

Expand Down Expand Up @@ -1346,6 +1347,20 @@ if isLinux && [[ "${TARGET_ARCH}" == "x86_64" ]]; then

CONFIGURE_OPTIONS+=("--enable-libvpl")

# Libva support.
if build "libva" "latest"; then

download "https://github.com/intel/libva/archive/refs/tags/2.20.0.tar.gz" "libva-2.20.0.tar.gz"

execute env LIBTOOLIZE="${WORKSPACE}/bin/libtoolize" ./autogen.sh --prefix="${WORKSPACE}" --with-drivers-path="/usr/lib/x86_64-linux-gnu/dri" --enable-static --disable-shared
execute make -j ${MJOBS}
execute make install

build_done "libva" "2.20.0"
fi

CONFIGURE_OPTIONS+=("--enable-vaapi")

if command_exists "nvcc"; then

if build "nv-codec" "11.1.5.2"; then
Expand Down
3 changes: 2 additions & 1 deletion prepare-build
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ case $ID in

alpine)
echo "Configuring the Alpine Linux build environment."
apk add autoconf automake bash cmake curl diffutils g++ gcc git lame-dev libogg-static libpng-static libtheora-dev libtheora-static libvorbis-dev libvorbis-static linux-headers m4 make meson nasm opencore-amr-dev openssl-dev openssl-libs-static pcre-dev perl python3 samurai tar xz yasm zlib-dev zlib-static
apk add autoconf automake bash cmake curl diffutils g++ gcc giflib-static git lame-dev libdrm-dev libogg-static libpng-static libtheora-dev libtheora-static libtool libvorbis-dev libvorbis-static linux-headers m4 make meson nasm opencore-amr-dev openssl-dev openssl-libs-static pcre-dev perl python3 samurai tar xz yasm zlib-dev zlib-static
;;

esac

0 comments on commit 4fa8f5d

Please sign in to comment.