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

Merge remote-tracking branch 'upstream/master' into cegui-0.8

This commit is contained in:
Quintus 2016-07-29 21:41:49 +02:00
parent 8737985c5f d6349ea72a
commit e6b7de09f6
18 changed files with 1891 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE vendored Normal file
View File

@ -0,0 +1,2 @@
If a package fails to build, upload the log file to
https://gist.github.com/ and put the link here.

19
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,19 @@
Please read http://mxe.cc/#creating-packages
In particular, make sure that your build rules:
* install .pc file,
* install bin/test-pkg.exe compiled with flags by pkg-config,
* install .dll to bin/ and .a, .dll.a to lib/,
* use $(TARGET)-cmake instead of cmake,
* build in `$(BUILD_DIR)` instead of `$(SOURCE_DIR)`,
* do not run target executables with Wine,
* do not download anything while building,
* do not install documentation,
* do not install .exe files except test and build systems,
and .patch files are generated by tools/patch-tool-mxe.
If you add a package, you can use tool tools/skeleton.py.
Thanks!

40
build-matrix.html
View File

@ -477,6 +477,16 @@ feel free to submit a pull request.
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">djvulibre</th>
<td>3.5.27</td>
<td class="unsupported">&#x2717;</td>
<td class="supported">&#x2713;</td>
<td class="unsupported">&#x2717;</td>
<td class="supported">&#x2713;</td>
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">dlfcn-win32</th>
<td>1.0.0</td>
@ -777,6 +787,16 @@ feel free to submit a pull request.
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">ghostscript</th>
<td>9.19</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">giflib</th>
<td>5.1.4</td>
@ -2047,6 +2067,16 @@ feel free to submit a pull request.
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">libspectre</th>
<td>0.2.8</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="supported">&#x2713;</td>
<td class="unsupported">&#x2717;</td>
</tr>
<tr>
<th class="row">libssh2</th>
<td>1.7.0</td>
@ -4199,14 +4229,14 @@ feel free to submit a pull request.
<tr>
<th class="row" colspan="2">
Total: 408
Total: 411
<br>(+5 virtual
+3 native-only)
</th>
<th>405</th>
<th>307</th>
<th>389</th>
<th>306</th>
<th>407</th>
<th>310</th>
<th>391</th>
<th>309</th>
<th>15</th>
</tr>
</tbody>

12
index.html
View File

@ -1273,6 +1273,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">devil</td>
<td class="website"><a href="http://openil.sourceforge.net/">DevIL</a></td>
</tr>
<tr>
<td class="package">djvulibre</td>
<td class="website"><a href="http://djvu.sourceforge.net/">DjVuLibre</a></td>
</tr>
<tr>
<td class="package">dlfcn-win32</td>
<td class="website"><a href="https://code.google.com/p/dlfcn-win32/">POSIX dlfcn wrapper for Windows</a></td>
@ -1393,6 +1397,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">gettext</td>
<td class="website"><a href="https://www.gnu.org/software/gettext/">gettext</a></td>
</tr>
<tr>
<td class="package">ghostscript</td>
<td class="website"><a href="http://www.ghostscript.com/">ghostscript</a></td>
</tr>
<tr>
<td class="package">giflib</td>
<td class="website"><a href="http://sourceforge.net/projects/libungif/">giflib</a></td>
@ -1901,6 +1909,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">libsoup</td>
<td class="website"><a href="https://github.com/GNOME/libsoup">libsoup</a></td>
</tr>
<tr>
<td class="package">libspectre</td>
<td class="website"><a href="https://libspectre.freedesktop.org">libspectre</a></td>
</tr>
<tr>
<td class="package">libssh2</td>
<td class="website"><a href="http://www.libssh2.org">libssh2</a></td>

1
src/aubio.mk
View File

@ -28,6 +28,7 @@ define $(PKG)_BUILD
--with-target-platform='win$(BITS)' \
--prefix='$(PREFIX)/$(TARGET)' \
--enable-fftw3f \
--libdir='$(PREFIX)/$(TARGET)/lib' \
$(if $(BUILD_STATIC), \
--enable-static --disable-shared --disable-jack, \
--disable-static --enable-shared)

51
src/djvulibre-1-fixes.patch Normal file
View File

