Mercurial > mxe-octave

changeset 5102:c1b55b71d4e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gdcm: update to v3.0.0 * src/gdcm.mk: update version/checksum * src/of-dicom-1-gdcm3.patch: new patch file
author John Donoghue
date Wed, 03 Jul 2019 08:28:00 -0400
parents 25b307ea221a
children 9e4c158989eb
files src/gdcm.mk src/of-dicom-1-gdcm3.patch
diffstat 2 files changed, 41 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gdcm.mk	Thu Jun 27 12:00:43 2019 -0400
+++ b/src/gdcm.mk	Wed Jul 03 08:28:00 2019 -0400
@@ -3,11 +3,11 @@
 
 PKG             := gdcm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.6.9
-$(PKG)_CHECKSUM := 28aa7da1f286fa0ebcedebe535e4cd7463364847
+$(PKG)_VERSION  := 3.0.0
+$(PKG)_CHECKSUM := ce4507e9ad19589abc45fb5828fcceae80c4a9cd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 2.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 3.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := expat zlib
 
 $(PKG)_CMAKE_OPTS :=
@@ -18,7 +18,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 2.x/' | \
+    $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 3.x/' | \
     $(SED) -n 's,.*title=\"GDCM \([0-9.]*\)\".*,\1,p' | \
     $(SORT) -V | \
     tail -1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-dicom-1-gdcm3.patch	Wed Jul 03 08:28:00 2019 -0400
@@ -0,0 +1,37 @@
+diff -ur dicom-0.2.2.orig/src/aclocal.m4 dicom-0.2.2/src/aclocal.m4
+--- dicom-0.2.2.orig/src/aclocal.m4	2019-07-02 09:18:41.091614681 -0400
++++ dicom-0.2.2/src/aclocal.m4	2019-07-02 09:19:10.448327204 -0400
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.15 -*- Autoconf -*-
++# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
++# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ 
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+Only in dicom-0.2.2/src: config.h.in~
+diff -ur dicom-0.2.2.orig/src/configure dicom-0.2.2/src/configure
+--- dicom-0.2.2.orig/src/configure	2019-07-02 09:18:41.091614681 -0400
++++ dicom-0.2.2/src/configure	2019-07-02 09:19:10.816336138 -0400
+@@ -3219,7 +3219,7 @@
+ $as_echo_n "checking for gdcm headers path... " >&6; }
+   found_gdcm_header=
+   for p in  /usr/include /usr/local/include /opt/include /mingw32/include /mingw64/include ; do
+-    for v in   gdcm gdcm-2.0 gdcm-2.2 gdcm-2.4 gdcm-2.6 gdcm-2.8; do
++    for v in   gdcm gdcm-2.0 gdcm-2.2 gdcm-2.4 gdcm-2.6 gdcm-2.8 gdcm-3.0; do
+ 
+     CPPFLAGS="-I$p/$v $save_CPPFLAGS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+diff -ur dicom-0.2.2.orig/src/configure.ac dicom-0.2.2/src/configure.ac
+--- dicom-0.2.2.orig/src/configure.ac	2019-07-02 09:18:41.095614778 -0400
++++ dicom-0.2.2/src/configure.ac	2019-07-02 09:19:00.020074073 -0400
+@@ -112,7 +112,7 @@
+   AC_MSG_CHECKING([for gdcm headers path])
+   found_gdcm_header=
+   for p in [ /usr/include /usr/local/include /opt/include /mingw32/include /mingw64/include ]; do
+-    for v in [  gdcm gdcm-2.0 gdcm-2.2 gdcm-2.4 gdcm-2.6 gdcm-2.8]; do
++    for v in [  gdcm gdcm-2.0 gdcm-2.2 gdcm-2.4 gdcm-2.6 gdcm-2.8 gdcm-3.0]; do
+ 
+     CPPFLAGS="-I$p/$v $save_CPPFLAGS"
+     AC_COMPILE_IFELSE(