d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various packages: enable/disable mingw-w64 builds

This commit is contained in:
Tony Theodore 2013-05-24 00:38:06 +10:00
parent b974ef08d8
commit 5390e5203e
64 changed files with 768 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/agg.mk
View File

@ -26,3 +26,5 @@ define $(PKG)_BUILD
--without-x
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/cegui.mk
View File

@ -58,3 +58,5 @@ define $(PKG)_BUILD
`'$(TARGET)-pkg-config' --libs --cflags freeimage xerces-c` \
-o '$(PREFIX)/$(TARGET)/bin/test-cegui.exe'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

58
src/cgal-1-fixes.patch
View File

@ -1,10 +1,12 @@
This file is part of MXE.
See index.html for further information.
From 036e8f90ce7f2f1302a2603b89ae7661211c090d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Contains ad hoc patches for cross building.
From 06377a4e5c08eee03cb2ab244454a24499fc7231 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 21 Oct 2011 23:08:52 +0200
Subject: [PATCH 1/4] adjustments for mingw-cross-env
Subject: [PATCH 1/5] adjustments for mingw-cross-env
diff --git a/CMakeLists.txt b/CMakeLists.txt
@ -269,13 +271,13 @@ index c89e7f7..57a5d40 100644
if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
--
1.7.10.4
1.8.2.2
From a455aa3d21f432831ccafcffc90bc7baf766ce6b Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
From fc63de416f0922286a4d381124ea99e067cccf08 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 18 Nov 2011 00:08:25 +0100
Subject: [PATCH 2/4] prevent Qt's moc from choking on BOOST_JOIN
Subject: [PATCH 2/5] prevent Qt's moc from choking on BOOST_JOIN
Taken from:
https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
@ -298,13 +300,13 @@ index 62d0485..852fcc9 100644
else()
--
1.7.10.4
1.8.2.2
From 7225ba1e69c3e4501706e73e2f1e61e3d1313bfa Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
From 34f21d7bc2d213b0fb326e5214d19179f9ff8261 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 6 Jul 2012 09:27:49 +0200
Subject: [PATCH 3/4] update "detected" Qt version
Subject: [PATCH 3/5] update "detected" Qt version
diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake
@ -322,13 +324,13 @@ index 299de90..f11ddc6 100644
- CACHE STRING "version=4.8.0" FORCE)
+ CACHE STRING "version=4.8.2" FORCE)
--
1.7.10.4
1.8.2.2
From c6a34b69b8c538456fa23d07f2914aef6395bcf7 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
From 79a8541a6782e3909573a50b25b34f999b14ca18 Mon Sep 17 00:00:00 2001
From: MXE
Date: Wed, 18 Jul 2012 00:43:17 +0200
Subject: [PATCH 4/4] boost 1.50 compatibility
Subject: [PATCH 4/5] boost 1.50 compatibility
diff --git a/cmake/modules/CGAL_SetupBoost.cmake b/cmake/modules/CGAL_SetupBoost.cmake
@ -345,5 +347,29 @@ index fc3dc11..d72074fd 100644
message( STATUS "Boost include: ${Boost_INCLUDE_DIRS}" )
message( STATUS "Boost libraries: ${Boost_LIBRARIES}" )
--
1.7.10.4
1.8.2.2
From b242f346ec427d3d1d9fac5e65ab8c1842993a5c Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 May 2013 21:18:27 +1000
Subject: [PATCH 5/5] fix for mingw-w64 include
diff --git a/include/CGAL/FPU.h b/include/CGAL/FPU.h
index 688216f..3b28451 100644
--- a/include/CGAL/FPU.h
+++ b/include/CGAL/FPU.h
@@ -24,6 +24,9 @@
#ifndef CGAL_FPU_H
#define CGAL_FPU_H
+#ifdef __MINGW64__
+#include <windows.h>
+#endif
#include <CGAL/number_type_basic.h>
--
1.8.2.2

1
src/cgal.mk
View File

@ -30,6 +30,7 @@ define $(PKG)_BUILD
-DBOOST_USE_STATIC_LIBS=1 \
-DBUILD_SHARED_LIBS=0 \
-C TryRunResults.cgal.cmake .
$(MAKE) -C '$(1)' -j $(JOBS)
cd '$(1)/examples/AABB_tree' && cmake \
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \

16
src/curl-1-fixes.patch Normal file
View File

@ -0,0 +1,16 @@
This file is part of MXE.
See index.html for further information.
diff -ur curl-7.30.0.orig/lib/connect.c curl-7.30.0/lib/connect.c
--- curl-7.30.0.orig/lib/connect.c 2013-05-09 16:46:48.000000000 +1000
+++ curl-7.30.0/lib/connect.c 2013-05-09 16:50:27.000000000 +1000
@@ -427,8 +427,8 @@
So the scope ID, if present, is known to be numeric */
si6->sin6_scope_id = atoi(scope_ptr);
}
- }
#endif
+ }
sizeof_sa = sizeof(struct sockaddr_in6);
}
else

3
src/dcmtk.mk
View File

@ -35,3 +35,6 @@ define $(PKG)_BUILD
ac_cv_my_c_rightshift_unsigned=no
$(MAKE) -C '$(1)' -j '$(JOBS)' install-lib
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/devil.mk
View File

@ -39,3 +39,5 @@ define $(PKG)_BUILD
--without-examples
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= INFO_DEPS=
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

4
src/ffmpeg.mk
View File

