Update to 2.6.2

Move python2, java, vtk, swig to optdepends for now.

TODO: Create options to build with java, python wrapping and vtk bindings.

Changed Chris to maintainer

2 files changed, 21 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3df11996ea7f..f724b1fdbd61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
+# Generated by mksrcinfo v8
+# Wed Dec 30 20:30:59 UTC 2015
 pkgbase = gdcm
 	pkgdesc = a C++ library for DICOM medical files
-	pkgver = 2.4.4
-	pkgrel = 2
+	pkgver = 2.6.2
+	pkgrel = 3
 	url = http://gdcm.sourceforge.net
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
-	makedepends = swig
-	makedepends = python2
-	makedepends = java-environment
-	makedepends = mono
-	depends = vtk
 	optdepends = python2: python bindings
 	optdepends = java-runtime: java bindings
-	source = http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.4.4/gdcm-2.4.4.tar.bz2
-	md5sums = c1fd2a9595236a03d114370e9c42ef48
+	optdepends = vtk: vtk bindings
+	optdepends = swig: generate python wrappers
+	source = http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.6.2/gdcm-2.6.2.tar.gz
+	sha512sums = 0f3f66db5f27ff3f7cde2eb50878aa47a700880ca79fde450846dd0dc33a0176453175b6d50f41f64e1c28eb0b2023e7a2cdc2b2c7f40097939a40449650ab98
 
 pkgname = gdcm
 
diff --git a/PKGBUILD b/PKGBUILD
index 96508fceedbe..c2e4e6a9569e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,38 @@
-# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
+# Maintainer: Chris <christopher.r.mullins g-mail>
+# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=gdcm
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.6.2
+pkgrel=3
 pkgdesc='a C++ library for DICOM medical files'
 arch=('i686' 'x86_64')
 url='http://gdcm.sourceforge.net'
 license=('BSD')
-depends=('vtk')
 optdepends=('python2: python bindings'
-            'java-runtime: java bindings')
-makedepends=('cmake' 'swig' 'python2' 'java-environment' 'mono')
-source=("http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20${pkgver}/gdcm-${pkgver}.tar.bz2")
-md5sums=('c1fd2a9595236a03d114370e9c42ef48')
+            'java-runtime: java bindings'
+            'vtk: vtk bindings'
+            'swig: generate python wrappers')
+makedepends=('cmake')
+source=("http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20$pkgver/gdcm-$pkgver.tar.gz")
+sha512sums=('0f3f66db5f27ff3f7cde2eb50878aa47a700880ca79fde450846dd0dc33a0176453175b6d50f41f64e1c28eb0b2023e7a2cdc2b2c7f40097939a40449650ab98')
 
 build() {
   cd "$srcdir"
-
   mkdir -p build && cd build
-
   cmake \
-    -DCMAKE_SKIP_RPATH:BOOL=YES \
     -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DGDCM_BUILD_APPLICATIONS:BOOL=ON \
     -DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
     -DGDCM_BUILD_TESTING:BOOL=OFF \
     -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DGDCM_WRAP_PYTHON:BOOL=OFF \
-    -DGDCM_WRAP_CSHARP:BOOL=OFF \
-    -DGDCM_WRAP_JAVA:BOOL=OFF \
-    -DGDCM_USE_VTK:BOOL=ON \
-    -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DGDCM_USE_SYSTEM_UUID:BOOL=ON \
-    -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=OFF \
-    -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
-    ../$pkgname-$pkgver
-
-    #  binding fail for some reason with new vtk. Will investigate later.
-    #
-    #-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 \
-    #-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
-    #-DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so \
-    #-DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk/vtk.jar \
-  make
+    ../$pkgname-$pkgver 
+    make
 }
 
 package() {
   cd "$srcdir"/$pkgname-$pkgver
   install -Dm644 Copyright.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  cd ../build
+  cd "$srcdir"/build
   make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"/usr/lib
-
-  #mkdir -p python2.7/site-packages
-  #mv *.py python2.7/site-packages
-
-  #mkdir -p ../share/java/gdcm
-  #mv *.jar ../share/java/gdcm
 }