diff options
| author | Martin Lambers <marlam@marlam.de> | 2010-11-16 14:07:43 (GMT) |
|---|---|---|
| committer | Martin Lambers <marlam@marlam.de> | 2010-11-16 14:07:43 (GMT) |
| commit | 4c758bf74c4063c16281fb22521353ed1ae8051a (patch) | |
| tree | e00e00b8bad1760b7b8ece281ec89f7f09cba4ea | |
| parent | 565fcd82fdef1b234b930f2b99a946d9647d1124 (diff) | |
| download | mxe-4c758bf74c4063c16281fb22521353ed1ae8051a.zip mxe-4c758bf74c4063c16281fb22521353ed1ae8051a.tar.gz mxe-4c758bf74c4063c16281fb22521353ed1ae8051a.tar.bz2 | |
new package: dcmtk
| -rw-r--r-- | src/dcmtk-1-explicit-cast.patch | 23 | ||||
| -rw-r--r-- | src/dcmtk-2-const-correctness.patch | 14 | ||||
| -rw-r--r-- | src/dcmtk.mk | 35 |
3 files changed, 72 insertions, 0 deletions
diff --git a/src/dcmtk-1-explicit-cast.patch b/src/dcmtk-1-explicit-cast.patch new file mode 100644 index 0000000..6c36f18 --- /dev/null +++ b/src/dcmtk-1-explicit-cast.patch @@ -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 diff --git a/src/dcmtk-2-const-correctness.patch b/src/dcmtk-2-const-correctness.patch new file mode 100644 index 0000000..66fff9d --- /dev/null +++ b/src/dcmtk-2-const-correctness.patch @@ -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: diff --git a/src/dcmtk.mk b/src/dcmtk.mk new file mode 100644 index 0000000..0cc2cec --- /dev/null +++ b/src/dcmtk.mk @@ -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 |