@ -21,7 +21,7 @@ define $(PKG)_BUILD
cd '$(1)' && ./configure \
--cross-prefix='$(TARGET)'- \
--enable-cross-compile \
--arch=i686 \
--arch=$(patsubst -%,,$(TARGET)) \
--target-os=mingw32 \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
@ -49,3 +49,5 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst enable-libxvid,disable-libxvid,$($(PKG)_BUILD))

42
src/freeimage-1-fixes.patch
View File

@ -3,15 +3,15 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From f1a9c3261457568064127586e9c782664bb8df78 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
From 85f449a5341881f90a6af1dbbb7f3d3cd656bca6 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sat, 27 Oct 2012 22:57:27 +0200
Subject: [PATCH 1/1] include string.h for memset
Subject: [PATCH 1/2] include string.h for memset
taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504
diff --git a/Source/OpenEXR/IlmImf/ImfAutoArray.h b/Source/OpenEXR/IlmImf/ImfAutoArray.h
index edb8b10..0b1378e 100644
index edb8b10..0b1378e 100755
--- a/Source/OpenEXR/IlmImf/ImfAutoArray.h
+++ b/Source/OpenEXR/IlmImf/ImfAutoArray.h
@@ -45,6 +45,10 @@
@ -26,5 +26,37 @@ index edb8b10..0b1378e 100644
namespace Imf {
--
1.7.10.4
1.8.2.2
From 1c85f65b9efc06760ac572ba19c1c513f14d4719 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sat, 11 May 2013 15:15:39 +1000
Subject: [PATCH 2/2] mingw-w64 fixes
diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
index 72218a2..10c86fd 100755
--- a/Source/FreeImage/PluginTIFF.cpp
+++ b/Source/FreeImage/PluginTIFF.cpp
@@ -35,6 +35,8 @@
#undef __unix
#endif
+#include <stdint.h>
+
#include "FreeImage.h"
#include "Utilities.h"
#include "../LibTIFF4/tiffiop.h"
@@ -207,7 +209,7 @@ TIFFFdOpen(thandle_t handle, const char *name, const char *mode) {
// 64bit machines (sizeof(int) != sizeof(long)).
// Needs to be fixed within libTIFF.
if (tif) {
- tif->tif_fd = (long)handle;
+ tif->tif_fd = (intptr_t)handle;
}
return tif;
--
1.8.2.2

31
src/gdal.mk
View File

@ -16,11 +16,12 @@ define $(PKG)_UPDATE
head -1
endef
define $(PKG)_BUILD
define $(PKG)_CONFIGURE
# The option '--without-threads' means native win32 threading without pthread.
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--enable-static \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-bsb \
@ -42,9 +43,7 @@ define $(PKG)_BUILD
--with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \
--with-pg='$(PREFIX)/bin/$(TARGET)-pg_config' \
--with-gta='$(PREFIX)/$(TARGET)' \
--with-hdf4='$(PREFIX)/$(TARGET)' \
--with-hdf5='$(PREFIX)/$(TARGET)' \
--with-netcdf='$(PREFIX)/$(TARGET)' \
--without-odbc \
--without-static-proj4 \
--without-xerces \
@ -72,8 +71,10 @@ define $(PKG)_BUILD
--without-perl \
--without-php \
--without-ruby \
--without-python \
LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
--without-python
endef
define $(PKG)_MAKE
$(MAKE) -C '$(1)' -j 1 lib-target
$(MAKE) -C '$(1)' -j 1 install-lib
$(MAKE) -C '$(1)/port' -j 1 install
@ -84,3 +85,23 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST=
ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
endef
define $(PKG)_BUILD
$($(PKG)_CONFIGURE)\
--with-hdf4='$(PREFIX)/$(TARGET)' \
--with-netcdf='$(PREFIX)/$(TARGET)' \
LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$($(PKG)_MAKE)
endef
define $(PKG)_BUILD_x86_64-w64-mingw32
$($(PKG)_CONFIGURE) \
LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$($(PKG)_MAKE)
endef
define $(PKG)_BUILD_i686-w64-mingw32
$($(PKG)_CONFIGURE) \
LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
$($(PKG)_MAKE)
endef

1
src/gnutls.mk
View File

@ -30,6 +30,7 @@ define $(PKG)_BUILD
--enable-static \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-rpath \
--disable-nls \
--disable-guile \
--disable-docs \

39
src/gstreamer-1-fixes.patch Normal file
View File

@ -0,0 +1,39 @@
This file is part of MXE.
See index.html for further information.
This patch has been taken from https://bug697550.bugzilla-attachments.gnome.org/attachment.cgi?id=240941
From 5ccb0f4589e04aaf711b44b77cf609333e1b40bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1=D1?=
=?UTF-8?q?=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Mon, 8 Apr 2013 13:14:35 +0400
Subject: [PATCH 1/3] Also check for clock_gettime in libpthread
libwinpthreads provides POSIX time API.
It also provides libpthread alias for itself, for compatibility, so that
is what we will link with.
Fixes #697550
---
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index 1063828..34b7448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,6 +458,11 @@ AC_CHECK_FUNCS(clock_gettime, [], [
AC_CHECK_LIB(rt, clock_gettime, [
AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
LIBS="$LIBS -lrt"
+ ], [
+ AC_CHECK_LIB(pthread, clock_gettime, [
+ AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+ LIBS="$LIBS -lpthread"
+ ])
])
])
--
1.8.0

3
src/gstreamer.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 3ce96dd414233f23b81651e90a3efd54054abce4
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc glib libxml2
$(PKG)_DEPS := gcc glib libxml2 pthreads
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://cgit.freedesktop.org/gstreamer/gstreamer/refs/tags' | \
@ -18,6 +18,7 @@ endef
define $(PKG)_BUILD
$(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in
$(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in
cd '$(1)' && autoconf
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \

136
src/gtk2-1-fixes.patch
View File

@ -3,14 +3,14 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001
From 374c56944944128d57b33b3b5c1be978a02d3dbb Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:43:43 +0200
Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain,
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index dc139be..be2a7ee 100644
index dc139be..e68a490 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -65,7 +65,7 @@ const GOptionEntry _gdk_windowing_args[] = {
@ -23,7 +23,7 @@ index dc139be..be2a7ee 100644
LPVOID reserved)
{
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d081f70..aa2973d 100644
index 56c92db..655f575 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -74,7 +74,7 @@
@ -36,17 +36,17 @@ index d081f70..aa2973d 100644
LPVOID lpvReserved)
{
--
1.7.7.3
1.8.2.2
From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001
From 8e08b42e368166814289abf32958c979d8d480c6 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:46:20 +0200
Subject: [PATCH 02/10] s,__declspec(dllimport),,
Subject: [PATCH 02/11] s,__declspec(dllimport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 506f35d..f40de41 100644
index eed3124..7ef1731 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -41,7 +41,7 @@
@ -59,7 +59,7 @@ index 506f35d..f40de41 100644
#else
# define GDKVAR extern
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 2190973..0a1c43c 100644
index 05964f8..a500a8e 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -66,7 +66,7 @@ typedef enum {
@ -72,7 +72,7 @@ index 2190973..0a1c43c 100644
#else
# define GTKVAR extern
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index bbea9cd..059d7d0 100644
index 02a1dae..59e0960 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
@ -98,17 +98,17 @@ index c624aea..b792ea5 100644
#else
#define VARIABLE extern
--
1.7.7.3
1.8.2.2
From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001
From 59408e4752be8277c26f9ae458a086874844ab2b Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 15:03:28 +0200
Subject: [PATCH 03/10] s,__declspec(dllexport),,
Subject: [PATCH 03/11] s,__declspec(dllexport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index f40de41..07cfb4e 100644
index 7ef1731..7adb7fc 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -39,7 +39,7 @@
@ -121,7 +121,7 @@ index f40de41..07cfb4e 100644
# define GDKVAR extern
# endif
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 0a1c43c..507ff69 100644
index a500a8e..4cc012f 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -64,7 +64,7 @@ typedef enum {
@ -134,7 +134,7 @@ index 0a1c43c..507ff69 100644
# define GTKVAR extern
# endif
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 059d7d0..8c360d0 100644
index 59e0960..0d0c8d0 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
@ -160,13 +160,13 @@ index b792ea5..f382a64 100644
#define VARIABLE extern
#endif
--
1.7.7.3
1.8.2.2
From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001
From 15527e24127117bbaf24dec513daa6fb67a00a8c Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:17:22 +0200
Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
Subject: [PATCH 04/11] fix gtk+-2.0.pc.in
diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
@ -181,20 +181,20 @@ index 46853e1..7f3eb22 100644
+Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
--
1.7.7.3
1.8.2.2
From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001
From 165597a3bbe73e830d79dbd2d109e3b075ea2985 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:48:31 +0200
Subject: [PATCH 05/10] disable gtkbuiltincache
Subject: [PATCH 05/11] disable gtkbuiltincache
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 76981d8..b6d170f 100644
index 54200e7..e984933 100644
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -2888,7 +2888,7 @@ stamp-icons: $(STOCK_ICONS)
@@ -5660,7 +5660,7 @@ stamp-icons: $(STOCK_ICONS)
) done \
&& touch stamp-icons
@ -204,20 +204,20 @@ index 76981d8..b6d170f 100644
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
--
1.7.7.3
1.8.2.2
From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001
From 465171f3b0ebba7760719c0ee86a0d0f216fe51e Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:49:50 +0200
Subject: [PATCH 06/10] disable test-inline-pixbufs.h
Subject: [PATCH 06/11] disable test-inline-pixbufs.h
diff --git a/demos/Makefile.in b/demos/Makefile.in
index 9f90d09..2e4f967 100644
index 97e9536..abf0f14 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -432,7 +432,7 @@ LDADDS = \
@@ -488,7 +488,7 @@ LDADDS = \
$(GTK_DEP_LIBS) \
$(MATH_LIB)
@ -227,20 +227,20 @@ index 9f90d09..2e4f967 100644
testpixbuf_drawable_DEPENDENCIES = $(DEPS)
testpixbuf_save_DEPENDENCIES = $(DEPS)
--
1.7.7.3
1.8.2.2
From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001
From 417065a8b000250f6553c2801a26eae4491041dd Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:51:04 +0200
Subject: [PATCH 07/10] permit static building
Subject: [PATCH 07/11] permit static building
diff --git a/configure b/configure
index 5eedff6..6380da5 100755
index c61e096..34a116d 100755
--- a/configure
+++ b/configure
@@ -4361,9 +4361,9 @@ if test "${enable_static+set}" = set; then :
@@ -4530,9 +4530,9 @@ if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
@ -252,7 +252,7 @@ index 5eedff6..6380da5 100755
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
for pkg in $enableval; do
@@ -4376,7 +4376,7 @@ if test "${enable_static+set}" = set; then :
@@ -4545,7 +4545,7 @@ if test "${enable_static+set}" = set; then :
;;
esac
else
@ -261,7 +261,7 @@ index 5eedff6..6380da5 100755
fi
@@ -4944,15 +4944,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5114,15 +5114,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
@ -283,7 +283,7 @@ index 5eedff6..6380da5 100755
fi
enable_win32_dll=yes
@@ -8752,7 +8752,7 @@ func_stripname_cnf ()
@@ -8951,7 +8951,7 @@ func_stripname_cnf ()
if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
@ -292,7 +292,7 @@ index 5eedff6..6380da5 100755
no) enable_shared=no ;;
*)
enable_shared=no
@@ -8761,14 +8761,14 @@ if test "${enable_shared+set}" = set; then :
@@ -8960,14 +8960,14 @@ if test "${enable_shared+set}" = set; then :
for pkg in $enableval; do
IFS="$lt_save_ifs"
if test "X$pkg" = "X$p"; then
@ -309,7 +309,7 @@ index 5eedff6..6380da5 100755
fi
@@ -12632,7 +12632,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
@@ -12854,7 +12854,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
# are all built from PIC.
case $host_os in
aix3*)
@ -318,7 +318,7 @@ index 5eedff6..6380da5 100755
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -12641,7 +12641,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
@@ -12863,7 +12863,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
@ -328,20 +328,20 @@ index 5eedff6..6380da5 100755
;;
esac
--
1.7.7.3
1.8.2.2
From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001
From 907f9831f56004a322d785f34417e99735de3109 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:53:18 +0200
Subject: [PATCH 08/10] no -Wl
Subject: [PATCH 08/11] no -Wl
diff --git a/configure b/configure
index 6380da5..7283f17 100755
index 34a116d..3c12234 100755
--- a/configure
+++ b/configure
@@ -23788,7 +23788,7 @@ fi
@@ -23441,7 +23441,7 @@ fi
fi
if test "x$gdktarget" = "xwin32"; then
@ -351,20 +351,20 @@ index 6380da5..7283f17 100755
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
--
1.7.7.3
1.8.2.2
From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001
From 1e02f2e984433a899bc642af5622bea971a06a3a Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 14:54:15 +0200
Subject: [PATCH 09/10] gio not gio-unix
Subject: [PATCH 09/11] gio not gio-unix
diff --git a/configure b/configure
index 7283f17..50e6a86 100755
index 3c12234..ce40ad1 100755
--- a/configure
+++ b/configure
@@ -24008,9 +24008,9 @@ fi
@@ -23673,9 +23673,9 @@ fi
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@ -377,17 +377,17 @@ index 7283f17..50e6a86 100755
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
fi
--
1.7.7.3
1.8.2.2
From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001
From b9bd33ba09c0297b874b7e6955864e6a76b83364 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 15:30:49 +0200
Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
Subject: [PATCH 10/11] removed duplicate _gtk_marshal_OBJECT__VOID()
diff --git a/perf/marshalers.c b/perf/marshalers.c
index f533ab0..0a37ba4 100644
index 9a8c715..14f5ab1 100644
--- a/perf/marshalers.c
+++ b/perf/marshalers.c
@@ -49,43 +49,6 @@
@ -435,5 +435,31 @@ index f533ab0..0a37ba4 100644
void
_gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,
--
1.7.7.3
1.8.2.2
From e232e6602e7476fbc72521892a69c636b63a6f14 Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 May 2013 20:53:44 +1000
Subject: [PATCH 11/11] fix for mingw-w64 uuid
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index a41a0e7..05c60b8 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -69,8 +69,10 @@
* the current Windows code page. See gdkim-win32.c for more info on that.
*
*/
-
+
+#ifndef __MINGW64_VERSION_MAJOR
#define INITGUID
+#endif
#include "gdkdnd.h"
#include "gdkproperty.h"
--
1.8.2.2

3
src/guile.mk
View File

@ -38,3 +38,6 @@ define $(PKG)_BUILD
`'$(TARGET)-pkg-config' guile-$(call SHORT_PKG_VERSION,$(PKG)) --cflags --libs` \
-DGUILE_MAJOR_MINOR=\"$(call SHORT_PKG_VERSION,$(PKG))\"
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/hdf4.mk
View File

@ -32,3 +32,6 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)'/mfhdf/libsrc -j '$(JOBS)'
$(MAKE) -C '$(1)'/mfhdf/libsrc -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/hunspell.mk
View File

@ -27,10 +27,9 @@ define $(PKG)_BUILD
--prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
# Test
'$(TARGET)-g++' \
-W -Wall -Werror -ansi -pedantic \
-W -Wall -Werror -std=c++0x -pedantic \
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
`'$(TARGET)-pkg-config' hunspell --cflags --libs`
endef

2
src/imagemagick.mk
View File

@ -37,3 +37,5 @@ define $(PKG)_BUILD
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-imagemagick.exe' \
`'$(TARGET)-pkg-config' ImageMagick++ --cflags --libs`
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

5
src/lame.mk
View File

@ -21,6 +21,9 @@ define $(PKG)_BUILD
--build="`config.guess`" \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j '$(JOBS)' MXE_CFLAGS=
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst MXE_CFLAGS=,CFLAGS="-DFORCEINLINE=inline",$($(PKG)_BUILD))
$(PKG)_BUILD_i686-w64-mingw32 = $(subst MXE_CFLAGS=,CFLAGS="-DFORCEINLINE=inline",$($(PKG)_BUILD))

3
src/libdnet.mk
View File

@ -32,3 +32,6 @@ define $(PKG)_BUILD
--prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

121
src/libgcrypt-1-mingw-w64.patch Normal file
View File

@ -0,0 +1,121 @@
This file is part of MXE.
See index.html for further information.
These patches have been taken from http://pkgs.fedoraproject.org/cgit/mingw-libgcrypt.git
http://pkgs.fedoraproject.org/cgit/mingw-libgcrypt.git/plain/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
--- a/random/rndw32.c.orig 2011-07-04 19:11:18.137525831 +0200
+++ b/random/rndw32.c 2011-07-04 19:11:40.785404249 +0200
@@ -887,7 +887,7 @@
{
HANDLE handle;
FILETIME creationTime, exitTime, kernelTime, userTime;
- DWORD minimumWorkingSetSize, maximumWorkingSetSize;
+ SIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
handle = GetCurrentThread ();
GetThreadTimes (handle, &creationTime, &exitTime,
http://pkgs.fedoraproject.org/cgit/mingw-libgcrypt.git/plain/libgcrypt-use-correct-def-file.patch
--- a/src/libgcrypt.def.orig 2012-02-28 00:16:33.422552508 +0100
+++ b/src/libgcrypt.def 2012-02-28 00:16:59.188018940 +0100
@@ -1,3 +1,4 @@
+EXPORTS
;; libgcrypt.defs - Exported symbols for W32
;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
;;
@@ -22,7 +23,6 @@
;; never be changed. Also check libgcrypt.vers and visibility.h.
-EXPORTS
gcry_check_version @1
gcry_control @2
http://pkgs.fedoraproject.org/cgit/mingw-libgcrypt.git/plain/libgcrypt-use-correct-asm-code-for-win64.patch
--- a/mpi/mpi-internal.h.orig 2013-01-02 12:04:49.634772462 +0100
+++ b/mpi/mpi-internal.h 2013-01-02 12:11:41.222744150 +0100
@@ -168,6 +168,12 @@
} while (0)
+#ifdef _WIN64
+#define ATTR_ABI __attribute__ ((sysv_abi))
+#else
+#define ATTR_ABI
+#endif
+
/*-- mpiutil.c --*/
#define mpi_alloc_limb_space(n,f) _gcry_mpi_alloc_limb_space((n),(f))
mpi_ptr_t _gcry_mpi_alloc_limb_space( unsigned nlimbs, int sec );
@@ -186,7 +192,7 @@
mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
mpi_size_t s1_size, mpi_limb_t s2_limb );
mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_ptr_t s2_ptr, mpi_size_t size) ATTR_ABI;
mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
mpi_ptr_t s2_ptr, mpi_size_t s2_size);
@@ -194,7 +200,7 @@
mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
mpi_size_t s1_size, mpi_limb_t s2_limb );
mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_ptr_t s2_ptr, mpi_size_t size) ATTR_ABI;
mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
mpi_ptr_t s2_ptr, mpi_size_t s2_size);
@@ -216,9 +222,9 @@
void _gcry_mpih_release_karatsuba_ctx( struct karatsuba_ctx *ctx );
mpi_limb_t _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
mpi_limb_t _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
void _gcry_mpih_mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp,
mpi_size_t size);
mpi_limb_t _gcry_mpih_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
@@ -235,7 +241,7 @@
/*-- mpih-mul_1.c (or xxx/cpu/ *.S) --*/
mpi_limb_t _gcry_mpih_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
- mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
/*-- mpih-div.c --*/
mpi_limb_t _gcry_mpih_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
@@ -249,9 +255,9 @@
/*-- mpih-shift.c --*/
mpi_limb_t _gcry_mpih_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
- unsigned cnt);
+ unsigned cnt) ATTR_ABI;
mpi_limb_t _gcry_mpih_rshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
- unsigned cnt);
+ unsigned cnt) ATTR_ABI;
/* Define stuff for longlong.h. */
--- a/mpi/generic/mpi-asm-defs.h.orig 2013-01-02 15:07:53.540464492 +0100
+++ b/mpi/generic/mpi-asm-defs.h 2013-01-02 15:08:16.720633878 +0100
@@ -1,8 +1,11 @@
/* This file defines some basic constants for the MPI machinery. We
* need to define the types on a per-CPU basis, so it is done with
* this file here. */
+#ifdef _WIN64
+#define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG_LONG)
+#else
#define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG)
-
+#endif

