[med-svn] [Git][med-team/gdcm][master] 6 commits: d/patches: Refresh patches for new vtk9 release
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Oct 26 08:52:45 BST 2022
Andreas Tille pushed to branch master at Debian Med / gdcm
Commits:
6db87c05 by Mathieu Malaterre at 2022-09-02T16:26:27+02:00
d/patches: Refresh patches for new vtk9 release
- - - - -
d3860613 by Mathieu Malaterre at 2022-09-02T16:28:16+02:00
d/rules: Update for latest vtk9 release
Also update *.install
- - - - -
760a328c by Mathieu Malaterre at 2022-09-02T16:28:27+02:00
d/control: Remove vtkgdcm-java / vtkgdcm-cil
Not supported upstream anymore since vtk9
- - - - -
58e183f4 by Andreas Tille at 2022-10-26T08:34:10+02:00
Merge branch 'debian/experimental'
- - - - -
8a7856ea by Andreas Tille at 2022-10-26T08:36:36+02:00
Mention drop of C# and Java bindings for VTK
- - - - -
a106f265 by Andreas Tille at 2022-10-26T09:25:27+02:00
Update patches
- - - - -
15 changed files:
- debian/changelog
- debian/control
- debian/control.in
- − debian/libvtkgdcm-cil.install
- − debian/libvtkgdcm-cil.installcligac
- debian/libvtkgdcm-dev.install
- − debian/libvtkgdcm-java.install
- debian/libvtkgdcm3.0.install
- debian/patches/03_linkvtkdoc.patch
- − debian/patches/fix_charls_2.patch
- − debian/patches/fix_swig4.patch
- debian/patches/series
- − debian/patches/use_swig_add_library_for_csharp.patch
- debian/python3-vtkgdcm.install
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,7 +1,7 @@
gdcm (3.0.17-5) UNRELEASED; urgency=medium
* Team upload.
- * Switch to VTK9
+ * Switch to VTK9 and drop bindings for vtk for C# and Java
Closes: #1013156
-- Andreas Tille <tille at debian.org> Tue, 25 Oct 2022 11:26:34 +0200
=====================================
debian/control
=====================================
@@ -23,7 +23,6 @@ Build-Depends: castxml,
libsocket++-dev,
libssl-dev,
libvtk9-dev,
- libvtk9-java [!hppa !hurd-any !kfreebsd-any],
libxml2-dev,
libz-dev,
mono-devel [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64] <!nocil>,
=====================================
debian/control.in
=====================================
@@ -23,7 +23,6 @@ Build-Depends: castxml,
libsocket++-dev,
libssl-dev,
libvtk9-dev,
- libvtk9-java [!hppa !hurd-any !kfreebsd-any],
libxml2-dev,
libz-dev,
mono-devel [@DEB_MONO_ARCHS@] <!nocil>,
@@ -141,22 +140,6 @@ Description: Grassroots DICOM VTK development libraries and headers
use GDCM, but are needed to build plugins or programs that link
against libvtkgdcm.
-Package: libvtkgdcm-cil
-Build-Profiles: <!nocil>
-Architecture: @DEB_MONO_ARCHS@
-Section: cli-mono
-Depends: libgdcm3.0 (= ${binary:Version}),
- ${cli:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: libgdcm-cil
-Description: Grassroots DICOM VTK CLI 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 CLI bindings to the GDCM DICOM library.
-
Package: python3-vtkgdcm
Architecture: any
Section: python
@@ -211,18 +194,3 @@ Description: Grassroots DICOM Java bindings
.
Java bindings to the GDCM DICOM library. It allows developers to use
GDCM from Java environment.
-
-Package: libvtkgdcm-java
-Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
-Section: java
-Depends: libgdcm3.0 (= ${binary:Version}),
- ${java:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: libgdcm-java
-Description: Grassroots DICOM VTK Java 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 Java bindings to the GDCM DICOM library.
=====================================
debian/libvtkgdcm-cil.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/*/libvtkgdcmsharpglue.so usr/lib/cli/vtkgdcm-sharp-3.0
-usr/lib/*/vtkgdcm-sharp.dll usr/lib/cli/vtkgdcm-sharp-3.0
=====================================
debian/libvtkgdcm-cil.installcligac deleted
=====================================
@@ -1 +0,0 @@
-/usr/lib/cli/vtkgdcm-sharp-3.0/vtkgdcm-sharp.dll
=====================================
debian/libvtkgdcm-dev.install
=====================================
@@ -1,2 +1,2 @@
usr/include/gdcm-3.*/vtk*
-usr/lib/*/libvtkgdcm.so
+usr/lib/*/libvtkgdcm-*.so
=====================================
debian/libvtkgdcm-java.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/*/jni/libvtkgdcmJava.so
-usr/lib/*/vtkgdcm.jar usr/share/java
=====================================
debian/libvtkgdcm3.0.install
=====================================
@@ -1 +1 @@
-usr/lib/*/libvtkgdcm.so.*
+usr/lib/*/libvtkgdcm-*.so.*
=====================================
debian/patches/03_linkvtkdoc.patch
=====================================
@@ -22,8 +22,8 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
- elseif(EXISTS "/usr/share/doc/vtk6-doc/doxygen")
- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen")
-+ elseif(EXISTS "/usr/share/doc/vtk-7.1/doxygen")
-+ set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-7.1/doxygen")
++ elseif(EXISTS "/usr/share/doc/vtk9/doxygen")
++ set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk9/doxygen")
else()
message(ERROR "DOXYGEN_SOURCE_DIR need to be set.")
endif()
@@ -43,7 +43,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
# PATH_TO_VTK_DOX_SCRIPTS=@CMAKE_CURRENT_SOURCE_DIR@
#
-export PATH_TO_VTK_DOX_SCRIPTS="@DOXYGEN_SOURCE_DIR@"
-+export PATH_TO_VTK_DOX_SCRIPTS=/usr/share/vtk-7.1/doxygen/
++export PATH_TO_VTK_DOX_SCRIPTS=/usr/share/vtk9/doxygen/
export PATH_TO_VTKGDCM_FINAL_PATH="@VTKGDCM_FINAL_PATH@"
=====================================
debian/patches/fix_charls_2.patch deleted
=====================================
@@ -1,52 +0,0 @@
-Description: Fix compiling with CharLS 2.0
-Author: Gert Wollny <gewo at debian.org>
-
---- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
-+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
-@@ -22,6 +22,12 @@
- // CharLS includes
- #include "gdcm_charls.h"
-
-+#include <cstring>
-+
-+using BYTE=unsigned char;
-+#define ILV_LINE charls::InterleaveMode::Line;
-+#define ILV_NONE charls::InterleaveMode::None;
-+
- #if defined(__GNUC__) && GCC_VERSION < 50101
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
- #endif
-@@ -287,7 +293,7 @@
- provide the possiblity to tune the JPEG-LS internals for better compression
- ratios. Expect a lot of work and testing to achieve small improvements.
-
-- Lossy/lossless is controlled by the field allowedlossyerror. If you put in
-+ Lossy/lossless is controlled by the field allowedLossyError. If you put in
- 0, encoding is lossless. If it is non-zero, then encoding is lossy. The
- value of 3 is often suggested as a default.
-
---- a/Utilities/gdcm_charls.h
-+++ b/Utilities/gdcm_charls.h
-@@ -20,11 +20,6 @@
- // It is expected that version 2.0.0 is used
- # include <CharLS/charls.h>
- # include <CharLS/publictypes.h>
--# include <CharLS/util.h>
--# include <CharLS/defaulttraits.h>
--# include <CharLS/losslesstraits.h>
--# include <CharLS/colortransform.h>
--# include <CharLS/processline.h>
- #else
- #include "gdcmcharls/charls.h"
- #include "gdcmcharls/publictypes.h"
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -367,7 +367,7 @@
-
- if(GDCM_USE_SYSTEM_CHARLS)
- find_package(CharLS 2.0.0 REQUIRED)
-- set(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARIES})
-+ set(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARY})
- else()
- set(GDCM_CHARLS_LIBRARIES gdcmcharls)
- endif()
=====================================
debian/patches/fix_swig4.patch deleted
=====================================
@@ -1,52 +0,0 @@
-Author: Mathieu Malaterre <malat at debian.org>
-
---- a/Utilities/VTK/vtkgdcm.i
-+++ b/Utilities/VTK/vtkgdcm.i
-@@ -341,37 +341,34 @@
- %ignore vtkGDCMImageReader::PrintSelf;
- %ignore vtkGDCMImageWriter::PrintSelf;
-
--%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") vtkGDCMTesting {
-+%typemap(csdisposing_derived, methodname="Dispose", methodmodifiers="protected", parameters="bool disposing") vtkGDCMTesting {
- lock(this) {
- if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
- swigCMemOwn = false;
- vtkgdcmPINVOKE.vtkObjectBase_Delete(swigCPtr);
- }
- swigCPtr = new HandleRef(null, IntPtr.Zero);
-- GC.SuppressFinalize(this);
-- base.Dispose();
-- }
--}
--%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") vtkGDCMImageReader {
-+ base.Dispose(disposing);
-+ }
-+}
-+%typemap(csdisposing_derived, methodname="Dispose", methodmodifiers="protected", parameters="bool disposing") vtkGDCMImageReader {
- lock(this) {
- if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
- swigCMemOwn = false;
- vtkgdcmPINVOKE.vtkObjectBase_Delete(swigCPtr);
- }
- swigCPtr = new HandleRef(null, IntPtr.Zero);
-- GC.SuppressFinalize(this);
-- base.Dispose();
-- }
--}
--%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") vtkGDCMImageWriter {
-+ base.Dispose(disposing);
-+ }
-+}
-+%typemap(csdisposing_derived, methodname="Dispose", methodmodifiers="protected", parameters="bool disposing") vtkGDCMImageWriter {
- lock(this) {
- if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
- swigCMemOwn = false;
- vtkgdcmPINVOKE.vtkObjectBase_Delete(swigCPtr);
- }
- swigCPtr = new HandleRef(null, IntPtr.Zero);
-- GC.SuppressFinalize(this);
-- base.Dispose();
-+ base.Dispose(disposing);
- }
- }
-
=====================================
debian/patches/series
=====================================
@@ -2,8 +2,3 @@ rename-pdf.patch
02_fixhurd.patch
03_linkvtkdoc.patch
04_multiarch.patch
-#use_system_findjni.patch
-#unforce_cxx98.patch
-#use_swig_add_library_for_csharp.patch
-#fix_charls_2.patch
-#fix_swig4.patch
=====================================
debian/patches/use_swig_add_library_for_csharp.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Use_swig_add_library_for_csharp
-Author: Gert Wollny <gewo at debian.org>
---- a/Wrapping/Csharp/CMakeLists.txt
-+++ b/Wrapping/Csharp/CMakeLists.txt
-@@ -27,7 +27,8 @@
- set(CMAKE_SWIG_FLAGS "-namespace gdcm -dllimport gdcmsharpglue")
- separate_arguments(CMAKE_SWIG_FLAGS)
- # libgdksharpglue.so
--SWIG_ADD_MODULE(gdcmsharpglue csharp gdcm.i)
-+set_property(SOURCE gdcm.i PROPERTY CPLUSPLUS ON)
-+SWIG_ADD_LIBRARY(gdcmsharpglue LANGUAGE csharp SOURCES gdcm.i)
- SWIG_LINK_LIBRARIES(gdcmsharpglue gdcmMSFF
- gdcmMEXD
- )
=====================================
debian/python3-vtkgdcm.install
=====================================
@@ -1,2 +1,2 @@
-usr/lib/*/libvtkgdcmPythonD.so*
-usr/lib/python3*/dist-packages/vtkgdcm*
+usr/lib/python3*/dist-packages/vtkgdcm/*
+usr/lib/x86_64-linux-gnu/vtk-*/hierarchy/vtkgdcm/vtkgdcm-hierarchy.txt
=====================================
debian/rules
=====================================
@@ -71,7 +71,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DVTKGDCM_WRAP_PYTHON:BOOL=ON \
- -DVTKGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
+ -DVTKGDCM_WRAP_JAVA:BOOL=OFF \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
-DGDCM_WRAP_PHP:BOOL=OFF \
-DGDCM_USE_PVRG:BOOL=ON \
@@ -117,8 +117,7 @@ override_dh_auto_install-arch:
find obj-* -name "GDCMTargets*.cmake" -exec sed -i -e "s/FATAL_ERROR/STATUS/g" \{\} \;
# See #989296
find obj-* -name "GDCMTargets*.cmake" -exec \
- sed -i -e 's@/lib/\(.\+\)/libvtkgdcmsharpglue.so@/lib/cli/vtkgdcm-sharp-3.0/libvtkgdcmsharpglue.so@' \
- -e 's@/lib/python/dist-packages/vtkgdcmPython.so@/lib/python3/dist-packages/vtkgdcmPython.cpython-$(PV)-$(DEB_HOST_MULTIARCH).so@' \
+ sed -i -e 's@/lib/python/dist-packages/vtkgdcmPython.so@/lib/python3/dist-packages/vtkgdcmPython.cpython-$(PV)-$(DEB_HOST_MULTIARCH).so@' \
\{\} \;
dh_auto_install
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/e5a9b43b972a686256bb8b363d3051aa0849e648...a106f2657ad20542993179b8ba809274e10c1c22
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/e5a9b43b972a686256bb8b363d3051aa0849e648...a106f2657ad20542993179b8ba809274e10c1c22
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221026/4c082d6c/attachment-0001.htm>
More information about the debian-med-commit
mailing list