[packages/dcmtk] - up to 3.6.3
arekm
arekm at pld-linux.org
Thu Sep 20 11:14:01 CEST 2018
commit 490ce1200c569392075993830169fc37f16afb93
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Sep 20 11:13:51 2018 +0200
- up to 3.6.3
CharLS.patch | 20 +++++++++++++++++
dcmtk-etc.patch | 14 ++++++------
dcmtk.spec | 70 +++++++++++++++++++++++++++++++--------------------------
3 files changed, 65 insertions(+), 39 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 13e72a3..8113e52 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -3,22 +3,22 @@
# are libjpeg 6b with some arithmetic and lossless patches applied;
# libjpeg 8 already inclded arithmetic encoding support, but not lossless)
#
-%define snap 20160630
-Summary: DICOM Toolkit - implementation of DICOM/MEDICOM standard
+Summary: DICOM To:olkit - implementation of DICOM/MEDICOM standard
Summary(pl.UTF-8): Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
Name: dcmtk
-Version: 3.6.1
-Release: 0.%{snap}.1
+Version: 3.6.3
+Release: 1
License: BSD
Group: Libraries
-Source0: http://dicom.offis.de/download/dcmtk/snapshot/%{name}-%{version}_%{snap}.tar.gz
-# Source0-md5: 8a15ed7ce05ba03184af18ce9837db9b
+Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk363/%{name}-%{version}.tar.gz
+# Source0-md5: 2f79082d52cbbb06a360f48b4a9c61be
Patch0: %{name}-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
Patch1: %{name}-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch
Patch2: %{name}-3.6.1-0002-Find-and-include-CharLS.patch
Patch3: %{name}-3.6.1-0003-Create-FindCharLS.cmake.patch
Patch4: %{name}-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
Patch5: %{name}-etc.patch
+Patch6: CharLS.patch
URL: http://dicom.offis.de/dcmtk
BuildRequires: CharLS-devel < 2.0
BuildRequires: cmake >= 2.4
@@ -66,13 +66,14 @@ Header files for DCMTK libraries.
Pliki nagłówkowe bibliotek DCMTK.
%prep
-%setup -q -n %{name}-%{version}_%{snap}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# enforce system CharLS
%{__rm} -r dcmjpls/libcharls
@@ -101,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dcmtk
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -129,12 +130,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/img2dcm
%attr(755,root,root) %{_bindir}/mkreport
%attr(755,root,root) %{_bindir}/movescu
+%attr(755,root,root) %{_bindir}/msgserv
%attr(755,root,root) %{_bindir}/ofstd_tests
%attr(755,root,root) %{_bindir}/pdf2dcm
%attr(755,root,root) %{_bindir}/storescp
%attr(755,root,root) %{_bindir}/storescu
%attr(755,root,root) %{_bindir}/termscu
%attr(755,root,root) %{_bindir}/wlmscpfs
+%attr(755,root,root) %{_bindir}/wltest
%attr(755,root,root) %{_bindir}/xml2dcm
%attr(755,root,root) %{_bindir}/xml2dsr
%dir %{_sysconfdir}/dcmtk
@@ -170,53 +173,55 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcmr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcmr.so.9
+%attr(755,root,root) %ghost %{_libdir}/libcmr.so.13
%attr(755,root,root) %{_libdir}/libdcmdata.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.13
%attr(755,root,root) %{_libdir}/libdcmdsig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.13
%attr(755,root,root) %{_libdir}/libdcmfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.13
%attr(755,root,root) %{_libdir}/libdcmimage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.13
%attr(755,root,root) %{_libdir}/libdcmimgle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.13
%attr(755,root,root) %{_libdir}/libdcmiod.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.13
%attr(755,root,root) %{_libdir}/libdcmjpeg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.13
%attr(755,root,root) %{_libdir}/libdcmjpls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.13
%attr(755,root,root) %{_libdir}/libdcmnet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.13
%attr(755,root,root) %{_libdir}/libdcmpstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.13
%attr(755,root,root) %{_libdir}/libdcmqrdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.13
%attr(755,root,root) %{_libdir}/libdcmrt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.13
%attr(755,root,root) %{_libdir}/libdcmseg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.13
+%attr(755,root,root) %{_libdir}/libdcmpmap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.13
%attr(755,root,root) %{_libdir}/libdcmsr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.13
%attr(755,root,root) %{_libdir}/libdcmtract.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.13
%attr(755,root,root) %{_libdir}/libdcmtls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.13
%attr(755,root,root) %{_libdir}/libdcmwlm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.9
+%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.13
%attr(755,root,root) %{_libdir}/libi2d.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libi2d.so.9
+%attr(755,root,root) %ghost %{_libdir}/libi2d.so.13
%attr(755,root,root) %{_libdir}/libijg12.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg12.so.9
+%attr(755,root,root) %ghost %{_libdir}/libijg12.so.13
%attr(755,root,root) %{_libdir}/libijg16.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg16.so.9
+%attr(755,root,root) %ghost %{_libdir}/libijg16.so.13
%attr(755,root,root) %{_libdir}/libijg8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg8.so.9
+%attr(755,root,root) %ghost %{_libdir}/libijg8.so.13
%attr(755,root,root) %{_libdir}/liboflog.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboflog.so.9
+%attr(755,root,root) %ghost %{_libdir}/liboflog.so.13
%attr(755,root,root) %{_libdir}/libofstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libofstd.so.9
+%attr(755,root,root) %ghost %{_libdir}/libofstd.so.13
%files devel
%defattr(644,root,root,755)
@@ -230,6 +235,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libdcmjpeg.so
%attr(755,root,root) %{_libdir}/libdcmjpls.so
%attr(755,root,root) %{_libdir}/libdcmnet.so
+%attr(755,root,root) %{_libdir}/libdcmpmap.so
%attr(755,root,root) %{_libdir}/libdcmpstat.so
%attr(755,root,root) %{_libdir}/libdcmqrdb.so
%attr(755,root,root) %{_libdir}/libdcmrt.so
diff --git a/CharLS.patch b/CharLS.patch
new file mode 100644
index 0000000..d2f7484
--- /dev/null
+++ b/CharLS.patch
@@ -0,0 +1,20 @@
+--- dcmtk-3.6.3/dcmjpls/libsrc/djcodece.cc~ 2018-09-20 10:38:14.000000000 +0200
++++ dcmtk-3.6.3/dcmjpls/libsrc/djcodece.cc 2018-09-20 10:59:27.453790390 +0200
+@@ -664,7 +664,7 @@ OFCondition DJLSEncoderBase::compressRaw
+
+ size_t bytesWritten = 0;
+
+- JLS_ERROR err = JpegLsEncode(&buffer, &size, &bytesWritten, framePointer, frameSize, &jls_params);
++ JLS_ERROR err = JpegLsEncode(&buffer, size, &bytesWritten, framePointer, frameSize, &jls_params);
+ result = DJLSError::convert(err);
+
+ if (result.good())
+@@ -1055,7 +1055,7 @@ OFCondition DJLSEncoderBase::compressCoo
+
+ size_t bytesWritten = 0;
+
+- JLS_ERROR err = JpegLsEncode(&compressed_buffer, &compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);
++ JLS_ERROR err = JpegLsEncode(&compressed_buffer, compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);
+ result = DJLSError::convert(err);
+
+ if (result.good())
diff --git a/dcmtk-etc.patch b/dcmtk-etc.patch
index a1059e2..451045b 100644
--- a/dcmtk-etc.patch
+++ b/dcmtk-etc.patch
@@ -1,11 +1,11 @@
---- dcmtk-3.6.1_20160630/CMake/GenerateDCMTKConfigure.cmake~ 2016-06-30 11:41:55.000000000 +0200
-+++ dcmtk-3.6.1_20160630/CMake/GenerateDCMTKConfigure.cmake 2016-08-07 13:05:38.470285825 +0200
-@@ -113,7 +113,7 @@ ELSE(WIN32 AND NOT CYGWIN AND NOT MINGW)
+--- dcmtk-3.6.3/CMake/GenerateDCMTKConfigure.cmake~ 2018-02-05 18:58:12.000000000 +0100
++++ dcmtk-3.6.3/CMake/GenerateDCMTKConfigure.cmake 2018-09-19 12:54:55.238532235 +0200
+@@ -164,7 +164,7 @@ ELSE(WIN32 AND NOT CYGWIN)
SET(DCM_DICT_DEFAULT_PATH "")
- ENDIF (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+ ENDIF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
# Set default directory for configuration and support data.
-- SET(DCMTK_DEFAULT_CONFIGURATION_DIR "${DCMTK_PREFIX}/${DCMTK_INSTALL_ETCDIR}/")
+- SET(DCMTK_DEFAULT_CONFIGURATION_DIR "${DCMTK_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/dcmtk/")
+ SET(DCMTK_DEFAULT_CONFIGURATION_DIR "/${DCMTK_INSTALL_ETCDIR}/")
- SET(DCMTK_DEFAULT_SUPPORT_DATA_DIR "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/")
- ENDIF(WIN32 AND NOT CYGWIN AND NOT MINGW)
+ SET(DCMTK_DEFAULT_SUPPORT_DATA_DIR "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/")
+ ENDIF(WIN32 AND NOT CYGWIN)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dcmtk.git/commitdiff/490ce1200c569392075993830169fc37f16afb93
More information about the pld-cvs-commit
mailing list