summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--index.html4
-rw-r--r--src/dcmtk-3-pointer-fixes.patch37
-rw-r--r--src/dcmtk.mk2
-rw-r--r--src/gdal.mk7
-rw-r--r--src/graphicsmagick.mk2
-rw-r--r--src/imagemagick.mk2
-rw-r--r--src/jack-1-link-to-libsndfile-deps.patch28
-rw-r--r--src/jack.mk28
-rw-r--r--src/libgcrypt-2-no-git.patch34
-rw-r--r--src/libssh2.mk4
-rw-r--r--src/openexr-1-fix-aligned-alloc.patch38
-rw-r--r--src/openexr.mk5
-rw-r--r--src/openssl.mk4
-rw-r--r--src/qtservice.mk3
-rw-r--r--src/qtsystems.mk3
-rw-r--r--src/qtxlsxwriter.mk4
-rw-r--r--src/vmime.mk4
17 files changed, 188 insertions, 21 deletions
diff --git a/index.html b/index.html
index e36e8a4..1e40b50 100644
--- a/index.html
+++ b/index.html
@@ -1461,6 +1461,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="website"><a href="http://www.itk.org/">Insight Segmentation and Registration Toolkit (ITK)</a></td>
</tr>
<tr>
+ <td class="package">jack</td>
+ <td class="website"><a href="http://jackaudio.org/">JACK Audio Connection Kit</a></td>
+ </tr>
+ <tr>
<td class="package">jansson</td>
<td class="website"><a href="http://www.digip.org/jansson/">Jansson</a></td>
</tr>
diff --git a/src/dcmtk-3-pointer-fixes.patch b/src/dcmtk-3-pointer-fixes.patch
new file mode 100644
index 0000000..3204bf0
--- /dev/null
+++ b/src/dcmtk-3-pointer-fixes.patch
@@ -0,0 +1,37 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 808089f334f44ea125ec5263fb85c0f2c95fd190 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sat, 6 Jun 2015 06:16:19 -0700
+Subject: [PATCH] Do not cast pointer to integer types. Instead, pass them in
+ as-is.
+
+
+diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc
+index 48a267b..3a5eb18 100644
+--- a/dcmnet/libsrc/dul.cc
++++ b/dcmnet/libsrc/dul.cc
+@@ -1770,7 +1770,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
+ // send number of socket handle in child process over anonymous pipe
+ DWORD bytesWritten;
+ char buf[20];
+- sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle));
++ sprintf(buf, "%p", childSocketHandle);
+ if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL))
+ {
+ CloseHandle(hChildStdInWriteDup);
+@@ -1780,7 +1780,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
+ // return OF_ok status code DULC_FORKEDCHILD with descriptive text
+ OFOStringStream stream;
+ stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId)
+- << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends;
++ << ", socketHandle " << childSocketHandle << OFStringStream_ends;
+ OFSTRINGSTREAM_GETOFSTRING(stream, msg)
+ return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str());
+ }
+--
+2.1.4
+
diff --git a/src/dcmtk.mk b/src/dcmtk.mk
index df380e7..6e8fe25 100644
--- a/src/dcmtk.mk
+++ b/src/dcmtk.mk
@@ -38,6 +38,4 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)' install-lib
endef
-$(PKG)_BUILD_x86_64-w64-mingw32 =
-
$(PKG)_BUILD_SHARED =
diff --git a/src/gdal.mk b/src/gdal.mk
index 3e6d10a..cd3275a 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -23,8 +23,8 @@ define $(PKG)_CONFIGURE
cd '$(1)' && autoreconf -fi
# The option '--without-threads' means native win32 threading without pthread.
cd '$(1)' && ./configure \
- $(MXE_CONFIGURE_OPTS) \
- --with-bsb \
+ $(MXE_CONFIGURE_OPTS) \
+ --with-bsb \
--with-grib \
--with-ogr \
--with-pam \
@@ -40,6 +40,7 @@ define $(PKG)_CONFIGURE
--with-expat='$(PREFIX)/$(TARGET)' \
--with-sqlite3='$(PREFIX)/$(TARGET)' \
--with-gta='$(PREFIX)/$(TARGET)' \
+ --with-hdf4='$(PREFIX)/$(TARGET)' \
--with-hdf5='$(PREFIX)/$(TARGET)' \
--with-libjson-c='$(PREFIX)/$(TARGET)' \
--with-netcdf='$(PREFIX)/$(TARGET)' \
@@ -83,7 +84,7 @@ define $(PKG)_MAKE
$(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install
$(MAKE) -C '$(1)/alg' -j '$(JOBS)' install
$(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED=
- $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install BIN_LIST=
+ $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install
ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
endef
diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk
index f021fdc..32471e8 100644
--- a/src/graphicsmagick.mk
+++ b/src/graphicsmagick.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := bd3c543520b810999348e52d4abad6b59069f78b
$(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION)
$(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc pthreads libltdl zlib bzip2 jpeg jasper lcms libpng tiff freetype libxml2
+$(PKG)_DEPS := gcc pthreads libltdl zlib bzip2 jpeg jasper lcms libpng tiff freetype libxml2 libgomp
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/' | \
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index f7287aa..2bcc466 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -39,6 +39,4 @@ define $(PKG)_BUILD
`'$(TARGET)-pkg-config' ImageMagick++ --cflags --libs`
endef
-$(PKG)_BUILD_x86_64-w64-mingw32 =
-
$(PKG)_BUILD_SHARED =
diff --git a/src/jack-1-link-to-libsndfile-deps.patch b/src/jack-1-link-to-libsndfile-deps.patch
new file mode 100644
index 0000000..5986ebb
--- /dev/null
+++ b/src/jack-1-link-to-libsndfile-deps.patch
@@ -0,0 +1,28 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+????
+
+--- jack-1.9.10/example-clients/wscript.orig 2015-06-16 15:34:56.407346962 +0300
++++ jack-1.9.10/example-clients/wscript 2015-06-16 21:15:40.923117183 +0300
+@@ -41,6 +41,10 @@
+
+ if conf.is_defined('HAVE_SNDFILE'):
+ conf.env['LIB_SNDFILE'] = ['sndfile']
++ conf.env['LIB_FLAC'] = ['FLAC']
++ conf.env['LIB_VORBIS'] = ['vorbis']
++ conf.env['LIB_VORBISENC'] = ['vorbisenc']
++ conf.env['LIB_OGG'] = ['ogg']
+
+ conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs', mandatory=False)
+
+@@ -124,7 +128,7 @@
+ if bld.env['IS_SUN']:
+ prog.use += ['RT', 'SNDFILE']
+ if bld.env['IS_WINDOWS']:
+- prog.uselib = ['SNDFILE']
++ prog.uselib = ['SNDFILE', 'FLAC', 'VORBIS', 'VORBISENC', 'OGG']
+ prog.target = 'jack_rec'
+
+ if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
diff --git a/src/jack.mk b/src/jack.mk
new file mode 100644
index 0000000..2275c51
--- /dev/null
+++ b/src/jack.mk
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := jack
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 1.9.10
+$(PKG)_CHECKSUM := 1177655ae0fbbd8c2229b398a79724115a392941
+$(PKG)_SUBDIR := jack-$($(PKG)_VERSION)
+$(PKG)_FILE := jack-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL := https://dl.dropboxusercontent.com/u/28869550/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc libsamplerate libgnurx portaudio libsndfile winpthreads
+
+define $(PKG)_UPDATE
+ echo 'TODO: write update script for $(PKG).' >&2;
+ echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && \
+ AR='$(TARGET)-ar' \
+ CC='$(TARGET)-gcc' \
+ CXX='$(TARGET)-g++' \
+ PKGCONFIG='$(TARGET)-pkg-config' \
+ ./waf configure build install \
+ -j '$(JOBS)' \
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --dist-target=mingw
+endef
diff --git a/src/libgcrypt-2-no-git.patch b/src/libgcrypt-2-no-git.patch
new file mode 100644
index 0000000..ebde54d
--- /dev/null
+++ b/src/libgcrypt-2-no-git.patch
@@ -0,0 +1,34 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From bb6a01f7a13be69e9ba395977dacd2ac0b9efbcd Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Fri, 12 Jun 2015 14:53:55 -0700
+Subject: [PATCH] Don't call git to determine the revision.
+
+
+diff --git a/configure.ac b/configure.ac
+index d9a1670..ab98441 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [3])
+ # processing is done by autoconf and not during the configure run.
+ m4_define(mym4_version,
+ [mym4_version_major.mym4_version_minor.mym4_version_micro])
+-m4_define([mym4_revision],
+- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision], [4091])
+ m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
+- awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring], [])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+--
+2.1.4
+
diff --git a/src/libssh2.mk b/src/libssh2.mk
index c8b4a57..e0fd663 100644
--- a/src/libssh2.mk
+++ b/src/libssh2.mk
@@ -3,8 +3,8 @@
PKG := libssh2
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.5.0
-$(PKG)_CHECKSUM := d9a97a04aef8bcf835b22a7a2e8e869782baa3aa
+$(PKG)_VERSION := 1.6.0
+$(PKG)_CHECKSUM := 93563084168bd2595f3cbd54585c9abe8ddb0fa9
$(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION)
$(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE)
diff --git a/src/openexr-1-fix-aligned-alloc.patch b/src/openexr-1-fix-aligned-alloc.patch
new file mode 100644
index 0000000..131d2a1
--- /dev/null
+++ b/src/openexr-1-fix-aligned-alloc.patch
@@ -0,0 +1,38 @@
+diff -uNr openexr-2.1.0.orig/IlmImf/ImfSystemSpecific.h openexr-2.1.0/IlmImf/ImfSystemSpecific.h
+--- openexr-2.1.0.orig/IlmImf/ImfSystemSpecific.h 2013-10-21 21:02:22.000000000 +0200
++++ openexr-2.1.0/IlmImf/ImfSystemSpecific.h 2015-01-07 15:31:25.851288890 +0100
+@@ -58,6 +58,20 @@
+ #define EXR_FORCEINLINE inline
+ #define EXR_RESTRICT __restrict
+
++#ifdef __MINGW32__
++
++static void* EXRAllocAligned(size_t size, size_t alignment)
++{
++ return _aligned_malloc(size, alignment);
++}
++
++static void EXRFreeAligned(void* ptr)
++{
++ return _aligned_free(ptr);
++}
++
++#else
++
+ static void* EXRAllocAligned(size_t size, size_t alignment)
+ {
+ void* ptr = 0;
+@@ -65,12 +79,12 @@
+ return ptr;
+ }
+
+-
+ static void EXRFreeAligned(void* ptr)
+ {
+ free(ptr);
+ }
+
++#endif
+ #elif defined _MSC_VER
+
+ #define EXR_FORCEINLINE __forceinline
diff --git a/src/openexr.mk b/src/openexr.mk
index e37100d..a371b81 100644
--- a/src/openexr.mk
+++ b/src/openexr.mk
@@ -38,7 +38,8 @@ define $(PKG)_BUILD
--disable-threading \
--disable-posix-sem \
--disable-ilmbasetest \
- PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+ CXXFLAGS="-fpermissive"
# build the code generator manually
cd '$(1)/IlmImf' && g++ \
-I'$(1)/ilmbase/include/OpenEXR' \
@@ -54,5 +55,3 @@ define $(PKG)_BUILD
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-openexr.exe' \
`'$(TARGET)-pkg-config' OpenEXR --cflags --libs`
endef
-
-$(PKG)_BUILD_x86_64-w64-mingw32 =
diff --git a/src/openssl.mk b/src/openssl.mk
index eb7ed5c..b86a4bf 100644
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -3,8 +3,8 @@
PKG := openssl
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.0.2a
-$(PKG)_CHECKSUM := 46ecd325b8e587fa491f6bb02ad4a9fb9f382f5f
+$(PKG)_VERSION := 1.0.2c
+$(PKG)_CHECKSUM := 6e4a5e91159eb32383296c7c83ac0e59b83a0a44
$(PKG)_SUBDIR := openssl-$($(PKG)_VERSION)
$(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE)
diff --git a/src/qtservice.mk b/src/qtservice.mk
index 09c243f..085b89e 100644
--- a/src/qtservice.mk
+++ b/src/qtservice.mk
@@ -3,7 +3,8 @@
PKG := qtservice
$(PKG)_IGNORE :=
$(PKG)_VERSION := 38e79e3
-$(PKG)_CHECKSUM := 3d3e2ebb092f2e04b3bc1d75a4221465fdac29e8
+$(PKG)_VERSION := 25e2cbb
+$(PKG)_CHECKSUM := b23cac6e92991424c4813b9900241f13715fdb7a
$(PKG)_SUBDIR := qtproject-qt-solutions-$($(PKG)_VERSION)
$(PKG)_FILE := qt-solutions-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/qtproject/qt-solutions/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/qtsystems.mk b/src/qtsystems.mk
index 709e46d..88339a8 100644
--- a/src/qtsystems.mk
+++ b/src/qtsystems.mk
@@ -3,7 +3,8 @@
PKG := qtsystems
$(PKG)_IGNORE :=
$(PKG)_VERSION := 32e6573
-$(PKG)_CHECKSUM := a36520f065948c6066e8e539ff4e67ad490a5af7
+$(PKG)_VERSION := 37b614a
+$(PKG)_CHECKSUM := eba4177015dc02fb438dd28a8d2b80650d805048
$(PKG)_SUBDIR := qtproject-$(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/qtproject/qtsystems/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/qtxlsxwriter.mk b/src/qtxlsxwriter.mk
index 57c6458..44bf3f7 100644
--- a/src/qtxlsxwriter.mk
+++ b/src/qtxlsxwriter.mk
@@ -2,8 +2,8 @@
# See index.html for further information.
PKG := qtxlsxwriter
$(PKG)_IGNORE :=
-$(PKG)_VERSION := fe3fbb23eb878b7a85e40805f3525f0a277b5570
-$(PKG)_CHECKSUM := 5d759f2b0faa2fea9d77e2f0d5733302fbf33958
+$(PKG)_VERSION := ad90b6a2c21b300138ceb9fe9030a5917230f92d
+$(PKG)_CHECKSUM := c3803adef77c76b8254026ae78ddc345acfc1253
$(PKG)_SUBDIR := QtXlsxWriter-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/dbzhang800/QtXlsxWriter/archive/$($(PKG)_VERSION).tar.gz
diff --git a/src/vmime.mk b/src/vmime.mk
index 44656c5..7fee853 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -3,8 +3,8 @@
PKG := vmime
$(PKG)_IGNORE :=
-$(PKG)_VERSION := c446afd
-$(PKG)_CHECKSUM := 61e33ff335e294a9ca54e9d61c9639c673a72e49
+$(PKG)_VERSION := 3dd5975
+$(PKG)_CHECKSUM := ff2c274a5aaa1a98d689266967c3a8d8c3e90cf1
$(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
generated by cgit v0.12 at 2024-09-29 01:25:34 (GMT)