[med-svn] r10730 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon May 7 13:04:04 UTC 2012
Author: malat
Date: 2012-05-07 13:04:04 +0000 (Mon, 07 May 2012)
New Revision: 10730
Added:
trunk/packages/gdcm/trunk/debian/gdcm.ini
trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch
trunk/packages/gdcm/trunk/debian/php5-gdcm.install
trunk/packages/gdcm/trunk/debian/php5-gdcm.postinst
trunk/packages/gdcm/trunk/debian/php5-gdcm.prerm
trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.install
trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.postinst
trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.prerm
trunk/packages/gdcm/trunk/debian/vtkgdcm.ini
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/control
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/rules
Log:
Work on PHP module
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2012-05-07 12:59:19 UTC (rev 10729)
+++ trunk/packages/gdcm/trunk/debian/changelog 2012-05-07 13:04:04 UTC (rev 10730)
@@ -1,3 +1,11 @@
+gdcm (2.2.0-11) UNRELEASED; urgency=low
+
+ * Remove SONAME from python module, as per policy
+ * Build PHP5 bindings
+ * Fix issue with python 3.2 vs 2.7
+
+ -- Mathieu Malaterre <malat at debian.org> Mon, 07 May 2012 11:34:03 +0200
+
gdcm (2.2.0-10) unstable; urgency=low
* Fix some undefined symbols (reported upstream)
Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control 2012-05-07 12:59:19 UTC (rev 10729)
+++ trunk/packages/gdcm/trunk/debian/control 2012-05-07 13:04:04 UTC (rev 10730)
@@ -7,8 +7,8 @@
Steve M. Robbins <smr at debian.org>
Build-Depends: debhelper (>= 8), python-all-dev, libvtk-java, pvrg-jpeg,
uuid-dev, libz-dev, libexpat-dev, doxygen-latex, ghostscript,
- swig, cmake, libvtk5-dev, libcharls-dev, javahelper,
- libopenjpeg-dev, graphviz, default-jdk,
+ swig (>= 2.0.5), cmake (>= 2.6.2), libvtk5-dev, libcharls-dev, javahelper,
+ libopenjpeg-dev, graphviz, default-jdk, php5-dev, php5-cli,
libpoppler-private-dev, libssl-dev, python-vtk, gccxml,
libactiviz.net-cil [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
mummy [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
@@ -86,6 +86,18 @@
CLI bindings to the GDCM DICOM library. It allows developers to use
GDCM from C# environment.
+Package: php5-gdcm
+Section: php
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Description: Grassroots DICOM PHP5 bindings
+ Grassroots DiCoM is a C++ library for DICOM medical files. It is
+ automatically wrapped to python/C#/Java (using swig). It supports
+ RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
+ .
+ Java bindings to the GDCM DICOM library. It allows developers to use
+ GDCM from PHP5 environment.
+
Package: libgdcm-java
Section: java
Architecture: any
@@ -147,6 +159,18 @@
.
VTK CLI bindings to the GDCM DICOM library.
+Package: php5-vtkgdcm
+Section: php
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.2 (= ${binary:Version})
+Suggests: php-gdcm
+Description: Grassroots DICOM VTK PHP bindings
+ Grassroots DiCoM is a C++ library for DICOM medical files. It is
+ automatically wrapped to python/C#/Java (using swig). It supports
+ RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
+ .
+ VTK PHP bindings to the GDCM DICOM library.
+
Package: libvtkgdcm-java
Section: java
Architecture: any
Added: trunk/packages/gdcm/trunk/debian/gdcm.ini
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm.ini (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm.ini 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,3 @@
+; configuration for the php5-gdcm module
+
+extension=gdcm.so
Added: trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/removesonamepython.patch 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,22 @@
+From 6de3cc940b3358f493f2022774a28ebe6f454a84 Mon Sep 17 00:00:00 2001
+From: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Date: Mon, 7 May 2012 11:29:34 +0200
+Subject: [PATCH] Start using the next cmake 2.8.9 property: NO_SONAME
+
+This property will allow the building of proper module, without SONAME
+---
+ Wrapping/Python/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+Index: gdcm-2.2.0/Wrapping/Python/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Wrapping/Python/CMakeLists.txt 2012-05-07 11:33:30.239979003 +0200
++++ gdcm-2.2.0/Wrapping/Python/CMakeLists.txt 2012-05-07 11:33:40.719978624 +0200
+@@ -84,6 +84,7 @@
+ #SET (SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS ${SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/docstrings.i)
+ SWIG_ADD_MODULE(${GDCM_PYTHON_IMPLEMENTATION_NAME} python gdcmswig.i gdcmPythonFilter.cxx)
+ SWIG_LINK_LIBRARIES(${GDCM_PYTHON_IMPLEMENTATION_NAME} gdcmMEXD gdcmMSFF gdcmIOD) # ${PYTHON_LIBRARIES})
++set_property(TARGET ${SWIG_MODULE_${GDCM_PYTHON_IMPLEMENTATION_NAME}_REAL_NAME} PROPERTY NO_SONAME 1)
+
+ #MESSAGE(SWIG_MODULE_${MODULE_NAME}_EXTRA_DEPS)
+ #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gdcm.pth.in
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 12:59:19 UTC (rev 10729)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 13:04:04 UTC (rev 10730)
@@ -9,3 +9,4 @@
removepythonlink.patch
fixhurd.patch
fixundef.patch
+removesonamepython.patch
Added: trunk/packages/gdcm/trunk/debian/php5-gdcm.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-gdcm.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-gdcm.install 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,3 @@
+usr/share/php/gdcm.php
+usr/lib/php5/*/gdcm.so
+debian/gdcm.ini etc/php5/mods-available
Added: trunk/packages/gdcm/trunk/debian/php5-gdcm.postinst
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-gdcm.postinst (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-gdcm.postinst 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+[ "$1" = "configure" ] && php5enmod gdcm
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/gdcm/trunk/debian/php5-gdcm.prerm
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-gdcm.prerm (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-gdcm.prerm 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+[ "$1" = "remove" ] && php5dismod gdcm
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.install 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,3 @@
+usr/share/php/vtkgdcm.php
+usr/lib/php5/*/vtkgdcm.so
+debian/vtkgdcm.ini etc/php5/mods-available
Added: trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.postinst
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.postinst (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.postinst 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+[ "$1" = "configure" ] && php5enmod vtkgdcm
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.prerm
===================================================================
--- trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.prerm (rev 0)
+++ trunk/packages/gdcm/trunk/debian/php5-vtkgdcm.prerm 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+[ "$1" = "remove" ] && php5dismod vtkgdcm
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2012-05-07 12:59:19 UTC (rev 10729)
+++ trunk/packages/gdcm/trunk/debian/rules 2012-05-07 13:04:04 UTC (rev 10730)
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
DPKG_EXPORT_BUILDFLAGS = 1
@@ -9,7 +7,12 @@
# to please dpkg-shlibdeps and java private libs in /usr/lib/jni
LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni
+# warning: couldn't find library ../../bin/libvtkgdcmPythonD.so
+#LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib
+# PHP5 extensions dir:
+PHP_EX=$(shell /usr/bin/php-config5 --extension-dir)
+
# required for DEB_MONO_ARCHS (debian/control.in)
-include /usr/share/mono/mono-archs.make
@@ -31,17 +34,18 @@
PYVER := $(shell pyversions -dv)
PYMODDIR := /usr/lib/$(shell pyversions -r)
+# Need to make sure to build using the same vtk/python version:
CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DGDCM_NO_EXECUTABLE_PROPERTIES=ON \
-DGDCM_BUILD_APPLICATIONS=ON \
-DGDCM_DOCUMENTATION:BOOL=ON \
- -DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
+ -DGDCM_PDF_DOCUMENTATION:BOOL=ON \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
-DGDCM_WRAP_JAVA:BOOL=ON \
- -DGDCM_WRAP_PHP:BOOL=OFF \
+ -DGDCM_WRAP_PHP:BOOL=ON \
-DGDCM_USE_PVRG:BOOL=ON \
-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \
-DGMCS_EXECUTABLE:FILEPATH=/usr/bin/mono-csc \
@@ -55,6 +59,8 @@
-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \
-DGDCM_USE_PARAVIEW:BOOL=OFF \
-DGDCM_USE_ACTIVIZ:BOOL=ON \
+ -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
+ -DPYTHON_LIBRARY:FILEPATH=/usr/lib/python2.7/config/libpython2.7.so \
-DGDCM_USE_VTK:BOOL=ON
override_dh_auto_configure:
@@ -67,6 +73,14 @@
# See #664188
sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets-relwithdebinfo.cmake
dh_auto_install
+ # PHP
+ mkdir -p debian/tmp/$(PHP_EX)
+ mkdir -p debian/tmp/usr/share/php
+ mv debian/tmp/usr/lib/gdcm.php debian/tmp/usr/share/php
+ mv debian/tmp/usr/lib/gdcm.so debian/tmp/$(PHP_EX)
+ mv debian/tmp/usr/lib/vtkgdcm.php debian/tmp/usr/share/php
+ mv debian/tmp/usr/lib/vtkgdcm.so debian/tmp/$(PHP_EX)
+ # Python
mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
Added: trunk/packages/gdcm/trunk/debian/vtkgdcm.ini
===================================================================
--- trunk/packages/gdcm/trunk/debian/vtkgdcm.ini (rev 0)
+++ trunk/packages/gdcm/trunk/debian/vtkgdcm.ini 2012-05-07 13:04:04 UTC (rev 10730)
@@ -0,0 +1,3 @@
+; configuration for the php5-vtkgdcm module
+
+extension=vtkgdcm.so
More information about the debian-med-commit
mailing list