summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD37
2 files changed, 29 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26e89c9228e6..141581b5fcca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
pkgbase = inviwo
pkgdesc = Software framework for rapid visualization prototyping
- pkgver = 0.9.10
+ pkgver = 0.9.11
pkgrel = 1
url = http://www.inviwo.org/
arch = x86_64
license = BSD
makedepends = git
makedepends = cmake
+ depends = libjpeg
+ depends = libpng
+ depends = libtiff
depends = libtirpc
depends = python
depends = qt5-base
- source = git+https://github.com/inviwo/inviwo.git#tag=v0.9.10
+ depends = zlib
+ source = git+https://github.com/inviwo/inviwo.git#tag=v0.9.11
source = inviwo.desktop
source = inviwo.sh
source = icon_24.png::https://avatars1.githubusercontent.com/u/10848351?s=24
diff --git a/PKGBUILD b/PKGBUILD
index ea771e39efdc..16db4bae671d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,19 @@
# Maintainer of this PKBGUILD file: Martino Pilia <martino.pilia@gmail.com>
pkgname=inviwo
-pkgver=0.9.10
+pkgver=0.9.11
pkgrel=1
pkgdesc="Software framework for rapid visualization prototyping"
arch=('x86_64')
url="http://www.inviwo.org/"
license=('BSD')
depends=(
+ 'libjpeg'
+ 'libpng'
+ 'libtiff'
'libtirpc'
'python'
'qt5-base'
+ 'zlib'
)
makedepends=('git' 'cmake')
_icon_url='https://avatars1.githubusercontent.com/u/10848351'
@@ -41,26 +45,31 @@ prepare() {
# do not try to use the source folder as base path for the executable
sed -i 's,IVW_TRUNK,std::string("/opt/inviwo"),' src/core/util/filesystem.cpp
- # fix missing libraries in sigar
- sed -i '27i#include <sys/sysmacros.h>' ext/sigar/src/os/linux/linux_sigar.c
- sed -i \
- -e '69itarget_link_libraries(sigar PRIVATE libtirpc.so)' \
- -e '69itarget_include_directories(sigar PRIVATE /usr/include/tirpc)' \
- ext/sigar/CMakeLists.txt
-
- mkdir build || :
- cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX:PATH="/opt/inviwo"
+ # look in the source folder for test files
+ sed -i "s,filesystem::getPath(PathType::Tests),\"$srcdir/$pkgname/tests\"," \
+ tests/integrationtests/image-test.cpp \
+ tests/integrationtests/volume-test.cpp
+ sed -i "s,filesystem::getPath(.*),\"$srcdir/$pkgname/tests/images/swirl.png\"," \
+ modules/png/tests/unittests/png-savetobuffer-test.cpp
+ sed -i "s,filesystem::getPath(.*),\"$srcdir/$pkgname/tests/images/swirl.\" + testExtension," \
+ modules/cimg/tests/unittests/savetobuffer-test.cpp
+
+ mkdir "${srcdir}/build" || :
+ cd "${srcdir}/build"
+
+ cmake "$srcdir/$pkgname" \
+ -DCMAKE_INSTALL_PREFIX:PATH="/opt/inviwo" \
+ -DIVW_USE_EXTERNAL_IMG:BOOL=ON \
+ -DIVW_INTEGRATION_TESTS:BOOL=OFF
}
build() {
- cd "$srcdir/$pkgname/build"
+ cd "${srcdir}/build"
make
}
package() {
- cd "$srcdir/$pkgname/build"
+ cd "${srcdir}/build"
_install="$pkgdir/opt/inviwo"
mkdir -p "$_install" "$pkgdir/usr/bin"