summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2016-11-18 22:41:31 +0100
committerLuca Weiss2016-11-18 22:41:31 +0100
commit780fb4d6edeaad944d52f427ef613666c9abedb0 (patch)
tree3b39bc695a8bcfaafc772caff3d593ab4981c4a4
parent621685173048cd4df5f90e7d9aca80ca22ffe1bb (diff)
downloadaur-780fb4d6edeaad944d52f427ef613666c9abedb0.tar.gz
Improve submodule handling & format code
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD51
2 files changed, 33 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 193f7988744..7feb55d48f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Nov 17 21:46:56 UTC 2016
+# Fri Nov 18 21:41: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.8
@@ -23,6 +23,10 @@ pkgbase = natron
depends = openfx-misc
optdepends = openfx-arena: Extra OpenFX plugins for Natron includes text node
source = natron::git://github.com/MrKepzie/Natron.git#tag=2.1.8
+ source = git+https://github.com/devernay/openfx.git
+ source = git+https://github.com/MrKepzie/google-test.git
+ source = git+https://github.com/MrKepzie/google-mock.git
+ source = git+https://github.com/MrKepzie/SequenceParsing.git
source = https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.1.tar.gz
source = config.pri
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1363824aff4..6e3714d0508 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,41 +12,46 @@ depends=('fontconfig' 'qt4' 'python2-pyside' 'python2-shiboken' 'boost-libs' 'pi
makedepends=('git' 'expat' 'boost')
optdepends=('openfx-arena: Extra OpenFX plugins for Natron includes text node')
source=("$pkgname::git://github.com/MrKepzie/Natron.git#tag=$pkgver"
- "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${pkgver%.*}.tar.gz"
- "config.pri")
+ "git+https://github.com/devernay/openfx.git"
+ "git+https://github.com/MrKepzie/google-test.git"
+ "git+https://github.com/MrKepzie/google-mock.git"
+ "git+https://github.com/MrKepzie/SequenceParsing.git"
+ "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${pkgver%.*}.tar.gz"
+ "config.pri")
md5sums=('SKIP'
'4ca4eca4856cae50cfa4645a090258dd'
'09f5ac67c0ad57eb853141b38eccb0ff')
prepare() {
- cd "$srcdir/$pkgname"
-
- mv "$srcdir/OpenColorIO-Configs-Natron-v${pkgver%.*}" "$srcdir/$pkgname/OpenColorIO-Configs"
-
- # For OpenFX update
- git submodule update -i --recursive
-
- mv "${srcdir}/config.pri" "${srcdir}/${pkgname%%-*}/config.pri"
-
- # Fix for gcc6 build issues
- sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Gui/Gui.pro
- sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Engine/Engine.pro
- sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Tests/Tests.pro
+ cd "$srcdir/$pkgname"
+
+ mv "$srcdir/OpenColorIO-Configs-Natron-v${pkgver%.*}" "$srcdir/$pkgname/OpenColorIO-Configs"
+
+ # Git submodules
+ git config submodule.libs/OpenFX.url $srcdir/openfx
+ git config submodule.Tests/google-mock.url $srcdir/google-mock
+ git config submodule.Tests/google-test.url $srcdir/google-test
+ git config submodule.libs/SequenceParsing.url $srcdir/SequenceParsing
+ git submodule update
+
+ mv "${srcdir}/config.pri" "${srcdir}/${pkgname%%-*}/config.pri"
+ # Fix for gcc6 build issues
+ sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Gui/Gui.pro
+ sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Engine/Engine.pro
+ sed -i '1s/^/QMAKE_CXXFLAGS += -std=c++98\n/' Tests/Tests.pro
}
build() {
- cd "$srcdir/$pkgname"
+ cd "$srcdir/$pkgname"
- [[ -d build ]] && rm -r build; mkdir build; cd build
+ [[ -d build ]] && rm -r build; mkdir build; cd build
- qmake-qt4 -r "$srcdir/natron/Project.pro" PREFIX=/usr CONFIG+=release DEFINES+=QT_NO_DEBUG_OUTPUT \
- QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
+ qmake-qt4 -r "$srcdir/natron/Project.pro" PREFIX=/usr CONFIG+=release DEFINES+=QT_NO_DEBUG_OUTPUT QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
- make
+ make
}
package() {
- cd "$srcdir/$pkgname/build"
-
- make INSTALL_ROOT="$pkgdir" install
+ cd "$srcdir/$pkgname/build"
+ make INSTALL_ROOT="$pkgdir" install
}