commit 291a797ffb7ba0e8e8ef31931971f154f51c2449
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Mon Aug 8 08:54:57 2016 +0200
- missing patches
...-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch | 53 ++++++++++++++++++++++
...01-Removed-reference-to-bundled-libcharls.patch | 24 ++++++++++
dcmtk-3.6.1-0002-Find-and-include-CharLS.patch | 37 +++++++++++++++
dcmtk-3.6.1-0003-Create-FindCharLS.cmake.patch | 53 ++++++++++++++++++++++
...4-Use-cmake-suggested-location-for-CharLS.patch | 34 ++++++++++++++
5 files changed, 201 insertions(+)
---
diff --git a/dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
b/dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
new file mode 100644
index 0000000..ef3c3e4
--- /dev/null
+++ b/dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
@@ -0,0 +1,53 @@
+From 6d6a52c1c049c0fe8440d8b03d5cb852a47c0cd5 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrcer...@gmail.com>
+Date: Sun, 20 Mar 2011 14:40:48 +0100
+Subject: [PATCH 5/6] Fixed includes for CharLS 1.0
+
+---
+ dcmjpls/libsrc/djcodecd.cc | 2 +-
+ dcmjpls/libsrc/djcodece.cc | 2 +-
+ dcmjpls/libsrc/djerror.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
+index 8a11515..8da8d7a 100644
+--- a/dcmjpls/libsrc/djcodecd.cc
++++ b/dcmjpls/libsrc/djcodecd.cc
+@@ -44,7 +44,7 @@
+ #include "djerror.h" /* for private class DJLSError */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
+ {
+diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc
+index 9d6e1d8..8148b31 100644
+--- a/dcmjpls/libsrc/djcodece.cc
++++ b/dcmjpls/libsrc/djcodece.cc
+@@ -62,7 +62,7 @@
+ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ BEGIN_EXTERN_C
+ #ifdef HAVE_FCNTL_H
+diff --git a/dcmjpls/libsrc/djerror.h b/dcmjpls/libsrc/djerror.h
+index 68ebae1..d3cd2ad 100644
+--- a/dcmjpls/libsrc/djerror.h
++++ b/dcmjpls/libsrc/djerror.h
+@@ -31,7 +31,7 @@
+
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
+-#include "intrface.h" /* CharLS include */
++#include "CharLS/interface.h" /* CharLS include */
+
+ /** Helper class for converting between dcmjpls and CharLS error codes
+ */
+--
+1.7.4
+
diff --git a/dcmtk-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch
b/dcmtk-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch
new file mode 100644
index 0000000..5a04969
--- /dev/null
+++ b/dcmtk-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch
@@ -0,0 +1,24 @@
+From 6996b93b9ea3721ae970e4984d617fe050cd3b02 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mario.cer...@upf.edu>
+Date: Mon, 15 Dec 2014 12:00:53 +0100
+Subject: [PATCH] Removed reference to bundled libcharls
+
+---
+ dcmjpls/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dcmjpls/CMakeLists.txt b/dcmjpls/CMakeLists.txt
+index e114663..c92ac5b 100644
+--- a/dcmjpls/CMakeLists.txt
++++ b/dcmjpls/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ PROJECT(dcmjpls)
+
+ # recurse into subdirectories
+-FOREACH(SUBDIR libsrc libcharls apps include)
++FOREACH(SUBDIR libsrc apps include)
+ ADD_SUBDIRECTORY(${SUBDIR})
+ ENDFOREACH(SUBDIR)
+--
+1.9.3
+
diff --git a/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
b/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
new file mode 100644
index 0000000..84a0dca
--- /dev/null
+++ b/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
@@ -0,0 +1,37 @@
+From 9cc2c06d89d357a22065913abb0ab3ccda5a732b Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mario.cer...@upf.edu>
+Date: Mon, 15 Dec 2014 12:22:00 +0100
+Subject: [PATCH] Find and include CharLS
+
+---
+ CMake/3rdparty.cmake | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
+index 9fcca77..2ccda35 100755
+--- a/CMake/3rdparty.cmake
++++ b/CMake/3rdparty.cmake
+@@ -267,6 +267,20 @@ ELSE(WIN32)
+ ENDIF(NOT WRAP_FOUND)
+ ENDIF(DCMTK_WITH_WRAP)
+
++ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
++
++ IF(DCMTK_WITH_CHARLS)
++ FIND_PACKAGE(CharLS)
++ INCLUDE_DIRECTORIES(${CHARLS_INCLUDE_DIRS})
++ SET(CHARLS_LIBS ${CHARLS_LIBRARIES})
++ IF (NOT CHARLS_LIBS)
++ MESSAGE(STATUS "Warning: CharLS not found. Cannot build!")
++ ELSE(NOT CHARLS_LIBS)
++ MESSAGE(STATUS "Info: DCMTK CHARLS support will be enabled")
++ SET(WITH_CHARLS 1)
++ ENDIF(NOT CHARLS_LIBS)
++ ENDIF(DCMTK_WITH_CHARLS)
++
+ ENDIF()
+
+ # Find doxygen
+--
+1.9.3
+
diff --git a/dcmtk-3.6.1-0003-Create-FindCharLS.cmake.patch
b/dcmtk-3.6.1-0003-Create-FindCharLS.cmake.patch
new file mode 100644
index 0000000..9a69d97
--- /dev/null
+++ b/dcmtk-3.6.1-0003-Create-FindCharLS.cmake.patch
@@ -0,0 +1,53 @@
+From a86cb1e1d622951d8345f0283837b20d8df707d0 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mario.cer...@upf.edu>
+Date: Mon, 15 Dec 2014 12:28:55 +0100
+Subject: [PATCH] Create FindCharLS.cmake
+
+---
+ CMake/FindCharLS.cmake | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 CMake/FindCharLS.cmake
+
+diff --git a/CMake/FindCharLS.cmake b/CMake/FindCharLS.cmake
+new file mode 100644
+index 0000000..eaa45b7
+--- /dev/null
++++ b/CMake/FindCharLS.cmake
+@@ -0,0 +1,34 @@
++FIND_PATH(CHARLS_INCLUDE_DIR CharLS/interface.h
++/usr/local/include
++/usr/include
++)
++
++FIND_LIBRARY(CHARLS_LIBRARY
++ NAMES CharLS
++ PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
++ )
++
++
++IF (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++ SET(CHARLS_LIBRARIES ${CHARLS_LIBRARY})
++ SET(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR})
++ SET(CHARLS_FOUND "YES")
++ELSE (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++ SET(CHARLS_FOUND "NO")
++ENDIF (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++
++
++IF (CHARLS_FOUND)
++ IF (NOT CHARLS_FIND_QUIETLY)
++ MESSAGE(STATUS "Found CHARLS: ${CHARLS_LIBRARIES}")
++ ENDIF (NOT CHARLS_FIND_QUIETLY)
++ELSE (CHARLS_FOUND)
++ IF (CHARLS_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could not find CHARLS library")
++ ENDIF (CHARLS_FIND_REQUIRED)
++ENDIF (CHARLS_FOUND)
++
++MARK_AS_ADVANCED(
++ CHARLS_LIBRARIES
++ CHARLS_INCLUDE_DIR
++ )
+--
+1.9.3
+
diff --git a/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
b/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
new file mode 100644
index 0000000..669724f
--- /dev/null
+++ b/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
@@ -0,0 +1,34 @@
+From 356494231c72c30d4cfa17559891863c1c0c483b Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mario.cer...@upf.edu>
+Date: Mon, 15 Dec 2014 14:26:11 +0100
+Subject: [PATCH] Use cmake suggested location for CharLS
+
+---
+ dcmjpls/apps/CMakeLists.txt | 2 +-
+ dcmjpls/libsrc/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
+index 2e881d7..6170f8a 100644
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
+@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle
dcmdata oflog ofstd ofstd)
++ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage
dcmimgle dcmdata oflog ofstd ofstd)
+ ENDFOREACH(PROGRAM)
+diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
+index 8a7b4e8..dc3ff44 100644
+--- a/dcmjpls/libsrc/CMakeLists.txt
++++ b/dcmjpls/libsrc/CMakeLists.txt
+@@ -4,4 +4,4 @@ INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include
${ofstd_SOURCE_DIR}/include ${
+ # create library from source files
+ DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd
djutils djcodece)
+
+-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage
charls)
++DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage
${CHARLS_LIBS})
+--
+1.9.3
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dcmtk.git/commitdiff/291a797ffb7ba0e8e8ef31931971f154f51c2449
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
