Updated to version 3.3

3 files changed, 51 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93a8a9b97172..177cab9c8cb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
+# Generated by mksrcinfo v8
+# Sat May  6 23:22:39 UTC 2017
 pkgbase = ffmpeg-decklink
-	pkgdesc = Complete solution to record, convert and stream audio and video
-	pkgver = 3.2.2
-	pkgrel = 2
+	pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
+	pkgver = 3.3
+	pkgrel = 1
 	epoch = 1
 	url = http://ffmpeg.org/
 	arch = i686
 	arch = x86_64
-	license = GPL3
-	makedepends = decklink-sdk
+	license = custom:UNREDISTRIBUTABLE
 	makedepends = hardening-wrapper
 	makedepends = ladspa
 	makedepends = libvdpau
 	makedepends = yasm
+	makedepends = blackmagic-decklink-sdk
 	depends = alsa-lib
 	depends = bzip2
-	depends = decklink
 	depends = fontconfig
 	depends = fribidi
 	depends = glibc
@@ -57,13 +58,22 @@ pkgbase = ffmpeg-decklink
 	depends = libx265.so
 	depends = libxvidcore.so
 	optdepends = ladspa: LADSPA filters
+	provides = libavcodec.so
+	provides = libavdevice.so
+	provides = libavfilter.so
+	provides = libavformat.so
+	provides = libavresample.so
+	provides = libavutil.so
+	provides = libpostproc.so
+	provides = libswresample.so
+	provides = libswscale.so
 	provides = ffmpeg
 	conflicts = ffmpeg
-	source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz
-	source = https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.xz.asc
-	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = 3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
-	sha256sums = SKIP
+	conflicts = ffmpeg-git
+	source = https://ffmpeg.org/releases/ffmpeg-3.3.tar.xz
+	source = UNREDISTRIBUTABLE.txt
+	sha256sums = 599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d
+	sha256sums = bc2b76d4f5be42c5b0a6a07f1b754d29392c84f8234f3b6ab9e7858fdc4043ff
 
 pkgname = ffmpeg-decklink
 
diff --git a/PKGBUILD b/PKGBUILD
index 19e5ad1a6840..8515075700ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,17 @@
-# $Id: PKGBUILD 279478 2016-10-30 16:53:01Z alucryd $
-# Maintainer: Jan Koppe <post@jankoppe.de>
+# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Contributor: Jan Koppe <post@jankoppe.de>
 #
 # This package is a modified version of extra/ffmpeg with --enable-decklink
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg-decklink
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.3
+pkgrel=1
 epoch=1
-pkgdesc='Complete solution to record, convert and stream audio and video'
+pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
 arch=('i686' 'x86_64')
 url='http://ffmpeg.org/'
-license=('GPL3')
-depends=('alsa-lib' 'bzip2' 'decklink' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
+license=('custom:UNREDISTRIBUTABLE')
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
          'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse'
          'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau'
          'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus'
@@ -24,31 +19,34 @@ depends=('alsa-lib' 'bzip2' 'decklink' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnu
          'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so'
          'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
          'libx264.so' 'libx265.so' 'libxvidcore.so')
-makedepends=('decklink-sdk' 'hardening-wrapper' 'ladspa' 'libvdpau' 'yasm')
+makedepends=(
+    # binary repositories:
+        'hardening-wrapper' 'ladspa' 'libvdpau' 'yasm'
+    # AUR:
+        'blackmagic-decklink-sdk'
+)
 optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-          'libswscale.so')
-conflicts=('ffmpeg')
-provides=('ffmpeg')
-source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc})
-validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc'
-            'SKIP')
+          'libswscale.so' 'ffmpeg')
+conflicts=('ffmpeg' 'ffmpeg-git')
+source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
+        'UNREDISTRIBUTABLE.txt')
+sha256sums=('599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d'
+            'bc2b76d4f5be42c5b0a6a07f1b754d29392c84f8234f3b6ab9e7858fdc4043ff')
 
 build() {
-  cd ffmpeg-${pkgver}
+  cd "ffmpeg-${pkgver}"
 
+  msg2 "Running ffmpeg configure script. Please wait..."
+  
   ./configure \
     --prefix='/usr' \
     --disable-debug \
     --disable-static \
     --disable-stripping \
-    --extra-cflags="-I/usr/src/decklink-sdk" \
-    --extra-ldflags="-L/usr/src/decklink-sdk" \
     --enable-avisynth \
     --enable-avresample \
-    --enable-decklink \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gnutls \
@@ -79,11 +77,13 @@ build() {
     --enable-libwebp \
     --enable-libx264 \
     --enable-libx265 \
+    --enable-libxcb \
     --enable-libxvid \
     --enable-netcdf \
     --enable-shared \
     --enable-version3 \
-    --enable-x11grab
+    --enable-nonfree \
+    --enable-decklink
 
   make
   make tools/qt-faststart
@@ -91,10 +91,9 @@ build() {
 }
 
 package() {
-  cd ffmpeg-${pkgver}
+  cd "ffmpeg-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install install-man
-  install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/
+  make DESTDIR="$pkgdir" install install-man
+  install -Dm 755 tools/qt-faststart "${pkgdir}/usr/bin/"
+  install -D -m644 "${srcdir}/UNREDISTRIBUTABLE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/UNREDISTRIBUTABLE.txt"
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/UNREDISTRIBUTABLE.txt b/UNREDISTRIBUTABLE.txt
new file mode 100755
index 000000000000..ff73ce67d2f3
--- /dev/null
+++ b/UNREDISTRIBUTABLE.txt
@@ -0,0 +1 @@
+This package uses nonfree code and thus cannot be redistributed in binary form.