version bump, conflicts with ffmpeg

2 files changed, 8 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec37900c30d4..70c5abf55ff6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-decklink
 	pkgdesc = Complete solution to record, convert and stream audio and video
-	pkgver = 3.2
+	pkgver = 3.2.2
 	pkgrel = 2
 	epoch = 1
 	url = http://ffmpeg.org/
@@ -66,10 +66,11 @@ pkgbase = ffmpeg-decklink
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
-	source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz
-	source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc
+	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 = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
+	sha256sums = 3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
 	sha256sums = SKIP
 
 pkgname = ffmpeg-decklink
diff --git a/PKGBUILD b/PKGBUILD
index 7d1826fbe824..fbab8caf9bea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg-decklink
-pkgver=3.2
+pkgver=3.2.2
 pkgrel=2
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video'
@@ -29,9 +29,10 @@ 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')
 source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da'
+sha256sums=('3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc'
             'SKIP')
 
 build() {