diff --git a/.SRCINFO b/.SRCINFO index 2440ff0..a047ae6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ffmpeg-full pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgver = 7.1.1 - pkgrel = 3 + pkgrel = 4 url = https://www.ffmpeg.org/ arch = x86_64 license = LicenseRef-nonfree-and-unredistributable @@ -155,11 +155,10 @@ pkgbase = ffmpeg-full source = 030-ffmpeg-add-svt-vp9-g3b9a3fa.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/3b9a3fa43da4cc5fe60c7d22afe2be15341392ea/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch source = 031-ffmpeg-add-svt-vp9.patch source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch - source = 050-ffmpeg-fix-segfault-with-avisynthplus.patch - source = 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch - source = 070-ffmpeg-svt-av1-3.0.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95 - source = 080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch - source = 090-ffmpeg-lcevcdec4.0.0-fix.patch + source = 050-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch + source = 060-ffmpeg-svt-av1-3.0.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95 + source = 070-ffmpeg-fix-cuda-nvcc-with-gcc14.patch + source = 080-ffmpeg-lcevcdec4.0.0-fix.patch source = LICENSE validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 sha256sums = 733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1 @@ -169,7 +168,6 @@ pkgbase = ffmpeg-full sha256sums = 59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa sha256sums = aa0daffc4d234b6621b63c298dc165d29522c5087f8905a923d23ee2d164e9ad sha256sums = 57697441b8f3ff3be883a2444b4cb89eed452764d24965e74e7b101e6af7f70a - sha256sums = 26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b sha256sums = 5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15 sha256sums = b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884 sha256sums = e670e6ed4e6e614a248cedd9de461ddce2321d2fef982861c86639eaa65dce23 diff --git a/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch b/050-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch similarity index 100% rename from 060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch rename to 050-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch diff --git a/050-ffmpeg-fix-segfault-with-avisynthplus.patch b/050-ffmpeg-fix-segfault-with-avisynthplus.patch deleted file mode 100644 index e184b05..0000000 --- a/050-ffmpeg-fix-segfault-with-avisynthplus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libavformat/avisynth.c -+++ b/libavformat/avisynth.c -@@ -120,7 +120,7 @@ typedef struct AviSynthContext { - - static av_cold int avisynth_load_library(AviSynthContext *avs) - { -- avs->avs_library.library = dlopen(AVISYNTH_LIB, RTLD_NOW | RTLD_LOCAL); -+ avs->avs_library.library = dlopen(AVISYNTH_LIB, RTLD_NOW | RTLD_DEEPBIND); - if (!avs->avs_library.library) - return AVERROR_UNKNOWN; - diff --git a/080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch b/070-ffmpeg-fix-cuda-nvcc-with-gcc14.patch similarity index 100% rename from 080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch rename to 070-ffmpeg-fix-cuda-nvcc-with-gcc14.patch diff --git a/090-ffmpeg-lcevcdec4.0.0-fix.patch b/080-ffmpeg-lcevcdec4.0.0-fix.patch similarity index 100% rename from 090-ffmpeg-lcevcdec4.0.0-fix.patch rename to 080-ffmpeg-lcevcdec4.0.0-fix.patch diff --git a/PKGBUILD b/PKGBUILD index a78e715..057e483 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ffmpeg-full pkgver=7.1.1 -pkgrel=3 +pkgrel=4 _svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c' _svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' @@ -159,11 +159,10 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc} "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch" "031-ffmpeg-add-svt-vp9.patch" '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch' - '050-ffmpeg-fix-segfault-with-avisynthplus.patch' - '060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch' - '070-ffmpeg-svt-av1-3.0.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95' - '080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch' - '090-ffmpeg-lcevcdec4.0.0-fix.patch' + '050-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch' + '060-ffmpeg-svt-av1-3.0.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95' + '070-ffmpeg-fix-cuda-nvcc-with-gcc14.patch' + '080-ffmpeg-lcevcdec4.0.0-fix.patch' 'LICENSE') sha256sums=('733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1' 'SKIP' @@ -172,7 +171,6 @@ sha256sums=('733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1' '59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa' 'aa0daffc4d234b6621b63c298dc165d29522c5087f8905a923d23ee2d164e9ad' '57697441b8f3ff3be883a2444b4cb89eed452764d24965e74e7b101e6af7f70a' - '26419f819d1f3e4d0534995b73d05a8195bc7c892b74c37c3880085af027515b' '5a3731d1410747703948c87e46bb3aef820c6038f7101ab37f9d072cd1d15d15' 'b83ba1efdfec19ac54d1b0395a98d02039fe9d45bec1e6473e57a6288a304884' 'e670e6ed4e6e614a248cedd9de461ddce2321d2fef982861c86639eaa65dce23' @@ -187,11 +185,10 @@ prepare() { patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/031-ffmpeg-add-svt-vp9.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i <(filterdiff -i b/libavcodec/libsvt_vp9.c "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch") patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" - patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-segfault-with-avisynthplus.patch" - patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch" - patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-svt-av1-3.0.0-fix.patch" - patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-fix-cuda-nvcc-with-gcc14.patch" - patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/090-ffmpeg-lcevcdec4.0.0-fix.patch" + patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch" + patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-svt-av1-3.0.0-fix.patch" + patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-fix-cuda-nvcc-with-gcc14.patch" + patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-lcevcdec4.0.0-fix.patch" } build() {