summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO75
-rw-r--r--040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch6
-rw-r--r--050-ffmpeg-fix-segfault-with-avisynthplus.patch2
-rw-r--r--060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch2
-rw-r--r--PKGBUILD86
5 files changed, 91 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 025e507ee453..2bb86c8f525d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-decklink
pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
- pkgver = 6.1.1
- pkgrel = 4
+ pkgver = 7.0.1
+ pkgrel = 1
epoch = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = ffmpeg-decklink
makedepends = avisynthplus
makedepends = clang
makedepends = ffnvcodec-headers
+ makedepends = frei0r-plugins
makedepends = ladspa
makedepends = mesa
makedepends = nasm
@@ -19,67 +20,75 @@ pkgbase = ffmpeg-decklink
depends = alsa-lib
depends = aom
depends = bzip2
+ depends = cairo
+ depends = dav1d
depends = fontconfig
+ depends = freetype2
depends = fribidi
+ depends = glib2
+ depends = glibc
depends = gmp
depends = gnutls
depends = gsm
+ depends = harfbuzz
depends = jack
depends = lame
- depends = libass.so
+ depends = libass
depends = libavc1394
- depends = libbluray.so
- depends = libbs2b.so
- depends = libdav1d.so
+ depends = libbluray
+ depends = libbs2b
depends = libdrm
- depends = libfreetype.so
+ depends = libdvdnav
+ depends = libdvdread
depends = libgl
depends = libiec61883
- depends = libjxl.so
+ depends = libjxl
depends = libmodplug
- depends = libopenmpt.so
+ depends = libopenmpt
+ depends = libplacebo
depends = libpulse
- depends = librav1e.so
depends = libraw1394
- depends = librsvg-2.so
+ depends = librsvg
depends = libsoxr
depends = libssh
depends = libtheora
- depends = libva.so
- depends = libva-drm.so
- depends = libva-x11.so
+ depends = libva
depends = libvdpau
- depends = libvidstab.so
- depends = libvorbisenc.so
- depends = libvorbis.so
- depends = libvpl.so
- depends = libvpx.so
+ depends = libvorbis
+ depends = libvpl
+ depends = libvpx
depends = libwebp
depends = libx11
- depends = libx264.so
- depends = libx265.so
depends = libxcb
depends = libxext
depends = libxml2
depends = libxv
- depends = libxvidcore.so
- depends = libzimg.so
depends = ocl-icd
depends = opencore-amr
depends = openjpeg2
depends = opus
+ depends = rav1e
+ depends = rubberband
depends = sdl2
+ depends = snappy
depends = speex
depends = srt
depends = svt-av1
depends = v4l-utils
+ depends = vapoursynth
+ depends = vid.stab
depends = vmaf
depends = vulkan-icd-loader
+ depends = x264
+ depends = x265
+ depends = xvidcore
depends = xz
+ depends = zimg
depends = zlib
optdepends = avisynthplus: for AviSynthPlus support
+ optdepends = frei0r-plugins: for Frei0r video effects support
optdepends = ladspa: for LADSPA filters
- optdepends = nvidia-utils: for Nvidia NVDEC/NVENC support
+ optdepends = nvidia-utils: for NVIDIA NVDEC/NVENC support
optdepends = vpl-runtime: for Intel Quick Sync Video
provides = libavcodec.so
provides = libavdevice.so
@@ -91,24 +100,18 @@ pkgbase = ffmpeg-decklink
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.xz
- source = https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.xz.asc
+ source = https://ffmpeg.org/releases/ffmpeg-7.0.1.tar.xz
+ source = https://ffmpeg.org/releases/ffmpeg-7.0.1.tar.xz.asc
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 = 090-ffmpeg-vulkan-headers1.3.279-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/fef22c87ada4517441701e6e61e062c9f4399c8e
- source = 100-ffmpeg-nvenc-replace-deprecated-format-specifiers.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/43b417d516b0fabbec1f02120d948f636b8a018e
- source = 110-ffmpeg-nvenc-support-sdk-12.2-bit-depth-api.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/06c2a2c425f22e7dba5cad909737a631cc676e3f
source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
- sha256sums = 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968
+ sha256sums = bce9eeb0f17ef8982390b1f37711a61b4290dc8c2a0c1a37b5857e85bfb0e4ff
sha256sums = SKIP
- sha256sums = 7d5ce8058b143bae1be10a06d79ac0f1a72daf00cf648309450d83bea249a6b1
- sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440
- sha256sums = f2f73793a45c9dffb033f23c1b10a612abe6528cbd06c04b06e8189d1ef208be
- sha256sums = c2ef9c35082ed2e5989428d086b7bfef1dfe9e0a85e6d259daf46f369f115483
- sha256sums = 8b5b6173c63d3dc280ba4110d91b1f303e1d0a1996956d51567962f570f770e5
- sha256sums = 8d7549121dfa6a3784f3cfbc30d8a4c997aaa17ce5e703e7a93b1f9a464134b4
+ sha256sums = 62509a98460d3d48afcb0ce26250def7dfed124b82acc95a3b84a2802910c1fa
+ sha256sums = b0ce071f0d9c7c5eff8e7e654e30c6f4377aa137797aeb54338c2c3a93d5472c
+ sha256sums = 4a8972bc6eae02ed9f473938b6e4d9dfa544274143dd735903073ca89633b721
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-decklink
diff --git a/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
index 091a17a7dfdc..13c32d35020d 100644
--- a/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
+++ b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
@@ -1,8 +1,8 @@
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
-@@ -1030,6 +1030,10 @@ attribute_deprecated
- int64_t av_stream_get_end_pts(const AVStream *st);
- #endif
+@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
+
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st);
diff --git a/050-ffmpeg-fix-segfault-with-avisynthplus.patch b/050-ffmpeg-fix-segfault-with-avisynthplus.patch
index 9e2ddb399c9e..70ccfdf22180 100644
--- a/050-ffmpeg-fix-segfault-with-avisynthplus.patch
+++ b/050-ffmpeg-fix-segfault-with-avisynthplus.patch
@@ -1,6 +1,6 @@
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
-@@ -142,7 +142,7 @@ static av_cold void avisynth_atexit_handler(void);
+@@ -143,7 +143,7 @@ static av_cold void avisynth_atexit_hand
static av_cold int avisynth_load_library(void)
{
diff --git a/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch b/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch
index 7caf065eb55a..bc10cbe6ab5c 100644
--- a/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch
+++ b/060-ffmpeg-fix-nvidia-vulkan-decoding-segfault.patch
@@ -1,6 +1,6 @@
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
-@@ -607,6 +607,9 @@ int ff_vk_exec_add_dep_frame(FFVulkanContext *s, FFVkExecContext *e, AVFrame *f,
+@@ -606,6 +606,9 @@ int ff_vk_exec_add_dep_frame(FFVulkanCon
uint32_t *queue_family_dst;
VkAccessFlagBits *access_dst;
diff --git a/PKGBUILD b/PKGBUILD
index 51896582c242..29a1f417a34d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Jan Koppe <post@jankoppe.de>
pkgname=ffmpeg-decklink
-pkgver=6.1.1
-pkgrel=4
+pkgver=7.0.1
+pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
arch=('x86_64')
@@ -13,63 +13,70 @@ depends=(
alsa-lib
aom
bzip2
+ cairo
+ dav1d
fontconfig
+ freetype2
fribidi
+ glib2
+ glibc
gmp
gnutls
gsm
+ harfbuzz
jack
lame
- libass.so
+ libass
libavc1394
- libbluray.so
- libbs2b.so
- libdav1d.so
+ libbluray
+ libbs2b
libdrm
- libfreetype.so
+ libdvdnav
+ libdvdread
libgl
libiec61883
- libjxl.so
+ libjxl
libmodplug
- libopenmpt.so
+ libopenmpt
+ libplacebo
libpulse
- librav1e.so
libraw1394
- librsvg-2.so
+ librsvg
libsoxr
libssh
libtheora
- libva.so
- libva-drm.so
- libva-x11.so
+ libva
libvdpau
- libvidstab.so
- libvorbisenc.so
- libvorbis.so
- libvpl.so
- libvpx.so
+ libvorbis
+ libvpl
+ libvpx
libwebp
libx11
- libx264.so
- libx265.so
libxcb
libxext
libxml2
libxv
- libxvidcore.so
- libzimg.so
ocl-icd
opencore-amr
openjpeg2
opus
+ rav1e
+ rubberband
sdl2
+ snappy
speex
srt
svt-av1
v4l-utils
+ vapoursynth
+ vid.stab
vmaf
vulkan-icd-loader
+ x264
+ x265
+ xvidcore
xz
+ zimg
zlib
)
makedepends=(
@@ -77,6 +84,7 @@ makedepends=(
avisynthplus
clang
ffnvcodec-headers
+ frei0r-plugins
ladspa
mesa
nasm
@@ -85,9 +93,11 @@ makedepends=(
decklink-sdk
)
optdepends=('avisynthplus: for AviSynthPlus support'
+ 'frei0r-plugins: for Frei0r video effects support'
'ladspa: for LADSPA filters'
- 'nvidia-utils: for Nvidia NVDEC/NVENC support'
- 'vpl-runtime: for Intel Quick Sync Video')
+ 'nvidia-utils: for NVIDIA NVDEC/NVENC support'
+ 'vpl-runtime: for Intel Quick Sync Video'
+)
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
'ffmpeg')
@@ -96,18 +106,12 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
'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'
- '090-ffmpeg-vulkan-headers1.3.279-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/fef22c87ada4517441701e6e61e062c9f4399c8e'
- '100-ffmpeg-nvenc-replace-deprecated-format-specifiers.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/43b417d516b0fabbec1f02120d948f636b8a018e'
- '110-ffmpeg-nvenc-support-sdk-12.2-bit-depth-api.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/06c2a2c425f22e7dba5cad909737a631cc676e3f'
'LICENSE')
-sha256sums=('8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968'
+sha256sums=('bce9eeb0f17ef8982390b1f37711a61b4290dc8c2a0c1a37b5857e85bfb0e4ff'
'SKIP'
- '7d5ce8058b143bae1be10a06d79ac0f1a72daf00cf648309450d83bea249a6b1'
- '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440'
- 'f2f73793a45c9dffb033f23c1b10a612abe6528cbd06c04b06e8189d1ef208be'
- 'c2ef9c35082ed2e5989428d086b7bfef1dfe9e0a85e6d259daf46f369f115483'
- '8b5b6173c63d3dc280ba4110d91b1f303e1d0a1996956d51567962f570f770e5'
- '8d7549121dfa6a3784f3cfbc30d8a4c997aaa17ce5e703e7a93b1f9a464134b4'
+ '62509a98460d3d48afcb0ce26250def7dfed124b82acc95a3b84a2802910c1fa'
+ 'b0ce071f0d9c7c5eff8e7e654e30c6f4377aa137797aeb54338c2c3a93d5472c'
+ '4a8972bc6eae02ed9f473938b6e4d9dfa544274143dd735903073ca89633b721'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
@@ -115,9 +119,6 @@ prepare() {
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}/090-ffmpeg-vulkan-headers1.3.279-fix.patch"
- patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/100-ffmpeg-nvenc-replace-deprecated-format-specifiers.patch"
- patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/110-ffmpeg-nvenc-support-sdk-12.2-bit-depth-api.patch"
}
build() {
@@ -129,12 +130,12 @@ build() {
--disable-debug \
--disable-static \
--disable-stripping \
- --disable-htmlpages \
--enable-amf \
--enable-avisynth \
--enable-cuda-llvm \
--enable-lto \
--enable-fontconfig \
+ --enable-frei0r \
--enable-gmp \
--enable-gnutls \
--enable-gpl \
@@ -145,9 +146,12 @@ build() {
--enable-libbs2b \
--enable-libdav1d \
--enable-libdrm \
+ --enable-libdvdnav \
+ --enable-libdvdread \
--enable-libfreetype \
--enable-libfribidi \
--enable-libgsm \
+ --enable-libharfbuzz \
--enable-libiec61883 \
--enable-libjack \
--enable-libjxl \
@@ -158,9 +162,12 @@ build() {
--enable-libopenjpeg \
--enable-libopenmpt \
--enable-libopus \
+ --enable-libplacebo \
--enable-libpulse \
--enable-librav1e \
--enable-librsvg \
+ --enable-librubberband \
+ --enable-libsnappy \
--enable-libsoxr \
--enable-libspeex \
--enable-libsrt \
@@ -185,6 +192,7 @@ build() {
--enable-opencl \
--enable-opengl \
--enable-shared \
+ --enable-vapoursynth \
--enable-version3 \
--enable-vulkan \
--enable-decklink \