summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mattern2016-05-23 18:08:38 +0200
committerPeter Mattern2016-05-23 20:12:07 +0200
commit44f3da73b9426065e7b0292d90e218ecb2b805af (patch)
treefeb826b183780684c1613300aac3a85b24d22712
parent849cc5f70a892a03f0997585d99346917ec14788 (diff)
downloadaur-44f3da73b9426065e7b0292d90e218ecb2b805af.tar.gz
Fix dependencies
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD35
2 files changed, 26 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1830cb408d6..6ce34f650e1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon May 2 10:01:57 UTC 2016
+# Mon May 23 18:11:58 UTC 2016
pkgbase = gdcm-git
pkgdesc = Open source implementation of the DICOM standard
- pkgver = r9344.a18f94b
+ pkgver = 2.6.3.328.ga18f94b
pkgrel = 1
url = http://gdcm.sourceforge.net
arch = i686
@@ -10,11 +10,14 @@ pkgbase = gdcm-git
license = BSD
makedepends = git
makedepends = cmake
- makedepends = poppler
- makedepends = openjpeg2
- makedepends = python
+ makedepends = libxslt
+ makedepends = dcmtk-git
makedepends = swig
+ makedepends = python
makedepends = java-environment
+ depends = poppler
+ optdepends = java-environment: Java wrapper
+ optdepends = python: Python wrapper
provides = gdcm
conflicts = gdcm
source = gdcm::git://git.code.sf.net/p/gdcm/gdcm
diff --git a/PKGBUILD b/PKGBUILD
index e8818c2a3098..6944a7aaf680 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
_pkgname=gdcm
pkgname=$_pkgname-git
-pkgver=r9344.a18f94b
+pkgver=2.6.3.328.ga18f94b
pkgrel=1
pkgdesc='Open source implementation of the DICOM standard'
arch=('i686' 'x86_64')
url='http://gdcm.sourceforge.net'
license=('BSD')
-makedepends=('git' 'cmake' 'poppler' 'openjpeg2' 'python' 'swig' 'java-environment')
+depends=('poppler')
+optdepends=('java-environment: Java wrapper' 'python: Python wrapper')
+makedepends=('git' 'cmake' 'libxslt' 'dcmtk-git' 'swig' 'python' 'java-environment')
provides=("$_pkgname")
conflicts=("$_pkgname")
source=("$_pkgname::git://git.code.sf.net/p/gdcm/gdcm")
@@ -16,32 +18,31 @@ sha256sums=("SKIP")
pkgver() {
cd $_pkgname
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ git describe --tags | sed 's:^v::;s:-:.:g'
}
build() {
- mkdir -p build
+ rm -Rf build && mkdir build
cd build
cmake $srcdir/$_pkgname \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_TESTING=OFF \
-DGDCM_BUILD_APPLICATIONS=ON \
-DGDCM_BUILD_SHARED_LIBS=ON \
- -DGDCM_BUILD_TESTING=ON \
- -DGDCM_DOCUMENTATION=OFF \
+ -DGDCM_LEGACY_REMOVE=ON \
-DGDCMV2_0_COMPATIBILITY=OFF \
- -DGDCM_USE_SYSTEM_ZLIB=ON \
- -DGDCM_USE_SYSTEM_OPENSSL=ON \
+ -DGDCM_USE_SYSTEM_CHARLS=OFF \
-DGDCM_USE_SYSTEM_EXPAT=ON \
- -DGDCM_USE_SYSTEM_JSON=ON \
- -DGDCM_USE_SYSTEM_PAPYRUS3=OFF \
- -DGDCM_USE_SYSTEM_SOCKETXX=ON \
+ -DGDCM_USE_SYSTEM_JSON=OFF \
+ -DGDCM_USE_SYSTEM_LIBXML2=ON \
-DGDCM_USE_SYSTEM_LJPEG=OFF \
- -DGDCM_USE_SYSTEM_OPENJPEG=ON \
- -DGDCM_USE_SYSTEM_CHARLS=ON \
+ -DGDCM_USE_SYSTEM_OPENJPEG=OFF \
+ -DGDCM_USE_SYSTEM_OPENSSL=ON \
-DGDCM_USE_SYSTEM_POPPLER=ON \
- -DGDCM_USE_SYSTEM_LIBXML2=ON \
- -DGDCM_WRAP_PYTHON=ON \
- -DGDCM_WRAP_PERL=OFF \
- -DGDCM_WRAP_JAVA=ON
+ -DGDCM_USE_SYSTEM_SOCKETXX=OFF \
+ -DGDCM_USE_SYSTEM_ZLIB=ON \
+ -DGDCM_WRAP_JAVA=ON \
+ -DGDCM_WRAP_PYTHON=ON
make
}