diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | vlc-decklink-fix-build-with-sdk-11.patch | 152 |
3 files changed, 10 insertions, 174 deletions
@@ -1,7 +1,7 @@ pkgbase = vlc-decklink pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support) - pkgver = 3.0.6 - pkgrel = 3 + pkgver = 3.0.7.1 + pkgrel = 1 url = https://www.videolan.org/vlc/ arch = x86_64 license = LGPL2.1 @@ -164,21 +164,15 @@ pkgbase = vlc-decklink conflicts = vlc-plugin replaces = vlc-plugin options = !emptydirs - source = https://download.videolan.org/vlc/3.0.6/vlc-3.0.6.tar.xz - source = https://download.videolan.org/vlc/3.0.6/vlc-3.0.6.tar.xz.asc + source = https://download.videolan.org/vlc/3.0.7.1/vlc-3.0.7.1.tar.xz + source = https://download.videolan.org/vlc/3.0.7.1/vlc-3.0.7.1.tar.xz.asc source = update-vlc-plugin-cache.hook source = lua53_compat.patch - source = vlc-libvpx18.patch::https://github.com/videolan/vlc-3.0/commit/2688feb2742a6021ca211ae5c106b12c3d822946.patch - source = vlc-libssh2-ecdsa.patch::https://github.com/videolan/vlc-3.0/commit/db381f6edeac9d70b7545a72bc2840f42266d655.patch - source = vlc-decklink-fix-build-with-sdk-11.patch validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC - sha256sums = 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 + sha256sums = 0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 sha256sums = SKIP sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa - sha256sums = 8b7b4cb3982f2dd16bbe8ab53f4d42c70ff9ca7145daab72a61118ce12cb3564 - sha256sums = 99e85191e972d0939ee62498f47da6820020e01e834a733a995f665fd1ccef45 - sha256sums = be1ae99f62304d5291eecd181175d593b5a26a4192021528624e88d96ecf3c74 pkgname = vlc-decklink @@ -5,8 +5,8 @@ _srcname=vlc pkgname=vlc-decklink -pkgver=3.0.6 -pkgrel=3 +pkgver=3.0.7.1 +pkgrel=1 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support)' url='https://www.videolan.org/vlc/' arch=('x86_64') @@ -97,17 +97,11 @@ replaces=('vlc-plugin') options=('!emptydirs') source=("https://download.videolan.org/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.xz"{,.asc} 'update-vlc-plugin-cache.hook' - 'lua53_compat.patch' - 'vlc-libvpx18.patch'::'https://github.com/videolan/vlc-3.0/commit/2688feb2742a6021ca211ae5c106b12c3d822946.patch' - 'vlc-libssh2-ecdsa.patch'::'https://github.com/videolan/vlc-3.0/commit/db381f6edeac9d70b7545a72bc2840f42266d655.patch' - 'vlc-decklink-fix-build-with-sdk-11.patch') -sha256sums=('18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3' + 'lua53_compat.patch') +sha256sums=('0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5' 'SKIP' 'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a' - 'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa' - '8b7b4cb3982f2dd16bbe8ab53f4d42c70ff9ca7145daab72a61118ce12cb3564' - '99e85191e972d0939ee62498f47da6820020e01e834a733a995f665fd1ccef45' - 'be1ae99f62304d5291eecd181175d593b5a26a4192021528624e88d96ecf3c74') + 'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa') validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key prepare() { diff --git a/vlc-decklink-fix-build-with-sdk-11.patch b/vlc-decklink-fix-build-with-sdk-11.patch deleted file mode 100644 index fa53fd924a0a..000000000000 --- a/vlc-decklink-fix-build-with-sdk-11.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 774a96ae649ff66e4842c43c5a047b118dc411e4 Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie <fcvlcdev@free.fr> -Date: Thu, 9 May 2019 10:38:01 +0200 -Subject: [PATCH] decklink: fix compilation with SDK 11.1 (fix #22276) - -provided deprecated api entries just does not work - -(cherry picked from commit 10d6549f4eb577670cf657768bb0ad82ef6c69c1) ---- - modules/access/decklink.cpp | 9 +++++-- - modules/video_output/decklink.cpp | 42 +++++++++++++++++++++---------- - 2 files changed, 36 insertions(+), 15 deletions(-) - -diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp -index 04f0b469f4a..c0ded3f051a 100644 ---- a/modules/access/decklink.cpp -+++ b/modules/access/decklink.cpp -@@ -35,6 +35,11 @@ - - #include <DeckLinkAPI.h> - #include <DeckLinkAPIDispatch.cpp> -+#include <DeckLinkAPIVersion.h> -+#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000 -+ #define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes -+ #define IDeckLinkProfileAttributes IDeckLinkAttributes -+#endif - - #include "sdi.h" - -@@ -135,7 +140,7 @@ struct demux_sys_t - /* We need to hold onto the IDeckLinkConfiguration object, or our settings will not apply. - See section 2.4.15 of the Blackmagic DeckLink SDK documentation. */ - IDeckLinkConfiguration *config; -- IDeckLinkAttributes *attributes; -+ IDeckLinkProfileAttributes *attributes; - - bool autodetect; - -@@ -542,7 +547,7 @@ static int Open(vlc_object_t *p_this) - goto finish; - } - -- if (sys->card->QueryInterface(IID_IDeckLinkAttributes, (void**)&sys->attributes) != S_OK) { -+ if (sys->card->QueryInterface(IID_IDeckLinkProfileAttributes, (void**)&sys->attributes) != S_OK) { - msg_Err(demux, "Failed to get attributes interface"); - goto finish; - } -diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp -index 1e504610873..23909b86c61 100644 ---- a/modules/video_output/decklink.cpp -+++ b/modules/video_output/decklink.cpp -@@ -47,6 +47,11 @@ - - #include <DeckLinkAPI.h> - #include <DeckLinkAPIDispatch.cpp> -+#include <DeckLinkAPIVersion.h> -+#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000 -+ #define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes -+ #define IDeckLinkProfileAttributes IDeckLinkAttributes -+#endif - - #define FRAME_SIZE 1920 - #define CHANNELS_MAX 6 -@@ -463,7 +468,7 @@ static picture_t * CreateNoSignalPicture(vlc_object_t *p_this, const video_forma - static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd, - IDeckLinkOutput *output, - const video_format_t *fmt, -- BMDDisplayMode forcedmode = bmdDisplayModeNotSupported) -+ BMDDisplayMode forcedmode = bmdModeUnknown) - { - HRESULT result; - IDeckLinkDisplayMode *p_selected = NULL; -@@ -507,7 +512,7 @@ static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd, - continue; - } - -- if(forcedmode != bmdDisplayModeNotSupported && unlikely(!p_selected)) -+ if(forcedmode != bmdModeUnknown && unlikely(!p_selected)) - { - BMDDisplayMode modenl = htonl(forcedmode); - msg_Dbg(vd, "Forced mode '%4.4s'", (char *)&modenl); -@@ -518,7 +523,7 @@ static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd, - continue; - } - -- if(p_selected == NULL && forcedmode == bmdDisplayModeNotSupported) -+ if(p_selected == NULL && forcedmode == bmdModeUnknown) - { - if(i_width >> i_div == p_mode->GetWidth() >> i_div && - i_height >> i_div == p_mode->GetHeight() >> i_div) -@@ -564,9 +569,9 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys) - IDeckLinkIterator *decklink_iterator = NULL; - IDeckLinkDisplayMode *p_display_mode = NULL; - IDeckLinkConfiguration *p_config = NULL; -- IDeckLinkAttributes *p_attributes = NULL; -+ IDeckLinkProfileAttributes *p_attributes = NULL; - IDeckLink *p_card = NULL; -- BMDDisplayMode wanted_mode_id = bmdDisplayModeNotSupported; -+ BMDDisplayMode wanted_mode_id = bmdModeUnknown; - - vlc_mutex_lock(&sys->lock); - -@@ -622,7 +627,7 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys) - - /* Read attributes */ - -- result = p_card->QueryInterface(IID_IDeckLinkAttributes, (void**)&p_attributes); -+ result = p_card->QueryInterface(IID_IDeckLinkProfileAttributes, (void**)&p_attributes); - CHECK("Could not get IDeckLinkAttributes"); - - int64_t vconn; -@@ -662,6 +667,7 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys) - BMDDisplayMode modenl = htonl(mode_id); - msg_Dbg(vd, "Selected mode '%4.4s'", (char *) &modenl); - -+ BMDPixelFormat pixelFormat = sys->video.tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV; - BMDVideoOutputFlags flags = bmdVideoOutputVANC; - if (mode_id == bmdModeNTSC || - mode_id == bmdModeNTSC2398 || -@@ -669,15 +675,25 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys) - { - flags = bmdVideoOutputVITC; - } -- -- BMDDisplayModeSupport support; -- IDeckLinkDisplayMode *resultMode; -- -+ bool supported; -+#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000 -+ BMDDisplayModeSupport support = bmdDisplayModeNotSupported; - result = sys->p_output->DoesSupportVideoMode(mode_id, -- sys->video.tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV, -- flags, &support, &resultMode); -+ pixelFormat, -+ flags, -+ &support, -+ NULL); -+ supported = (support != bmdDisplayModeNotSupported); -+#else -+ result = sys->p_output->DoesSupportVideoMode(vconn, -+ mode_id, -+ pixelFormat, -+ bmdSupportedVideoModeDefault, -+ NULL, -+ &supported); -+#endif - CHECK("Does not support video mode"); -- if (support == bmdDisplayModeNotSupported) -+ if (!supported) - { - msg_Err(vd, "Video mode not supported"); - goto error; |