@ -0,0 +1,51 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sun, 24 Jul 2016 09:33:22 +0200
Subject: [PATCH] define XXX_EXPORT symbols
diff --git a/libdjvu/Makefile.am b/libdjvu/Makefile.am
index 1111111..2222222 100644
--- a/libdjvu/Makefile.am
+++ b/libdjvu/Makefile.am
@@ -33,6 +33,8 @@ libdjvulibre_la_LIBADD = $(JPEG_LIBS) $(PTHREAD_LIBS)
libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info)
if HAVE_OS_WIN32
+libdjvulibre_la_CPPFLAGS += -DDJVUAPI_EXPORT
+libdjvulibre_la_CPPFLAGS += -DDDJVUAPI_EXPORT -DMINILISPAPI_EXPORT
libdjvulibre_la_LDFLAGS += -Wl,--export-all-symbols
endif
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sun, 24 Jul 2016 09:36:49 +0200
Subject: [PATCH] disable unknown pragma warnings
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
index 1111111..2222222 100644
--- a/libdjvu/miniexp.cpp
+++ b/libdjvu/miniexp.cpp
@@ -382,6 +382,7 @@ static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) {
{CSLOCK(r);TlsFree(tlsIndex);tlsIndex=TLS_OUT_OF_INDEXES;}
}
# endif
+#ifndef __GNUC__
// -- Very black magic to clean tls variables.
# ifdef _M_IX86
# pragma comment (linker, "/INCLUDE:_tlscb")
@@ -391,6 +392,7 @@ static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) {
# pragma const_seg(".CRT$XLB")
extern "C" PIMAGE_TLS_CALLBACK tlscb = gctls_cb;
# pragma const_seg()
+#endif /* !__GNUC__ */
#else
// No threads

17
src/djvulibre-test.c Normal file
View File

@ -0,0 +1,17 @@
/*
* This file is part of MXE.
* See index.html for further information.
*/
#include <libdjvu/ddjvuapi.h>
int main(int argc, char *argv[])
{
ddjvu_context_t *djvu_test;
(void)argc;
djvu_test = ddjvu_context_create(argv[0]);
ddjvu_context_release(djvu_test);
return 0;
}

33
src/djvulibre.mk Normal file
View File

@ -0,0 +1,33 @@
# This file is part of MXE.
# See index.html for further information.
PKG := djvulibre
$(PKG)_VERSION := 3.5.27
$(PKG)_CHECKSUM := e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/djvu/DjVuLibre/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc jpeg tiff zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://sourceforge.net/projects/djvu/files/DjVuLibre/' | \
$(SED) -n 's,.*/\([0-9][^A-Za-z"]*\)/".*,\1,p' | \
head -1
endef
# can't build a working static library for now
# https://sourceforge.net/p/djvu/bugs/274/
define $(PKG)_BUILD_SHARED
cd '$(SOURCE_DIR)' && autoreconf -fi
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--disable-desktopfiles
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install-strip \
$(MXE_DISABLE_CRUFT) dist_bin_SCRIPTS=
'$(TARGET)-g++' \
-W -Wall -Werror -pedantic \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
`'$(TARGET)-pkg-config' ddjvuapi --cflags --libs`
endef

1389
src/ghostscript-1-fixes.patch Normal file
View File

File diff suppressed because it is too large Load Diff

46
src/ghostscript-test.c Normal file
View File

@ -0,0 +1,46 @@
/*
* This file is part of MXE.
* See index.html for further information.
*/
#ifdef _WIN32
#include <windows.h>
#ifndef _Windows
# define _Windows
#endif
#ifndef GSDLLEXPORT
# ifdef GS_STATIC_LIB
# define GSDLLEXPORT
# else
# define GSDLLEXPORT __declspec(dllimport)
# endif
#endif
#endif /* _WIN32 */
#include <iapi.h>
void *minst;
int main(int argc, char *argv[])
{
int code;
(void)argc;
(void)argv;
code = gsapi_new_instance(&minst, 0);
if (code < 0)
return 1;
code = gsapi_exit(minst);
if (code < 0)
return 1;
gsapi_delete_instance(minst);
return 0;
}

76
src/ghostscript.mk Normal file
View File

@ -0,0 +1,76 @@
# This file is part of MXE.
# See index.html for further information.
PKG := ghostscript
$(PKG)_IGNORE :=
$(PKG)_VERSION := 9.19
$(PKG)_NODOTVER := $(subst .,,$($(PKG)_VERSION))
$(PKG)_CHECKSUM := f67acdcfcde1f86757ff3553cd719f12eac2d7681a0e96d8bdd1f40a0f47b45b
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$($(PKG)_NODOTVER)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc dbus fontconfig freetype lcms libiconv libidn libjpeg-turbo libpaper libpng openjpeg tiff zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://ghostscript.com/Releases.html' | \
$(SED) -n 's:.*GPL_Ghostscript_::p' | \
$(SED) -n 's:\.html.*::p'
endef
define $(PKG)_BUILD
cd '$(SOURCE_DIR)' && rm -rf freetype jpeg lcms2 libpng openjpeg tiff zlib
cd '$(SOURCE_DIR)' && $(LIBTOOLIZE) --force --copy --install
cd '$(SOURCE_DIR)' && autoconf -f -i
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--disable-contrib \
--enable-threading \
--enable-fontconfig \
--enable-dbus \
--enable-freetype \
--disable-cups \
--enable-openjpeg \
--disable-gtk \
--with-libiconv=gnu \
--with-libidn \
--with-libpaper \
--with-system-libtiff \
--with-ijs \
--with-luratech \
--with-jbig2dec \
--with-omni \
--without-x \
--with-drivers=ALL \
--with-memory-alignment=$(if $(filter x86_64-%,$(TARGET)),8,4)
$(MAKE) -C '$(BUILD_DIR)' -j 1 $(if $(BUILD_STATIC),gs.a,so)
$(INSTALL) -d '$(PREFIX)/$(TARGET)/include/ghostscript'
$(INSTALL) '$(SOURCE_DIR)/devices/gdevdsp.h' '$(PREFIX)/$(TARGET)/include/ghostscript/gdevdsp.h'
$(INSTALL) '$(SOURCE_DIR)/base/gserrors.h' '$(PREFIX)/$(TARGET)/include/ghostscript/gserrors.h'
$(INSTALL) '$(SOURCE_DIR)/psi/iapi.h' '$(PREFIX)/$(TARGET)/include/ghostscript/iapi.h'
$(INSTALL) '$(SOURCE_DIR)/psi/ierrors.h' '$(PREFIX)/$(TARGET)/include/ghostscript/ierrors.h'
$(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
$(if $(BUILD_STATIC),\
$(INSTALL) '$(BUILD_DIR)/gs.a' '$(PREFIX)/$(TARGET)/lib/libgs.a',\
$(INSTALL) '$(BUILD_DIR)/sobin/libgs-9.dll' '$(PREFIX)/$(TARGET)/bin/libgs-9.dll' && \
$(INSTALL) '$(BUILD_DIR)/sobin/libgs.dll.a' '$(PREFIX)/$(TARGET)/lib/libgs.dll.a')
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
(echo 'Name: ghostscript'; \
echo 'Version: $($(PKG)_VERSION)'; \
echo 'Description: Ghostscript library'; \
echo 'Cflags: -I"$(PREFIX)/$(TARGET)/include/ghostscript"'; \
echo 'Cflags.private: -DGS_STATIC_LIB'; \
echo 'Libs: -L"$(PREFIX)/$(TARGET)/lib" -lgs'; \
echo 'Requires: libidn libtiff-4 libpng jpeg lcms2 zlib'; \
echo '# https://github.com/mxe/mxe/issues/1446'; \
echo 'Libs.private: -lm -liconv -lpaper -lopenjp2 -lwinspool';) \
> '$(PREFIX)/$(TARGET)/lib/pkgconfig/ghostscript.pc'
'$(TARGET)-gcc' \
-W -Wall -Werror -pedantic \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-ghostscript.exe' \
`$(TARGET)-pkg-config --cflags --libs ghostscript`
endef

50
src/libspectre-1-fixes.patch Normal file
View File

@ -0,0 +1,50 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Thu, 21 Jul 2016 12:00:00 +0200
Subject: [PATCH] add PKG_CHECK_MODULES macro to configure.ac
diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ AC_CHECK_FUNC(_vscprintf, [ AC_DEFINE(HAVE__VSCPRINTF, 1, [Define if the '_vscpr
LIBGS_REQUIRED="8.62"
+PKG_CHECK_MODULES(GHOSTSCRIPT, [ghostscript >= $LIBGS_REQUIRED], [LIB_GS="$GHOSTSCRIPT_LIBS"], [
AC_CHECK_LIB(gs, gsapi_new_instance, have_libgs=yes, have_libgs=no)
if test "x$have_libgs" = "xyes"; then
LIB_GS="-lgs"
@@ -97,6 +98,7 @@ if test "x$have_libgs" = "xyes"; then
else
AC_MSG_ERROR([You need libgs in order to compile libspectre])
fi
+])
AC_SUBST(LIB_GS)
AC_ARG_ENABLE(asserts,
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Thu, 21 Jul 2016 12:00:00 +0200
Subject: [PATCH] enable out-of-tree builds
diff --git a/libspectre/Makefile.am b/libspectre/Makefile.am
index 1111111..2222222 100644
--- a/libspectre/Makefile.am
+++ b/libspectre/Makefile.am
@@ -42,6 +42,7 @@ libspectre_la_SOURCES = \
$(gv_sources)
libspectre_la_CPPFLAGS = \
+ -I@top_srcdir@ \
$(SPECTRE_CFLAGS)
libspectre_la_LIBADD = $(LIB_GS)

23
src/libspectre-test.c Normal file
View File

@ -0,0 +1,23 @@
/*
* This file is part of MXE.
* See index.html for further information.
*/
#include <libspectre/spectre.h>
int main(int argc, char *argv[])
{
SpectreDocument *document;
SpectreRenderContext *rc;
(void)argc;
(void)argv;
document = spectre_document_new();
rc = spectre_render_context_new();
spectre_document_free(document);
spectre_render_context_free(rc);
return 0;
}

32
src/libspectre.mk Normal file
View File

@ -0,0 +1,32 @@
# This file is part of MXE.
# See index.html for further information.
PKG := libspectre
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.2.8
$(PKG)_CHECKSUM := 65256af389823bbc4ee4d25bfd1cc19023ffc29ae9f9677f2d200fa6e98bc7a8
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://libspectre.freedesktop.org/releases/$($(PKG)_FILE)
$(PKG)_DEPS := gcc cairo ghostscript
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://libspectre.freedesktop.org/releases/' | \
$(SED) -n 's:.*>LATEST-libspectre-::p' | \
$(SED) -n 's:<.*::p'
endef
define $(PKG)_BUILD
cd '$(SOURCE_DIR)' && autoreconf -f -i
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--disable-silent-rules \
--enable-test
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' install
echo "Requires: cairo ghostscript" >> '$(PREFIX)/$(TARGET)/lib/pkgconfig/libspectre.pc'
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
endef

126
src/ocaml-camlimages-1-fixes.patch
View File

@ -3,17 +3,18 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From c09e9baa34783c7dd44cc5afc65f1f4b4030ebf2 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 12 Aug 2012 20:55:49 +0200
Subject: [PATCH 1/4] set back configure build system that enables cross compilation (instead of OMake)
Subject: [PATCH] set back configure build system that enables cross
compilation (instead of OMake)
this patch and next ones are taken from camlimages bug tracker :
http://modulogic.inria.fr/bugtracker/view.php?id=7
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..cdaf30d
index 1111111..2222222
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,58 @@
@ -77,7 +78,7 @@ index 0000000..cdaf30d
+# $(INSTALL) -g caml -m g+w $(DISTFILE) $(FTPSITEDIR)
diff --git a/Makefile.rules b/Makefile.rules
new file mode 100644
index 0000000..a2a41d9
index 1111111..2222222
--- /dev/null
+++ b/Makefile.rules
@@ -0,0 +1,36 @@
@ -119,7 +120,7 @@ index 0000000..a2a41d9
+@AMDEP_TRUE@@am__include@ @am__quote@.depend@am__quote@
diff --git a/Makefile.variables b/Makefile.variables
new file mode 100644
index 0000000..c29c97b
index 1111111..2222222
--- /dev/null
+++ b/Makefile.variables
@@ -0,0 +1,49 @@
@ -173,7 +174,7 @@ index 0000000..c29c97b
+ $(OCAMLSOURCES:.ml=.cmi) \
+ $(COBJS)
diff --git a/configure.ac b/configure.ac
index 06464b3..12269c9 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,68 +1,62 @@
@ -472,7 +473,7 @@ index 06464b3..12269c9 100644
Lablgtk2 support: $SUPPORT_LABLGTK2
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..3c4ac76
index 1111111..2222222
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,36 @@
@ -514,7 +515,7 @@ index 0000000..3c4ac76
+ mv eng.html.tmp eng.html
diff --git a/doc/sphinx/Makefile b/doc/sphinx/Makefile
new file mode 100644
index 0000000..45073fd
index 1111111..2222222
--- /dev/null
+++ b/doc/sphinx/Makefile
@@ -0,0 +1,89 @@
@ -609,7 +610,7 @@ index 0000000..45073fd
+ "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..38d4474
index 1111111..2222222
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,37 @@
@ -652,7 +653,7 @@ index 0000000..38d4474
+endif
diff --git a/examples/converter/Makefile.am b/examples/converter/Makefile.am
new file mode 100644
index 0000000..1de0339
index 1111111..2222222
--- /dev/null
+++ b/examples/converter/Makefile.am
@@ -0,0 +1,43 @@
@ -701,7 +702,7 @@ index 0000000..1de0339
+include ../../Makefile.rules
diff --git a/examples/crop/Makefile.am b/examples/crop/Makefile.am
new file mode 100644
index 0000000..23e3852
index 1111111..2222222
--- /dev/null
+++ b/examples/crop/Makefile.am
@@ -0,0 +1,44 @@
@ -751,7 +752,7 @@ index 0000000..23e3852
+include ../../Makefile.rules
diff --git a/examples/edgedetect/Makefile.am b/examples/edgedetect/Makefile.am
new file mode 100644
index 0000000..556730a
index 1111111..2222222
--- /dev/null
+++ b/examples/edgedetect/Makefile.am
@@ -0,0 +1,42 @@
@ -799,7 +800,7 @@ index 0000000..556730a
+include ../../Makefile.rules
diff --git a/examples/gifanim/Makefile.am b/examples/gifanim/Makefile.am
new file mode 100644
index 0000000..1c8c5e0
index 1111111..2222222
--- /dev/null
+++ b/examples/gifanim/Makefile.am
@@ -0,0 +1,50 @@
@ -855,7 +856,7 @@ index 0000000..1c8c5e0
+include ../../Makefile.rules
diff --git a/examples/imgstat/Makefile.am b/examples/imgstat/Makefile.am
new file mode 100644
index 0000000..b74f90c
index 1111111..2222222
--- /dev/null
+++ b/examples/imgstat/Makefile.am
@@ -0,0 +1,42 @@
@ -903,7 +904,7 @@ index 0000000..b74f90c
+include ../../Makefile.rules
diff --git a/examples/liv-furuse/Makefile.am b/examples/liv-furuse/Makefile.am
new file mode 100644
index 0000000..7c993d8
index 1111111..2222222
--- /dev/null
+++ b/examples/liv-furuse/Makefile.am
@@ -0,0 +1,77 @@
@ -986,7 +987,7 @@ index 0000000..7c993d8
+include ../../Makefile.rules
diff --git a/examples/liv/Makefile.am b/examples/liv/Makefile.am
new file mode 100644
index 0000000..7c993d8
index 1111111..2222222
--- /dev/null
+++ b/examples/liv/Makefile.am
@@ -0,0 +1,77 @@
@ -1069,7 +1070,7 @@ index 0000000..7c993d8
+include ../../Makefile.rules
diff --git a/examples/monochrome/Makefile.am b/examples/monochrome/Makefile.am
new file mode 100644
index 0000000..9cfb0bc
index 1111111..2222222
--- /dev/null
+++ b/examples/monochrome/Makefile.am
@@ -0,0 +1,42 @@
@ -1117,7 +1118,7 @@ index 0000000..9cfb0bc
+include ../../Makefile.rules
diff --git a/examples/normalize/Makefile.am b/examples/normalize/Makefile.am
new file mode 100644
index 0000000..6af840b
index 1111111..2222222
--- /dev/null
+++ b/examples/normalize/Makefile.am
@@ -0,0 +1,42 @@
@ -1165,7 +1166,7 @@ index 0000000..6af840b
+include ../../Makefile.rules
diff --git a/examples/resize/Makefile.am b/examples/resize/Makefile.am
new file mode 100644
index 0000000..10a181c
index 1111111..2222222
--- /dev/null
+++ b/examples/resize/Makefile.am
@@ -0,0 +1,42 @@
@ -1213,7 +1214,7 @@ index 0000000..10a181c
+include ../../Makefile.rules
diff --git a/examples/tiffps/Makefile.am b/examples/tiffps/Makefile.am
new file mode 100644
index 0000000..56e657d
index 1111111..2222222
--- /dev/null
+++ b/examples/tiffps/Makefile.am
@@ -0,0 +1,42 @@
@ -1261,7 +1262,7 @@ index 0000000..56e657d
+include ../../Makefile.rules
diff --git a/examples/ttfimg/Makefile.am b/examples/ttfimg/Makefile.am
new file mode 100644
index 0000000..32a518d
index 1111111..2222222
--- /dev/null
+++ b/examples/ttfimg/Makefile.am
@@ -0,0 +1,42 @@
@ -1308,7 +1309,7 @@ index 0000000..32a518d
+
+include ../../Makefile.rules
diff --git a/ocaml.m4 b/ocaml.m4
index 9a59648..6431281 100644
index 1111111..2222222 100644
--- a/ocaml.m4
+++ b/ocaml.m4
@@ -1,279 +1,197 @@
@ -1787,7 +1788,7 @@ index 9a59648..6431281 100644
+])
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..6d90c5d
index 1111111..2222222
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,256 @@
@ -2049,7 +2050,7 @@ index 0000000..6d90c5d
+include ../Makefile.rules
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..a02b0bf
index 1111111..2222222
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,54 @@
@ -2107,18 +2108,15 @@ index 0000000..a02b0bf
+
+
+include ../Makefile.rules
--
1.7.2.5
From 79be4b11cf6e32056ac199efb48728fd7a09bbe9 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 12 Aug 2012 20:56:46 +0200
Subject: [PATCH 2/4] modify META file with ad-hock patch to make it usable in MXE
Subject: [PATCH] modify META file with ad-hock patch to make it usable in MXE
diff --git a/src/META.in b/src/META.in
index 45e96d6..e1b1c18 100644
index 1111111..2222222 100644
--- a/src/META.in
+++ b/src/META.in
@@ -2,68 +2,15 @@ name = "CamlImages"
@ -2194,18 +2192,16 @@ index 45e96d6..e1b1c18 100644
+ archive(byte) = "camlimages.cma"
+ archive(native) = "camlimages.cmxa"
)
--
1.7.2.5
From 7ecf7a9c4ca35e5f43514cfc634d09999ee0a099 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 12 Aug 2012 20:58:10 +0200
Subject: [PATCH 3/4] update gifread.c and gifwrite.c for new giflib-5.0.0, and png for similar purpose
Subject: [PATCH] update gifread.c and gifwrite.c for new giflib-5.0.0, and png
for similar purpose
diff --git a/src/gifread.c b/src/gifread.c
index ecf40c4..097db1d 100644
index 1111111..2222222 100644
--- a/src/gifread.c
+++ b/src/gifread.c
@@ -140,7 +140,7 @@ value dGifOpenFileName( value name )
@ -2232,7 +2228,7 @@ index ecf40c4..097db1d 100644
}
CAMLreturn(buf);
diff --git a/src/gifwrite.c b/src/gifwrite.c
index 4b6399f..caf04c0 100644
index 1111111..2222222 100644
--- a/src/gifwrite.c
+++ b/src/gifwrite.c
@@ -25,7 +25,7 @@
@ -2285,7 +2281,7 @@ index 4b6399f..caf04c0 100644
failwith("EGifPutExtension");
}
diff --git a/src/pngread.c b/src/pngread.c
index cc576e8..ce25110 100644
index 1111111..2222222 100644
--- a/src/pngread.c
+++ b/src/pngread.c
@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
@ -2325,7 +2321,7 @@ index cc576e8..ce25110 100644
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
diff --git a/src/pngwrite.c b/src/pngwrite.c
index 3248562..6937cd8 100644
index 1111111..2222222 100644
--- a/src/pngwrite.c
+++ b/src/pngwrite.c
@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, width, height, with_alpha )
@ -2346,18 +2342,16 @@ index 3248562..6937cd8 100644
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);
--
1.7.2.5
From f35cfc4a23431f0da77f9fa75f6d102a7b09e094 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 3 Oct 2012 09:37:05 +0200
Subject: [PATCH 4/4] META : add camlimages.lablgtk2 and camlimages.freetype (referencing camlimages.all_formats)
Subject: [PATCH] META : add camlimages.lablgtk2 and camlimages.freetype
(referencing camlimages.all_formats)
diff --git a/src/META.in b/src/META.in
index e1b1c18..5994beb 100644
index 1111111..2222222 100644
--- a/src/META.in
+++ b/src/META.in
@@ -9,8 +9,16 @@ package "core" (
@ -2378,6 +2372,36 @@ index e1b1c18..5994beb 100644
archive(byte) = "camlimages.cma"
archive(native) = "camlimages.cmxa"
)
--
1.7.2.5
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 17 Jul 2016 12:16:43 +1000
Subject: [PATCH] fix for giflib >=5.1
diff --git a/src/gifread.c b/src/gifread.c
index 1111111..2222222 100644
--- a/src/gifread.c
+++ b/src/gifread.c
@@ -161,7 +161,7 @@ value dGifCloseFile( value hdl )
segmentation faults */
((GifFileType *)hdl)->Image.ColorMap = NULL;
- DGifCloseFile( (GifFileType *) hdl );
+ DGifCloseFile( (GifFileType *) hdl, NULL );
CAMLreturn(Val_unit);
}
diff --git a/src/gifwrite.c b/src/gifwrite.c
index 1111111..2222222 100644
--- a/src/gifwrite.c
+++ b/src/gifwrite.c
@@ -88,7 +88,7 @@ value eGifCloseFile( value hdl )
segmentation faults */
((GifFileType *)hdl)->Image.ColorMap = NULL;
- EGifCloseFile( (GifFileType *) hdl );
+ EGifCloseFile( (GifFileType *) hdl, NULL );
CAMLreturn(Val_unit);
}

