summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apr-1.patch82
-rw-r--r--src/apr-2-wtypes.patch36
-rw-r--r--src/apr-3.patch32
-rw-r--r--src/apr-util.mk17
-rw-r--r--src/apr.mk17
-rw-r--r--src/armadillo.mk4
-rw-r--r--src/aubio-1-fix-pkg-config.patch16
-rw-r--r--src/aubio-1-fixes.patch192
-rw-r--r--src/aubio-test.c26
-rw-r--r--src/aubio.mk40
-rw-r--r--src/cairo-3-lto.patch46
-rw-r--r--src/cairo.mk4
-rw-r--r--src/cminpack.mk4
-rw-r--r--src/ffmpeg.mk4
-rw-r--r--src/flann.mk4
-rw-r--r--src/flex.mk3
-rw-r--r--src/gendef.mk24
-rw-r--r--src/harfbuzz.mk4
-rw-r--r--src/libpng.mk4
-rw-r--r--src/libsndfile.mk4
-rw-r--r--src/luajit.mk7
-rw-r--r--src/openblas.mk4
-rw-r--r--src/poco-3-winsock2.patch25
-rw-r--r--src/poco.mk10
-rw-r--r--src/sdl2_net-1-winsocks2.patch26
-rw-r--r--src/sdl_net-2-winsocks2.patch26
-rw-r--r--src/sqlite.mk4
-rw-r--r--src/xmlrpc-c.mk6
28 files changed, 529 insertions, 142 deletions
diff --git a/src/apr-1.patch b/src/apr-1.patch
index de94bb2..530b5da 100644
--- a/src/apr-1.patch
+++ b/src/apr-1.patch
@@ -1,36 +1,78 @@
This file is part of MXE.
See index.html for further information.
-From d221ed3c7576a3456a8f5623246b46d355a4db83 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sun, 9 Feb 2014 02:48:38 +0100
-Subject: [PATCH] winsock2.h must precede windows.h
+From 1e244993f497ca7167361dfb29a2fe43232a7661 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Thu, 13 Nov 2014 00:17:19 -0500
+Subject: [PATCH] Include windows.h after winsock2.h
-MinGW 4 is particular about this.
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+---
+ include/apr.h.in | 2 +-
+ include/apr.hw | 2 +-
+ include/apr.hwc | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/apr.h.in b/include/apr.h.in
-index 9f1fb6f..f1741c1 100644
+index 0ad7a91..0d70142 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
-@@ -115,14 +115,14 @@
- * or the extern "C" namespace
- */
+@@ -142,7 +142,6 @@
+ #define NOIME
+ #endif
--#if APR_HAVE_WINDOWS_H
-#include <windows.h>
--#endif
--
- #if APR_HAVE_WINSOCK2_H
- #include <winsock2.h>
+ /*
+ * Add a _very_few_ declarations missing from the restricted set of headers
+ * (If this list becomes extensive, re-enable the required headers above!)
+@@ -156,6 +155,7 @@
+ #else
+ #include <winsock.h>
#endif
++#include <windows.h>
-+#if APR_HAVE_WINDOWS_H
+ #endif /* ndef _WINDOWS_ */
+ #endif /* APR_HAVE_WINDOWS_H */
+diff --git a/include/apr.hw b/include/apr.hw
+index a75bc60..caa933c 100644
+--- a/include/apr.hw
++++ b/include/apr.hw
+@@ -95,7 +95,6 @@
+ #ifndef NOIME
+ #define NOIME
+ #endif
+-#include <windows.h>
+ /*
+ * Add a _very_few_ declarations missing from the restricted set of headers
+ * (If this list becomes extensive, re-enable the required headers above!)
+@@ -109,6 +108,7 @@
+ #else
+ #include <winsock.h>
+ #endif
+#include <windows.h>
-+#endif
-+
- #if APR_HAVE_SYS_TYPES_H
- #include <sys/types.h>
+ #endif /* !_WINDOWS_ */
+
+ /**
+diff --git a/include/apr.hwc b/include/apr.hwc
+index 0579962..b171d48 100644
+--- a/include/apr.hwc
++++ b/include/apr.hwc
+@@ -92,7 +92,6 @@
+ #ifndef NOIME
+ #define NOIME
+ #endif
+-#include <windows.h>
+ /*
+ * Add a _very_few_ declarations missing from the restricted set of headers
+ * (If this list becomes extensive, re-enable the required headers above!)
+@@ -106,6 +105,7 @@
+ #else
+ #include <winsock.h>
#endif
++#include <windows.h>
+ #endif /* !_WINDOWS_ */
+
+ /**
--
-1.8.4.5
+1.9.1
diff --git a/src/apr-2-wtypes.patch b/src/apr-2-wtypes.patch
new file mode 100644
index 0000000..c1676bd
--- /dev/null
+++ b/src/apr-2-wtypes.patch
@@ -0,0 +1,36 @@
+This file is part of MXE.
+See index.html for further information.
+
+From: "Jon Schewe (BBN) <jschewe@bbn.com>"
+Taken from https://issues.apache.org/bugzilla/attachment.cgi?id=31800.
+
+--- a/include/arch/win32/apr_private.h.orig 2014-07-03 14:34:47 -0500
++++ b/include/arch/win32/apr_private.h 2014-07-03 14:35:51 -0500
+@@ -45,13 +45,9 @@
+ */
+ #ifndef _WIN32_WCE
+ #define HAVE_ACLAPI 1
+-#ifdef __wtypes_h__
++#define COM_NO_WINDOWS_H
+ #include <accctrl.h>
+-#else
+-#define __wtypes_h__
+-#include <accctrl.h>
+-#undef __wtypes_h__
+-#endif
++#undef COM_NO_WINDOWS_H
+ #else
+ #define HAVE_ACLAPI 0
+ #endif
+--- a/file_io/win32/filestat.c.orig 2014-07-03 14:42:41 -0500
++++ b/file_io/win32/filestat.c 2014-07-03 14:43:09 -0500
+@@ -15,7 +15,9 @@
+ */
+
+ #include "apr.h"
++#define COM_NO_WINDOWS_H
+ #include <aclapi.h>
++#undef COM_NO_WINDOWS_H
+ #include "apr_private.h"
+ #include "apr_arch_file_io.h"
+ #include "apr_file_io.h"
diff --git a/src/apr-3.patch b/src/apr-3.patch
new file mode 100644
index 0000000..19a02d0
--- /dev/null
+++ b/src/apr-3.patch
@@ -0,0 +1,32 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 72ceb6351c8519ed48b21233246fc87f5dc8ee18 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Thu, 13 Nov 2014 01:10:29 -0500
+Subject: [PATCH] Make it possible to use another tools/gen_test_char
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..db08a1f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,9 +137,10 @@ tools/gen_test_char.lo: make_tools_dir
+ tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+ $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+
++GEN_TEST_CHAR ?= tools/gen_test_char@EXEEXT@
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ $(APR_MKDIR) include/private
+- tools/gen_test_char@EXEEXT@ > $@
++ $(GEN_TEST_CHAR) > $@
+
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+ @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
+--
+1.9.1
+
diff --git a/src/apr-util.mk b/src/apr-util.mk
index 38a06fb..27e3201 100644
--- a/src/apr-util.mk
+++ b/src/apr-util.mk
@@ -2,13 +2,13 @@
# See index.html for further information.
PKG := apr-util
-$(PKG)_IGNORE := 1.5%
-$(PKG)_VERSION := 1.4.1
-$(PKG)_CHECKSUM := ca4db631d186ea13526fd087aebc06799d4c5415
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 1.5.4
+$(PKG)_CHECKSUM := 72cc3ac693b52fb831063d5c0de18723bc8e0095
$(PKG)_SUBDIR := apr-util-$($(PKG)_VERSION)
$(PKG)_FILE := apr-util-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
-$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_URL := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_URL_2 := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
$(PKG)_DEPS := gcc apr expat libiconv
define $(PKG)_UPDATE
@@ -23,8 +23,13 @@ define $(PKG)_BUILD
--without-pgsql \
--without-sqlite2 \
--without-sqlite3 \
+ --without-freetds \
--with-apr='$(PREFIX)/$(TARGET)' \
CFLAGS=-D_WIN32_WINNT=0x0500
- $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT)
+ $(if $(BUILD_STATIC), \
+ sed -i '1i #define APU_DECLARE_STATIC 1' \
+ '$(PREFIX)/$(TARGET)/include/apr-1/apu.h')
ln -sf '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config'
endef
diff --git a/src/apr.mk b/src/apr.mk
index d58b374..22db581 100644
--- a/src/apr.mk
+++ b/src/apr.mk
@@ -2,13 +2,13 @@
# See index.html for further information.
PKG := apr
-$(PKG)_IGNORE := 1.5%
-$(PKG)_VERSION := 1.4.2
-$(PKG)_CHECKSUM := d48324efb0280749a5d7ccbb053d68545c568b4b
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 1.5.1
+$(PKG)_CHECKSUM := 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3
$(PKG)_SUBDIR := apr-$($(PKG)_VERSION)
$(PKG)_FILE := apr-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
-$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_URL := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_URL_2 := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
@@ -18,6 +18,10 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
+ cp -Rp '$(1)' '$(1).native'
+ cd '$(1).native' && ./configure
+ cd '$(1).native' && make tools/gen_test_char \
+ CFLAGS='-DNEED_ENHANCED_ESCAPES'
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
ac_cv_sizeof_off_t=4 \
@@ -25,6 +29,7 @@ define $(PKG)_BUILD
ac_cv_sizeof_size_t=4 \
ac_cv_sizeof_ssize_t=4 \
CFLAGS=-D_WIN32_WINNT=0x0500
- $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j 1 install GEN_TEST_CHAR='$(1).native/tools/gen_test_char'
+
ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
endef
diff --git a/src/armadillo.mk b/src/armadillo.mk
index 302f2cf..4314ef9 100644
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@@ -3,8 +3,8 @@
PKG := armadillo
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 4.450.4
-$(PKG)_CHECKSUM := a8b4ecba8161aee4d252da9f6de40eb78895f329
+$(PKG)_VERSION := 4.500.0
+$(PKG)_CHECKSUM := 4747a6fb4350f5adabfb71f3c0031d5ae44b38d3
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)
diff --git a/src/aubio-1-fix-pkg-config.patch b/src/aubio-1-fix-pkg-config.patch
deleted file mode 100644
index b57c86c..0000000
--- a/src/aubio-1-fix-pkg-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -urN aubio-0.3.2.orig/configure.ac aubio-0.3.2/configure.ac
---- aubio-0.3.2.orig/configure.ac 2006-10-09 01:11:39.000000000 +0200
-+++ aubio-0.3.2/configure.ac 2010-01-26 23:07:23.000000000 +0100
-@@ -135,9 +135,6 @@
- [Defined when c99 style varargs macros are supported])
- fi
-
--dnl Check for pkg-config
--AC_PATH_PROG(PKG_CONFIG,pkg-config,no)
--
- PKG_CHECK_MODULES(SNDLIB, sndfile >= 1.0.4, SNDLIB_SUPPORT=1)
- PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, SAMPLERATE_SUPPORT=1)
-
diff --git a/src/aubio-1-fixes.patch b/src/aubio-1-fixes.patch
new file mode 100644
index 0000000..f900dea
--- /dev/null
+++ b/src/aubio-1-fixes.patch
@@ -0,0 +1,192 @@
+From a34301d5fcdb6187dceb508bab341727ec57d0b4 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Fri, 14 Nov 2014 16:37:52 -0500
+Subject: [PATCH 1/4] Add options for enabling shared and/or static libraries
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/src/wscript_build b/src/wscript_build
+index 94b2062..1a72e4a 100644
+--- a/src/wscript_build
++++ b/src/wscript_build
+@@ -18,13 +18,11 @@ ctx(features = 'c',
+ lib = 'm',
+ target = 'lib_objects')
+
+-# build libaubio.so (cshlib) and/or libaubio.a (cstlib)
+-if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
+- build_features = ['cstlib']
+-elif ctx.env['DEST_OS'] in ['win32', 'win64']:
+- build_features = ['cshlib']
+-else: #linux, darwin, android, mingw, ...
+- build_features = ['cshlib', 'cstlib']
++build_features = []
++if ctx.options.enable_shared:
++ build_features += ['cshlib']
++if ctx.options.enable_static:
++ build_features += ['cstlib']
+
+ for target in build_features:
+ ctx(features = 'c ' + target,
+diff --git a/wscript b/wscript
+index 83ad7b8..7013f12 100644
+--- a/wscript
++++ b/wscript
+@@ -73,6 +73,13 @@ def options(ctx):
+ help_str = 'compile in double precision mode',
+ help_disable_str = 'compile in single precision mode (default)')
+
++ add_option_enable_disable(ctx, 'shared', default = True,
++ help_str = 'compile shared libraries (defaut)',
++ help_disable_str = 'do not compile shared library')
++ add_option_enable_disable(ctx, 'static', default = True,
++ help_str = 'compile static libraries (default)',
++ help_disable_str = 'do not compile static library')
++
+ ctx.add_option('--with-target-platform', type='string',
+ help='set target platform for cross-compilation', dest='target_platform')
+
+--
+1.9.1
+
+
+From e133535438a965b3f6f7f0cac5cb5c062c07829f Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Fri, 14 Nov 2014 16:39:51 -0500
+Subject: [PATCH 2/4] fftw3 support requires -pthread
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/wscript b/wscript
+index 7013f12..052fb27 100644
+--- a/wscript
++++ b/wscript
+@@ -197,8 +197,10 @@ def configure(ctx):
+ # fftw not enabled, use vDSP or ooura
+ if 'HAVE_FFTW3F' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'fftw3f')
++ ctx.env.LINKFLAGS += ['-pthread']
+ elif 'HAVE_FFTW3' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'fftw3')
++ ctx.env.LINKFLAGS += ['-pthread']
+ elif 'HAVE_ACCELERATE' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'vDSP')
+ else:
+--
+1.9.1
+
+
+From 16fda40e02065b670b63e193a453357051ca9c33 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Fri, 14 Nov 2014 16:40:53 -0500
+Subject: [PATCH 3/4] Add static deps to pkgconfig file
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/aubio.pc.in b/aubio.pc.in
+index 301a1b5..0cd2281 100644
+--- a/aubio.pc.in
++++ b/aubio.pc.in
+@@ -6,5 +6,7 @@ includedir=@includedir@
+ Name: aubio
+ Description: a library for audio labelling
+ Version: @VERSION@
++Require.private: @PCREQUIRES@
+ Libs: -L${libdir} -laubio
++Libs.private: @PCLIBS@
+ Cflags: -I${includedir}
+diff --git a/wscript b/wscript
+index 052fb27..424bcf8 100644
+--- a/wscript
++++ b/wscript
+@@ -176,6 +176,8 @@ def configure(ctx):
+ if (ctx.options.enable_complex == True):
+ ctx.check(header_name='complex.h')
+
++ pcrequires = []
++ pclibs = []
+ # check for fftw3
+ if (ctx.options.enable_fftw3 != False or ctx.options.enable_fftw3f != False):
+ # one of fftwf or fftw3f
+@@ -197,9 +199,13 @@ def configure(ctx):
+ # fftw not enabled, use vDSP or ooura
+ if 'HAVE_FFTW3F' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'fftw3f')
++ pcrequires += ['fftw3f >= 3.0.0']
++ pclibs += ['-lpthread']
+ ctx.env.LINKFLAGS += ['-pthread']
+ elif 'HAVE_FFTW3' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'fftw3')
++ pcrequires += ['fftw3 >= 3.0.0']
++ pclibs += ['-lpthread']
+ ctx.env.LINKFLAGS += ['-pthread']
+ elif 'HAVE_ACCELERATE' in ctx.env.define_key:
+ ctx.msg('Checking for FFT implementation', 'vDSP')
+@@ -210,16 +216,22 @@ def configure(ctx):
+ if (ctx.options.enable_sndfile != False):
+ ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
+ args = '--cflags --libs', mandatory = False)
++ if 'HAVE_SNDFILE' in ctx.env.define_key:
++ pcrequires += ['sndfile >= 1.0.4']
+
+ # check for libsamplerate
+ if (ctx.options.enable_samplerate != False):
+ ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
+ args = '--cflags --libs', mandatory = False)
++ if 'HAVE_SAMPLERATE' in ctx.env.define_key:
++ pcrequires += ['samplerate >= 0.0.15']
+
+ # check for jack
+ if (ctx.options.enable_jack != False):
+ ctx.check_cfg(package = 'jack',
+ args = '--cflags --libs', mandatory = False)
++ if 'HAVE_JACK' in ctx.env.define_key:
++ pcrequires += ['jack']
+
+ # check for libav
+ if (ctx.options.enable_avcodec != False):
+@@ -235,9 +247,13 @@ def configure(ctx):
+ for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
+ ctx.define('HAVE_LIBAV', 1)
+ ctx.msg('Checking for all libav libraries', 'yes')
++ pcrequires += ['libavcodec >= 54.35.0', 'libavformat >= 52.3.0',
++ 'libavutil >= 52.3.0', 'libavresample >= 1.0.1']
+ else:
+ ctx.msg('Checking for all libav libraries', 'not found', color = 'YELLOW')
+
++ ctx.env.PCREQUIRES = ', '.join(pcrequires)
++ ctx.env.PCLIBS = ', '.join(pclibs)
+ ctx.define('HAVE_WAVREAD', 1)
+ ctx.define('HAVE_WAVWRITE', 1)
+
+--
+1.9.1
+
+
+From 407863716f05ffca5b2241d7dcedb3d1c1ae87ad Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Fri, 14 Nov 2014 16:45:04 -0500
+Subject: [PATCH 4/4] [MXE] disable tests and examples
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/wscript b/wscript
+index 424bcf8..7f135b5 100644
+--- a/wscript
++++ b/wscript
+@@ -290,9 +290,9 @@ def build(bld):
+ bld.recurse('src')
+ if bld.env['DEST_OS'] not in ['ios', 'iosimulator']:
+ pass
+- if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']:
+- bld.recurse('examples')
+- bld.recurse('tests')
++ #if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']:
++ #bld.recurse('examples')
++ #bld.recurse('tests')
+
+ bld( source = 'aubio.pc.in' )
+
+--
+1.9.1
+
diff --git a/src/aubio-test.c b/src/aubio-test.c
new file mode 100644
index 0000000..c7782f0
--- /dev/null
+++ b/src/aubio-test.c
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <aubio/aubio.h>
+
+int main(void)
+{
+ fvec_t *vec = new_fvec(20);
+
+ fvec_ones(vec);
+ if (vec->data[0] != 1.)
+ return 1;
+
+ fvec_zeros(vec);
+ if (vec->data[0] != 0.)
+ return 1;
+
+ fvec_print(vec);
+
+ del_fvec(vec);
+
+ return 0;
+}
+
diff --git a/src/aubio.mk b/src/aubio.mk
index 78a3e9f..f5fb46a 100644
--- a/src/aubio.mk
+++ b/src/aubio.mk
@@ -3,12 +3,12 @@
PKG := aubio
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.3.2
-$(PKG)_CHECKSUM := 8ef7ccbf18a4fa6db712a9192acafc9c8d080978
+$(PKG)_VERSION := 0.4.1
+$(PKG)_CHECKSUM := 338ec9f633e82c371a370b9727d6f0b86b0ba376
$(PKG)_SUBDIR := aubio-$($(PKG)_VERSION)
-$(PKG)_FILE := aubio-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE := aubio-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.aubio.org/pub/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc fftw libsamplerate libsndfile
+$(PKG)_DEPS := gcc ffmpeg fftw libsamplerate libsndfile
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.aubio.org/download' | \
@@ -17,15 +17,25 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cd '$(1)' && autoconf
- cd '$(1)' && ./configure \
- --host='$(TARGET)' \
- --disable-shared \
- --disable-jack \
- --prefix='$(PREFIX)/$(TARGET)' \
- PYTHON='no'
- $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
- $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-endef
+ cd '$(1)' && \
+ CC='$(TARGET)-gcc' \
+ PKGCONFIG='$(TARGET)-pkg-config' \
+ ./waf configure build install \
+ -j '$(JOBS)' \
+ --with-target-platform='win$(BITS)' \
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --enable-fftw3f \
+ $(if $(BUILD_STATIC), \
+ --enable-static --disable-shared, \
+ --disable-static --enable-shared)
+
+ # It is not trivial to adjust the installation path for the DLL in the
+ # waf-based build system. Adjust it here.
+ $(if $(BUILD_SHARED), \
+ mv '$(PREFIX)/$(TARGET)/lib/libaubio-4.dll' '$(PREFIX)/$(TARGET)/bin')
-$(PKG)_BUILD_SHARED =
+ '$(TARGET)-gcc' \
+ -W -Wall -Werror -ansi -pedantic \
+ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-aubio.exe' \
+ `'$(TARGET)-pkg-config' aubio --cflags --libs`
+endef
diff --git a/src/cairo-3-lto.patch b/src/cairo-3-lto.patch
deleted file mode 100644
index 4c11a49..0000000
--- a/src/cairo-3-lto.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Add an option to disable LTO which breaks static linking.
-
-diff -Naur cairo-1.12.16/build/configure.ac.warnings cairo-1.12.16.new/build/configure.ac.warnings
---- cairo-1.12.16/build/configure.ac.warnings 2013-08-26 08:07:21.000000000 -0700
-+++ cairo-1.12.16.new/build/configure.ac.warnings 2014-05-08 20:08:11.296371571 -0700
-@@ -36,14 +36,30 @@
- dnl We also abuse the warning-flag facility to enable other compiler
- dnl options. Namely, the following:
-
--dnl -flto working really needs a test link, not just a compile
-+AC_ARG_ENABLE(lto,
-+ AS_HELP_STRING([--enable-lto],
-+ [Enable link-time optimization.]), [
-+if test "x$enableval" = "xyes"; then
-+ dnl -flto working really needs a test link, not just a compile
-
--safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto"
--AC_TRY_LINK([],[
-- int main(int argc, char **argv) { return 0; }
--],[],[
-- MAYBE_WARN="$safe_MAYBE_WARN"
-+ safe_MAYBE_WARN="$MAYBE_WARN"
-+ MAYBE_WARN="$MAYBE_WARN -flto"
-+ AC_TRY_LINK([],[
-+ int main(int argc, char **argv) { return 0; }
-+ ],[],[
-+ MAYBE_WARN="$safe_MAYBE_WARN"
-+ ])
-+fi
-+], [
-+ dnl -flto working really needs a test link, not just a compile
-+
-+ safe_MAYBE_WARN="$MAYBE_WARN"
-+ MAYBE_WARN="$MAYBE_WARN -flto"
-+ AC_TRY_LINK([],[
-+ int main(int argc, char **argv) { return 0; }
-+ ],[],[
-+ MAYBE_WARN="$safe_MAYBE_WARN"
-+ ])
- ])
-
- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
diff --git a/src/cairo.mk b/src/cairo.mk
index 10b4ffe..39c6c0c 100644
--- a/src/cairo.mk
+++ b/src/cairo.mk
@@ -3,8 +3,8 @@
PKG := cairo
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.16
-$(PKG)_CHECKSUM := 4f6e337d5d3edd7ea79d1426f575331552b003ec
+$(PKG)_VERSION := 1.12.18
+$(PKG)_CHECKSUM := a76940b58da9c83b8934264617135326c0918f9d
$(PKG)_SUBDIR := cairo-$($(PKG)_VERSION)
$(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE)
diff --git a/src/cminpack.mk b/src/cminpack.mk
index 61f89aa..735a23d 100644
--- a/src/cminpack.mk
+++ b/src/cminpack.mk
@@ -3,8 +3,8 @@
PKG := cminpack
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.3.2
-$(PKG)_CHECKSUM := f88374f014ca74a56691314cad070789bde62729
+$(PKG)_VERSION := 1.3.4
+$(PKG)_CHECKSUM := 58519c93e9d4e28a17eabb551e4c23b3d39e064d
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://devernay.free.fr/hacks/cminpack/$($(PKG)_FILE)
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index ab7bd50..57dbd4d 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,8 +3,8 @@
PKG := ffmpeg
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.4.2
-$(PKG)_CHECKSUM := 8fedc6f235d8510f716bca1784faa8cbe5d9cf78
+$(PKG)_VERSION := 2.4.3
+$(PKG)_CHECKSUM := a2f05df7ea3e65ede2898e055b0c6615accfb1b3
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
diff --git a/src/flann.mk b/src/flann.mk
index ce8ea14..bce86df 100644
--- a/src/flann.mk
+++ b/src/flann.mk
@@ -7,11 +7,11 @@ $(PKG)_VERSION := 1.8.4
$(PKG)_CHECKSUM := e03d9d458757f70f6af1d330ff453e3621550a4f
$(PKG)_SUBDIR := flann-$($(PKG)_VERSION)-src
$(PKG)_FILE := flann-$($(PKG)_VERSION)-src.zip
-$(PKG)_URL := http://people.cs.ubc.ca/~mariusm/uploads/FLANN/$($(PKG)_FILE)
+$(PKG)_URL := http://www.cs.ubc.ca/research/flann/uploads/FLANN/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libgomp
define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://people.cs.ubc.ca/~mariusm/index.php/FLANN/Changelog' | \
+ $(WGET) -q -O- 'http://www.cs.ubc.ca/research/flann/index.php/FLANN/Changelog' | \
grep 'Version' | \
$(SED) -n 's,.*Version.\([0-9.]*\).*,\1,p' | \
head -1
diff --git a/src/flex.mk b/src/flex.mk
index 5f242e2..7485768 100644
--- a/src/flex.mk
+++ b/src/flex.mk
@@ -20,7 +20,8 @@ endef
define $(PKG)_BUILD_$(BUILD)
mkdir '$(1).build'
cd '$(1).build' && '$(1)/configure' \
- --prefix='$(PREFIX)/$(TARGET)'
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --disable-shared
$(MAKE) -C '$(1).build' -j '$(JOBS)'
$(MAKE) -C '$(1).build' -j 1 install
endef
diff --git a/src/gendef.mk b/src/gendef.mk
new file mode 100644
index 0000000..de6f90e
--- /dev/null
+++ b/src/gendef.mk
@@ -0,0 +1,24 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := gendef
+$(PKG)_IGNORE = $(mingw-w64_IGNORE)
+$(PKG)_VERSION = $(mingw-w64_VERSION)
+$(PKG)_CHECKSUM = $(mingw-w64_CHECKSUM)
+$(PKG)_SUBDIR = $(mingw-w64_SUBDIR)
+$(PKG)_FILE = $(mingw-w64_FILE)
+$(PKG)_URL = $(mingw-w64_URL)
+$(PKG)_DEPS :=
+
+define $(PKG)_UPDATE
+ echo $(mingw-w64_VERSION)
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)/mingw-w64-tools/gendef' && ./configure \
+ --host='$(BUILD)' \
+ --build='$(BUILD)' \
+ --prefix='$(PREFIX)' \
+ --target='$(TARGET)'
+ $(MAKE) -C '$(1)/mingw-w64-tools/gendef' -j '$(JOBS)' install
+endef
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index 6b299da..2109b52 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -3,8 +3,8 @@
PKG := harfbuzz
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.9.35
-$(PKG)_CHECKSUM := 6f4401af396069214be2ba15b884361ef540e501
+$(PKG)_VERSION := 0.9.36
+$(PKG)_CHECKSUM := 237e869d9dafc30c37cb6ab9886a616ffee6d71e
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)
diff --git a/src/libpng.mk b/src/libpng.mk
index 61a7167..c7b85d0 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -3,8 +3,8 @@
PKG := libpng
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.14
-$(PKG)_CHECKSUM := 9cc30ac84214fda2177a02da275359ffd5b068d9
+$(PKG)_VERSION := 1.6.15
+$(PKG)_CHECKSUM := bddeac8ca97fbcf54d6d32c6eefed5d94b49df88
$(PKG)_SUBDIR := libpng-$($(PKG)_VERSION)
$(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/libsndfile.mk b/src/libsndfile.mk
index ee3e19c..223941c 100644
--- a/src/libsndfile.mk
+++ b/src/libsndfile.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := e95d9fca57f7ddace9f197071cbcfb92fa16748e
$(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION)
$(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc sqlite flac ogg vorbis
+$(PKG)_DEPS := gcc flac ogg vorbis
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.mega-nerd.com/libsndfile/' | \
@@ -21,7 +21,7 @@ define $(PKG)_BUILD
cd '$(1)' && autoreconf -fi -IM4
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
- --enable-sqlite \
+ --disable-sqlite \
--enable-external-libs \
--disable-octave \
--disable-alsa \
diff --git a/src/luajit.mk b/src/luajit.mk
index 1dc5b87..d71342c 100644
--- a/src/luajit.mk
+++ b/src/luajit.mk
@@ -12,7 +12,7 @@ $(PKG)_DEPS := gcc
define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)' \
- HOST_CC='gcc -m32' CROSS='$(TARGET)-' \
+ HOST_CC='gcc -m$(BITS)' CROSS='$(TARGET)-' \
TARGET_SYS=Windows BUILDMODE=static \
PREFIX='$(PREFIX)/$(TARGET)' \
FILE_T=luajit.exe \
@@ -20,10 +20,7 @@ define $(PKG)_BUILD
endef
# gcc -m64 is only available on 64-bit machines
-ifneq (,$(findstring 64,$(BUILD)))
- $(PKG)_BUILD_x86_64-w64-mingw32 = \
- $(subst 'gcc -m32','gcc -m64',$($(PKG)_BUILD))
-else
+ifeq (,$(findstring 64,$(BUILD)))
$(PKG)_BUILD_x86_64-w64-mingw32 =
endif
diff --git a/src/openblas.mk b/src/openblas.mk
index bfdafd6..74407fe 100644
--- a/src/openblas.mk
+++ b/src/openblas.mk
@@ -34,8 +34,8 @@ $(PKG)_MAKE_OPTS = \
DYNAMIC_ARCH=1 \
ARCH=$(strip \
$(if $(findstring x86_64,$(TARGET)),x86_64,\
- $(if $(findstring i686,$(TARGET)),x86)) \
- BINARY=$(if $(findstring x86_64,$(TARGET)),64,32)) \
+ $(if $(findstring i686,$(TARGET)),x86))) \
+ BINARY=$(BITS) \
$(if $(BUILD_STATIC),NO_SHARED=1) \
$(if $(BUILD_SHARED),NO_STATIC=1) \
EXTRALIB="`'$(TARGET)-pkg-config' --libs pthreads` -fopenmp"
diff --git a/src/poco-3-winsock2.patch b/src/poco-3-winsock2.patch
new file mode 100644
index 0000000..753d01c
--- /dev/null
+++ b/src/poco-3-winsock2.patch
@@ -0,0 +1,25 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 25b2fc9af331fe6add75fb108bec590f8d467b20 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Sun, 16 Nov 2014 09:14:22 -0800
+Subject: [PATCH] Environment: Fix winsock2.h include
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp
+index 9443c32..e251da1 100644
+--- a/Foundation/src/Environment_WIN32.cpp
++++ b/Foundation/src/Environment_WIN32.cpp
+@@ -39,6 +39,7 @@
+ #include <sstream>
+ #include <cstring>
+ #include "Poco/UnWindows.h"
++#include <winsock2.h>
+ #include <iphlpapi.h>
+
+
+--
+1.9.1
+
diff --git a/src/poco.mk b/src/poco.mk
index 1e68c87..c360576 100644
--- a/src/poco.mk
+++ b/src/poco.mk
@@ -3,8 +3,8 @@
PKG := poco
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.4.6p2
-$(PKG)_CHECKSUM := 90042349faf1790b5167bad0e84e1713bfd46046
+$(PKG)_VERSION := 1.4.7
+$(PKG)_CHECKSUM := 7cd3122662afe31ea9eccab002aefd96c6de91c4
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
$(PKG)_URL := http://pocoproject.org/releases/$(PKG)-$(word 1,$(subst p, ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
@@ -21,11 +21,13 @@ define $(PKG)_BUILD
--config=MinGW-CrossEnv \
--static \
--unbundled \
- --prefix='$(PREFIX)/$(TARGET)'
+ --prefix='$(PREFIX)/$(TARGET)' \
+ --no-tests \
+ --no-samples
$(if $(BUILD_STATIC), \
$(SED) -i 's:// #define POCO_STATIC:#define POCO_STATIC:' \
'$(1)/Foundation/include/Poco/Config.h')
- $(MAKE) -C '$(1)' -j '$(JOBS)' CROSSENV=$(TARGET) || $(MAKE) -C '$(1)' -j 1 CROSSENV=$(TARGET)
+ $(MAKE) -C '$(1)' -j '$(JOBS)' -k CROSSENV=$(TARGET) || $(MAKE) -C '$(1)' -j 1 CROSSENV=$(TARGET)
$(MAKE) -C '$(1)' -j 1 install CROSSENV=$(TARGET)
'$(TARGET)-g++' \
diff --git a/src/sdl2_net-1-winsocks2.patch b/src/sdl2_net-1-winsocks2.patch
new file mode 100644
index 0000000..9d4376d
--- /dev/null
+++ b/src/sdl2_net-1-winsocks2.patch
@@ -0,0 +1,26 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 68e75d3818547ee17f1a67283d655bee51e59568 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Wed, 12 Nov 2014 23:44:05 -0500
+Subject: [PATCH] SDLnetsys: Fix winsocks2.h include on i686-w64-mingw32
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/SDLnetsys.h b/SDLnetsys.h
+index f5f4714..e2252d6 100644
+--- a/SDLnetsys.h
++++ b/SDLnetsys.h
+@@ -34,7 +34,7 @@
+ /* Include system network headers */
+ #if defined(__WIN32__) || defined(WIN32)
+ #define __USE_W32_SOCKETS
+-#ifdef _WIN64
++#if defined(_WIN64) || defined(__MINGW64_VERSION_MAJOR)
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #else
+--
+1.9.1
+
diff --git a/src/sdl_net-2-winsocks2.patch b/src/sdl_net-2-winsocks2.patch
new file mode 100644
index 0000000..9d4376d
--- /dev/null
+++ b/src/sdl_net-2-winsocks2.patch
@@ -0,0 +1,26 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 68e75d3818547ee17f1a67283d655bee51e59568 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Wed, 12 Nov 2014 23:44:05 -0500
+Subject: [PATCH] SDLnetsys: Fix winsocks2.h include on i686-w64-mingw32
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/SDLnetsys.h b/SDLnetsys.h
+index f5f4714..e2252d6 100644
+--- a/SDLnetsys.h
++++ b/SDLnetsys.h
+@@ -34,7 +34,7 @@
+ /* Include system network headers */
+ #if defined(__WIN32__) || defined(WIN32)
+ #define __USE_W32_SOCKETS
+-#ifdef _WIN64
++#if defined(_WIN64) || defined(__MINGW64_VERSION_MAJOR)
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #else
+--
+1.9.1
+
diff --git a/src/sqlite.mk b/src/sqlite.mk
index f19dc13..4c3ae77 100644
--- a/src/sqlite.mk
+++ b/src/sqlite.mk
@@ -3,8 +3,8 @@
PKG := sqlite
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 3080701
-$(PKG)_CHECKSUM := 5601be1263842209d7c5dbf6128f1cc0b6bbe2e5
+$(PKG)_VERSION := 3080702
+$(PKG)_CHECKSUM := 175283383d010709f76fdd13cb0c8c3c329a1c67
$(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.sqlite.org/2014/$($(PKG)_FILE)
diff --git a/src/xmlrpc-c.mk b/src/xmlrpc-c.mk
index 92d5c15..cca1217 100644
--- a/src/xmlrpc-c.mk
+++ b/src/xmlrpc-c.mk
@@ -50,6 +50,6 @@ $(PKG)_BUILD_STATIC=$(subst @xmlrpc-c-shared-lib-type@,NONE,\
$(subst @xmlrpc-c-must-build-shlib@,N,\
$($(PKG)_BUILD_COMMON)))
-$(PKG)_BUILD_SHARED=$(subst @xmlrpc-c-shared-lib-type@,dll,\
- $(subst @xmlrpc-c-must-build-shlib@,Y,\
- $($(PKG)_BUILD_COMMON)))
+#$(PKG)_BUILD_SHARED=$(subst @xmlrpc-c-shared-lib-type@,dll,\
+# $(subst @xmlrpc-c-must-build-shlib@,Y,\
+# $($(PKG)_BUILD_COMMON)))
generated by cgit v0.12 at 2024-07-17 12:23:27 (GMT)