16
src/libgcrypt.mk
View File

@ -16,13 +16,16 @@ define $(PKG)_UPDATE
tail -1
endef
define $(PKG)_BUILD
define $(PKG)_CONFIGURE
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
--with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
endef
define $(PKG)_MAKE
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
ln -sf '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config'
@ -31,3 +34,14 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \
`$(TARGET)-libgcrypt-config --cflags --libs`
endef
define $(PKG)_BUILD
$($(PKG)_CONFIGURE)
$($(PKG)_MAKE)
endef
define $(PKG)_BUILD_x86_64-w64-mingw32
$($(PKG)_CONFIGURE) \
ac_cv_sys_symbol_underscore=no
$($(PKG)_MAKE)
endef

3
src/libmikmod.mk
View File

@ -30,3 +30,6 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmikmod.exe' \
`'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs`
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/liboil.mk
View File

@ -27,3 +27,5 @@ define $(PKG)_BUILD
--with-html-dir='$(1)/sink'
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/librsvg.mk
View File

@ -28,7 +28,7 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
'$(TARGET)-gcc' \
-mwindows -W -Wall -Werror -ansi -pedantic \
-mwindows -W -Wall -Werror -std=c99 -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-librsvg.exe' \
`'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs`
endef

6
src/libvpx.mk
View File

