summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-12-15 12:48:22 +0000
committerDaniel Bermond2019-12-15 12:48:55 +0000
commitc52d7deb645c01cb921264d026bc1355c0268cab (patch)
treeee881e9d3bdf060a131bd8ef2514de509290d105
parent962e89e0243ce7df4ea8547ad4ccf7b915a36777 (diff)
downloadaur-c52d7deb645c01cb921264d026bc1355c0268cab.tar.gz
Updated to version 4.2.1
-rw-r--r--.SRCINFO42
-rw-r--r--PKGBUILD87
-rw-r--r--ffmpeg-decklink-sdk-11.patch128
3 files changed, 80 insertions, 177 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3412cc5544c..47ec4e495d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,31 @@
pkgbase = ffmpeg-decklink
pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
- pkgver = 4.1.4
+ pkgver = 4.2.1
pkgrel = 1
epoch = 1
- url = https://ffmpeg.org/
+ url = https://www.ffmpeg.org/
arch = x86_64
license = custom: nonfree and unredistributable
makedepends = nasm
makedepends = ffnvcodec-headers
makedepends = ladspa
- makedepends = blackmagic-decklink-sdk
+ makedepends = decklink-sdk
depends = alsa-lib
depends = aom
depends = bzip2
depends = fontconfig
depends = fribidi
- depends = glibc
depends = gmp
depends = gnutls
depends = gsm
depends = jack
depends = lame
+ depends = libass.so
depends = libavc1394
+ depends = libbluray.so
+ depends = libdav1d.so
depends = libdrm
+ depends = libfreetype.so
depends = libiec61883
depends = libmodplug
depends = libomxil-bellagio
@@ -31,13 +34,23 @@ pkgbase = ffmpeg-decklink
depends = libsoxr
depends = libssh
depends = libtheora
+ depends = libva.so
+ depends = libva-drm.so
+ depends = libva-x11.so
depends = libvdpau
+ depends = libvidstab.so
+ depends = libvorbisenc.so
+ depends = libvorbis.so
+ depends = libvpx.so
depends = libwebp
depends = libx11
+ depends = libx264.so
+ depends = libx265.so
depends = libxcb
depends = libxext
depends = libxml2
depends = libxv
+ depends = libxvidcore.so
depends = opencore-amr
depends = openjpeg2
depends = opus
@@ -46,19 +59,6 @@ pkgbase = ffmpeg-decklink
depends = v4l-utils
depends = xz
depends = zlib
- depends = libass.so
- depends = libbluray.so
- depends = libfreetype.so
- depends = libva-drm.so
- depends = libva.so
- depends = libva-x11.so
- depends = libvidstab.so
- depends = libvorbisenc.so
- depends = libvorbis.so
- depends = libvpx.so
- depends = libx264.so
- depends = libx265.so
- depends = libxvidcore.so
optdepends = ladspa: LADSPA filters
provides = libavcodec.so
provides = libavdevice.so
@@ -70,14 +70,12 @@ pkgbase = ffmpeg-decklink
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.xz
- source = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.xz.asc
- source = ffmpeg-decklink-sdk-11.patch
+ source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz
+ source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz.asc
source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
- sha256sums = f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1
+ sha256sums = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
sha256sums = SKIP
- sha256sums = 96500257c72c664a9e7417d9aee3d0b2a4436f836e9733dcf1c9c30926b642df
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-decklink
diff --git a/PKGBUILD b/PKGBUILD
index 5149c03f7ef..336fbe6b489 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,70 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
# Contributor: Jan Koppe <post@jankoppe.de>
pkgname=ffmpeg-decklink
-pkgver=4.1.4
+pkgver=4.2.1
pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
arch=('x86_64')
-url='https://ffmpeg.org/'
+url='https://www.ffmpeg.org/'
license=('custom: nonfree and unredistributable')
-depends=('alsa-lib' 'aom' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
- 'jack' 'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug'
- 'libomxil-bellagio' 'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora'
- 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv'
- 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
- 'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so'
- 'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
- 'libx264.so' 'libx265.so' 'libxvidcore.so')
+depends=(
+ 'alsa-lib'
+ 'aom'
+ 'bzip2'
+ 'fontconfig'
+ 'fribidi'
+ 'gmp'
+ 'gnutls'
+ 'gsm'
+ 'jack'
+ 'lame'
+ 'libass.so'
+ 'libavc1394'
+ 'libbluray.so'
+ 'libdav1d.so'
+ 'libdrm'
+ 'libfreetype.so'
+ 'libiec61883'
+ 'libmodplug'
+ 'libomxil-bellagio'
+ 'libpulse'
+ 'libraw1394'
+ 'libsoxr'
+ 'libssh'
+ 'libtheora'
+ 'libva.so'
+ 'libva-drm.so'
+ 'libva-x11.so'
+ 'libvdpau'
+ 'libvidstab.so'
+ 'libvorbisenc.so'
+ 'libvorbis.so'
+ 'libvpx.so'
+ 'libwebp'
+ 'libx11'
+ 'libx264.so'
+ 'libx265.so'
+ 'libxcb'
+ 'libxext'
+ 'libxml2'
+ 'libxv'
+ 'libxvidcore.so'
+ 'opencore-amr'
+ 'openjpeg2'
+ 'opus'
+ 'sdl2'
+ 'speex'
+ 'v4l-utils'
+ 'xz'
+ 'zlib'
+)
makedepends=(
# official repositories:
'nasm' 'ffnvcodec-headers' 'ladspa'
# AUR:
- 'blackmagic-decklink-sdk'
+ 'decklink-sdk'
)
optdepends=('ladspa: LADSPA filters')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
@@ -29,20 +72,12 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'ffmpeg')
conflicts=('ffmpeg')
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
- 'ffmpeg-decklink-sdk-11.patch'
'LICENSE')
-sha256sums=('f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1'
+sha256sums=('cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4'
'SKIP'
- '96500257c72c664a9e7417d9aee3d0b2a4436f836e9733dcf1c9c30926b642df'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-prepare() {
- cd "ffmpeg-${pkgver}"
-
- patch -Np1 -i "${srcdir}/ffmpeg-decklink-sdk-11.patch"
-}
-
build() {
cd "ffmpeg-${pkgver}"
@@ -61,6 +96,7 @@ build() {
--enable-libaom \
--enable-libass \
--enable-libbluray \
+ --enable-libdav1d \
--enable-libdrm \
--enable-libfreetype \
--enable-libfribidi \
@@ -101,10 +137,7 @@ build() {
}
package() {
- cd "ffmpeg-${pkgver}"
-
- make DESTDIR="$pkgdir" install
-
- install -D -m755 tools/qt-faststart -t "${pkgdir}/usr/bin"
- install -D -m644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ make -C "ffmpeg-${pkgver}" DESTDIR="$pkgdir" install
+ install -D -m755 "ffmpeg-${pkgver}/tools/qt-faststart" -t "${pkgdir}/usr/bin"
+ install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
diff --git a/ffmpeg-decklink-sdk-11.patch b/ffmpeg-decklink-sdk-11.patch
deleted file mode 100644
index dd655235d6b..00000000000
--- a/ffmpeg-decklink-sdk-11.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Naurp a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
---- a/libavdevice/decklink_common.cpp 2019-04-01 11:16:31.000000000 +0000
-+++ b/libavdevice/decklink_common.cpp 2019-04-19 19:12:28.000000000 +0000
-@@ -81,9 +81,9 @@ static int decklink_get_attr_string(IDec
- {
- DECKLINK_STR tmp;
- HRESULT hr;
-- IDeckLinkAttributes *attr;
-+ IDeckLinkProfileAttributes *attr;
- *s = NULL;
-- if (dl->QueryInterface(IID_IDeckLinkAttributes, (void **)&attr) != S_OK)
-+ if (dl->QueryInterface(IID_IDeckLinkProfileAttributes, (void **)&attr) != S_OK)
- return AVERROR_EXTERNAL;
- hr = attr->GetString(cfg_id, &tmp);
- attr->Release();
-@@ -149,11 +149,28 @@ int ff_decklink_set_configs(AVFormatCont
- if (ctx->duplex_mode) {
- DECKLINK_BOOL duplex_supported = false;
-
-+#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
-+ IDeckLinkProfileManager *manager = NULL;
-+ if (ctx->dl->QueryInterface(IID_IDeckLinkProfileManager, (void **)&manager) == S_OK)
-+ duplex_supported = true;
-+#else
- if (ctx->attr->GetFlag(BMDDeckLinkSupportsDuplexModeConfiguration, &duplex_supported) != S_OK)
- duplex_supported = false;
-+#endif
-
- if (duplex_supported) {
-+#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
-+ IDeckLinkProfile *profile = NULL;
-+ BMDProfileID bmd_profile_id = ctx->duplex_mode == 2 ? bmdProfileOneSubDeviceFullDuplex : bmdProfileTwoSubDevicesHalfDuplex;
-+ res = manager->GetProfile(bmd_profile_id, &profile);
-+ if (res == S_OK) {
-+ res = profile->SetActive();
-+ profile->Release();
-+ }
-+ manager->Release();
-+#else
- res = ctx->cfg->SetInt(bmdDeckLinkConfigDuplexMode, ctx->duplex_mode == 2 ? bmdDuplexModeFull : bmdDuplexModeHalf);
-+#endif
- if (res != S_OK)
- av_log(avctx, AV_LOG_WARNING, "Setting duplex mode failed.\n");
- else
-@@ -182,7 +199,11 @@ int ff_decklink_set_format(AVFormatConte
- {
- struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
- struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
-+#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
-+ DECKLINK_BOOL support;
-+#else
- BMDDisplayModeSupport support;
-+#endif
- IDeckLinkDisplayModeIterator *itermode;
- IDeckLinkDisplayMode *mode;
- int i = 1;
-@@ -243,6 +264,31 @@ int ff_decklink_set_format(AVFormatConte
-
- if (ctx->bmd_mode == bmdModeUnknown)
- return -1;
-+
-+#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000
-+ if (direction == DIRECTION_IN) {
-+ if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format,
-+ bmdVideoInputFlagDefault,
-+ &support) != S_OK)
-+ return -1;
-+ } else {
-+ BMDDisplayMode actualMode = ctx->bmd_mode;
-+ if (!ctx->supports_vanc || ctx->dlo->DoesSupportVideoMode(bmdVideoConnectionUnspecified, ctx->bmd_mode, ctx->raw_format,
-+ bmdVideoOutputVANC,
-+ &actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) {
-+ /* Try without VANC enabled */
-+ if (ctx->dlo->DoesSupportVideoMode(bmdVideoConnectionUnspecified, ctx->bmd_mode, ctx->raw_format,
-+ bmdVideoOutputFlagDefault,
-+ &actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) {
-+ return -1;
-+ }
-+ ctx->supports_vanc = 0;
-+ }
-+
-+ }
-+ if (support)
-+ return 0;
-+#else
- if (direction == DIRECTION_IN) {
- if (ctx->dli->DoesSupportVideoMode(ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format,
- bmdVideoOutputFlagDefault,
-@@ -264,6 +310,7 @@ int ff_decklink_set_format(AVFormatConte
- }
- if (support == bmdDisplayModeSupported)
- return 0;
-+#endif
-
- return -1;
- }
-@@ -468,7 +515,7 @@ int ff_decklink_init_device(AVFormatCont
- return AVERROR_EXTERNAL;
- }
-
-- if (ctx->dl->QueryInterface(IID_IDeckLinkAttributes, (void **)&ctx->attr) != S_OK) {
-+ if (ctx->dl->QueryInterface(IID_IDeckLinkProfileAttributes, (void **)&ctx->attr) != S_OK) {
- av_log(avctx, AV_LOG_ERROR, "Could not get attributes interface for '%s'\n", name);
- ff_decklink_cleanup(avctx);
- return AVERROR_EXTERNAL;
-diff -Naurp a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
---- a/libavdevice/decklink_common.h 2019-04-01 11:16:31.000000000 +0000
-+++ b/libavdevice/decklink_common.h 2019-04-19 19:12:28.000000000 +0000
-@@ -24,6 +24,10 @@
- #define AVDEVICE_DECKLINK_COMMON_H
-
- #include <DeckLinkAPIVersion.h>
-+#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b000000
-+#define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes
-+#define IDeckLinkProfileAttributes IDeckLinkAttributes
-+#endif
-
- #include "libavutil/thread.h"
- #include "decklink_common_c.h"
-@@ -87,7 +91,7 @@ struct decklink_ctx {
- IDeckLinkOutput *dlo;
- IDeckLinkInput *dli;
- IDeckLinkConfiguration *cfg;
-- IDeckLinkAttributes *attr;
-+ IDeckLinkProfileAttributes *attr;
- decklink_output_callback *output_callback;
-
- /* DeckLink mode information */