diff --git a/extra/ffmpeg4.4/.SRCINFO b/extra/ffmpeg4.4/.SRCINFO index d968e6229..86a45c36c 100644 --- a/extra/ffmpeg4.4/.SRCINFO +++ b/extra/ffmpeg4.4/.SRCINFO @@ -1,14 +1,12 @@ pkgbase = ffmpeg4.4 pkgdesc = Complete solution to record, convert and stream audio and video pkgver = 4.4.4 - pkgrel = 5 + pkgrel = 6 url = https://ffmpeg.org/ arch = x86_64 license = GPL3 makedepends = amf-headers makedepends = avisynthplus - makedepends = clang - makedepends = ffnvcodec-headers makedepends = git makedepends = ladspa makedepends = nasm diff --git a/extra/ffmpeg4.4/PKGBUILD b/extra/ffmpeg4.4/PKGBUILD index a51966236..35cbc2805 100644 --- a/extra/ffmpeg4.4/PKGBUILD +++ b/extra/ffmpeg4.4/PKGBUILD @@ -16,7 +16,7 @@ pkgname=ffmpeg4.4 pkgver=4.4.4 -pkgrel=5 +pkgrel=6 pkgdesc='Complete solution to record, convert and stream audio and video' arch=(x86_64) url=https://ffmpeg.org/ @@ -76,7 +76,6 @@ depends=( makedepends=( amf-headers avisynthplus - clang git ladspa nasm @@ -108,18 +107,12 @@ pkgver() { prepare() { cd ffmpeg - git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus git cherry-pick -n 031f1561cd286596cdb374da32f8aa816ce3b135 # remove compressed_ten_bit_format patch -p1 -i ../binutils-2.41.patch # Fix build with binutils 2.41 - - # use non-deprecated nvenc GUID for conftest - git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f - git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500 } build() { cd ffmpeg - [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"' ./configure \ @@ -133,7 +126,6 @@ build() { --disable-stripping \ --enable-amf \ --enable-avisynth \ - --enable-cuda-llvm \ --enable-fontconfig \ --enable-gmp \ --enable-gnutls \ @@ -183,9 +175,7 @@ build() { package() { make DESTDIR="${pkgdir}" -C ffmpeg install - cd "${pkgdir}" - # Move libs to /usr/lib, except the .so symlinks local f for f in usr/lib/ffmpeg4.4/*; do @@ -195,7 +185,6 @@ package() { mv "$f" usr/lib fi done - rm -r usr/share }