From c4c135e7978264f9e7bc1949b2b4b7618cad7037 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Tue, 28 Jun 2016 18:32:12 +1000 Subject: multimedia/vlc: Remove Decklink support Signed-off-by: Christoph Willing --- multimedia/vlc/README | 4 ---- multimedia/vlc/vlc.SlackBuild | 14 +++----------- multimedia/vlc/vlc.info | 10 ++++------ 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/multimedia/vlc/README b/multimedia/vlc/README index 8f2ec4d02a..1aab89deab 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -12,8 +12,4 @@ are detected at build time, they will be included. Conversely if optional packages are not available at build time, vlc will continue to build with a reduced feature set. -This SlackBuild also builds in support for BlackMagic Design's "Decklink" -range of video input and output cards, including those with UHD (3840x2160) -capability. - Please advise the maintainer to suggest support for any further options. diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index e9ca7f5cd3..df60516b9e 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -6,7 +6,7 @@ # modified to build VLC only, shared libraries needed. # Copyright (c) 2007,2008,2009,2010,2011 Eric Hameleers, Eindhoven, Netherlands -# Copyright (c) 2014 Christoph Willing, Brisbane, Australia +# Copyright (c) 2014-2016 Christoph Willing, Brisbane, Australia # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -29,7 +29,7 @@ PRGNAM=vlc VERSION=${VERSION:-2.1.6} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -45,9 +45,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DECKLINK_SDK_VERSION=${DECKLINK_SDK_VERSION:-10.1.4} -DECKLINKSDK=Blackmagic_DeckLink_SDK_${DECKLINK_SDK_VERSION}.zip - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -81,10 +78,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION -mkdir -p decklink/include -unzip -o $CWD/$DECKLINKSDK -cp -p Blackmagic\ DeckLink\ SDK\ ${DECKLINK_SDK_VERSION}/Linux/include/* decklink/include/ - patch -p1 < $CWD/patch-vlc-opencv3.diff patch -p0 < $CWD/patch-freerdp.diff @@ -114,8 +107,7 @@ LDFLAGS="$SLKLDFLAGS" \ --localstatedir=/var \ --build=$ARCH-slackware-linux \ --enable-merge-ffmpeg \ - --with-kde-solid=no \ - --with-decklink-sdk=$TMP/$PRGNAM-$VERSION/decklink + --with-kde-solid=no make make DESTDIR=$PKG install diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info index 3a6eb8606c..23f5d07c97 100644 --- a/multimedia/vlc/vlc.info +++ b/multimedia/vlc/vlc.info @@ -1,12 +1,10 @@ PRGNAM="vlc" VERSION="2.1.6" HOMEPAGE="http://www.videolan.org/vlc/" -DOWNLOAD="http://download.videolan.org/vlc/2.1.6/vlc-2.1.6.tar.xz \ - http://software.blackmagicdesign.com/SDK/Blackmagic_DeckLink_SDK_10.1.4.zip" -MD5SUM="6de050559fbb1456b35303f04705145d \ - 16fbc2f49dc62fecac15835c538f78d4" +DOWNLOAD="http://download.videolan.org/vlc/2.1.6/vlc-2.1.6.tar.xz" +MD5SUM="6de050559fbb1456b35303f04705145d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="a52dec libass libdc1394 libdvbpsi libdvdnav libmpeg2 libupnp lua portaudio twolame opus libvpx gsm opencv libtar libkate faac libdca libmatroska libshout speex libva avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint libssh2 gst1-plugins-base x265" +REQUIRES="a52dec libass libdc1394 libdvbpsi libdvdnav libmpeg2 libupnp lua portaudio twolame opus libvpx gsm opencv libtar libkate faac libdca libmatroska libshout speex libva avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint libssh2 x265" MAINTAINER="Christoph Willing" -EMAIL="chris.willing@iinet.net.au" +EMAIL="chris.willing@linux.com" -- cgit v1.2.3-65-gdbad