Bump to 0.5.2.r2397.gc77fdae

Add conflicts

2 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac2e65c7b45..656d5906fe10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat May 14 08:21:07 UTC 2016
+# Fri Nov 25 14:48:11 UTC 2016
 pkgbase = gpac-git
 	pkgdesc = A multimedia framework based on the MPEG-4 Systems standard (git version)
-	pkgver = 0.5.2.r1734.gd7c9205
+	pkgver = 0.5.2.r2397.gc77fdae
 	pkgrel = 1
 	epoch = 1
 	url = http://gpac.sourceforge.net
@@ -25,6 +25,7 @@ pkgbase = gpac-git
 	optdepends = faad2: for AAC support
 	optdepends = libmad: for mp3 support
 	optdepends = sdl2: for sdl support
+	conflicts = gpac
 	options = staticlibs
 	options = !makeflags
 	source = git://github.com/gpac/gpac.git
diff --git a/PKGBUILD b/PKGBUILD
index ae5b345379a1..6a0181ae9c35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=gpac
 pkgname=$_pkgname-git
-pkgver=0.5.2.r1734.gd7c9205
+pkgver=0.5.2.r2397.gc77fdae
 pkgrel=1
 epoch=1
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard (git version)"
@@ -18,14 +18,13 @@ optdepends=('jack: for jack support'
 	    'libmad: for mp3 support'
 	    'sdl2: for sdl support')
 options=('staticlibs' '!makeflags')
+conflicts=('gpac')
 source=(
     git://github.com/gpac/gpac.git
     'ssl3.patch'
 )
-sha256sums=(
-    'SKIP'
-    'f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41'
-)
+sha256sums=('SKIP'
+            'f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41')
 
 pkgver() {
   cd "$_pkgname"