@ -20,10 +20,14 @@ define $(PKG)_BUILD
CROSS='$(TARGET)-' \
./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--target=x86-win32-gcc \
--target=libvpx-target \
--disable-examples \
--disable-install-docs
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
$(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a
endef
$(PKG)_BUILD_i686-pc-mingw32 = $(subst libvpx-target ,x86-win32-gcc ,$($(PKG)_BUILD))
$(PKG)_BUILD_i686-w64-mingw32 = $(subst libvpx-target ,x86-win32-gcc ,$($(PKG)_BUILD))
$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst libvpx-target ,x86_64-win64-gcc ,$($(PKG)_BUILD))

3
src/libxslt.mk
View File

@ -28,3 +28,6 @@ define $(PKG)_BUILD
--without-plugins
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/netcdf.mk
View File

@ -36,3 +36,6 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

208
src/nsis-1-fixes.patch
View File

@ -3,10 +3,10 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From a2aff1c5e0febc993545ecd8379135ec7b53358b Mon Sep 17 00:00:00 2001
From d143dbb2e06d8597dfea89d4b9f55f44ddc6e7f1 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 12 Aug 2012 12:33:26 +0200
Subject: [PATCH 1/3] explicit mingw cross prefix
Subject: [PATCH 1/4] explicit mingw cross prefix
This patch has been taken from:
http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
@ -47,13 +47,13 @@ index 80872bc..4f113dd 100755
Export('defenv')
--
1.8.2.1
1.8.2.2
From d48abdf87538c76261cc447501e0abd755b88c4b Mon Sep 17 00:00:00 2001
From 2c32b56851aa15ad8460ed3dd0944ecb78b43ea9 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 12 Aug 2012 12:36:39 +0200
Subject: [PATCH 2/3] add missing header
Subject: [PATCH 2/4] add missing header
diff --git a/Source/util.h b/Source/util.h
@ -69,13 +69,13 @@ index 4259a6a..664923e 100755
--
1.8.2.1
1.8.2.2
From ed27d84aa1de6aee0a2ba788e90a6d0857d2d535 Mon Sep 17 00:00:00 2001
From ad29c1f6af0eba959e3bcb96992d1a709ba58aca Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 3 May 2013 17:28:44 +1000
Subject: [PATCH 3/3] Enable native 64-bit build
Subject: [PATCH 3/4] Enable native 64-bit build
Taken from:
http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD
@ -584,5 +584,195 @@ index 2c0b07f..18c31a2 100755
SetLastError( 0 );
return dwResult;
--
1.8.2.1
1.8.2.2
From 055b07791400ae22bde948f60d71e3311e25f452 Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 9 May 2013 13:08:59 +1000
Subject: [PATCH 4/4] i686-w64-mingw32 fixes
diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index d8303b0..fefc8f8 100755
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -13,6 +13,7 @@
#include <cderr.h>
#include "resource.h"
#include "shellapi.h"
+#include <algorithm>
#include <nsis/pluginapi.h> // nsis plugin
@@ -149,7 +150,7 @@ struct FieldType {
int nField; // field number in INI file
char *pszHwndEntry; // "HWND" or "HWND2"
- long wndProc;
+ long wndProc;
};
// initial buffer size. buffers will grow as required.
@@ -759,7 +760,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT);
// Make some more room so the focus rect won't cut letters off
- rc.right = min(rc.right + 2, lpdis->rcItem.right);
+ rc.right = std::min(rc.right + 2, lpdis->rcItem.right);
// Move rect to right if in RTL mode
if (bRTL)
@@ -877,7 +878,7 @@ int WINAPI NumbersOnlyPasteWndProc(HWND hWin, UINT uMsg, WPARAM wParam, LPARAM l
if (OpenClipboard(hWin))
{
HGLOBAL hData = GetClipboardData(CF_TEXT);
-
+
if (hData)
{
char *lpData = (char *) GlobalLock(hData);
@@ -1346,7 +1347,7 @@ int WINAPI createCfgDlg()
int keycolor = *bmp & 0xFFFFFF;
- // Search for transparent pixels
+ // Search for transparent pixels
for (y = bm.bmHeight - 1; y >= 0; y--) {
for (x = 0; x < bm.bmWidth;) {
if ((*bmp & 0xFFFFFF) == keycolor) {
diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h
index d4c5e1f..16b729d 100755
--- a/Contrib/Makensisw/afxres.h
+++ b/Contrib/Makensisw/afxres.h
@@ -1,4 +1,4 @@
-#define _WIN32_IE 0x0400
+#define _WIN32_IE 0x0501
#include <windows.h>
#ifndef IDC_STATIC
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index beadc3f..1479b2f 100755
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -22,7 +22,7 @@
#ifndef MAKENSIS_H
#define MAKENSIS_H
-#define _WIN32_IE 0x0400
+#define _WIN32_IE 0x0501
#include <windows.h>
#include <commctrl.h>
#include "utils.h"
diff --git a/Source/SConscript b/Source/SConscript
index 505e438..f9aee9d 100755
--- a/Source/SConscript
+++ b/Source/SConscript
@@ -71,7 +71,7 @@ AddAvailableLibs(env, libs)
##### Defines
-env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
+env.Append(CPPDEFINES = ['_WIN32_IE=0x0501'])
##### Set PCH
diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript
index bebdd54..2f4e490 100755
--- a/Source/exehead/SConscript
+++ b/Source/exehead/SConscript
@@ -53,7 +53,7 @@ Import('env compression solid_compression')
env.Append(CPPDEFINES = ['EXEHEAD'])
env.Append(CPPDEFINES = ['WIN32_LEAN_AND_MEAN'])
-env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
+env.Append(CPPDEFINES = ['_WIN32_IE=0x0501'])
### Some other settings
diff --git a/Source/util.cpp b/Source/util.cpp
index 18c31a2..fc9443f 100755
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -1,15 +1,15 @@
/*
* util.cpp
- *
+ *
* This file is a part of NSIS.
- *
+ *
* Copyright (C) 1999-2009 Nullsoft and Contributors
- *
+ *
* Licensed under the zlib/libpng license (the "License");
* you may not use this file except in compliance with the License.
- *
+ *
* Licence details can be found in the file COPYING.
- *
+ *
* This software is provided 'as-is', without any express or implied
* warranty.
*/
@@ -616,7 +616,7 @@ typedef struct _VXD_VERSION_RESOURCE {
} VXD_VERSION_RESOURCE, *PVXD_VERSION_RESOURCE;
#pragma pack( pop, pre_vxd_ver )
-static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
+static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
{
HANDLE hFile = NULL;
@@ -673,7 +673,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
pDosExeHdr = (PIMAGE_DOS_HEADER) pView;
// Check to make sure the file has a DOS EXE header.
- if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE )
+ if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE )
{
if ( pView )
UnmapViewOfFile( pView );
@@ -693,7 +693,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
+ pDosExeHdr->e_lfanew );
// Check to make sure the file is a VxD.
- if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE )
+ if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE )
{
if ( pView )
UnmapViewOfFile( pView );
@@ -769,18 +769,18 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
return TRUE;
}
-static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
+static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
{
DWORD dwResult = 0;
// Call GetVxdVersion() with NULL for the pointer to the buffer.
- if ( !GetVxdVersion( szFile, &dwResult, NULL ) )
+ if ( !GetVxdVersion( szFile, &dwResult, NULL ) )
{
DWORD dwError = GetLastError();
// GetVxdVersion() will fail with ERROR_INSUFFICIENT_BUFFER and
// the required buffer size will be returned in dwResult.
- if ( dwError == ERROR_INSUFFICIENT_BUFFER )
+ if ( dwError == ERROR_INSUFFICIENT_BUFFER )
{
SetLastError( 0 );
return dwResult;
@@ -791,7 +791,7 @@ static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
return 0;
}
-static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData )
+static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData )
{
return GetVxdVersion( szFile, &dwLen, lpData );
}
--
1.8.2.2

2
src/nsis.mk
View File

@ -26,3 +26,5 @@ define $(PKG)_BUILD
install
$(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/ocaml-cairo.mk
View File

@ -31,3 +31,6 @@ define $(PKG)_BUILD
-o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
< '$(2).ml'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/ocaml-camlimages.mk
View File

@ -35,3 +35,5 @@ define $(PKG)_BUILD
-o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
< '$(2).ml'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/ocaml-core.mk
View File

@ -118,3 +118,5 @@ define $(PKG)_BUILD
mkdir '$(1)/tmp' && cp '$(2).ml' '$(1)/tmp/test.ml'
cd '$(1)/tmp' && $(TARGET)-ocamlbuild test.native
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/ocaml-findlib.mk
View File

@ -54,3 +54,5 @@ define $(PKG)_BUILD
< '$(2).ml'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/ocaml-flexdll.mk
View File

@ -38,3 +38,5 @@ define $(PKG)_BUILD
#works if wine is installed :
#cd '$(1)/test' && ./dump.exe plug1.dll plug2.dll
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/ocaml-lablgl.mk
View File

@ -52,3 +52,6 @@ define $(PKG)_BUILD
echo 'archive(native) = "lablgl.cmxa"') \
> $(PREFIX)/$(TARGET)/lib/ocaml/lablGL/META
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/ocaml-lablgtk2.mk
View File

@ -31,3 +31,6 @@ define $(PKG)_BUILD
-o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
< '$(2).ml'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/ocaml-native.mk
View File

@ -43,3 +43,5 @@ define $(PKG)_BUILD
done
# test will be done once cross ocamlopt is built in package ocaml-core
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/ocaml-xml-light.mk
View File

@ -31,3 +31,5 @@ define $(PKG)_BUILD
echo 'archive(native) = "xml-light.cmxa"') \
> $(PREFIX)/$(TARGET)/lib/ocaml/xml-light/META
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

5
src/opencv.mk
View File

@ -58,3 +58,8 @@ define $(PKG)_BUILD
'$(1)/samples/c/fback_c.c' -o '$(PREFIX)/$(TARGET)/bin/test-opencv.exe' \
`'$(TARGET)-pkg-config' opencv --cflags --libs`
endef
# float.h issues https://bugzilla.redhat.com/show_bug.cgi?id=843436
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/openexr.mk
View File

@ -56,3 +56,5 @@ 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 =

3
src/openscenegraph.mk
View File

@ -29,3 +29,6 @@ define $(PKG)_BUILD
-D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1
$(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/openssl.mk
View File

@ -29,3 +29,5 @@ define $(PKG)_BUILD
RANLIB='$(TARGET)-ranlib' \
AR='$(TARGET)-ar rcu'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mingw ,mingw64 ,$($(PKG)_BUILD))

2
src/pcl.mk
View File

@ -39,3 +39,5 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1
$(MAKE) -C '$(1)' -j 1 install VERBOSE=1
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/physfs.mk
View File

@ -30,3 +30,5 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-physfs.exe' \
-lphysfs -lz
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

2
src/plib.mk
View File

@ -29,3 +29,5 @@ define $(PKG)_BUILD
html_DATA= \
AR='$(TARGET)-ar'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/plibc.mk
View File

@ -27,3 +27,6 @@ define $(PKG)_BUILD
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef
$(PKG)_BUILD_i686-w64-mingw32 =
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/poco.mk
View File

@ -27,3 +27,6 @@ define $(PKG)_BUILD
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-poco.exe' \
-lPocoFoundation
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/portablexdr.mk
View File

@ -26,3 +26,5 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/portaudio.mk
View File

@ -33,3 +33,6 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \
`'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs`
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/portmidi.mk
View File

@ -40,3 +40,6 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portmidi.exe' \
-lportmidi -lwinmm
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

4
src/postgresql.mk
View File

@ -43,7 +43,8 @@ define $(PKG)_BUILD
--without-libxslt \
--with-zlib \
--with-system-tzdata=/dev/null \
LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl --libs`"
LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl --libs`" \
ac_cv_func_getaddrinfo=no
$(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib=
$(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= shlib=
$(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= shlib=
@ -74,3 +75,4 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install
ln -sf '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config'
endef

2
src/sdl_gfx.mk
View File

@ -30,3 +30,5 @@ define $(PKG)_BUILD
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_gfx.exe' \
`'$(TARGET)-pkg-config' SDL_gfx --cflags --libs`
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

58
src/sox-1-fixes.patch Normal file
View File

@ -0,0 +1,58 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 72c87a290b580df8f5b40e6f07ecf135723bbdec Mon Sep 17 00:00:00 2001
From: MXE
Date: Sat, 25 May 2013 19:25:04 +1000
Subject: [PATCH] cross build fixes
diff --git a/configure b/configure
index bfebd34..cb2d2b9 100755
--- a/configure
+++ b/configure
@@ -13240,7 +13240,7 @@ if ${ac_cv_lib_magic_magic_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmagic $LIBS"
+LIBS="-lmagic -lshlwapi -lgnurx $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13271,7 +13271,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5
$as_echo "$ac_cv_lib_magic_magic_open" >&6; }
if test "x$ac_cv_lib_magic_magic_open" = xyes; then :
- MAGIC_LIBS="-lmagic"
+ MAGIC_LIBS="-lmagic -lshlwapi -lgnurx"
else
using_magic=no
fi
diff --git a/src/flac.c b/src/flac.c
index eff2ae4..6cbd88d 100644
--- a/src/flac.c
+++ b/src/flac.c
@@ -55,7 +55,7 @@ typedef struct {
} priv_t;
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
/* Provide a local definition of ntohl so we don't need to load wsock32.dll. */
unsigned long __stdcall ntohl(unsigned long val)
{
@@ -213,7 +213,7 @@ static size_t read_samples(sox_format_t * const ft, sox_sample_t * sampleBuffer,
size_t prev_requested;
if (p->seek_pending) {
- p->seek_pending = sox_false;
+ p->seek_pending = sox_false;
/* discard leftover decoded data */
free(p->leftover_buf);
--
1.8.2.3

24
src/sox-1-magic.patch
View File

@ -1,24 +0,0 @@
This file is part of MXE.
See index.html for further information.
diff -urN sox-14.4.1.orig/configure sox-14.4.1/configure
--- sox-14.4.1.orig/configure 2013-02-02 03:02:52.000000000 +0100
+++ sox-14.4.1/configure 2013-03-10 08:48:41.000000000 +0100
@@ -13240,7 +13240,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmagic $LIBS"
+LIBS="-lmagic -lshlwapi -lgnurx $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13271,7 +13271,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5
$as_echo "$ac_cv_lib_magic_magic_open" >&6; }
if test "x$ac_cv_lib_magic_magic_open" = xyes; then :
- MAGIC_LIBS="-lmagic"
+ MAGIC_LIBS="-lmagic -lshlwapi -lgnurx"
else
using_magic=no
fi

2
src/vigra.mk
View File

@ -38,3 +38,5 @@ define $(PKG)_BUILD
-DVIGRA_STATIC_LIB \
-lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/vmime.mk
View File

@ -36,3 +36,6 @@ define $(PKG)_BUILD
`'$(TARGET)-pkg-config' vmime --cflags --libs`
$(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/vtk.mk
View File

@ -52,3 +52,6 @@ define $(PKG)_BUILD
..
$(MAKE) -C '$(1)/cross_build' -j '$(JOBS)' install VERBOSE=1
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/wget.mk
View File

@ -25,3 +25,6 @@ define $(PKG)_BUILD
--with-ssl=gnutls
$(MAKE) -C '$(1)' -j '$(JOBS)' install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/winpcap.mk
View File

@ -37,3 +37,6 @@ define $(PKG)_BUILD
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
$(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/'
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

2
src/wt.mk
View File

@ -36,3 +36,5 @@ define $(PKG)_BUILD
'$(1)'
$(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/wxwidgets.mk
View File

@ -124,3 +124,6 @@ define $(PKG)_BUILD
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-wxwidgets.exe' \
`'$(TARGET)-wx-config' --cflags --libs`
endef
$(PKG)_BUILD_i686-w64-mingw32 =
$(PKG)_BUILD_x86_64-w64-mingw32 =

3
src/xine-lib.mk
View File

@ -58,3 +58,6 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =

3
src/xmlwrapp.mk
View File

@ -23,3 +23,6 @@ define $(PKG)_BUILD
PKG_CONFIG='$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
endef
$(PKG)_BUILD_x86_64-w64-mingw32 =
$(PKG)_BUILD_i686-w64-mingw32 =