[med-svn] r7654 - in trunk/packages/ctk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sun Sep 4 11:55:57 UTC 2011
Author: malat-guest
Date: 2011-09-04 11:55:56 +0000 (Sun, 04 Sep 2011)
New Revision: 7654
Added:
trunk/packages/ctk/debian/patches/fixdcmtk.patch
trunk/packages/ctk/debian/patches/fixvtk.patch
Modified:
trunk/packages/ctk/debian/patches/series
trunk/packages/ctk/debian/rules
Log:
Activate more modules
Added: trunk/packages/ctk/debian/patches/fixdcmtk.patch
===================================================================
--- trunk/packages/ctk/debian/patches/fixdcmtk.patch (rev 0)
+++ trunk/packages/ctk/debian/patches/fixdcmtk.patch 2011-09-04 11:55:56 UTC (rev 7654)
@@ -0,0 +1,115 @@
+Taken from:
+https://github.com/malaterre/CTK/commit/e06d661
+This has not been pulled yet in upstream
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDatabase.cpp
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2011-09-04 13:55:28.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include "ctkLogger.h"
+
+ // DCMTK includes
++#define HAVE_CONFIG_H
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcdeftag.h>
+@@ -49,7 +50,7 @@
+ #include <dcmtk/ofstd/ofstring.h>
+ #include <dcmtk/ofstd/ofstd.h> /* for class OFStandard */
+ #include <dcmtk/dcmdata/dcddirif.h> /* for class DicomDirInterface */
+-#include <dcmimage.h>
++#include <dcmtk/dcmimgle/dcmimage.h>
+
+ #include <dcmtk/dcmjpeg/djdecode.h> /* for dcmjpeg decoders */
+ #include <dcmtk/dcmjpeg/djencode.h> /* for dcmjpeg encoders */
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.cpp
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDataset.cpp 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.cpp 2011-09-04 13:55:28.000000000 +0200
+@@ -21,9 +21,9 @@
+
+ #include "ctkDICOMDataset.h"
+
+-#include <dctk.h>
+-#include <dcostrmb.h>
+-#include <dcistrmb.h>
++#include <dcmtk/dcmdata/dctk.h>
++#include <dcmtk/dcmdata/dcostrmb.h>
++#include <dcmtk/dcmdata/dcistrmb.h>
+
+ #include <stdexcept>
+
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMIndexer.cpp
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2011-09-04 13:55:28.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include "ctkDICOMAbstractThumbnailGenerator.h"
+
+ // DCMTK includes
++#define HAVE_CONFIG_H
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcdeftag.h>
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMQuery.cpp
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMQuery.cpp 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMQuery.cpp 2011-09-04 13:55:28.000000000 +0200
+@@ -35,8 +35,9 @@
+ #include "ctkLogger.h"
+
+ // DCMTK includes
+-#include "dcmtk/dcmnet/dimse.h"
+-#include "dcmtk/dcmnet/diutil.h"
++#define HAVE_CONFIG_H
++#include <dcmtk/dcmnet/dimse.h>
++#include <dcmtk/dcmnet/diutil.h>
+
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcfilefo.h>
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2011-09-04 13:55:28.000000000 +0200
+@@ -37,8 +37,9 @@
+ #include "ctkLogger.h"
+
+ // DCMTK includes
+-#include "dcmtk/dcmnet/dimse.h"
+-#include "dcmtk/dcmnet/diutil.h"
++#define HAVE_CONFIG_H
++#include <dcmtk/dcmnet/dimse.h>
++#include <dcmtk/dcmnet/diutil.h>
+
+ #include <dcmtk/dcmdata/dcfilefo.h>
+ #include <dcmtk/dcmdata/dcfilefo.h>
+@@ -167,6 +168,7 @@
+
+ // Issue request
+ logger.debug ( "Sending Move Request" );
++#if 0
+ MOVEResponses responses;
+ T_ASC_PresentationContextID presID = scu.findPresentationContextID(UID_MOVEStudyRootQueryRetrieveInformationModel, "" /* don't care about transfer syntax */ );
+ if (presID == 0)
+@@ -283,6 +285,7 @@
+ // }
+ // }
+ // }
++#endif
+ return true;
+ }
+
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/CMakeLists.txt 2011-09-04 13:55:23.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/CMakeLists.txt 2011-09-04 13:55:28.000000000 +0200
+@@ -85,6 +85,9 @@
+ CONFIGURE_FILE( Resources/dcmqrscp.cfg.in dcmqrscp.cfg )
+ set (DCMQRSCP_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/dcmqrscp.cfg)
+
++find_package(DCMTK REQUIRED)
++list(APPEND KIT_target_libraries ${DCMTK_LIBRARIES})
++
+ ctkMacroBuildLib(
+ NAME ${PROJECT_NAME}
+ EXPORT_DIRECTIVE ${KIT_export_directive}
Added: trunk/packages/ctk/debian/patches/fixvtk.patch
===================================================================
--- trunk/packages/ctk/debian/patches/fixvtk.patch (rev 0)
+++ trunk/packages/ctk/debian/patches/fixvtk.patch 2011-09-04 11:55:56 UTC (rev 7654)
@@ -0,0 +1,12 @@
+Index: ctk-0.1.0~git622a40d/Libs/Visualization/VTK/Core/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/Visualization/VTK/Core/CMakeLists.txt 2011-09-03 19:08:49.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/Visualization/VTK/Core/CMakeLists.txt 2011-09-03 19:09:00.000000000 +0200
+@@ -3,6 +3,7 @@
+ #
+ # 3rd party dependencies
+ #
++find_package(VTK REQUIRED)
+ INCLUDE(${VTK_USE_FILE})
+
+ #
Modified: trunk/packages/ctk/debian/patches/series
===================================================================
--- trunk/packages/ctk/debian/patches/series 2011-09-04 09:57:36 UTC (rev 7653)
+++ trunk/packages/ctk/debian/patches/series 2011-09-04 11:55:56 UTC (rev 7654)
@@ -1,2 +1,4 @@
debian-changes-0.1.0-2
debian-changes-0.1.0-3
+fixvtk.patch
+fixdcmtk.patch
Modified: trunk/packages/ctk/debian/rules
===================================================================
--- trunk/packages/ctk/debian/rules 2011-09-04 09:57:36 UTC (rev 7653)
+++ trunk/packages/ctk/debian/rules 2011-09-04 11:55:56 UTC (rev 7654)
@@ -9,14 +9,14 @@
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_BUILD_TYPE:STRING=Debug \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
- -DCMAKE_SKIP_RPATH:BOOL=OFF \
+ -DCMAKE_SKIP_RPATH:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \
-DCTK_APP_ctkCLIPluginExplorer:BOOL=ON \
-DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
-DCTK_LIB_DICOM/Core:BOOL=ON \
-DCTK_LIB_Widgets:BOOL=ON \
- -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
- -DCTK_LIB_Visualization/VTK/Core:BOOL=OFF \
+ -DCTK_LIB_Scripting/Python/Core:BOOL=ON \
+ -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
-DCTK_SUPERBUILD:BOOL=OFF \
More information about the debian-med-commit
mailing list