Gentoo Archives: gentoo-commits

From: Steve Arnold <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/, sci-libs/dcmtk/files/
Date: Sun, 29 Nov 2015 07:21:55
Message-Id: 1448781655.71fecd8ad8a0ff3f653d3b6bedf8b5c2d6cba5b0.nerdboy@gentoo
1 commit: 71fecd8ad8a0ff3f653d3b6bedf8b5c2d6cba5b0
2 Author: Stephen L Arnold <nerdboy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 07:17:43 2015 +0000
4 Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 07:20:55 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fecd8a
7
8 sci-libs/dcmtk: new ebuild, core DICOM tools and libraries for medical
9 imaging support
10
11 Package-Manager: portage-2.2.24
12
13 sci-libs/dcmtk/Manifest | 1 +
14 sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 95 ++++++
15 sci-libs/dcmtk/files/01_fix_perl_script_path.patch | 222 ++++++++++++++
16 sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch | 89 ++++++
17 sci-libs/dcmtk/files/04_nostrip.patch | 171 +++++++++++
18 sci-libs/dcmtk/files/dcmtk-asneeded.patch | 63 ++++
19 sci-libs/dcmtk/files/dcmtk-gcc472-error.patch | 318 +++++++++++++++++++++
20 sci-libs/dcmtk/files/dcmtk_version_number.patch | 131 +++++++++
21 sci-libs/dcmtk/files/png_tiff.patch | 11 +
22 .../files/regression_stacksequenceisodd.patch | 98 +++++++
23 sci-libs/dcmtk/metadata.xml | 9 +
24 11 files changed, 1208 insertions(+)
25
26 diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
27 new file mode 100644
28 index 0000000..4712820
29 --- /dev/null
30 +++ b/sci-libs/dcmtk/Manifest
31 @@ -0,0 +1 @@
32 +DIST dcmtk-3.6.0.tar.gz 4673121 SHA256 cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c WHIRLPOOL 88538048a7534847c5c1450be0ccc94979ab20be8fc1a05a944b4a7f8f627578d585e91a30984f75ae0f1c29bca0c615c3b290cc6c0965b6e7ddd23e31ba3cd9
33
34 diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
35 new file mode 100644
36 index 0000000..da01b9c
37 --- /dev/null
38 +++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
39 @@ -0,0 +1,95 @@
40 +# Copyright 1999-2015 Gentoo Foundation
41 +# Distributed under the terms of the GNU General Public License v2
42 +# $Id$
43 +
44 +EAPI="5"
45 +
46 +inherit cmake-utils eutils
47 +
48 +DESCRIPTION="The DICOM Toolkit"
49 +HOMEPAGE="http://dicom.offis.de/dcmtk.php.en"
50 +SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/${P}.tar.gz"
51 +
52 +LICENSE="OFFIS"
53 +KEYWORDS="~amd64 ~arm ~x86"
54 +SLOT="0"
55 +IUSE="doc png ssl tcpd tiff +threads xml zlib"
56 +
57 +RDEPEND="
58 + virtual/jpeg:0
59 + png? ( media-libs/libpng:* )
60 + ssl? ( dev-libs/openssl:0 )
61 + tcpd? ( sys-apps/tcp-wrappers )
62 + tiff? ( media-libs/tiff:0 )
63 + xml? ( dev-libs/libxml2:2 )
64 + zlib? ( sys-libs/zlib )"
65 +DEPEND="${RDEPEND}
66 + doc? ( app-doc/doxygen )
67 + media-gfx/graphviz"
68 +
69 +src_prepare() {
70 +
71 + epatch \
72 + "${FILESDIR}"/01_fix_perl_script_path.patch \
73 + "${FILESDIR}"/02_dcmtk_3.6.0-1.patch \
74 + "${FILESDIR}"/04_nostrip.patch \
75 + "${FILESDIR}"/dcmtk_version_number.patch \
76 + "${FILESDIR}"/png_tiff.patch \
77 + "${FILESDIR}"/regression_stacksequenceisodd.patch \
78 + "${FILESDIR}"/${PN}-asneeded.patch \
79 + "${FILESDIR}"/${PN}-gcc472-error.patch
80 +
81 + sed -e "s:share/doc/dcmtk:&-${PV}:" \
82 + -e "s:DIR \"/:DIR \"/usr/:" \
83 + -e "s:usr/etc:etc:" \
84 + -e "s:/lib\":/$(get_libdir)\":" \
85 + -e "s:COPYRIGHT::" \
86 + -i CMakeLists.txt || die
87 + sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
88 + -i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
89 + # Temporary workaround: docs are not built with CMake
90 + sed -i -e '/include/d' doxygen/Makefile.in || die
91 +
92 + # fix -D deprecation warnings
93 + sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
94 + "${S}"/config/configure.in \
95 + "${S}"/CMakeLists.txt
96 +}
97 +
98 +src_configure() {
99 + mycmakeargs="${mycmakeargs}
100 + -DBUILD_SHARED_LIBS=ON
101 + -DCMAKE_INSTALL_PREFIX=/
102 + $(cmake-utils_use tiff DCMTK_WITH_TIFF)
103 + $(cmake-utils_use png DCMTK_WITH_PNG)
104 + $(cmake-utils_use xml DCMTK_WITH_XML)
105 + $(cmake-utils_use zlib DCMTK_WITH_ZLIB)
106 + $(cmake-utils_use ssl DCMTK_WITH_OPENSSL)
107 + $(cmake-utils_use doc DCMTK_WITH_DOXYGEN)
108 + $(cmake-utils_use threads DCMTK_WITH_THREADS)"
109 +
110 + cmake-utils_src_configure
111 +
112 + if use doc; then
113 + cd "${S}"/doxygen
114 + econf
115 + fi
116 +}
117 +
118 +src_compile() {
119 + cmake-utils_src_compile
120 +
121 + if use doc; then
122 + emake -C "${S}"/doxygen || die
123 + fi
124 +}
125 +
126 +src_install() {
127 + cmake-utils_src_install
128 +
129 + doman doxygen/manpages/man1/* || die
130 +
131 + if use doc; then
132 + dohtml -r "${S}"/doxygen/htmldocs/* || die
133 + fi
134 +}
135
136 diff --git a/sci-libs/dcmtk/files/01_fix_perl_script_path.patch b/sci-libs/dcmtk/files/01_fix_perl_script_path.patch
137 new file mode 100644
138 index 0000000..9f002d8
139 --- /dev/null
140 +++ b/sci-libs/dcmtk/files/01_fix_perl_script_path.patch
141 @@ -0,0 +1,222 @@
142 +Author: Jürgen Salk <jsa@××××××.org>
143 +Description: The original maintainer Jürgen Salk applied
144 + a set of patches to the original code. The part which fixes
145 + the path to the perl executable is collected in this patch set.
146 +
147 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/changepw.pl 2010-10-14 15:02:01.000000000 +0200
148 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/changepw.pl 2010-12-09 11:50:35.000000000 +0100
149 +@@ -1,4 +1,4 @@
150 +-#!/usr/local/bin/perl
151 ++#!/usr/bin/perl
152 + #
153 + # Copyright (C) 1996-2010, OFFIS e.V.
154 + # All rights reserved. See COPYRIGHT file for details.
155 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/checkvr.ph 2010-10-14 15:02:01.000000000 +0200
156 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/checkvr.ph 2010-12-09 11:50:35.000000000 +0100
157 +@@ -1,4 +1,4 @@
158 +-#!/usr/local/bin/perl
159 ++#!/usr/bin/perl
160 + #
161 + # Copyright (C) 1996-2010, OFFIS e.V.
162 + # All rights reserved. See COPYRIGHT file for details.
163 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/isocode.ph 2010-10-14 15:02:01.000000000 +0200
164 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/isocode.ph 2010-12-09 11:50:35.000000000 +0100
165 +@@ -1,4 +1,4 @@
166 +-#!/usr/local/bin/perl
167 ++#!/usr/bin/perl
168 + #
169 + # Copyright (C) 1996-2010, OFFIS e.V.
170 + # All rights reserved. See COPYRIGHT file for details.
171 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/layout.ph 2010-10-14 15:02:01.000000000 +0200
172 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/layout.ph 2010-12-09 11:50:35.000000000 +0100
173 +@@ -1,4 +1,4 @@
174 +-#!/usr/local/bin/perl
175 ++#!/usr/bin/perl
176 + #
177 + # Copyright (C) 1996-2010, OFFIS e.V.
178 + # All rights reserved. See COPYRIGHT file for details.
179 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/lock.ph 2010-10-14 15:02:01.000000000 +0200
180 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/lock.ph 2010-12-09 11:50:35.000000000 +0100
181 +@@ -1,4 +1,4 @@
182 +-#!/usr/local/bin/perl
183 ++#!/usr/bin/perl
184 + #
185 + # Copyright (C) 1996-2010, OFFIS e.V.
186 + # All rights reserved. See COPYRIGHT file for details.
187 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/log.ph 2010-10-14 15:02:01.000000000 +0200
188 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/log.ph 2010-12-09 11:50:35.000000000 +0100
189 +@@ -1,4 +1,4 @@
190 +-#!/usr/local/bin/perl
191 ++#!/usr/bin/perl
192 + #
193 + # Copyright (C) 1996-2010, OFFIS e.V.
194 + # All rights reserved. See COPYRIGHT file for details.
195 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/main.pl 2010-10-14 15:02:01.000000000 +0200
196 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/main.pl 2010-12-09 11:50:35.000000000 +0100
197 +@@ -1,4 +1,4 @@
198 +-#!/usr/local/bin/perl
199 ++#!/usr/bin/perl
200 + #
201 + # Copyright (C) 1996-2010, OFFIS e.V.
202 + # All rights reserved. See COPYRIGHT file for details.
203 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/password.ph 2010-10-14 15:02:01.000000000 +0200
204 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/password.ph 2010-12-09 11:50:35.000000000 +0100
205 +@@ -1,4 +1,4 @@
206 +-#!/usr/local/bin/perl
207 ++#!/usr/bin/perl
208 + #
209 + # Copyright (C) 1996-2010, OFFIS e.V.
210 + # All rights reserved. See COPYRIGHT file for details.
211 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/patidel.pl 2010-10-14 15:02:01.000000000 +0200
212 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patidel.pl 2010-12-09 11:50:35.000000000 +0100
213 +@@ -1,4 +1,4 @@
214 +-#!/usr/local/bin/perl
215 ++#!/usr/bin/perl
216 + #
217 + # Copyright (C) 1996-2010, OFFIS e.V.
218 + # All rights reserved. See COPYRIGHT file for details.
219 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/patiedit.pl 2010-10-14 15:02:01.000000000 +0200
220 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patiedit.pl 2010-12-09 11:50:35.000000000 +0100
221 +@@ -1,4 +1,4 @@
222 +-#!/usr/local/bin/perl
223 ++#!/usr/bin/perl
224 + #
225 + # Copyright (C) 1996-2010, OFFIS e.V.
226 + # All rights reserved. See COPYRIGHT file for details.
227 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/patient.pl 2010-10-14 15:02:01.000000000 +0200
228 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patient.pl 2010-12-09 11:50:35.000000000 +0100
229 +@@ -1,4 +1,4 @@
230 +-#!/usr/local/bin/perl
231 ++#!/usr/bin/perl
232 + #
233 + # Copyright (C) 1996-2010, OFFIS e.V.
234 + # All rights reserved. See COPYRIGHT file for details.
235 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/prefs.ph 2010-10-14 15:02:01.000000000 +0200
236 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prefs.ph 2010-12-09 11:50:35.000000000 +0100
237 +@@ -1,4 +1,4 @@
238 +-#!/usr/local/bin/perl
239 ++#!/usr/bin/perl
240 + #
241 + # Copyright (C) 1996-2010, OFFIS e.V.
242 + # All rights reserved. See COPYRIGHT file for details.
243 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/procdel.pl 2010-10-14 15:02:01.000000000 +0200
244 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procdel.pl 2010-12-09 11:50:35.000000000 +0100
245 +@@ -1,4 +1,4 @@
246 +-#!/usr/local/bin/perl
247 ++#!/usr/bin/perl
248 + #
249 + # Copyright (C) 1996-2010, OFFIS e.V.
250 + # All rights reserved. See COPYRIGHT file for details.
251 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/procedit.pl 2010-10-14 15:02:01.000000000 +0200
252 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedit.pl 2010-12-09 11:50:35.000000000 +0100
253 +@@ -1,4 +1,4 @@
254 +-#!/usr/local/bin/perl
255 ++#!/usr/bin/perl
256 + #
257 + # Copyright (C) 1996-2010, OFFIS e.V.
258 + # All rights reserved. See COPYRIGHT file for details.
259 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/procedur.pl 2010-10-14 15:02:01.000000000 +0200
260 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedur.pl 2010-12-09 11:50:35.000000000 +0100
261 +@@ -1,4 +1,4 @@
262 +-#!/usr/local/bin/perl
263 ++#!/usr/bin/perl
264 + #
265 + # Copyright (C) 1996-2010, OFFIS e.V.
266 + # All rights reserved. See COPYRIGHT file for details.
267 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/procstep.pl 2010-10-14 15:02:01.000000000 +0200
268 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procstep.pl 2010-12-09 11:50:35.000000000 +0100
269 +@@ -1,4 +1,4 @@
270 +-#!/usr/local/bin/perl
271 ++#!/usr/bin/perl
272 + #
273 + # Copyright (C) 1996-2010, OFFIS e.V.
274 + # All rights reserved. See COPYRIGHT file for details.
275 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/prstdel.pl 2010-10-14 15:02:02.000000000 +0200
276 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstdel.pl 2010-12-09 11:50:35.000000000 +0100
277 +@@ -1,4 +1,4 @@
278 +-#!/usr/local/bin/perl
279 ++#!/usr/bin/perl
280 + #
281 + # Copyright (C) 1996-2010, OFFIS e.V.
282 + # All rights reserved. See COPYRIGHT file for details.
283 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/prstedit.pl 2010-10-14 15:02:02.000000000 +0200
284 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstedit.pl 2010-12-09 11:50:35.000000000 +0100
285 +@@ -1,4 +1,4 @@
286 +-#!/usr/local/bin/perl
287 ++#!/usr/bin/perl
288 + #
289 + # Copyright (C) 1996-2010, OFFIS e.V.
290 + # All rights reserved. See COPYRIGHT file for details.
291 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/statdel.pl 2010-10-14 15:02:02.000000000 +0200
292 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statdel.pl 2010-12-09 11:50:35.000000000 +0100
293 +@@ -1,4 +1,4 @@
294 +-#!/usr/local/bin/perl
295 ++#!/usr/bin/perl
296 + #
297 + # Copyright (C) 1996-2010, OFFIS e.V.
298 + # All rights reserved. See COPYRIGHT file for details.
299 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/statedit.pl 2010-10-14 15:02:02.000000000 +0200
300 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statedit.pl 2010-12-09 11:50:35.000000000 +0100
301 +@@ -1,4 +1,4 @@
302 +-#!/usr/local/bin/perl
303 ++#!/usr/bin/perl
304 + #
305 + # Copyright (C) 1996-2010, OFFIS e.V.
306 + # All rights reserved. See COPYRIGHT file for details.
307 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/station.pl 2010-10-14 15:02:02.000000000 +0200
308 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/station.pl 2010-12-09 11:50:35.000000000 +0100
309 +@@ -1,4 +1,4 @@
310 +-#!/usr/local/bin/perl
311 ++#!/usr/bin/perl
312 + #
313 + # Copyright (C) 1996-2010, OFFIS e.V.
314 + # All rights reserved. See COPYRIGHT file for details.
315 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/urldecod.ph 2010-10-14 15:02:02.000000000 +0200
316 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/urldecod.ph 2010-12-09 11:50:35.000000000 +0100
317 +@@ -1,4 +1,4 @@
318 +-#!/usr/local/bin/perl
319 ++#!/usr/bin/perl
320 + #
321 + # Copyright & Disclaimer.
322 + # This set of routines may be freely distributed, modified and
323 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/workdel.pl 2010-10-14 15:02:02.000000000 +0200
324 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workdel.pl 2010-12-09 11:50:35.000000000 +0100
325 +@@ -1,4 +1,4 @@
326 +-#!/usr/local/bin/perl
327 ++#!/usr/bin/perl
328 + #
329 + # Copyright (C) 1996-2010, OFFIS e.V.
330 + # All rights reserved. See COPYRIGHT file for details.
331 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/workedit.pl 2010-10-14 15:02:02.000000000 +0200
332 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workedit.pl 2010-12-09 11:50:35.000000000 +0100
333 +@@ -1,4 +1,4 @@
334 +-#!/usr/local/bin/perl
335 ++#!/usr/bin/perl
336 + #
337 + # Copyright (C) 1996-2010, OFFIS e.V.
338 + # All rights reserved. See COPYRIGHT file for details.
339 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/worklist.pl 2010-10-14 15:02:02.000000000 +0200
340 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/worklist.pl 2010-12-09 11:50:35.000000000 +0100
341 +@@ -1,4 +1,4 @@
342 +-#!/usr/local/bin/perl
343 ++#!/usr/bin/perl
344 + #
345 + # Copyright (C) 1996-2010, OFFIS e.V.
346 + # All rights reserved. See COPYRIGHT file for details.
347 +--- dcmtk-3.5.5_20101130/dcmwlm/perl/write.ph 2010-10-14 15:02:02.000000000 +0200
348 ++++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/write.ph 2010-12-09 11:50:35.000000000 +0100
349 +@@ -1,4 +1,4 @@
350 +-#!/usr/local/bin/perl
351 ++#!/usr/bin/perl
352 + #
353 + # Copyright (C) 1996-2010, OFFIS e.V.
354 + # All rights reserved. See COPYRIGHT file for details.
355 +@@ -59,7 +59,7 @@
356 + if (open(outfile, ">@_[0]"))
357 + {
358 + print outfile <<EOF;
359 +-#!/usr/local/bin/perl
360 ++#!/usr/bin/perl
361 + #
362 + # automatically generated by write.pl - do not modify!
363 + #
364
365 diff --git a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch b/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch
366 new file mode 100644
367 index 0000000..11aaaec
368 --- /dev/null
369 +++ b/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch
370 @@ -0,0 +1,89 @@
371 +Author: Jürgen Salk <jsa@××××××.org>
372 +Description: The original maintainer Jürgen Salk applied
373 + a set of patches to the original code. This file contains
374 + changes to C++ code
375 +
376 +Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
377 +===================================================================
378 +--- dcmtk-3.6.0.orig/dcmqrdb/etc/dcmqrscp.cfg 2010-09-09 19:20:25.000000000 +0200
379 ++++ dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg 2011-01-28 09:49:02.000000000 +0100
380 +@@ -10,6 +10,9 @@
381 + NetworkTCPPort = 104
382 + MaxPDUSize = 16384
383 + MaxAssociations = 16
384 ++UserName = "dcmtk"
385 ++GroupName = "dcmtk"
386 ++
387 + #
388 + # UserName = <not used>
389 + # GroupName = <not used>
390 +@@ -28,12 +31,13 @@
391 + # NOTE: in the current implementation you cannot substitute an IP address
392 + # for a hostname.
393 + #
394 +-acme1 = (ACME1, acmehost1, 5678)
395 +-acme2 = (ACME2, acmehost2, 5678)
396 +-acmeCTcompany = acme1, acme2
397 +-united1 = (UNITED1, unitedhost1, 104)
398 +-united2 = (UNITED2, unitedhost2, 104)
399 +-unitedMRcompany = united1, united2
400 ++# Example:
401 ++#acme1 = (ACME1, acmehost1, 5678)
402 ++#acme2 = (ACME2, acmehost2, 5678)
403 ++#acmeCTcompany = acme1, acme2
404 ++#united1 = (UNITED1, unitedhost1, 104)
405 ++#united2 = (UNITED2, unitedhost2, 104)
406 ++#unitedMRcompany = united1, united2
407 + #
408 + HostTable END
409 +
410 +@@ -51,8 +55,9 @@
411 + # VendorName = SymbolicName
412 + # The symbolic name should be defined in the HostTable.
413 + #
414 +-"Acme CT Company" = acmeCTcompany
415 +-"United MR Company" = unitedMRcompany
416 ++# Example:
417 ++#"Acme CT Company" = acmeCTcompany
418 ++#"United MR Company" = unitedMRcompany
419 + #
420 + VendorTable END
421 +
422 +@@ -70,8 +75,13 @@
423 + # Entry in HostTable |
424 + # ANY
425 + #
426 +-COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
427 +-ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
428 +-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
429 ++# Example:
430 ++#
431 ++#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
432 ++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
433 ++#
434 ++# Uncomment and adjust the following lines for a common r/rw storage area:
435 ++#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
436 ++#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
437 + #
438 + AETable END
439 +Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
440 +===================================================================
441 +--- dcmtk-3.6.0.orig/dcmqrdb/docs/dcmqrcnf.txt 2010-09-09 19:20:12.000000000 +0200
442 ++++ dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt 2011-01-28 09:46:02.000000000 +0100
443 +@@ -44,8 +44,8 @@
444 + NetworkTCPPort = 104
445 + MaxPDUSize = 8192
446 + MaxAssociations = 20
447 +-UserName = (do not change user)
448 +-GroupName = (do not change group)
449 ++UserName = "dcmtk"
450 ++GroupName = "dcmtk"
451 +
452 + NOTE: You must have root privileges to bind port 104 for DICOM association
453 + requests on Unix/Linux/Posix platforms as this is a privileged port number
454 +Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
455 +===================================================================
456 +--- /dev/null 1970-01-01 00:00:00.000000000 +0000
457 ++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile 2011-01-28 09:46:02.000000000 +0100
458 +@@ -0,0 +1 @@
459 ++
460
461 diff --git a/sci-libs/dcmtk/files/04_nostrip.patch b/sci-libs/dcmtk/files/04_nostrip.patch
462 new file mode 100644
463 index 0000000..c4a109c
464 --- /dev/null
465 +++ b/sci-libs/dcmtk/files/04_nostrip.patch
466 @@ -0,0 +1,171 @@
467 +Remove all hardcoded calls to `strip` command
468 +
469 +Index: dcmtk-3.6.0/config/templates/Makefile.src
470 +===================================================================
471 +--- dcmtk-3.6.0.orig/config/templates/Makefile.src 2009-01-30 10:27:58.000000000 +0100
472 ++++ dcmtk-3.6.0/config/templates/Makefile.src 2011-01-28 09:53:28.000000000 +0100
473 +@@ -31,7 +31,7 @@
474 + install-bin: all
475 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
476 + for prog in $(progs); do \
477 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
478 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
479 + done
480 +
481 +
482 +Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
483 +===================================================================
484 +--- dcmtk-3.6.0.orig/dcmdata/apps/Makefile.in 2009-11-04 10:58:05.000000000 +0100
485 ++++ dcmtk-3.6.0/dcmdata/apps/Makefile.in 2011-01-28 09:53:45.000000000 +0100
486 +@@ -76,7 +76,7 @@
487 + install-bin: all
488 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
489 + for prog in $(progs); do \
490 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
491 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
492 + done
493 +
494 +
495 +Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
496 +===================================================================
497 +--- dcmtk-3.6.0.orig/dcmimage/apps/Makefile.in 2009-10-13 16:08:33.000000000 +0200
498 ++++ dcmtk-3.6.0/dcmimage/apps/Makefile.in 2011-01-28 09:53:59.000000000 +0100
499 +@@ -42,7 +42,7 @@
500 + install: all
501 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
502 + for prog in $(progs); do \
503 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
504 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
505 + done
506 +
507 +
508 +Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
509 +===================================================================
510 +--- dcmtk-3.6.0.orig/dcmimgle/apps/Makefile.in 2009-10-28 10:53:39.000000000 +0100
511 ++++ dcmtk-3.6.0/dcmimgle/apps/Makefile.in 2011-01-28 09:54:11.000000000 +0100
512 +@@ -39,7 +39,7 @@
513 + install: all
514 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
515 + for prog in $(progs); do \
516 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
517 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
518 + done
519 +
520 +
521 +Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
522 +===================================================================
523 +--- dcmtk-3.6.0.orig/dcmjpeg/apps/Makefile.in 2009-10-07 14:44:33.000000000 +0200
524 ++++ dcmtk-3.6.0/dcmjpeg/apps/Makefile.in 2011-01-28 09:54:28.000000000 +0100
525 +@@ -72,7 +72,7 @@
526 + install: all
527 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
528 + for prog in $(progs); do \
529 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
530 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
531 + done
532 +
533 + clean:
534 +Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
535 +===================================================================
536 +--- dcmtk-3.6.0.orig/dcmnet/apps/Makefile.in 2009-11-04 11:24:29.000000000 +0100
537 ++++ dcmtk-3.6.0/dcmnet/apps/Makefile.in 2011-01-28 09:54:50.000000000 +0100
538 +@@ -52,7 +52,7 @@
539 + install: all
540 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
541 + for prog in $(progs); do \
542 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
543 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
544 + done
545 +
546 +
547 +Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
548 +===================================================================
549 +--- dcmtk-3.6.0.orig/dcmpstat/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
550 ++++ dcmtk-3.6.0/dcmpstat/apps/Makefile.in 2011-01-28 09:55:10.000000000 +0100
551 +@@ -113,7 +113,7 @@
552 + install: all
553 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
554 + for prog in $(progs); do \
555 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
556 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
557 + done
558 +
559 +
560 +Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
561 +===================================================================
562 +--- dcmtk-3.6.0.orig/dcmqrdb/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
563 ++++ dcmtk-3.6.0/dcmqrdb/apps/Makefile.in 2011-01-28 09:55:24.000000000 +0100
564 +@@ -57,7 +57,7 @@
565 + install: all
566 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
567 + for prog in $(progs); do \
568 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
569 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
570 + done
571 +
572 +
573 +Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
574 +===================================================================
575 +--- dcmtk-3.6.0.orig/dcmsign/apps/Makefile.in 2009-09-04 17:42:31.000000000 +0200
576 ++++ dcmtk-3.6.0/dcmsign/apps/Makefile.in 2011-01-28 09:55:35.000000000 +0100
577 +@@ -33,7 +33,7 @@
578 + install: all
579 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
580 + for prog in $(progs); do \
581 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
582 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
583 + done
584 +
585 +
586 +Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
587 +===================================================================
588 +--- dcmtk-3.6.0.orig/dcmsr/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
589 ++++ dcmtk-3.6.0/dcmsr/apps/Makefile.in 2011-01-28 09:55:48.000000000 +0100
590 +@@ -44,7 +44,7 @@
591 + install-bin: all
592 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
593 + for prog in $(progs); do \
594 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
595 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
596 + done
597 +
598 +
599 +Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
600 +===================================================================
601 +--- dcmtk-3.6.0.orig/dcmwlm/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
602 ++++ dcmtk-3.6.0/dcmwlm/apps/Makefile.in 2011-01-28 09:55:58.000000000 +0100
603 +@@ -49,7 +49,7 @@
604 + install: all
605 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
606 + for prog in $(progs); do \
607 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
608 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
609 + done
610 +
611 +
612 +Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
613 +===================================================================
614 +--- dcmtk-3.6.0.orig/dcmwlm/wwwapps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
615 ++++ dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in 2011-01-28 09:56:33.000000000 +0100
616 +@@ -55,7 +55,7 @@
617 + install: all
618 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
619 + for prog in $(progs); do \
620 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
621 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
622 + done
623 +
624 +
625 +Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
626 +===================================================================
627 +--- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in 2011-01-28 09:56:54.000000000 +0100
628 ++++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in 2011-01-28 09:57:00.000000000 +0100
629 +@@ -71,7 +71,7 @@
630 + install: all
631 + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
632 + for prog in $(progs); do \
633 +- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
634 ++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
635 + done
636 +
637 +
638
639 diff --git a/sci-libs/dcmtk/files/dcmtk-asneeded.patch b/sci-libs/dcmtk/files/dcmtk-asneeded.patch
640 new file mode 100644
641 index 0000000..a27e46e
642 --- /dev/null
643 +++ b/sci-libs/dcmtk/files/dcmtk-asneeded.patch
644 @@ -0,0 +1,63 @@
645 +--- dcmimgle/libsrc/CMakeLists.txt.orig 2010-10-14 12:19:24.416833916 +0200
646 ++++ dcmimgle/libsrc/CMakeLists.txt 2010-10-14 12:18:51.682258692 +0200
647 +@@ -1,5 +1,5 @@
648 + # create library from source files
649 + ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils)
650 +-
651 ++TARGET_LINK_LIBRARIES(dcmimgle dcmdata)
652 + # declare installation files
653 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle)
654 +--- dcmpstat/libsrc/CMakeLists.txt.orig 2010-10-14 12:26:05.324680803 +0200
655 ++++ dcmpstat/libsrc/CMakeLists.txt 2010-10-14 12:26:35.309298272 +0200
656 +@@ -1,5 +1,5 @@
657 + # create library from source files
658 + ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl)
659 +-
660 ++TARGET_LINK_LIBRARIES(dcmpstat dcmdsig dcmtls dcmsr)
661 + # declare installation files
662 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat)
663 +--- dcmsign/libsrc/CMakeLists.txt.orig 2010-10-14 12:37:02.149984538 +0200
664 ++++ dcmsign/libsrc/CMakeLists.txt 2010-10-14 12:38:53.602332737 +0200
665 +@@ -1,5 +1,5 @@
666 + # create library from source files
667 + ADD_LIBRARY(dcmdsig dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes)
668 +-
669 ++TARGET_LINK_LIBRARIES(dcmdsig ${OPENSSL_LIBS})
670 + # declare installation files
671 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig)
672 +--- dcmimage/libsrc/CMakeLists.txt.orig 2010-10-14 12:45:06.926394516 +0200
673 ++++ dcmimage/libsrc/CMakeLists.txt 2010-10-14 12:46:05.197437359 +0200
674 +@@ -1,5 +1,5 @@
675 + # create library from source files
676 + ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img)
677 +-
678 ++TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
679 + # declare installation files
680 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage)
681 +--- dcmdata/libsrc/CMakeLists.txt.orig 2010-10-14 12:44:00.991741511 +0200
682 ++++ dcmdata/libsrc/CMakeLists.txt 2010-10-14 12:44:55.918954304 +0200
683 +@@ -1,5 +1,5 @@
684 + # create library from source files
685 + ADD_LIBRARY(dcmdata cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl)
686 +-
687 ++TARGET_LINK_LIBRARIES(dcmdata ${ZLIB_LIBS})
688 + # declare installation files
689 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata)
690 +--- dcmsr/libsrc/CMakeLists.txt.orig 2010-10-14 14:45:48.736866802 +0200
691 ++++ dcmsr/libsrc/CMakeLists.txt 2010-10-14 14:46:40.910215801 +0200
692 +@@ -1,5 +1,5 @@
693 + # create library from source files
694 + ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc)
695 +-
696 ++TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS})
697 + # declare installation files
698 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr)
699 +--- dcmtls/libsrc/CMakeLists.txt.orig 2012-11-11 19:19:00.832767189 -0800
700 ++++ dcmtls/libsrc/CMakeLists.txt 2012-11-11 19:29:43.887972426 -0800
701 +@@ -1,5 +1,6 @@
702 + # create library from source files
703 + ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu)
704 +
705 ++TARGET_LINK_LIBRARIES(dcmtls ${OPENSSL_LIBS})
706 + # declare installation files
707 + INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls)
708
709 diff --git a/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch b/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch
710 new file mode 100644
711 index 0000000..9d344d7
712 --- /dev/null
713 +++ b/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch
714 @@ -0,0 +1,318 @@
715 +--- ofstd/include/dcmtk/ofstd/ofoset.h.orig 2013-06-22 09:11:13.000000000 -0700
716 ++++ ofstd/include/dcmtk/ofstd/ofoset.h 2013-06-22 09:12:07.000000000 -0700
717 +@@ -146,7 +146,7 @@
718 + {
719 + // if size equals num, we need more space
720 + if( this->size == this->num )
721 +- Resize( this->size * 2 );
722 ++ this->Resize( this->size * 2 );
723 +
724 + // copy item
725 + T *newItem = new T( item );
726 +@@ -189,7 +189,7 @@
727 + {
728 + // if size equals num, we need more space
729 + if( this->size == this->num )
730 +- Resize( this->size * 2 );
731 ++ this->Resize( this->size * 2 );
732 +
733 + // copy item
734 + T *newItem = new T( item );
735 +--- dcmimage/include/dcmtk/dcmimage/diargpxt.h.orig 2013-06-22 09:32:37.000000000 -0700
736 ++++ dcmimage/include/dcmtk/dcmimage/diargpxt.h 2013-06-22 09:34:20.000000000 -0700
737 +@@ -91,7 +91,7 @@
738 + const unsigned long planeSize,
739 + const int bits)
740 + { // not very much optimized, but no one really uses ARGB !!
741 +- if (Init(pixel))
742 ++ if (this->Init(pixel))
743 + {
744 + register T2 value;
745 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
746 +--- dcmimage/include/dcmtk/dcmimage/dicmypxt.h.orig 2013-06-22 09:44:02.000000000 -0700
747 ++++ dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2013-06-22 09:51:29.000000000 -0700
748 +@@ -87,7 +87,7 @@
749 + const unsigned long planeSize,
750 + const int bits)
751 + {
752 +- if (Init(pixel))
753 ++ if (this->Init(pixel))
754 + {
755 + // use the number of input pixels derived from the length of the 'PixelData'
756 + // attribute), but not more than the size of the intermediate buffer
757 +--- dcmimgle/include/dcmtk/dcmimgle/discalet.h.orig 2013-06-22 09:52:08.000000000 -0700
758 ++++ dcmimgle/include/dcmtk/dcmimgle/discalet.h 2013-06-22 09:54:35.000000000 -0700
759 +@@ -206,12 +206,12 @@
760 + (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
761 + { // no image to be displayed
762 + DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
763 +- fillPixel(dest, value); // ... fill bitmap
764 ++ this->fillPixel(dest, value); // ... fill bitmap
765 + }
766 + else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
767 + {
768 + if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
769 +- copyPixel(src, dest); // copying
770 ++ this->copyPixel(src, dest); // copying
771 + else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
772 + (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
773 + clipPixel(src, dest); // clipping
774 +@@ -567,7 +567,7 @@
775 + if ((xtemp == NULL) || (xvalue == NULL))
776 + {
777 + DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
778 +- clearPixel(dest);
779 ++ this->clearPixel(dest);
780 + } else {
781 + for (int j = 0; j < this->Planes; ++j)
782 + {
783 +@@ -905,7 +905,7 @@
784 + if (pTemp == NULL)
785 + {
786 + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
787 +- clearPixel(dest);
788 ++ this->clearPixel(dest);
789 + } else {
790 +
791 + /*
792 +@@ -1029,7 +1029,7 @@
793 + if (pTemp == NULL)
794 + {
795 + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
796 +- clearPixel(dest);
797 ++ this->clearPixel(dest);
798 + } else {
799 +
800 + /*
801 +--- dcmimage/include/dcmtk/dcmimage/dicocpt.h.orig 2013-06-22 10:01:51.000000000 -0700
802 ++++ dcmimage/include/dcmtk/dcmimage/dicocpt.h 2013-06-22 10:03:10.000000000 -0700
803 +@@ -86,7 +86,7 @@
804 + inline void copy(const T *pixel[3],
805 + const unsigned long offset)
806 + {
807 +- if (Init(pixel))
808 ++ if (this->Init(pixel))
809 + {
810 + for (int j = 0; j < 3; j++)
811 + OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
812 +--- dcmimage/include/dcmtk/dcmimage/dicosct.h.orig 2013-06-22 10:03:27.000000000 -0700
813 ++++ dcmimage/include/dcmtk/dcmimage/dicosct.h 2013-06-22 10:04:56.000000000 -0700
814 +@@ -107,8 +107,8 @@
815 + inline void scale(const T *pixel[3],
816 + const int interpolate)
817 + {
818 +- if (Init(pixel))
819 +- scaleData(pixel, this->Data, interpolate);
820 ++ if (this->Init(pixel))
821 ++ this->scaleData(pixel, this->Data, interpolate);
822 + }
823 + };
824 +
825 +--- dcmimage/include/dcmtk/dcmimage/dicoflt.h.orig 2013-06-22 10:05:04.000000000 -0700
826 ++++ dcmimage/include/dcmtk/dcmimage/dicoflt.h 2013-06-22 10:08:17.000000000 -0700
827 +@@ -98,14 +98,14 @@
828 + const int horz,
829 + const int vert)
830 + {
831 +- if (Init(pixel))
832 ++ if (this->Init(pixel))
833 + {
834 + if (horz && vert)
835 +- flipHorzVert(pixel, this->Data);
836 ++ this->flipHorzVert(pixel, this->Data);
837 + else if (horz)
838 +- flipHorz(pixel, this->Data);
839 ++ this->flipHorz(pixel, this->Data);
840 + else if (vert)
841 +- flipVert(pixel, this->Data);
842 ++ this->flipVert(pixel, this->Data);
843 + }
844 + }
845 + };
846 +--- dcmimage/include/dcmtk/dcmimage/dicorot.h.orig 2013-06-22 10:08:25.000000000 -0700
847 ++++ dcmimage/include/dcmtk/dcmimage/dicorot.h 2013-06-22 10:09:57.000000000 -0700
848 +@@ -98,14 +98,14 @@
849 + inline void rotate(const T *pixel[3],
850 + const int degree)
851 + {
852 +- if (Init(pixel))
853 ++ if (this->Init(pixel))
854 + {
855 + if (degree == 90)
856 +- rotateRight(pixel, this->Data);
857 ++ this->rotateRight(pixel, this->Data);
858 + else if (degree == 180)
859 +- rotateTopDown(pixel, this->Data);
860 ++ this->rotateTopDown(pixel, this->Data);
861 + else if (degree == 270)
862 +- rotateLeft(pixel, this->Data);
863 ++ this->rotateLeft(pixel, this->Data);
864 + }
865 + }
866 + };
867 +--- dcmimage/include/dcmtk/dcmimage/dihsvpxt.h.orig 2013-06-22 10:10:11.000000000 -0700
868 ++++ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2013-06-22 10:10:54.000000000 -0700
869 +@@ -87,7 +87,7 @@
870 + const unsigned long planeSize,
871 + const int bits)
872 + {
873 +- if (Init(pixel))
874 ++ if (this->Init(pixel))
875 + {
876 + register T2 *r = this->Data[0];
877 + register T2 *g = this->Data[1];
878 +--- dcmimage/include/dcmtk/dcmimage/dipalpxt.h.orig 2013-06-22 10:18:26.000000000 -0700
879 ++++ dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2013-06-22 10:19:13.000000000 -0700
880 +@@ -92,7 +92,7 @@
881 + void convert(const T1 *pixel,
882 + DiLookupTable *palette[3])
883 + { // can be optimized if necessary !
884 +- if (Init(pixel))
885 ++ if (this->Init(pixel))
886 + {
887 + register const T1 *p = pixel;
888 + register T2 value = 0;
889 +--- dcmimage/include/dcmtk/dcmimage/diybrpxt.h.orig 2013-06-22 10:34:13.000000000 -0700
890 ++++ dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2013-06-22 10:34:48.000000000 -0700
891 +@@ -91,7 +91,7 @@
892 + const int bits,
893 + const OFBool rgb)
894 + {
895 +- if (Init(pixel))
896 ++ if (this->Init(pixel))
897 + {
898 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
899 + // use the number of input pixels derived from the length of the 'PixelData'
900 +--- dcmimage/include/dcmtk/dcmimage/dirgbpxt.h.orig 2013-06-22 10:35:08.000000000 -0700
901 ++++ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2013-06-22 10:35:39.000000000 -0700
902 +@@ -87,7 +87,7 @@
903 + const unsigned long planeSize,
904 + const int bits)
905 + {
906 +- if (Init(pixel))
907 ++ if (this->Init(pixel))
908 + {
909 + // use the number of input pixels derived from the length of the 'PixelData'
910 + // attribute), but not more than the size of the intermediate buffer
911 +--- dcmimage/include/dcmtk/dcmimage/diyp2pxt.h.orig 2013-06-22 10:35:45.000000000 -0700
912 ++++ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2013-06-22 10:36:34.000000000 -0700
913 +@@ -91,7 +91,7 @@
914 + void convert(const T1 *pixel,
915 + const int bits)
916 + {
917 +- if (Init(pixel))
918 ++ if (this->Init(pixel))
919 + {
920 + register T2 *r = this->Data[0];
921 + register T2 *g = this->Data[1];
922 +--- dcmimage/include/dcmtk/dcmimage/diyf2pxt.h.orig 2013-06-22 10:36:47.000000000 -0700
923 ++++ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2013-06-22 10:37:19.000000000 -0700
924 +@@ -95,7 +95,7 @@
925 + const int bits,
926 + const OFBool rgb)
927 + {
928 +- if (Init(pixel))
929 ++ if (this->Init(pixel))
930 + {
931 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
932 + register unsigned long i;
933 +--- dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h.orig 2013-06-22 10:44:20.000000000 -0700
934 ++++ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2013-06-22 10:47:08.000000000 -0700
935 +@@ -76,10 +76,10 @@
936 + else if ((this->Modality != NULL) && this->Modality->hasRescaling())
937 + {
938 + rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
939 +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
940 ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
941 + } else {
942 + rescale(pixel); // "copy" or reference pixel data
943 +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
944 ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
945 + }
946 + }
947 + }
948 +--- dcmimgle/include/dcmtk/dcmimgle/dimosct.h.orig 2013-06-22 10:47:22.000000000 -0700
949 ++++ dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2013-06-22 10:48:02.000000000 -0700
950 +@@ -124,7 +124,7 @@
951 + {
952 + const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
953 + OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
954 +- scaleData(&pixel, &this->Data, interpolate, value);
955 ++ this->scaleData(&pixel, &this->Data, interpolate, value);
956 + }
957 + }
958 + }
959 +--- dcmimgle/include/dcmtk/dcmimgle/dimoflt.h.orig 2013-06-22 10:48:07.000000000 -0700
960 ++++ dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2013-06-22 10:48:37.000000000 -0700
961 +@@ -106,11 +106,11 @@
962 + if (this->Data != NULL)
963 + {
964 + if (horz && vert)
965 +- flipHorzVert(&pixel, &this->Data);
966 ++ this->flipHorzVert(&pixel, &this->Data);
967 + else if (horz)
968 +- flipHorz(&pixel, &this->Data);
969 ++ this->flipHorz(&pixel, &this->Data);
970 + else if (vert)
971 +- flipVert(&pixel, &this->Data);
972 ++ this->flipVert(&pixel, &this->Data);
973 + }
974 + }
975 + }
976 +--- dcmimgle/include/dcmtk/dcmimgle/dimorot.h,orig 2013-06-22 10:50:38.000000000 -0700
977 ++++ dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2013-06-22 10:53:57.000000000 -0700
978 +@@ -105,11 +105,11 @@
979 + if (this->Data != NULL)
980 + {
981 + if (degree == 90)
982 +- rotateRight(&pixel, &(this->Data));
983 ++ this->rotateRight(&pixel, &(this->Data));
984 + else if (degree == 180)
985 +- rotateTopDown(&pixel, &(this->Data));
986 ++ this->rotateTopDown(&pixel, &(this->Data));
987 + else if (degree == 270)
988 +- rotateLeft(&pixel, &(this->Data));
989 ++ this->rotateLeft(&pixel, &(this->Data));
990 + }
991 + }
992 + }
993 +--- dcmimgle/include/dcmtk/dcmimgle/diflipt.h.orig 2013-06-22 11:03:34.000000000 -0700
994 ++++ dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2013-06-22 11:04:43.000000000 -0700
995 +@@ -123,13 +123,13 @@
996 + if ((src != NULL) && (dest != NULL))
997 + {
998 + if (horz && vert)
999 +- flipHorzVert(src, dest);
1000 ++ this->flipHorzVert(src, dest);
1001 + else if (horz)
1002 +- flipHorz(src, dest);
1003 ++ this->flipHorz(src, dest);
1004 + else if (vert)
1005 +- flipVert(src, dest);
1006 ++ this->flipVert(src, dest);
1007 + else
1008 +- copyPixel(src, dest);
1009 ++ this->copyPixel(src, dest);
1010 + }
1011 + }
1012 +
1013 +--- dcmimgle/include/dcmtk/dcmimgle/dirotat.h.orig 2013-06-22 11:06:17.000000000 -0700
1014 ++++ dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2013-06-22 11:07:00.000000000 -0700
1015 +@@ -126,13 +126,13 @@
1016 + const int degree)
1017 + {
1018 + if (degree == 90)
1019 +- rotateRight(src, dest);
1020 ++ this->rotateRight(src, dest);
1021 + else if (degree == 180)
1022 +- rotateTopDown(src, dest);
1023 ++ this->rotateTopDown(src, dest);
1024 + else if (degree == 270)
1025 +- rotateLeft(src, dest);
1026 ++ this->rotateLeft(src, dest);
1027 + else
1028 +- copyPixel(src, dest);
1029 ++ this->copyPixel(src, dest);
1030 + }
1031 +
1032 +
1033
1034 diff --git a/sci-libs/dcmtk/files/dcmtk_version_number.patch b/sci-libs/dcmtk/files/dcmtk_version_number.patch
1035 new file mode 100644
1036 index 0000000..130a3bf
1037 --- /dev/null
1038 +++ b/sci-libs/dcmtk/files/dcmtk_version_number.patch
1039 @@ -0,0 +1,131 @@
1040 +From: Joerg Riesmeier <dicom@×××××.de>
1041 +Date: Tue, 1 Feb 2011 17:01:14 +0000 (+0000)
1042 +Subject: Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
1043 +X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=12c35ca
1044 +
1045 +Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
1046 +string.
1047 +---
1048 +
1049 +Index: dcmtk-3.6.0/CMake/osconfig.h.in
1050 +===================================================================
1051 +--- dcmtk-3.6.0.orig/CMake/osconfig.h.in 2010-11-24 14:53:32.000000000 +0100
1052 ++++ dcmtk-3.6.0/CMake/osconfig.h.in 2011-06-17 14:34:56.000000000 +0200
1053 +@@ -677,7 +677,7 @@
1054 + #define PACKAGE_VERSION_SUFFIX "@DCMTK_PACKAGE_VERSION_SUFFIX@"
1055 +
1056 + /* Define to the version number of this package. */
1057 +-#define PACKAGE_VERSION_NUMBER "@DCMTK_PACKAGE_VERSION_NUMBER@"
1058 ++#define PACKAGE_VERSION_NUMBER @DCMTK_PACKAGE_VERSION_NUMBER@
1059 +
1060 + /* Define path separator */
1061 + #define PATH_SEPARATOR '@PATH_SEPARATOR@'
1062 +Index: dcmtk-3.6.0/CMakeLists.txt
1063 +===================================================================
1064 +--- dcmtk-3.6.0.orig/CMakeLists.txt 2011-01-06 11:48:43.000000000 +0100
1065 ++++ dcmtk-3.6.0/CMakeLists.txt 2011-06-17 14:34:56.000000000 +0200
1066 +@@ -21,7 +21,7 @@
1067 + SET(DCMTK_PACKAGE_DATE "2011-01-06")
1068 + #SET(DCMTK_PACKAGE_TARNAME "dcmtk-3.6.0")
1069 + SET(DCMTK_PACKAGE_VERSION "3.6.0")
1070 +-SET(DCMTK_PACKAGE_VERSION_NUMBER "360")
1071 ++SET(DCMTK_PACKAGE_VERSION_NUMBER 360)
1072 + SET(DCMTK_PACKAGE_VERSION_SUFFIX "")
1073 + #SET(DCMTK_PACKAGE_STRING "dcmtk 3.6.0")
1074 + #SET(DCMTK_PACKAGE_BUGREPORT "dicom-bugs@×××××.de")
1075 +Index: dcmtk-3.6.0/config/configure
1076 +===================================================================
1077 +--- dcmtk-3.6.0.orig/config/configure 2011-01-06 11:48:47.000000000 +0100
1078 ++++ dcmtk-3.6.0/config/configure 2011-06-17 14:34:56.000000000 +0200
1079 +@@ -1774,13 +1774,13 @@
1080 +
1081 +
1082 +
1083 +-PACKAGE_VERSION_NUMBER="360"
1084 ++PACKAGE_VERSION_NUMBER=360
1085 + PACKAGE_VERSION_SUFFIX=""
1086 + PACKAGE_DATE="2011-01-06"
1087 +
1088 +
1089 + cat >>confdefs.h <<_ACEOF
1090 +-#define PACKAGE_VERSION_NUMBER "${PACKAGE_VERSION_NUMBER}"
1091 ++#define PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION_NUMBER}
1092 + _ACEOF
1093 +
1094 +
1095 +Index: dcmtk-3.6.0/config/configure.in
1096 +===================================================================
1097 +--- dcmtk-3.6.0.orig/config/configure.in 2011-01-06 11:48:47.000000000 +0100
1098 ++++ dcmtk-3.6.0/config/configure.in 2011-06-17 14:34:56.000000000 +0200
1099 +@@ -8,11 +8,11 @@
1100 + dnl Additional Package Information
1101 + dnl -------------------------------------------------------
1102 +
1103 +-PACKAGE_VERSION_NUMBER="360"
1104 ++PACKAGE_VERSION_NUMBER=360
1105 + PACKAGE_VERSION_SUFFIX=""
1106 + PACKAGE_DATE="2011-01-06"
1107 +
1108 +-AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,"${PACKAGE_VERSION_NUMBER}",[Define to the version number of this package.])
1109 ++AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,${PACKAGE_VERSION_NUMBER},[Define to the version number of this package.])
1110 + AC_DEFINE_UNQUOTED(PACKAGE_VERSION_SUFFIX,"${PACKAGE_VERSION_SUFFIX}",[Define to the version suffix of this package.])
1111 + AC_DEFINE_UNQUOTED(PACKAGE_DATE,"${PACKAGE_DATE}",[Define to the release date of this package.])
1112 +
1113 +Index: dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h
1114 +===================================================================
1115 +--- dcmtk-3.6.0.orig/dcmdata/include/dcmtk/dcmdata/dcuid.h 2010-11-05 11:26:10.000000000 +0100
1116 ++++ dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h 2011-06-17 14:34:56.000000000 +0200
1117 +@@ -1,6 +1,6 @@
1118 + /*
1119 + *
1120 +- * Copyright (C) 1994-2010, OFFIS e.V.
1121 ++ * Copyright (C) 1994-2011, OFFIS e.V.
1122 + * All rights reserved. See COPYRIGHT file for details.
1123 + *
1124 + * This software and supporting documentation were developed by
1125 +@@ -20,8 +20,8 @@
1126 + * routines for finding and creating UIDs.
1127 + *
1128 + * Last Update: $Author: joergr $
1129 +- * Update Date: $Date: 2010-11-05 10:26:10 $
1130 +- * CVS/RCS Revision: $Revision: 1.89 $
1131 ++ * Update Date: $Date: 2011-02-01 17:01:33 $
1132 ++ * CVS/RCS Revision: $Revision: 1.90 $
1133 + * Status: $State: Exp $
1134 + *
1135 + * CVS/RCS Log at end of file
1136 +@@ -165,16 +165,21 @@
1137 + #error Required compiler definition PACKAGE_VERSION_NUMBER undefined
1138 + #endif
1139 +
1140 ++// helper macros for version number conversion
1141 ++
1142 ++#define PACKAGE_VERSION_NUMBER_TO_STRING_( x ) #x
1143 ++#define PACKAGE_VERSION_NUMBER_TO_STRING( x ) PACKAGE_VERSION_NUMBER_TO_STRING_( x )
1144 ++
1145 + /* NOTE: Implementation version name VR=SH may not be longer than 16 chars
1146 + * The second name is used to identify files written without dcmdata
1147 + * (i.e. using the --bit-preserving switch in various tools)
1148 + */
1149 +
1150 + /// implementation version name for this version of the toolkit
1151 +-#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER
1152 ++#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER)
1153 +
1154 + /// implementation version name for this version of the toolkit, used for files received in "bit preserving" mode
1155 +-#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2 "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER
1156 ++#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2 "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER)
1157 +
1158 + /// release date of current toolkit release
1159 + #ifdef DCMTK_BUILD_DATE
1160 +@@ -704,6 +709,10 @@
1161 + /*
1162 + ** CVS/RCS Log:
1163 + ** $Log: dcuid.h,v $
1164 ++** Revision 1.90 2011-02-01 17:01:33 joergr
1165 ++** Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
1166 ++** string.
1167 ++**
1168 + ** Revision 1.89 2010-11-05 10:26:10 joergr
1169 + ** Added new SOP Class UIDs from Supplement 131 and 134 (Implant Templates).
1170 + **
1171
1172 diff --git a/sci-libs/dcmtk/files/png_tiff.patch b/sci-libs/dcmtk/files/png_tiff.patch
1173 new file mode 100644
1174 index 0000000..0c49883
1175 --- /dev/null
1176 +++ b/sci-libs/dcmtk/files/png_tiff.patch
1177 @@ -0,0 +1,11 @@
1178 +--- dcmtk-3.5.5_20100504/dcmjpls/apps/Makefile.in 2010-12-09 11:27:05.000000000 +0100
1179 ++++ dcmtk-3.5.5_20100504.old/dcmjpls/apps/Makefile.in 2010-12-09 11:27:44.000000000 +0100
1180 +@@ -50,7 +50,7 @@
1181 + LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \
1182 + $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir)
1183 + LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \
1184 +- $(libcharlslib) $(ZLIBLIBS)
1185 ++ $(libcharlslib) $(ZLIBLIBS) $(TIFFLIBS) $(PNGLIBS)
1186 + PNMLIBS = $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS)
1187 +
1188 + objs = dcmdjpls.o dcmcjpls.o dcml2pnm.o
1189
1190 diff --git a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch b/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch
1191 new file mode 100644
1192 index 0000000..f95cb2e
1193 --- /dev/null
1194 +++ b/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch
1195 @@ -0,0 +1,98 @@
1196 +From: Joerg Riesmeier <dicom@×××××.de>
1197 +Date: Tue, 1 Mar 2011 10:04:16 +0000 (+0000)
1198 +Subject: Fixed some private tags copied from Philips MR Achieva conformance statement.
1199 +X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=0d3d794e71a3b9035c154a266834f93383083819;hp=0025bc0f762e96afec42dfff505386b3d591f6f7
1200 +
1201 +Fixed some private tags copied from Philips MR Achieva conformance statement.
1202 +Also added a couple of new private tags from the same conformance statement.
1203 +---
1204 +
1205 +Index: dcmtk-3.6.0/dcmdata/data/private.dic
1206 +===================================================================
1207 +--- dcmtk-3.6.0.orig/dcmdata/data/private.dic 2010-11-22 11:39:26.000000000 +0100
1208 ++++ dcmtk-3.6.0/dcmdata/data/private.dic 2011-06-17 14:40:20.000000000 +0200
1209 +@@ -35,6 +35,7 @@
1210 + # - Philips Digital Diagnost 1.3 conformance statement
1211 + # - Philips Integris H, catheterization laboratory, RIS-interface
1212 + # - Philips Intera Achieva Conformance Statement
1213 ++# - Philips MR Achieva Conformance Statement
1214 + # - Siemens Somatom syngo VA40B conformance statement
1215 + # - Siemens AXIOM Artis VB30 conformance statement
1216 + # - SonoWand Invite 2.1.1 conformance statement
1217 +@@ -1159,7 +1160,7 @@
1218 + (2001,"Philips Imaging DD 001",35) SS StackSliceNumber 1
1219 + (2001,"Philips Imaging DD 001",36) CS StackType 1
1220 + (2001,"Philips Imaging DD 001",3f) CS ZoomMode 1
1221 +-(2001,"Philips Imaging DD 001",5f) SQ StackSequence 1-n
1222 ++(2001,"Philips Imaging DD 001",5f) SQ StackSequence 1
1223 + (2001,"Philips Imaging DD 001",60) SL NumberOfStacks 1
1224 + (2001,"Philips Imaging DD 001",61) CS SeriesTransmitted 1
1225 + (2001,"Philips Imaging DD 001",62) CS SeriesCommitted 1
1226 +@@ -1204,7 +1205,7 @@
1227 + (2001,"PHILIPS IMAGING DD 001",35) SS StackSliceNumber 1
1228 + (2001,"PHILIPS IMAGING DD 001",36) CS StackType 1
1229 + (2001,"PHILIPS IMAGING DD 001",3f) CS ZoomMode 1
1230 +-(2001,"PHILIPS IMAGING DD 001",5f) SQ StackSequence 1-n
1231 ++(2001,"PHILIPS IMAGING DD 001",5f) SQ StackSequence 1
1232 + (2001,"PHILIPS IMAGING DD 001",60) SL NumberOfStacks 1
1233 + (2001,"PHILIPS IMAGING DD 001",61) CS SeriesTransmitted 1
1234 + (2001,"PHILIPS IMAGING DD 001",62) CS SeriesCommitted 1
1235 +@@ -1221,12 +1222,6 @@
1236 + (2005,"Philips MR Imaging DD 001",1f) SH MPRProtocol 1
1237 + (2005,"Philips MR Imaging DD 001",20) SL NumberOfChemicalShifts 1
1238 + (2005,"Philips MR Imaging DD 001",2d) SS NumberOfStackSlices 1
1239 +-(2005,"Philips MR Imaging DD 001",32) FL StackRadialAngle 1
1240 +-(2005,"Philips MR Imaging DD 001",33) CS StackRadialAxis 1
1241 +-(2005,"Philips MR Imaging DD 001",35) SS StackSliceNumber 1
1242 +-(2005,"Philips MR Imaging DD 001",36) CS StackType 1
1243 +-(2005,"Philips MR Imaging DD 001",a1) CS SyncraScanType 1
1244 +-(2005,"Philips MR Imaging DD 001",5f) SQ StackSequence 1
1245 + (2005,"Philips MR Imaging DD 001",83) SQ Unknown 1
1246 +
1247 + (2005,"Philips MR Imaging DD 005",02) SQ Unknown 1
1248 +@@ -1240,12 +1235,6 @@
1249 + (2005,"PHILIPS MR IMAGING DD 001",1f) SH MPRProtocol 1
1250 + (2005,"PHILIPS MR IMAGING DD 001",20) SL NumberOfChemicalShifts 1
1251 + (2005,"PHILIPS MR IMAGING DD 001",2d) SS NumberOfStackSlices 1
1252 +-(2005,"PHILIPS MR IMAGING DD 001",32) FL StackRadialAngle 1
1253 +-(2005,"PHILIPS MR IMAGING DD 001",33) CS StackRadialAxis 1
1254 +-(2005,"PHILIPS MR IMAGING DD 001",35) SS StackSliceNumber 1
1255 +-(2005,"PHILIPS MR IMAGING DD 001",36) CS StackType 1
1256 +-(2005,"PHILIPS MR IMAGING DD 001",a1) CS SyncraScanType 1
1257 +-(2005,"PHILIPS MR IMAGING DD 001",5f) SQ StackSequence 1
1258 + (2005,"PHILIPS MR IMAGING DD 001",83) SQ Unknown 1
1259 +
1260 + (0019,"PHILIPS MR R5.5/PART",1000) DS FieldOfView 1
1261 +Index: dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc
1262 +===================================================================
1263 +--- dcmtk-3.6.0.orig/dcmdata/libsrc/dcdictzz.cc 2010-11-22 11:48:17.000000000 +0100
1264 ++++ dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc 2011-06-17 14:41:07.000000000 +0200
1265 +@@ -20753,11 +20817,11 @@
1266 + DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1267 + "PHILIPS IMAGING DD 001" }
1268 + , { 0x2001, 0x005f, 0x2001, 0x005f,
1269 +- EVR_SQ, "StackSequence", 1, -1, "DICOM",
1270 ++ EVR_SQ, "StackSequence", 1, 1, "DICOM",
1271 + DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1272 + "Philips Imaging DD 001" }
1273 + , { 0x2001, 0x005f, 0x2001, 0x005f,
1274 +- EVR_SQ, "StackSequence", 1, -1, "DICOM",
1275 ++ EVR_SQ, "StackSequence", 1, 1, "DICOM",
1276 + DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1277 + "PHILIPS IMAGING DD 001" }
1278 + , { 0x2001, 0x0060, 0x2001, 0x0060,
1279 +@@ -20884,14 +20996,6 @@
1280 + EVR_CS, "StackType", 1, 1, "DICOM",
1281 + DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1282 + "PHILIPS MR IMAGING DD 001" }
1283 +- , { 0x2005, 0x005f, 0x2005, 0x005f,
1284 +- EVR_SQ, "StackSequence", 1, 1, "DICOM",
1285 +- DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1286 +- "Philips MR Imaging DD 001" }
1287 +- , { 0x2005, 0x005f, 0x2005, 0x005f,
1288 +- EVR_SQ, "StackSequence", 1, 1, "DICOM",
1289 +- DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1290 +- "PHILIPS MR IMAGING DD 001" }
1291 + , { 0x2005, 0x0083, 0x2005, 0x0083,
1292 + EVR_SQ, "Unknown", 1, 1, "DICOM",
1293 + DcmDictRange_Unspecified, DcmDictRange_Unspecified,
1294
1295 diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml
1296 new file mode 100644
1297 index 0000000..68a2a8a
1298 --- /dev/null
1299 +++ b/sci-libs/dcmtk/metadata.xml
1300 @@ -0,0 +1,9 @@
1301 +<?xml version="1.0" encoding="UTF-8"?>
1302 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1303 +<pkgmetadata>
1304 + <herd>sci-biology</herd>
1305 + <maintainer>
1306 + <email>sci-biology@g.o</email>
1307 + </maintainer>
1308 + <longdescription>DICOM ToolKit core medical imaging library and tools</longdescription>
1309 +</pkgmetadata>