cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gdcm-3.0.0

Browse Source
This commit is contained in:
jasper 2019-05-09 17:02:30 +00:00
parent 8f6ca01fea
commit 914cdee630
6 changed files with 27 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/gdcm/Makefile
View File

@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.9 2019/03/30 03:36:15 jasper Exp $
# $OpenBSD: Makefile,v 1.10 2019/05/09 17:02:30 jasper Exp $
COMMENT = cross-platform DICOM implementation
DISTNAME = gdcm-2.8.9
DISTNAME = gdcm-3.0.0
SHARED_LIBS += gdcmCommon 0.0 # 2.8
SHARED_LIBS += gdcmDICT 0.0 # 2.8
SHARED_LIBS += gdcmDSED 0.0 # 2.8
SHARED_LIBS += gdcmIOD 0.0 # 2.8
SHARED_LIBS += gdcmMEXD 0.0 # 2.8
SHARED_LIBS += gdcmMSFF 0.0 # 2.8
SHARED_LIBS += gdcmcharls 0.0 # 1.1
SHARED_LIBS += gdcmjpeg12 0.0 # 2.8
SHARED_LIBS += gdcmjpeg16 0.0 # 2.8
SHARED_LIBS += gdcmjpeg8 0.0 # 2.8
SHARED_LIBS += socketxx 0.0 # 1.2
SHARED_LIBS += gdcmCommon 1.0 # 2.8
SHARED_LIBS += gdcmDICT 1.0 # 2.8
SHARED_LIBS += gdcmDSED 1.0 # 2.8
SHARED_LIBS += gdcmIOD 1.0 # 2.8
SHARED_LIBS += gdcmMEXD 1.0 # 2.8
SHARED_LIBS += gdcmMSFF 1.0 # 2.8
SHARED_LIBS += gdcmcharls 1.0 # 1.1
SHARED_LIBS += gdcmjpeg12 1.0 # 2.8
SHARED_LIBS += gdcmjpeg16 1.0 # 2.8
SHARED_LIBS += gdcmjpeg8 1.0 # 2.8
SHARED_LIBS += socketxx 1.0 # 1.2
API_V = 3.0
CATEGORIES = graphics
API_V = 2.8
HOMEPAGE = http://gdcm.sourceforge.net/

4
graphics/gdcm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gdcm-2.8.9.tar.gz) = otqIt7PL+edqnfPonQbQV8ypzlT8YvsFngT0e/BWtyc=
SIZE (gdcm-2.8.9.tar.gz) = 3762694
SHA256 (gdcm-3.0.0.tar.gz) = V3teag7neHOrnyY6sANuUPIC/alhxWN9LXS5XqwXcjI=
SIZE (gdcm-3.0.0.tar.gz) = 3838288

