summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dcf85f7ceb3c..34defd4769bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Aug 22 22:54:06 UTC 2016
+# Mon Aug 22 23:13:12 UTC 2016
pkgbase = natron
pkgdesc = Open source compositing software. Node-graph based. Similar in functionalities to Adobe After Effects and Nuke by The Foundry.
pkgver = 2.1.2
@@ -25,6 +25,7 @@ pkgbase = natron
conflicts = natron-rc
conflicts = natron-bin
conflicts = natron-bin-dev
+ conflicts = natron-portable
source = natron::git://github.com/MrKepzie/Natron.git#tag=2.1.2
source = https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.1.tar.gz
source = config.pri
diff --git a/PKGBUILD b/PKGBUILD
index 82929cfb9e31..3507181c9eb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ license=("GPL")
depends=('fontconfig' 'qt4' 'python2-pyside' 'python2-shiboken' 'boost-libs' 'pixman' 'glfw-x11' 'cairo' 'openfx-io' 'openfx-misc')
makedepends=('expat' 'boost')
optdepends=('openfx-arena: Extra OpenFX plugins for Natron includes text node')
-conflicts=('natron-rc' 'natron-bin' 'natron-bin-dev')
+conflicts=('natron-rc' 'natron-bin' 'natron-bin-dev' 'natron-portable')
source=("$pkgname::git://github.com/MrKepzie/Natron.git#tag=$pkgver"
"https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${pkgver%.*}.tar.gz"
"config.pri")