commit b86d91273f5b2f274b7442b4feda03f8e5effe94
Author: Jan Palus <at...@pld-linux.org>
Date: Tue Jan 21 17:38:35 2025 +0100
up to 3.6.9 (new sonames)
CharLS.patch | 11 +++
...-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch | 11 +++
...4-Use-cmake-suggested-location-for-CharLS.patch | 2 +-
dcmtk-etc.patch | 8 +--
dcmtk.spec | 82 +++++++++-------------
5 files changed, 61 insertions(+), 53 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 4980d88..7a7cde5 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -3,20 +3,15 @@
# are libjpeg 6b with some arithmetic and lossless patches applied;
# libjpeg 8 already included arithmetic encoding support, but not lossless)
#
-# Conditional build:
-%bcond_without icu # libicu instead of bundled oficonv
-# glibc iconv supports only AbortTranscodingOnIllegalSequence conversion flag
-# icu supports AbortTranscodingOnIllegalSequence and DiscardIllegalSequences
-# standalone libiconv >= 1.8 supports additionally
TransliterateIllegalSequences
Summary: DICOM Toolkit - implementation of DICOM/MEDICOM standard
Summary(pl.UTF-8): Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
Name: dcmtk
-Version: 3.6.8
+Version: 3.6.9
Release: 1
License: BSD
Group: Libraries
Source0:
https://dicom.offis.de/download/dcmtk/release/%{name}-%{version}.tar.gz
-# Source0-md5: 7522e06ca2479183eb535c5da2bdf5e4
+# Source0-md5: cb30587f8da760c832a4f19d159acda5
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
@@ -27,9 +22,8 @@ Patch6: CharLS.patch
Patch7: %{name}-pc.patch
URL: https://dcmtk.org/
BuildRequires: CharLS-devel < 2.0
-BuildRequires: cmake >= 3.0
+BuildRequires: cmake >= 3.7
BuildRequires: doxygen
-%{?with_icu:BuildRequires: libicu-devel}
BuildRequires: libpng-devel >= 2:1.2.8
# handled during configuration, but actually not used
#BuildRequires: libsndfile-devel
@@ -40,6 +34,7 @@ BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: openjpeg2-devel >= 2
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: zlib-devel >= 1.2.3
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,7 +66,6 @@ Summary: Header files for DCMTK libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek DCMTK
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-%{?with_icu:Requires: libicu-devel}
Requires: libpng-devel >= 2:1.2.8
Requires: libstdc++-devel >= 6:4.8.1
Requires: libtiff-devel >= 4
@@ -106,15 +100,11 @@ cd build
# SNDFILE does nothing (as of 3.6.7), just -devel dependency
%cmake .. \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
- %{?with_icu:-DDCMTK_ENABLE_CHARSET_CONVERSION=ICU} \
-DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk \
-DBUILD_APPS:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
- -DDCMTK_ENABLE_CXX11:BOOL=ON \
- -DDCMTK_USE_CXX11_STL:BOOL=ON \
-DDCMTK_WITH_CHARLS:BOOL=ON \
-DDCMTK_WITH_ICONV:BOOL=OFF \
- %{?with_icu:-DDCMTK_WITH_ICU:BOOL=ON} \
-DDCMTK_WITH_OPENSSL:BOOL=ON \
-DDCMTK_WITH_PNG:BOOL=ON \
-DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
@@ -134,8 +124,6 @@ rm -rf $RPM_BUILD_ROOT
# disable completeness check incompatible with split packaging
%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d;
/^unset(_IMPORT_CHECK_TARGETS)/d'
$RPM_BUILD_ROOT%{_libdir}/cmake/dcmtk/DCMTKTargets.cmake
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/{oficonv,ofstd}_tests
-
# packaged as %doc
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc-%{version}
@@ -154,7 +142,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/dcod2lum
%attr(755,root,root) %{_bindir}/dconvlum
%attr(755,root,root) %{_bindir}/drtdump
-%attr(755,root,root) %{_bindir}/drttest
%attr(755,root,root) %{_bindir}/dsr2html
%attr(755,root,root) %{_bindir}/dsr2xml
%attr(755,root,root) %{_bindir}/dsrdump
@@ -165,20 +152,19 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/img2dcm
%attr(755,root,root) %{_bindir}/mkcsmapper
%attr(755,root,root) %{_bindir}/mkesdb
-%attr(755,root,root) %{_bindir}/mkreport
%attr(755,root,root) %{_bindir}/movescu
-%attr(755,root,root) %{_bindir}/msgserv
%attr(755,root,root) %{_bindir}/pdf2dcm
%attr(755,root,root) %{_bindir}/stl2dcm
%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
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/consolog.cfg
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/dcmpstat.cfg
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/dcmqrprf.cfg
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/dcmqrscp.cfg
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dcmtk/filelog.cfg
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dcmtk/logger.cfg
@@ -214,61 +200,61 @@ 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.18
+%attr(755,root,root) %ghost %{_libdir}/libcmr.so.19
%attr(755,root,root) %{_libdir}/libdcmdata.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.19
%attr(755,root,root) %{_libdir}/libdcmect.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmect.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmect.so.19
%attr(755,root,root) %{_libdir}/libdcmdsig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.19
%attr(755,root,root) %{_libdir}/libdcmfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.19
%attr(755,root,root) %{_libdir}/libdcmimage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.19
%attr(755,root,root) %{_libdir}/libdcmimgle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.19
%attr(755,root,root) %{_libdir}/libdcmiod.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.19
%attr(755,root,root) %{_libdir}/libdcmjpeg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.19
%attr(755,root,root) %{_libdir}/libdcmjpls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.19
%attr(755,root,root) %{_libdir}/libdcmnet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.19
%attr(755,root,root) %{_libdir}/libdcmpstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.19
%attr(755,root,root) %{_libdir}/libdcmqrdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.19
%attr(755,root,root) %{_libdir}/libdcmrt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.19
%attr(755,root,root) %{_libdir}/libdcmseg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.19
%attr(755,root,root) %{_libdir}/libdcmpmap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.19
%attr(755,root,root) %{_libdir}/libdcmsr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.19
%attr(755,root,root) %{_libdir}/libdcmtract.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.19
%attr(755,root,root) %{_libdir}/libdcmtls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.19
%attr(755,root,root) %{_libdir}/libdcmwlm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.19
%attr(755,root,root) %{_libdir}/libdcmxml.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmxml.so.18
+%attr(755,root,root) %ghost %{_libdir}/libdcmxml.so.19
%attr(755,root,root) %{_libdir}/libi2d.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libi2d.so.18
+%attr(755,root,root) %ghost %{_libdir}/libi2d.so.19
%attr(755,root,root) %{_libdir}/libijg12.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg12.so.18
+%attr(755,root,root) %ghost %{_libdir}/libijg12.so.19
%attr(755,root,root) %{_libdir}/libijg16.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg16.so.18
+%attr(755,root,root) %ghost %{_libdir}/libijg16.so.19
%attr(755,root,root) %{_libdir}/libijg8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg8.so.18
+%attr(755,root,root) %ghost %{_libdir}/libijg8.so.19
%attr(755,root,root) %{_libdir}/liboficonv.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboficonv.so.18
+%attr(755,root,root) %ghost %{_libdir}/liboficonv.so.19
%attr(755,root,root) %{_libdir}/liboflog.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboflog.so.18
+%attr(755,root,root) %ghost %{_libdir}/liboflog.so.19
%attr(755,root,root) %{_libdir}/libofstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libofstd.so.18
+%attr(755,root,root) %ghost %{_libdir}/libofstd.so.19
%files devel
%defattr(644,root,root,755)
diff --git a/CharLS.patch b/CharLS.patch
index 5603954..263a26e 100644
--- a/CharLS.patch
+++ b/CharLS.patch
@@ -22,3 +22,14 @@ won't fit (if so, CharLS throws exception).
result = DJLSError::convert(err);
if (result.good())
+--- dcmtk-3.6.9/dcmjpls/libsrc/dipijpls.cc.orig 2025-01-21
12:54:13.832127366 +0100
++++ dcmtk-3.6.9/dcmjpls/libsrc/dipijpls.cc 2025-01-21 17:12:47.821354842
+0100
+@@ -92,7 +92,7 @@
+ BYTE *compressed_buffer = new BYTE[compressed_buffer_size];
+ size_t bytesWritten = 0;
+
+- JLS_ERROR err = JpegLsEncode(&compressed_buffer, &compressed_buffer_size,
&bytesWritten, data, data_size, &jls_params);
++ JLS_ERROR err = JpegLsEncode(&compressed_buffer, compressed_buffer_size,
&bytesWritten, data, data_size, &jls_params);
+ OFCondition cond = DJLSError::convert(err);
+
+ if (cond.good())
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
index ef3c3e4..1be5ac3 100644
--- 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
@@ -51,3 +51,14 @@ index 68ebae1..d3cd2ad 100644
--
1.7.4
+--- dcmtk-3.6.9/dcmjpls/libsrc/dipijpls.cc.orig 2024-12-11
07:59:24.000000000 +0100
++++ dcmtk-3.6.9/dcmjpls/libsrc/dipijpls.cc 2025-01-21 12:53:35.355240389
+0100
+@@ -26,7 +26,7 @@
+ #include "dcmtk/dcmimgle/dipixel.h" /* for class DiPixel */
+ #include "dcmtk/dcmjpls/djlsutil.h" /* for DCMJPLS_WARN() */
+ #include "djerror.h" /* for class DJLSError */
+-#include "intrface.h" /* JPEG-LS library (CharLS) includes */
++#include "CharLS/interface.h" /* JPEG-LS library (CharLS) includes */
+
+ /*---------------------------------*
+ * constructors and mode setting *
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
index 7e784d7..1243a3a 100644
--- 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
@@ -20,7 +20,7 @@ Subject: [PATCH] Use cmake suggested location for CharLS
--- dcmtk-3.6.7/dcmjpls/libsrc/CMakeLists.txt.orig 2023-04-25
21:19:43.920918726 +0200
+++ dcmtk-3.6.7/dcmjpls/libsrc/CMakeLists.txt 2023-04-25 21:20:49.623896115
+0200
@@ -12,4 +12,4 @@ DCMTK_ADD_LIBRARY(dcmjpls
- djcodece.cc
+ dipijpls.cc
)
-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage
dcmtkcharls)
diff --git a/dcmtk-etc.patch b/dcmtk-etc.patch
index 20235f6..20955b1 100644
--- a/dcmtk-etc.patch
+++ b/dcmtk-etc.patch
@@ -4,8 +4,8 @@
# Modify the installation paths for configuration files, data files and
documents
# by adding a subdirectory with the DCMTK name and version number
-- set(CMAKE_INSTALL_FULL_SYSCONFDIR
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
-+ set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
- set(CMAKE_INSTALL_FULL_DATADIR
"${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
- set(CMAKE_INSTALL_FULL_DOCDIR
"${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+- set(CMAKE_INSTALL_SYSCONFDIR
"${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
++ set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk")
+ set(CMAKE_INSTALL_DATADIR
"${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+ set(CMAKE_INSTALL_DOCDIR
"${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dcmtk.git/commitdiff/b86d91273f5b2f274b7442b4feda03f8e5effe94
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