26
src/poppler-1-win32.patch
View File

@ -99,3 +99,29 @@ index 1111111..2222222 100644
# define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport)
# define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport)
#elif defined(__GNUC__)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 27 Jul 2016 10:29:52 +0200
Subject: [PATCH] do not try to use mman.h (package mman-win32)
fix https://github.com/mxe/mxe/issues/1455
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 1111111..2222222 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -48,13 +48,6 @@
#include "Gfx.h"
#include "Page.h"
-#if HAVE_FCNTL_H && HAVE_SYS_MMAN_H && HAVE_SYS_STAT_H
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#define CAN_CHECK_OPEN_FACES 1
-#endif
-
#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif

2
tools/build-pkg.lua
View File

@ -461,7 +461,7 @@ local function gitCheckout(new_branch, deps, item2index, pass_of_deps)
end
local function gitAdd()
os.execute(GIT .. 'add --all .')
os.execute(GIT .. 'add --all --force .')
end
-- return two lists of filepaths under ./usr/

3
versions.json
View File

@ -43,6 +43,7 @@
"dbus": "1.11.2",
"dcmtk": "3.6.0",
"devil": "1.7.8",
"djvulibre": "3.5.27",
"dlfcn-win32": "1.0.0",
"eigen": "3.2.5",
"exiv2": "0.25",
@ -73,6 +74,7 @@
"geoip-database": "20150317-1",
"geos": "3.4.2",
"gettext": "0.19.8.1",
"ghostscript": "9.19",
"giflib": "5.1.4",
"glew": "1.12.0",
"glfw2": "2.7.9",
@ -200,6 +202,7 @@
"libsndfile": "1.0.27",
"libsodium": "1.0.6",
"libsoup": "2.54.0.1",
"libspectre": "0.2.8",
"libssh2": "1.7.0",
"libsvm": "3.20",
"libtool": "2.4.4",