extra/ffmpeg4.4 to 4.4.4-6

This commit is contained in:
Kevin Mihelich 2024-06-21 22:33:11 +00:00
parent 2cfc1774a3
commit 647c563930
2 changed files with 2 additions and 15 deletions

View file

@ -1,14 +1,12 @@
pkgbase = ffmpeg4.4 pkgbase = ffmpeg4.4
pkgdesc = Complete solution to record, convert and stream audio and video pkgdesc = Complete solution to record, convert and stream audio and video
pkgver = 4.4.4 pkgver = 4.4.4
pkgrel = 5 pkgrel = 6
url = https://ffmpeg.org/ url = https://ffmpeg.org/
arch = x86_64 arch = x86_64
license = GPL3 license = GPL3
makedepends = amf-headers makedepends = amf-headers
makedepends = avisynthplus makedepends = avisynthplus
makedepends = clang
makedepends = ffnvcodec-headers
makedepends = git makedepends = git
makedepends = ladspa makedepends = ladspa
makedepends = nasm makedepends = nasm

View file

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