16
graphics/gdcm/patches/patch-Applications_Cxx_gdcminfo_cxx
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Applications_Cxx_gdcminfo_cxx,v 1.2 2019/03/30 03:36:15 jasper Exp $
Fix for newer poppler.
Index: Applications/Cxx/gdcminfo.cxx
--- Applications/Cxx/gdcminfo.cxx.orig
+++ Applications/Cxx/gdcminfo.cxx
@@ -202,7 +202,7 @@ static std::string getInfoDate(Dict *infoDict, const c
#endif
{
const GooString* gs = obj.getString();
- s = gs->getCString();
+ s = gs->c_str();
if (s[0] == 'D' && s[1] == ':')
{
s += 2;

16
graphics/gdcm/patches/patch-Applications_Cxx_gdcmpdf_cxx
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Applications_Cxx_gdcmpdf_cxx,v 1.2 2019/03/30 03:36:15 jasper Exp $
Fix for newer poppler.
Index: Applications/Cxx/gdcmpdf.cxx
--- Applications/Cxx/gdcmpdf.cxx.orig
+++ Applications/Cxx/gdcmpdf.cxx
@@ -50,7 +50,7 @@ static std::string getInfoDate(Dict *infoDict, const c
#endif
{
const GooString* gs = obj.getString();
- s = gs->getCString();
+ s = gs->c_str();
if (s[0] == 'D' && s[1] == ':')
{
s += 2;

19
graphics/gdcm/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2018/11/14 19:37:05 jasper Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.5 2019/05/09 17:02:30 jasper Exp $
Revert commit 966ca7e5d00a4b0bba5d6d9392303231e4e4e536 from upstream
(enforcing c++98), because it breaks builds with newer poppler.
@ -8,20 +8,11 @@ Unbreak build: we don't provide library symlinks
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -18,8 +18,6 @@ if( POLICY CMP0074 )
cmake_policy(SET CMP0074 NEW)
endif()
project(GDCM)
-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_EXTENSIONS OFF)
mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX)
set(GDCM_CMAKE_DIR "${GDCM_SOURCE_DIR}/CMake" CACHE INTERNAL "")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GDCM_CMAKE_DIR}")
@@ -119,7 +117,11 @@ else()
@@ -121,7 +121,11 @@ else()
set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
endif()
if(BUILD_SHARED_LIBS)
-if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
-if(BUILD_SHARED_LIBS)
+# OpenBSD doesn't have library symlinks
+if(CMAKE_SYSTEM_NAME MATCHES OpenBSD)
+ set(NAMELINK_ONLY)
@ -29,4 +20,4 @@ Index: CMakeLists.txt
+elseif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
set(NAMELINK_ONLY NAMELINK_ONLY)
set(NAMELINK_SKIP NAMELINK_SKIP)
else()
endif()

12
graphics/gdcm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2017/11/10 09:48:38 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2019/05/09 17:02:30 jasper Exp $
@bin bin/gdcmanon
@bin bin/gdcmconv
@bin bin/gdcmdiff
@ -54,7 +54,6 @@ include/gdcm-${API_V}/gdcmCP246ExplicitDataElement.h
include/gdcm-${API_V}/gdcmCP246ExplicitDataElement.txx
include/gdcm-${API_V}/gdcmCSAElement.h
include/gdcm-${API_V}/gdcmCSAHeader.h
include/gdcm-${API_V}/gdcmCSAHeader.txx
include/gdcm-${API_V}/gdcmCSAHeaderDict.h
include/gdcm-${API_V}/gdcmCSAHeaderDictEntry.h
include/gdcm-${API_V}/gdcmCStoreMessages.h
@ -98,6 +97,7 @@ include/gdcm-${API_V}/gdcmElement.h
include/gdcm-${API_V}/gdcmEmptyMaskGenerator.h
include/gdcm-${API_V}/gdcmEncapsulatedDocument.h
include/gdcm-${API_V}/gdcmEnumeratedValues.h
include/gdcm-${API_V}/gdcmEquipmentManufacturer.h
include/gdcm-${API_V}/gdcmEvent.h
include/gdcm-${API_V}/gdcmException.h
include/gdcm-${API_V}/gdcmExplicitDataElement.h
@ -332,19 +332,19 @@ include/gdcm-${API_V}/gdcmXMLPrivateDictReader.h
include/gdcm-${API_V}/gdcm_j2k.h
include/gdcm-${API_V}/gdcm_jp2.h
include/gdcm-${API_V}/gdcmcharls/
include/gdcm-${API_V}/gdcmcharls/charls.h
include/gdcm-${API_V}/gdcmcharls/colortransform.h
include/gdcm-${API_V}/gdcmcharls/config.h
include/gdcm-${API_V}/gdcmcharls/context.h
include/gdcm-${API_V}/gdcmcharls/contextrunmode.h
include/gdcm-${API_V}/gdcmcharls/decoderstrategy.h
include/gdcm-${API_V}/gdcmcharls/defaulttraits.h
include/gdcm-${API_V}/gdcmcharls/encoderstrategy.h
include/gdcm-${API_V}/gdcmcharls/header.h
include/gdcm-${API_V}/gdcmcharls/interface.h
include/gdcm-${API_V}/gdcmcharls/jlscodecfactory.h
include/gdcm-${API_V}/gdcmcharls/jpegimagedatasegment.h
include/gdcm-${API_V}/gdcmcharls/jpegmarker.h
include/gdcm-${API_V}/gdcmcharls/jpegmarkercode.h
include/gdcm-${API_V}/gdcmcharls/jpegmarkersegment.h
include/gdcm-${API_V}/gdcmcharls/jpegsegment.h
include/gdcm-${API_V}/gdcmcharls/jpegstreamreader.h
include/gdcm-${API_V}/gdcmcharls/jpegstreamwriter.h
include/gdcm-${API_V}/gdcmcharls/lookuptable.h
include/gdcm-${API_V}/gdcmcharls/losslesstraits.h