diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0c5bf6f8e..0ff858301 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -6,6 +6,7 @@ # ALARM: Kevin Mihelich # - use -fPIC in host cflags for v7/v8 to fix print_options.c compile +# - explicitly link v5/v6 with libatomic # - remove makedepends on ffnvcodec-headers, remove --enable-nvenc, --enable-nvdec # - remove depends on aom, remove --enable-libaom # - remove depends on intel-media-sdk, remove --enable-libmfx @@ -14,8 +15,8 @@ # - remove --enable-lto pkgname=ffmpeg -pkgver=4.3.2 -pkgrel=6 +pkgver=4.4 +pkgrel=1 epoch=2 pkgdesc='Complete solution to record, convert and stream audio and video' arch=(x86_64) @@ -41,6 +42,7 @@ depends=( libmodplug libpulse libraw1394 + librsvg-2.so libsoxr libssh libtheora @@ -94,7 +96,7 @@ provides=( libswresample.so libswscale.so ) -_tag=f719f869907764e6412a6af6e178c46e5f915d25 +_tag=dc91b913b6260e85e1304c74ff7bb3c22a8c9fb1 source=( git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag} vmaf-model-path.patch @@ -120,6 +122,7 @@ build() { cd ffmpeg [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"' + [[ $CARCH == "armv6h" || $CARCH == 'arm' ]] && CONFIG='--extra-libs="-latomic"' ./configure \ --prefix=/usr \ @@ -150,6 +153,7 @@ build() { --enable-libopenjpeg \ --enable-libopus \ --enable-libpulse \ + --enable-librsvg \ --enable-libsoxr \ --enable-libspeex \ --enable-libsrt \