summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2024-06-28 22:29:00 -0300
committerDaniel Bermond2024-06-28 22:29:00 -0300
commit6435d8fe51477822d79a786cd9ba4f42236a50d6 (patch)
tree571e7d230197bb0a5666d3e586215390c99bb9c7
parentb7ec57c97ed52bf323dd3ba814cefdddc74a119e (diff)
downloadaur-ffmpeg-full-git.tar.gz
Improve stv-vp9 patch applying
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a4d2640f84b..8b1fbfd4254f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
- pkgver = 7.1.r116028.g1080116658
+ pkgver = 7.1.r116051.g0b330d8642
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 21465ba0142c..34e88a0746a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=ffmpeg-full-git
-pkgver=7.1.r116028.g1080116658
+pkgver=7.1.r116051.g0b330d8642
pkgrel=1
_svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c'
_svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea'
@@ -173,11 +173,10 @@ sha256sums=('SKIP'
prepare() {
rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
- filterdiff -i b/libavcodec/libsvt_vp9.c "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" >"032-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/031-ffmpeg-add-svt-vp9.patch"
- patch -d ffmpeg -Np1 -i "${srcdir}/032-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+ patch -d ffmpeg -Np1 -i <(filterdiff -i b/libavcodec/libsvt_vp9.c "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch")
patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/050-ffmpeg-fix-segfault-with-avisynthplus.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch"