[med-svn] [gdcm] 04/05: Disable php bindings for now, because of the transition to php 7.0
Gert Wollny
gert-guest at moszumanska.debian.org
Fri Apr 22 15:12:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository gdcm.
commit 0a9e65e6be6db44cfc8bf9db9f2c52e970adafc3
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Thu Apr 21 10:00:28 2016 +0000
Disable php bindings for now, because of the transition to php 7.0
Currently, php 7.0 is not supported by swig.
---
debian/changelog | 4 +++-
debian/control | 48 +++++++++++++++++++++++-------------------------
debian/rules | 21 +++++++++++----------
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 39013d4..7b0d263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ gdcm (2.6.3-4) unstable; urgency=medium
* d/p/08: Add patch to compile against VTK 6.3
* d/p/09: Set minimum requirements for JAVA to 1.5 Closes: 821959
+ * d/control+rules: remove php bindings since the upcoming php7 is
+ not yet supported by upstream (swig doesn't support php7 yet).
- -- Gert Wollny <gw.fossdev at gmail.com> Sun, 17 Apr 2016 09:12:56 +0000
+ -- Gert Wollny <gw.fossdev at gmail.com> Thu, 21 Apr 2016 09:59:59 +0000
gdcm (2.6.3-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index dd9ccbb..7460308 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,7 @@ Build-Depends: cmake (>= 2.8.9),
libvtk6-dev,
libcharls-dev,
libopenjpeg-dev,
- libvtk6-java,
- php5-dev,
- php5-cli,
+ libvtk6-java,
libxml2-dev,
libjson-c-dev,
libpoppler-private-dev,
@@ -116,17 +114,17 @@ Description: Grassroots DICOM CLI bindings
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.
- .
- PHP5 bindings to the GDCM DICOM library. It allows developers to use
- GDCM from PHP5 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.
+# .
+# PHP5 bindings to the GDCM DICOM library. It allows developers to use
+# GDCM from PHP5 environment.
Package: python-gdcm
Section: python
@@ -178,17 +176,17 @@ Description: Grassroots DICOM VTK CLI bindings
.
VTK CLI bindings to the GDCM DICOM library.
-Package: php5-vtkgdcm
-Section: php
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.6 (= ${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: php5-vtkgdcm
+#Section: php
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.6 (= ${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: python-vtkgdcm
Section: python
diff --git a/debian/rules b/debian/rules
index 6a73b60..1a2a0f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni
# PHP5 extensions dir:
-PHP_EX=$(shell /usr/bin/php-config5 --extension-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
@@ -54,7 +54,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
-DGDCM_WRAP_JAVA:BOOL=ON \
- -DGDCM_WRAP_PHP:BOOL=ON \
+ -DGDCM_WRAP_PHP:BOOL=OFF \
-DGDCM_USE_PVRG:BOOL=ON \
-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \
-DGMCS_EXECUTABLE:FILEPATH=/usr/bin/mono-csc \
@@ -99,14 +99,15 @@ override_dh_auto_install-arch:
sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.6/GDCMTargets.cmake
dh_auto_install
# PHP
- mkdir -p debian/tmp/$(PHP_EX)
- mkdir -p debian/tmp/usr/share/php
- mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.php debian/tmp/usr/share/php
- mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.so debian/tmp/$(PHP_EX)
- mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.php debian/tmp/usr/share/php
- mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.so debian/tmp/$(PHP_EX)
- echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-gdcm.substvars
- echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-vtkgdcm.substvars
+ #mkdir -p debian/tmp/$(PHP_EX)
+ #mkdir -p debian/tmp/usr/share/php
+ #mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.php debian/tmp/usr/share/php
+ #mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.so debian/tmp/$(PHP_EX)
+ #mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.php debian/tmp/usr/share/php
+ #mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.so debian/tmp/$(PHP_EX)
+ #echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-gdcm.substvars
+ #echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-vtkgdcm.substvars
+
# Python
mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
#mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git
More information about the debian-med-commit
mailing list