Mercurial > mxe-octave
changeset 1366:4c2e54c1a378
new package: dcmtk
| author | Martin Lambers <marlam@marlam.de> |
|---|---|
| date | Tue, 16 Nov 2010 15:07:43 +0100 |
| parents | 74f410467f97 |
| children | 34089aeddea5 |
| files | src/dcmtk-1-explicit-cast.patch src/dcmtk-2-const-correctness.patch src/dcmtk.mk |
| diffstat | 3 files changed, 72 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk-1-explicit-cast.patch Tue Nov 16 15:07:43 2010 +0100 @@ -0,0 +1,23 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +--- dcmtk-3.5.4.orig/ofstd/libsrc/ofthread.cc 2005-12-08 16:49:02.000000000 +0100 ++++ dcmtk-3.5.4/ofstd/libsrc/ofthread.cc 2010-06-15 21:34:29.234201660 +0200 +@@ -139,7 +139,7 @@ + theThreadHandle = _beginthreadex(NULL, 0, thread_stub, (void *)this, 0, &tid); + if (theThreadHandle == 0) return errno; else + { +- theThread = tid; ++ theThread = (void *)tid; + return 0; + } + #elif defined(POSIX_INTERFACE) +@@ -195,7 +195,7 @@ + #endif + { + #ifdef WINDOWS_INTERFACE +- if (theThread == tID) return OFTrue; else return OFFalse; ++ if (theThread == (void *)tID) return OFTrue; else return OFFalse; + #elif defined(POSIX_INTERFACE) + #ifdef HAVE_POINTER_TYPE_PTHREAD_T + // dangerous - we cast an unsigned long back to a pointer type and hope that it is still valid
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk-2-const-correctness.patch Tue Nov 16 15:07:43 2010 +0100 @@ -0,0 +1,14 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +--- dcmtk-3.5.4.orig/dcmtls/libsrc/tlslayer.cc 2005-12-08 16:48:28.000000000 +0100 ++++ dcmtk-3.5.4/dcmtls/libsrc/tlslayer.cc 2010-06-16 06:25:12.279931390 +0200 +@@ -188,7 +188,7 @@ + SSLeay_add_all_algorithms(); + seedPRNG(randFile); + +- SSL_METHOD *method = NULL; ++ const SSL_METHOD *method = NULL; + switch (networkRole) + { + case DICOM_APPLICATION_ACCEPTOR:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/dcmtk.mk Tue Nov 16 15:07:43 2010 +0100 @@ -0,0 +1,35 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# dcmtk +PKG := dcmtk +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.5.4 +$(PKG)_CHECKSUM := 169056874947083e68eb941fcd53faaebc862ae5 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://dicom.offis.de/dcmtk.php.en +$(PKG)_URL := ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/$($(PKG)_FILE) +$(PKG)_DEPS := gcc openssl tiff libpng libxml2 zlib + +define $(PKG)_UPDATE + /bin/false +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --with-openssl \ + --with-libtiff \ + --with-libpng \ + --with-libxml \ + --with-libxmlinc='$(PREFIX)/$(TARGET)/include/libxml2' \ + --with-zlib \ + --without-libwrap \ + CXX='$(TARGET)-g++' \ + RANLIB='$(TARGET)-ranlib' \ + AR='$(TARGET)-ar' \ + ARFLAGS=cru + $(MAKE) -C '$(1)' -j '$(JOBS)' install-lib +endef