2016-10-19: Retired orphaned package, because it was orphaned for
more than six weeks.
This commit is contained in:
parent
aa5d3c4cb2
commit
6cb884f404
|
@ -1 +0,0 @@
|
||||||
/gdcm-2.0.16.tar.bz2
|
|
|
@ -1,34 +0,0 @@
|
||||||
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
|
|
||||||
)
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
2016-10-19: Retired orphaned package, because it was orphaned for
|
||||||
|
more than six weeks.
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
--- CMakeLists.txt 2009-11-12 23:09:48.000000000 +0100
|
|
||||||
+++ CMakeLists2.txt 2010-02-05 18:08:06.000000000 +0100
|
|
||||||
@@ -38,10 +38,7 @@
|
|
||||||
STRING(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${GDCM_BINARY_DIR}" INSOURCE)
|
|
||||||
GET_FILENAME_COMPONENT(PARENTDIR ${GDCM_BINARY_DIR} PATH)
|
|
||||||
STRING(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
|
|
||||||
-IF(INSOURCE OR INSOURCESUBDIR)
|
|
||||||
- MESSAGE(FATAL_ERROR "GDCM requires an out of source Build. "
|
|
||||||
- "Please create a separate binary directory and run CMake there.")
|
|
||||||
-ENDIF(INSOURCE OR INSOURCESUBDIR)
|
|
||||||
+
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
SET(GDCM_MAJOR_VERSION 2)
|
|
|
@ -1,101 +0,0 @@
|
||||||
--- CMakeLists.txt 2010-02-19 19:18:30.000000000 +0100
|
|
||||||
+++ CMakeLists2.txt 2010-02-19 19:21:51.000000000 +0100
|
|
||||||
@@ -197,7 +197,7 @@
|
|
||||||
|
|
||||||
IF(NOT GDCM_INSTALL_LIB_DIR)
|
|
||||||
#SET(GDCM_INSTALL_LIB_DIR "lib/${PROJECT_NAME}")
|
|
||||||
- SET(GDCM_INSTALL_LIB_DIR "lib")
|
|
||||||
+ SET(GDCM_INSTALL_LIB_DIR "lib${LIB_SUFFIX}")
|
|
||||||
ENDIF(NOT GDCM_INSTALL_LIB_DIR)
|
|
||||||
|
|
||||||
IF(NOT GDCM_INSTALL_DATA_DIR)
|
|
||||||
@@ -261,6 +261,11 @@
|
|
||||||
OPTION(GDCM_USE_SYSTEM_EXPAT "Use system expat" OFF)
|
|
||||||
OPTION(GDCM_USE_SYSTEM_LJPEG "Use system ljpeg (ijg lib)" OFF)
|
|
||||||
OPTION(GDCM_USE_SYSTEM_OPENJPEG "Use system openjpeg (1.x)" OFF)
|
|
||||||
+IF(GDCM_USE_JPEGLS)
|
|
||||||
+ OPTION(GDCM_USE_SYSTEM_JPEGLS "Use system JPEGLS (CharLS)" OFF)
|
|
||||||
+ MARK_AS_ADVANCED(GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
+ENDIF(GDCM_USE_JPEGLS)
|
|
||||||
+
|
|
||||||
MARK_AS_ADVANCED(GDCM_USE_SYSTEM_ZLIB GDCM_USE_SYSTEM_UUID GDCM_USE_SYSTEM_EXPAT GDCM_USE_SYSTEM_OPENSSL)
|
|
||||||
MARK_AS_ADVANCED(GDCM_USE_SYSTEM_OPENJPEG GDCM_USE_SYSTEM_LJPEG)
|
|
||||||
OPTION(GDCM_USE_SYSTEM_POPPLER "Use system poppler (pdf)" OFF)
|
|
||||||
@@ -283,6 +288,14 @@
|
|
||||||
SET(GDCM_OPENJPEG_LIBRARIES gdcmopenjpeg)
|
|
||||||
ENDIF(GDCM_USE_SYSTEM_OPENJPEG)
|
|
||||||
|
|
||||||
+IF(GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
+ FIND_PACKAGE(CharLS REQUIRED)
|
|
||||||
+ SET(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARIES})
|
|
||||||
+ELSE(GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
+ SET(GDCM_CHARLS_LIBRARIES gdcmcharls)
|
|
||||||
+ENDIF(GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
# Very advanced user option:
|
|
||||||
# This will cause building of the broken JPEG library released by the Standford PVRG group:
|
|
||||||
OPTION(GDCM_USE_PVRG "Use pvrg lib, only turn it on if you know what you are doing." OFF)
|
|
||||||
|
|
||||||
--- Utilities/CMakeLists.txt 2009-11-12 23:09:48.000000000 +0100
|
|
||||||
+++ Utilities/CMakeLists2.txt 2010-02-19 19:21:59.000000000 +0100
|
|
||||||
@@ -35,12 +35,14 @@
|
|
||||||
# Do jpegls (JPEG-LS aka near lossless implementation)
|
|
||||||
APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmcharls/License.txt)
|
|
||||||
IF(GDCM_USE_JPEGLS)
|
|
||||||
- SET(CHARLS_NAMESPACE "GDCMCHARLS")
|
|
||||||
- SET(CHARLS_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})
|
|
||||||
- SET(CHARLS_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})
|
|
||||||
- SET(CHARLS_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})
|
|
||||||
- SET(CHARLS_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR})
|
|
||||||
- SUBDIRS(gdcmcharls)
|
|
||||||
+ IF(NOT GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
+ SET(CHARLS_NAMESPACE "GDCMCHARLS")
|
|
||||||
+ SET(CHARLS_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES})
|
|
||||||
+ SET(CHARLS_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR})
|
|
||||||
+ SET(CHARLS_INSTALL_LIB_DIR ${GDCM_INSTALL_LIB_DIR})
|
|
||||||
+ SET(CHARLS_INSTALL_INCLUDE_DIR ${GDCM_INSTALL_INCLUDE_DIR})
|
|
||||||
+ SUBDIRS(gdcmcharls)
|
|
||||||
+ ENDIF(NOT GDCM_USE_SYSTEM_JPEGLS)
|
|
||||||
ENDIF(GDCM_USE_JPEGLS)
|
|
||||||
|
|
||||||
# Do md5
|
|
||||||
--- Source/MediaStorageAndFileFormat/CMakeLists.txt 2009-11-12 23:09:48.000000000 +0100
|
|
||||||
+++ Source/MediaStorageAndFileFormat/CMakeLists2.txt 2010-02-19 19:22:23.000000000 +0100
|
|
||||||
@@ -132,7 +132,7 @@
|
|
||||||
TARGET_LINK_LIBRARIES(gdcmMSFF gdcmIOD gdcmDSED gdcmDICT ${GDCM_LJPEG_LIBRARIES} ${GDCM_OPENJPEG_LIBRARIES})
|
|
||||||
SET_TARGET_PROPERTIES(gdcmMSFF PROPERTIES ${GDCM_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "gdcmDSED;gdcmDICT;gdcmIOD")
|
|
||||||
IF(GDCM_USE_JPEGLS)
|
|
||||||
- TARGET_LINK_LIBRARIES(gdcmMSFF gdcmcharls)
|
|
||||||
+ TARGET_LINK_LIBRARIES(gdcmMSFF ${GDCM_CHARLS_LIBRARIES})
|
|
||||||
ENDIF(GDCM_USE_JPEGLS)
|
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX AND MINGW)
|
|
||||||
--- Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx 2009-11-12 23:09:48.000000000 +0100
|
|
||||||
+++ Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec2.cxx 2010-02-19 19:22:09.000000000 +0100
|
|
||||||
@@ -18,6 +18,16 @@
|
|
||||||
#include "gdcmDataElement.h"
|
|
||||||
|
|
||||||
// CharLS includes
|
|
||||||
+#ifdef GDCM_USE_SYSTEM_EXPAT
|
|
||||||
+#include "CharLS/stdafx.h" // sigh...
|
|
||||||
+#include "CharLS/interface.h"
|
|
||||||
+#include "CharLS/util.h"
|
|
||||||
+#include "CharLS/defaulttraits.h"
|
|
||||||
+#include "CharLS/losslesstraits.h"
|
|
||||||
+#include "CharLS/colortransform.h"
|
|
||||||
+#include "CharLS/streams.h"
|
|
||||||
+#include "CharLS/processline.h"
|
|
||||||
+#else
|
|
||||||
#include "gdcmcharls/stdafx.h" // sigh...
|
|
||||||
#include "gdcmcharls/interface.h"
|
|
||||||
#include "gdcmcharls/util.h"
|
|
||||||
@@ -26,6 +36,8 @@
|
|
||||||
#include "gdcmcharls/colortransform.h"
|
|
||||||
#include "gdcmcharls/streams.h"
|
|
||||||
#include "gdcmcharls/processline.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
|
|
||||||
|
|
||||||
namespace gdcm
|
|
|
@ -1,15 +0,0 @@
|
||||||
--- CMake/UseCopyright.cmake 2009-11-12 23:09:48.000000000 +0100
|
|
||||||
+++ CMake/UseCopyright2.cmake 2010-02-17 13:24:09.000000000 +0100
|
|
||||||
@@ -18,8 +18,10 @@
|
|
||||||
# need to raise an error if COPYRIGHT_MODULE_FILENAME is not set...
|
|
||||||
IF(EXISTS ${COPYRIGHT_MODULE_FILENAME} )
|
|
||||||
FOREACH(filename ${ARGN})
|
|
||||||
- FILE(READ ${filename} content)
|
|
||||||
- FILE(APPEND ${COPYRIGHT_MODULE_FILENAME} ${content})
|
|
||||||
+ IF(EXISTS ${filename} )
|
|
||||||
+ FILE(READ ${filename} content)
|
|
||||||
+ FILE(APPEND ${COPYRIGHT_MODULE_FILENAME} ${content})
|
|
||||||
+ ENDIF(EXISTS ${filename} )
|
|
||||||
ENDFOREACH(filename)
|
|
||||||
ENDIF(EXISTS ${COPYRIGHT_MODULE_FILENAME} )
|
|
||||||
ENDMACRO(APPEND_COPYRIGHT)
|
|
|
@ -1,58 +0,0 @@
|
||||||
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
index 4d38bef..48a52ac 100644
|
|
||||||
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
@@ -72,7 +72,7 @@ bool JPEGLSCodec::GetHeaderInfo(std::istream &is, TransferSyntax &ts)
|
|
||||||
is.seekg(0, std::ios::beg);
|
|
||||||
is.read( dummy_buffer, buf_size);
|
|
||||||
|
|
||||||
- JlsParamaters metadata;
|
|
||||||
+ JlsParameters metadata;
|
|
||||||
if (JpegLsReadHeader(dummy_buffer, buf_size, &metadata) != OK)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
@@ -160,7 +160,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
sf->GetBuffer(buffer, totalLen);
|
|
||||||
//is.write(buffer, totalLen);
|
|
||||||
|
|
||||||
- JlsParamaters metadata;
|
|
||||||
+ JlsParameters metadata;
|
|
||||||
if (JpegLsReadHeader(buffer, totalLen, &metadata) != OK)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
@@ -172,7 +172,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
const BYTE* pbyteCompressed = (const BYTE*)buffer;
|
|
||||||
int cbyteCompressed = totalLen;
|
|
||||||
|
|
||||||
- JlsParamaters params = {0};
|
|
||||||
+ JlsParameters params = {0};
|
|
||||||
JpegLsReadHeader(pbyteCompressed, cbyteCompressed, ¶ms);
|
|
||||||
|
|
||||||
std::vector<BYTE> rgbyteCompressed;
|
|
||||||
@@ -216,7 +216,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
// what if 0xd9 is never found ?
|
|
||||||
assert( totalLen > 0 && pbyteCompressed[totalLen-1] == 0xd9 );
|
|
||||||
|
|
||||||
- JlsParamaters metadata;
|
|
||||||
+ JlsParameters metadata;
|
|
||||||
if (JpegLsReadHeader(mybuffer, totalLen, &metadata) != OK)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
@@ -228,7 +228,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
|
|
||||||
int cbyteCompressed = totalLen;
|
|
||||||
|
|
||||||
- JlsParamaters params = {0};
|
|
||||||
+ JlsParameters params = {0};
|
|
||||||
JpegLsReadHeader(pbyteCompressed, cbyteCompressed, ¶ms);
|
|
||||||
|
|
||||||
std::vector<BYTE> rgbyteCompressed;
|
|
||||||
@@ -293,7 +293,7 @@ bool JPEGLSCodec::Code(DataElement const &in, DataElement &out)
|
|
||||||
{
|
|
||||||
const char *inputdata = input + dim * image_len; //bv->GetPointer();
|
|
||||||
|
|
||||||
- JlsParamaters params = {};
|
|
||||||
+ JlsParameters params = {};
|
|
||||||
/*
|
|
||||||
The fields in JlsCustomParameters do not control lossy/lossless. They
|
|
||||||
provide the possiblity to tune the JPEG-LS internals for better compression
|
|
|
@ -1,22 +0,0 @@
|
||||||
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
index d51832f..4d38bef 100644
|
|
||||||
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
@@ -181,7 +181,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
std::vector<BYTE> rgbyteOut;
|
|
||||||
rgbyteOut.resize(params.height *params.width * ((params.bitspersample + 7) / 8) * params.components);
|
|
||||||
|
|
||||||
- JLS_ERROR result = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), pbyteCompressed, cbyteCompressed);
|
|
||||||
+ JLS_ERROR result = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), pbyteCompressed, cbyteCompressed, ¶ms);
|
|
||||||
ASSERT(result == OK);
|
|
||||||
|
|
||||||
delete[] buffer;
|
|
||||||
@@ -237,7 +237,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
|
|
||||||
std::vector<BYTE> rgbyteOut;
|
|
||||||
rgbyteOut.resize(params.height *params.width * ((params.bitspersample + 7) / 8) * params.components);
|
|
||||||
|
|
||||||
- JLS_ERROR result = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), pbyteCompressed, cbyteCompressed);
|
|
||||||
+ JLS_ERROR result = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), pbyteCompressed, cbyteCompressed, ¶ms);
|
|
||||||
ASSERT(result == OK);
|
|
||||||
bool r = true;
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
diff -ru gdcm-2.0.16_orig/Utilities/VTK/Applications/CMakeLists.txt gdcm-2.0.16/Utilities/VTK/Applications/CMakeLists.txt
|
|
||||||
--- gdcm-2.0.16_orig/Utilities/VTK/Applications/CMakeLists.txt 2010-08-18 12:25:43.000000000 +0200
|
|
||||||
+++ gdcm-2.0.16/Utilities/VTK/Applications/CMakeLists.txt 2010-11-19 20:30:06.447787551 +0100
|
|
||||||
@@ -29,7 +29,7 @@
|
|
||||||
IF(GDCM_EXECUTABLE_PROPERTIES)
|
|
||||||
SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
|
|
||||||
ENDIF(GDCM_EXECUTABLE_PROPERTIES)
|
|
||||||
- TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME})
|
|
||||||
+ TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME} gdcmMSFF)
|
|
||||||
IF(VTK_USE_RENDERING)
|
|
||||||
TARGET_LINK_LIBRARIES(${app} vtkRendering)
|
|
||||||
|
|
||||||
Only in gdcm-2.0.16/Utilities/VTK/Applications: CMakeLists.txt~
|
|
||||||
diff -ru gdcm-2.0.16_orig/Utilities/VTK/Examples/Cxx/CMakeLists.txt gdcm-2.0.16/Utilities/VTK/Examples/Cxx/CMakeLists.txt
|
|
||||||
--- gdcm-2.0.16_orig/Utilities/VTK/Examples/Cxx/CMakeLists.txt 2010-08-18 12:25:43.000000000 +0200
|
|
||||||
+++ gdcm-2.0.16/Utilities/VTK/Examples/Cxx/CMakeLists.txt 2010-11-19 20:30:09.457709578 +0100
|
|
||||||
@@ -40,7 +40,7 @@
|
|
||||||
FOREACH(app ${GDCM_VTK_APPS})
|
|
||||||
ADD_EXECUTABLE(${app} ${app}.cxx)
|
|
||||||
#SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
|
|
||||||
- TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME} ${vtkgdcm_LIBS})
|
|
||||||
+ TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME} ${vtkgdcm_LIBS} gdcmMSFF)
|
|
||||||
IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
|
|
||||||
IF(VTK_USE_RENDERING)
|
|
||||||
TARGET_LINK_LIBRARIES(${app} vtkWidgets vtkVolumeRendering)
|
|
||||||
Only in gdcm-2.0.16/Utilities/VTK/Examples/Cxx: CMakeLists.txt~
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/gdcm-2.0.16/Wrapping/Python/gdcmswig.i b/gdcm-2.0.16/Wrapping/Python/gdcmswig.i
|
|
||||||
index 6a5a5c7..26c8ba5 100644
|
|
||||||
--- a/gdcm-2.0.16/Wrapping/Python/gdcmswig.i
|
|
||||||
+++ b/gdcm-2.0.16/Wrapping/Python/gdcmswig.i
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
// "There is no option to suppress all SWIG warning messages."
|
|
||||||
#pragma SWIG nowarn=302,303,312,362,383,389,401,503,504,509,510,514,516
|
|
||||||
%{
|
|
||||||
+#include <cstddef> // ptrdiff_t
|
|
||||||
#include "gdcmTypes.h"
|
|
||||||
#include "gdcmASN1.h"
|
|
||||||
#include "gdcmSmartPointer.h"
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
index a44a2b1..d51832f 100644
|
|
||||||
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
// CharLS includes
|
|
||||||
#ifdef GDCM_USE_SYSTEM_EXPAT
|
|
||||||
-#include "CharLS/stdafx.h" // sigh...
|
|
||||||
+//#include "CharLS/stdafx.h" // sigh...
|
|
||||||
#include "CharLS/interface.h"
|
|
||||||
#include "CharLS/util.h"
|
|
||||||
#include "CharLS/defaulttraits.h"
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- CMakeLists.txt.orig2 2010-11-22 11:43:24.258330997 +0100
|
|
||||||
+++ CMakeLists.txt 2010-11-22 11:43:54.402331000 +0100
|
|
||||||
@@ -191,7 +191,7 @@
|
|
||||||
# Install directories
|
|
||||||
|
|
||||||
STRING(TOLOWER ${PROJECT_NAME} projectname)
|
|
||||||
-SET(subdir "${projectname}-${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}")
|
|
||||||
+SET(subdir "${projectname}")
|
|
||||||
|
|
||||||
IF(NOT GDCM_INSTALL_BIN_DIR)
|
|
||||||
SET(GDCM_INSTALL_BIN_DIR "bin")
|
|
260
gdcm.spec
260
gdcm.spec
|
@ -1,260 +0,0 @@
|
||||||
# we don't want to provide private python extension libs
|
|
||||||
%{?filter_setup:
|
|
||||||
%filter_provides_in %{python_sitearch}/.*\.so$
|
|
||||||
%filter_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
|
|
||||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
|
||||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: gdcm
|
|
||||||
Version: 2.0.16
|
|
||||||
Release: 13%{?dist}
|
|
||||||
Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files
|
|
||||||
Group: Development/Libraries
|
|
||||||
License: BSD
|
|
||||||
URL: http://sourceforge.net/apps/mediawiki/gdcm/index.php?title=Main_Page
|
|
||||||
Source0: http://download.sourceforge.net/project/gdcm/gdcm%202.x/GDCM%202.0.16/gdcm-2.0.16.tar.bz2
|
|
||||||
#Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.bz2
|
|
||||||
Source2: FindCharLS.cmake
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
# There is a bug in doxygen preventing compilation on:
|
|
||||||
ExcludeArch: ppc ppc64
|
|
||||||
|
|
||||||
Patch1: gdcm-2.0.14-inplacebuild.patch
|
|
||||||
Patch2: gdcm-2.0.14-usecopyright.patch
|
|
||||||
Patch3: gdcm-2.0.14-use_system_charls.patch
|
|
||||||
Patch4: gdcm-2.0.16-fix_dso_link.patch
|
|
||||||
Patch5: gdcm-2.0.16-remove_versioned_install_dir.patch
|
|
||||||
Patch6: gdcm-2.0.16-fix_ptrdiff.patch
|
|
||||||
Patch7: gdcm-2.0.16-remove-stdafx.patch
|
|
||||||
Patch8: gdcm-2.0.16-fix-decode.patch
|
|
||||||
Patch9: gdcm-2.0.16-JlsParameters.patch
|
|
||||||
|
|
||||||
BuildRequires: cmake >= 2.6.0
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: libuuid-devel
|
|
||||||
BuildRequires: expat-devel
|
|
||||||
BuildRequires: openjpeg-devel
|
|
||||||
BuildRequires: poppler-devel
|
|
||||||
BuildRequires: mesa-libOSMesa-devel
|
|
||||||
BuildRequires: fontconfig-devel
|
|
||||||
BuildRequires: doxygen
|
|
||||||
BuildRequires: CharLS-devel >= 1.0
|
|
||||||
BuildRequires: texlive-latex
|
|
||||||
BuildRequires: graphviz
|
|
||||||
BuildRequires: python2-devel
|
|
||||||
BuildRequires: swig
|
|
||||||
BuildRequires: vtk-devel
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
|
||||||
GDCM implements the dicom base standard part 5 that concentrates on image file
|
|
||||||
format. Hence GDCM supports the following formats:
|
|
||||||
- ACR-NEMA version 1 and 2 (huffman compression is not supported),
|
|
||||||
- DICOM version 3.0, including various encodings of JPEG - lossless & lossy-,
|
|
||||||
RLE, J2K, deflated, JPEG-LS (very experimental) (MPEG2 compression is not
|
|
||||||
supported)
|
|
||||||
- Papyrus V2 and V3 file headers should be readable,
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Libraries and headers for GDCM
|
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
|
|
||||||
You should install the gdcm-devel package if you would like to
|
|
||||||
compile applications based on gdcm
|
|
||||||
|
|
||||||
%package python
|
|
||||||
Summary: Python binding for GDCM
|
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description python
|
|
||||||
|
|
||||||
You should install the gdcm-python package if you would like to
|
|
||||||
used this library with python
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q
|
|
||||||
%patch1
|
|
||||||
%patch2
|
|
||||||
%patch3
|
|
||||||
%patch4 -p1
|
|
||||||
%patch5
|
|
||||||
%patch6 -p2
|
|
||||||
%patch7 -p1
|
|
||||||
%patch8 -p1
|
|
||||||
%patch9 -p1
|
|
||||||
|
|
||||||
# Remove bundled utilities (we use Fedora's ones)
|
|
||||||
|
|
||||||
rm -rf Utilities/gdcmexpat
|
|
||||||
rm -rf Utilities/gdcmopenjpeg
|
|
||||||
rm -rf Utilities/gdcmzlib
|
|
||||||
rm -rf Utilities/gdcmuuid
|
|
||||||
rm -rf Utilities/gdcmcharls
|
|
||||||
|
|
||||||
# Remove bundled utilities (we don't use them)
|
|
||||||
rm -rf Utilities/gdcmmd5
|
|
||||||
rm -rf Utilities/getopt
|
|
||||||
rm -rf Utilities/pvrg
|
|
||||||
rm -rf Utilities/rle
|
|
||||||
rm -rf Utilities/wxWidgets
|
|
||||||
|
|
||||||
cp %{SOURCE2} CMake/
|
|
||||||
|
|
||||||
%build
|
|
||||||
%cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
|
|
||||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
|
||||||
-DGDCM_BUILD_TESTING=OFF \
|
|
||||||
-DGDCM_BUILD_EXAMPLES:BOOL=ON \
|
|
||||||
-DGDCM_DOCUMENTATION:BOOL=ON \
|
|
||||||
-DGDCM_PDF_DOCUMENTATION:BOOL=ON \
|
|
||||||
-DGDCM_WRAP_PYTHON:BOOL=OFF \
|
|
||||||
-DGDCM_WRAP_JAVA=OFF \
|
|
||||||
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
|
|
||||||
-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
|
|
||||||
-DCMAKE_BUILD_TYPE:STRING="Release" \
|
|
||||||
-DGDCM_USE_VTK:BOOL=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_EXPAT=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_OPENJPEG=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_ZLIB=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_UUID=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_LJPEG=OFF \
|
|
||||||
-DGDCM_USE_SYSTEM_OPENSSL=ON \
|
|
||||||
-DGDCM_USE_JPEGLS=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_JPEGLS=ON \
|
|
||||||
-DGDCM_USE_SYSTEM_POPPLER=ON .
|
|
||||||
|
|
||||||
#Cannot build wrap_java:
|
|
||||||
# -DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk.jar no found!
|
|
||||||
# yum provides */vtk.jar -> No results found
|
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
#install -d $RPM_BUILD_ROOT%{python_sitelib}/
|
|
||||||
#mv $RPM_BUILD_ROOT%{_libdir}/gdcm.py $RPM_BUILD_ROOT%{python_sitelib}/
|
|
||||||
#mv $RPM_BUILD_ROOT%{_libdir}/gdcmswig.py $RPM_BUILD_ROOT%{python_sitelib}/
|
|
||||||
#mv $RPM_BUILD_ROOT%{_libdir}/_gdcmswig.so $RPM_BUILD_ROOT%{python_sitelib}/
|
|
||||||
#mv $RPM_BUILD_ROOT%{_libdir}/vtkgdcm.py $RPM_BUILD_ROOT%{python_sitelib}/
|
|
||||||
|
|
||||||
## Rearranging directory layout and removing version from dir
|
|
||||||
mv $RPM_BUILD_ROOT%{_libdir}/gdcm/*.cmake $RPM_BUILD_ROOT%{_datadir}/gdcm/
|
|
||||||
rmdir $RPM_BUILD_ROOT%{_libdir}/gdcm/
|
|
||||||
|
|
||||||
## Cleaning Example dir from cmake cache files + remove 0-lenght files
|
|
||||||
find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf
|
|
||||||
find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc %{_mandir}/man1/*.1*
|
|
||||||
%doc AUTHORS Copyright.txt README.Copyright.txt README.txt
|
|
||||||
%dir %{_datadir}/gdcm/
|
|
||||||
%{_bindir}/*
|
|
||||||
%{_libdir}/*.so.*
|
|
||||||
%{_datadir}/gdcm/XML
|
|
||||||
|
|
||||||
%check
|
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/bin
|
|
||||||
ctest .
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir %{_includedir}/gdcm/
|
|
||||||
%doc Examples
|
|
||||||
%{_includedir}/gdcm/*
|
|
||||||
%{_libdir}/*.so
|
|
||||||
%{_datadir}/gdcm/*.cmake
|
|
||||||
|
|
||||||
#%files python
|
|
||||||
#%defattr(-,root,root,-)
|
|
||||||
#%{python_sitelib}/*
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Feb 14 2011 Mario Ceresa <mrceresa@gmail.com> - 2.0.16-13
|
|
||||||
- Adapted to new version of CharLS lib (v 1.0)
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.16-12
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Feb 02 2011 Mario Ceresa <mrceresa@gmail.com> - 2.0.16-11
|
|
||||||
- Removed python bindings because they fail to build with gcc 4.6
|
|
||||||
|
|
||||||
* Mon Feb 02 2011 Mario Ceresa <mrceresa@gmail.com> - 2.0.16-10
|
|
||||||
- Added patch to fix upstream bug #3169784
|
|
||||||
|
|
||||||
* Sun Jan 02 2011 Rex Dieter <rdieter@fedoraproject.org> - 2.0.16-11
|
|
||||||
- rebuild (poppler)
|
|
||||||
|
|
||||||
* Wed Dec 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.0.16-8
|
|
||||||
- rebuild (poppler)
|
|
||||||
|
|
||||||
* Mon Nov 22 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-7
|
|
||||||
- Fixed bug 655738
|
|
||||||
|
|
||||||
* Tue Nov 19 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-6
|
|
||||||
- Enabled VTK support
|
|
||||||
|
|
||||||
* Tue Oct 19 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-5
|
|
||||||
- Filtered out private python extension lib
|
|
||||||
- Added documentation
|
|
||||||
|
|
||||||
* Tue Oct 19 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-4
|
|
||||||
- Changed directory ownership
|
|
||||||
|
|
||||||
* Fri Oct 15 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-3
|
|
||||||
- Rearranged directory layout to remove version in dir names
|
|
||||||
|
|
||||||
* Sat Sep 18 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-2
|
|
||||||
- Added ExcludeArch for ppc and ppc64 because of a bug in doxygen
|
|
||||||
see https://bugzilla.redhat.com/show_bug.cgi?id=566725#c9
|
|
||||||
|
|
||||||
* Sat Sep 18 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.16-1
|
|
||||||
- Updated to release 2.0.16
|
|
||||||
- Removed patch "stack_namespace" and "poppler_breaks_api" because
|
|
||||||
already included upstream
|
|
||||||
- Added swig and texlive-pdflatex to BuildRequires
|
|
||||||
- Moved python files to a separate package
|
|
||||||
|
|
||||||
* Sun Apr 11 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.14-5
|
|
||||||
- Fixed some issues pointed out by Martin Gieseking. In details:
|
|
||||||
- BR to build documentation (tex + graphviz)
|
|
||||||
- Changed man page inclusion
|
|
||||||
- Fixed changelog format
|
|
||||||
- Removed VTK support because cmake 2.8 is needed to recognize vtk 5.4!
|
|
||||||
- Fixed python support
|
|
||||||
|
|
||||||
* Thu Mar 25 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.14-4
|
|
||||||
- Added VTK support
|
|
||||||
- Added python support
|
|
||||||
|
|
||||||
* Mon Mar 21 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.14-3
|
|
||||||
- Added BuildRequires fontconfig-devel
|
|
||||||
- Fixed lib /lib64 issue with base CMakeLists.txt
|
|
||||||
|
|
||||||
* Mon Mar 15 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.14-2
|
|
||||||
- Added BuildRequires CharLS-devel
|
|
||||||
|
|
||||||
* Wed Feb 17 2010 Mario Ceresa <mrceresa@gmail.com> 2.0.14
|
|
||||||
- Initial RPM Release
|
|
||||||
|
|
Loading…
Reference in New Issue