diff options
43 files changed, 318 insertions, 319 deletions
@@ -124,7 +124,7 @@ define MXE_GET_GITHUB_SHA endef # use a minimal whitelist of safe environment variables -ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy +ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH ACLOCAL_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) SHORT_PKG_VERSION = \ diff --git a/doc/gmsl.html b/doc/gmsl.html index 822717b..28fd58d 100644 --- a/doc/gmsl.html +++ b/doc/gmsl.html @@ -250,6 +250,13 @@ Returns: Returns the set with the element removed<br> Returns: Returns $(true) if the element is in the set<br> </span> +<hr><b>set_is_not_member</b><br> +<br> +<span style="font-family: monospace;">Arguments: 1: A single element<br> + 2: A set<br> +Returns: Returns $(false) if the element is in the set<br> +</span> + <hr><b>set_union</b><br> <br> <span style="font-family: monospace;">Arguments: 1: A set<br> @@ -42,7 +42,7 @@ # This is the GNU Make Standard Library version number as a list with # three items: major, minor, revision -gmsl_version := 1 1 6 +gmsl_version := 1 1 7 __gmsl_name := GNU Make Standard Library @@ -383,6 +383,11 @@ lc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([A-Z]),$([a-z]),$1) # Arguments: 1: A string # Returns: Returns the length of the string # ---------------------------------------------------------------------------- + +# This results in __gmsl_tab containing a tab + +__gmsl_tab := # + __gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z __gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z __gmsl_characters += 0 1 2 3 4 5 6 7 8 9 @@ -403,10 +408,6 @@ define __gmsl_newline endef -# This results in __gmsl_tab containing a tab - -__gmsl_tab := # - # ---------------------------------------------------------------------------- # Function: substr # Arguments: 1: A string @@ -455,12 +456,14 @@ set_insert = $(__gmsl_tr2)$(sort $1 $2) set_remove = $(__gmsl_tr2)$(filter-out $1,$2) # ---------------------------------------------------------------------------- -# Function: set_is_member +# Function: set_is_member, set_is_not_member # Arguments: 1: A single element # 2: A set -# Returns: Returns $(true) if the element is in the set +# Returns: (set_is_member) Returns $(true) if the element is in the set +# (set_is_not_member) Returns $(false) if the element is in the set # ---------------------------------------------------------------------------- set_is_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(true),$(false)) +set_is_not_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(false),$(true)) # ---------------------------------------------------------------------------- # Function: set_union diff --git a/ext/config.guess b/ext/config.guess index 6c32c86..f7eb141 100755 --- a/ext/config.guess +++ b/ext/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-11-04' +timestamp='2015-03-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -933,6 +947,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -5,7 +5,7 @@ # A library of functions to be used with GNU Make's $(call) that # provides functionality not available in standard GNU Make. # -# Copyright (c) 2005-2013 John Graham-Cumming +# Copyright (c) 2005-2014 John Graham-Cumming # # This file is part of GMSL # @@ -3,8 +3,8 @@ PKG := apr $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.1 -$(PKG)_CHECKSUM := 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3 +$(PKG)_VERSION := 1.5.2 +$(PKG)_CHECKSUM := 2ef2ac9a8de7f97f15ef32cddf1ed7325163d84c $(PKG)_SUBDIR := apr-$($(PKG)_VERSION) $(PKG)_FILE := apr-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://archive.apache.org/dist/apr/$($(PKG)_FILE) diff --git a/src/cairo.mk b/src/cairo.mk index 39c6c0c..2d194ae 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -3,8 +3,8 @@ PKG := cairo $(PKG)_IGNORE := -$(PKG)_VERSION := 1.12.18 -$(PKG)_CHECKSUM := a76940b58da9c83b8934264617135326c0918f9d +$(PKG)_VERSION := 1.14.2 +$(PKG)_CHECKSUM := c8da68aa66ca0855b5d0ff552766d3e8679e1d24 $(PKG)_SUBDIR := cairo-$($(PKG)_VERSION) $(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) diff --git a/src/chipmunk.mk b/src/chipmunk.mk index e987468..7f40e6a 100644 --- a/src/chipmunk.mk +++ b/src/chipmunk.mk @@ -3,8 +3,8 @@ PKG := chipmunk $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1 -$(PKG)_CHECKSUM := 4b34fd79d232b523f80f4b7e21d7d7c866bfade0 +$(PKG)_VERSION := 6.2.2 +$(PKG)_CHECKSUM := 45fee9759bb492201b1e05e191ea4a3b3c35caa7 $(PKG)_SUBDIR := Chipmunk2D-Chipmunk-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-$($(PKG)_VERSION).tar.gz diff --git a/src/cmake/FindTIFF.cmake b/src/cmake/FindTIFF.cmake new file mode 100644 index 0000000..52f97d6 --- /dev/null +++ b/src/cmake/FindTIFF.cmake @@ -0,0 +1,13 @@ +# This file is part of MXE. +# See index.html for further information. + +if(NOT PKG_CONFIG_FOUND) + find_package(PkgConfig REQUIRED) +endif() + +pkg_check_modules(TIFF libtiff-4) + +# for backward compatiblity +set(TIFF_LIBRARY ${SDL_LIBRARIES}) +set(TIFF_INCLUDE_DIR ${SDL_INCLUDE_DIRS}) +set(TIFF_VERSION_STRING ${SDL_VERSION}) diff --git a/src/curl.mk b/src/curl.mk index a188788..19a893d 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.42.1 -$(PKG)_CHECKSUM := b72b1178a5b6af283c4a14f6ccaac00b8c4ace6d +$(PKG)_VERSION := 7.43.0 +$(PKG)_CHECKSUM := 22d7646741f22cc4c7ca8d72a1ef089d5f2b94a7 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) diff --git a/src/dbus.mk b/src/dbus.mk index f49bef2..642ed3f 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.14 -$(PKG)_CHECKSUM := 9e95dfa2fa05c6028a9bc7d76a151b59411711e9 +$(PKG)_VERSION := 1.9.16 +$(PKG)_CHECKSUM := f8b2b59fde3bd32100430407afc31eec71292c49 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) diff --git a/src/fdk-aac.mk b/src/fdk-aac.mk index f46f1f2..492e819 100644 --- a/src/fdk-aac.mk +++ b/src/fdk-aac.mk @@ -6,8 +6,8 @@ PKG := fdk-aac $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.3 -$(PKG)_CHECKSUM := fda64beee7f3b8e04ca209efcf9354cdae9afc33 +$(PKG)_VERSION := 0.1.4 +$(PKG)_CHECKSUM := 9215d19bdd911954fd5bc879c707ab571716ba0d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/opencore-amr/$(PKG)/$($(PKG)_FILE) diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index ec59b03..7d28973 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.2 -$(PKG)_CHECKSUM := 65470c9b967485f72f81758a7bad44cf7a1763db +$(PKG)_VERSION := 2.7 +$(PKG)_CHECKSUM := 70bd3bef074b269ff0b1f78d12e05b5a04025585 $(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/file-1-fixes.patch b/src/file-1-fixes.patch index 0adc428..f4f9f97 100644 --- a/src/file-1-fixes.patch +++ b/src/file-1-fixes.patch @@ -1,81 +1,40 @@ This file is part of MXE. See index.html for further information. -This patch has been taken from: -https://github.com/file/file/commit/fc71117317bfe752a1adc2512530ec8e59c54a0c.patch +Contains ad hoc patches for cross building. -From fc71117317bfe752a1adc2512530ec8e59c54a0c Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Sat, 11 Oct 2014 15:03:16 +0000 -Subject: [PATCH] locale autoconf fixes +From afe77055b3e244d82cf4dedc82af15524b34d908 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Thu, 18 Jun 2015 22:19:17 -0400 +Subject: [PATCH] {gm,local}time_r: Fix function signature ---- - ChangeLog | 5 +++++ - configure.ac | 4 ++-- - src/file.c | 4 +++- - src/file.h | 5 ++++- - 4 files changed, 14 insertions(+), 4 deletions(-) -diff --git a/ChangeLog b/ChangeLog -index 2b1bad9..b42e3d7 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2014-10-11 15:02 Christos Zoulas <christos@zoulas.com> -+ -+ * fix autoconf glue for setlocale and locale_t; some OS's -+ have locale_t in xlocale.h -+ - 2014-10-10 15:01 Christos Zoulas <christos@zoulas.com> +diff --git a/src/gmtime_r.c b/src/gmtime_r.c +index 963dfee..7e27ed6 100644 +--- a/src/gmtime_r.c ++++ b/src/gmtime_r.c +@@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: gmtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $") - * release 5.20 -diff --git a/configure.ac b/configure.ac -index 545c6bd..e0b1c39 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,7 @@ AC_HEADER_MAJOR - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h) - AC_CHECK_HEADERS(stddef.h utime.h wchar.h wctype.h limits.h) --AC_CHECK_HEADERS(getopt.h err.h) -+AC_CHECK_HEADERS(getopt.h err.h xlocale.h) - AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h) - AC_CHECK_HEADERS(zlib.h) + /* asctime_r is not thread-safe anyway */ + struct tm * +-gmtime_r(const time_t t, struct tm *tm) ++gmtime_r(const time_t *t, struct tm *tm) + { + struct tm *tmp = gmtime(t); + if (tmp == NULL) +diff --git a/src/localtime_r.c b/src/localtime_r.c +index 69d78d9..35c3b40 100644 +--- a/src/localtime_r.c ++++ b/src/localtime_r.c +@@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: localtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $") -@@ -138,7 +138,7 @@ else - fi]) - - dnl Checks for functions --AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale) -+AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale setlocale) - - dnl Provide implementation of some required functions if necessary - AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck) -diff --git a/src/file.c b/src/file.c -index 8720772..b6c2c38 100644 ---- a/src/file.c -+++ b/src/file.c -@@ -142,7 +142,9 @@ main(int argc, char *argv[]) - const char *magicfile = NULL; /* where the magic is */ - - /* makes islower etc work for other langs */ -+#ifdef HAVE_SETLOCALE - (void)setlocale(LC_CTYPE, ""); -+#endif - - #ifdef __EMX__ - /* sh-like wildcard expansion! Shouldn't hurt at least ... */ -diff --git a/src/file.h b/src/file.h -index 85e3936..fdbc889 100644 ---- a/src/file.h -+++ b/src/file.h -@@ -474,6 +474,9 @@ protected int file_os2_apptype(struct magic_set *, const char *, const void *, - #if defined(HAVE_LOCALE_H) - #include <locale.h> - #endif -+#if defined(HAVE_XLOCALE_H) -+#include <xlocale.h> -+#endif - - typedef struct { - const char *pat; + /* asctime_r is not thread-safe anyway */ + struct tm * +-localtime_r(const time_t t, struct tm *tm) ++localtime_r(const time_t *t, struct tm *tm) + { + struct tm *tmp = localtime(t); + if (tmp == NULL) +-- +1.9.1 + diff --git a/src/file.mk b/src/file.mk index 7be2d8d..3e2e11e 100644 --- a/src/file.mk +++ b/src/file.mk @@ -3,8 +3,8 @@ PKG := file $(PKG)_IGNORE := -$(PKG)_VERSION := 5.20 -$(PKG)_CHECKSUM := 4e93e9ae915f1812b05cc6012ae968fdb6416f8f +$(PKG)_VERSION := 5.23 +$(PKG)_CHECKSUM := c817fb4c27f01934993ece3b013adbdc4deab67e $(PKG)_SUBDIR := file-$($(PKG)_VERSION) $(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.cross-lfs.org/pub/clfs/conglomeration/file/$($(PKG)_FILE) diff --git a/src/freetds-1.patch b/src/freetds-1.patch new file mode 100644 index 0000000..32a6ecb --- /dev/null +++ b/src/freetds-1.patch @@ -0,0 +1,62 @@ +This file is part of MXE. +See index.html for further information. + +From 6f3f9396e79874e3f16c04e3ab34871430ca6d73 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Fri, 19 Jun 2015 10:59:58 +0200 +Subject: [PATCH] don't extern "C" {} windows includes + + +diff --git a/include/tds_sysdep_public.h.in b/include/tds_sysdep_public.h.in +index 41fc1f0..0b640dc 100644 +--- a/include/tds_sysdep_public.h.in ++++ b/include/tds_sysdep_public.h.in +@@ -22,11 +22,6 @@ + + /* $Id: tds_sysdep_public.h.in,v 1.15 2011-08-08 07:27:57 freddy77 Exp $ */ + +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +- + /* + ** This is where platform-specific changes need to be made. + */ +@@ -78,8 +73,4 @@ extern "C" + #error MSDBLIB and SYBDBLIB cannot both be defined + #endif + +-#ifdef __cplusplus +-} +-#endif +- + #endif /* _tds_sysdep_public_h_ */ +diff --git a/win32/tds_sysdep_public.h b/win32/tds_sysdep_public.h +index 76f1a28..d8f57dd 100644 +--- a/win32/tds_sysdep_public.h ++++ b/win32/tds_sysdep_public.h +@@ -22,11 +22,6 @@ +
+ /* $Id: tds_sysdep_public.h,v 1.10 2011-08-08 07:27:57 freddy77 Exp $ */
+
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-
+ /*
+ ** This is where platform-specific changes need to be made.
+ */
+@@ -54,8 +49,4 @@ extern "C" + #error MSDBLIB and SYBDBLIB cannot both be defined
+ #endif
+
+-#ifdef __cplusplus
+-}
+-#endif
+-
+ #endif /* _tds_sysdep_public_h_ */
+-- +2.1.4 + diff --git a/src/freetds.mk b/src/freetds.mk index 030ad05..ef9b1f5 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -3,10 +3,10 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 0.91 -$(PKG)_CHECKSUM := 3ab06c8e208e82197dc25d09ae353d9f3be7db52 +$(PKG)_VERSION := 0.95.5 +$(PKG)_CHECKSUM := 1447956cca8ca28eb5ebc891faa608f70c6a23d2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.mirrorservice.org/sites/distfiles.finkmirrors.net/sha1/$($(PKG)_CHECKSUM)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv gnutls diff --git a/src/freetype.mk b/src/freetype.mk index 7546d60..4730a8f 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.5 -$(PKG)_CHECKSUM := 7b7460ef51a8fdb17baae53c6658fc1ad000a1c2 +$(PKG)_VERSION := 2.6 +$(PKG)_CHECKSUM := cd2b144205dd2c61693e2d861069367aa3dde1bc $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE) @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 7.9 -$(PKG)_CHECKSUM := 1dabff2168bd8fe3cadf9386e47a47c527ea99ba +$(PKG)_VERSION := 7.9.1 +$(PKG)_CHECKSUM := 04ba2906279b16b5f99c4f6b25942843a3717cdb $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) diff --git a/src/gettext.mk b/src/gettext.mk index 9a7ca43..425ff4d 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.3 -$(PKG)_CHECKSUM := 8a4614d5d797af98822b88858c17ad8b3ed4224f +$(PKG)_VERSION := 0.19.4 +$(PKG)_CHECKSUM := c473f4f268501d971b913197fb07767e628644bb $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) @@ -12,9 +12,10 @@ $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) $(PKG)_DEPS := gcc libiconv define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.gnu.org/software/gettext/' | \ + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gettext/' | \ grep 'gettext-' | \ $(SED) -n 's,.*gettext-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SORT) -Vr | \ head -1 endef diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index eae67a9..325a69d 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001 +From dfe54cbfbcff8b46285819ed38ddb5757d27a716 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 3 Apr 2012 13:58:42 +0200 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" @@ -9,7 +9,7 @@ Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. diff --git a/configure.ac b/configure.ac -index 3e5b79d..99f3636 100644 +index 3f7ec24..ef9fd77 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -22,10 +22,10 @@ index 3e5b79d..99f3636 100644 AC_CONFIG_HEADERS([config.h]) -- -2.1.2 +2.1.4 -From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001 +From 5dc32c442c74e905a3d5199e658c77b6de44cde1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 6 Jun 2012 09:57:24 +0200 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility @@ -34,7 +34,7 @@ Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac -index 99f3636..8c1b4fd 100644 +index ef9fd77..7c3436a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ ggl_EARLY @@ -46,10 +46,10 @@ index 99f3636..8c1b4fd 100644 AC_PROG_YACC AC_PROG_SED -- -2.1.2 +2.1.4 -From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001 +From ab7fa52f69829b65e693723fade982cf372d5f27 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 4 Feb 2013 16:11:12 +0100 Subject: [PATCH 3/5] add missing private lib to pc file @@ -68,17 +68,17 @@ index a25fcdf..3860c68 100644 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -2.1.2 +2.1.4 -From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001 +From a4ef8a481bee4ddd1102138d2e304595c5eb1828 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Wed, 6 Feb 2013 08:43:43 +0100 Subject: [PATCH 4/5] relax automake version check diff --git a/configure.ac b/configure.ac -index 8c1b4fd..efa13e8 100644 +index 7c3436a..406db3a 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -91,10 +91,10 @@ index 8c1b4fd..efa13e8 100644 AC_CONFIG_HEADERS([config.h]) -- -2.1.2 +2.1.4 -From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001 +From 2314330147f966d2dcd192b73dff822533ccab4e Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 24 Nov 2014 08:56:48 +0100 Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop @@ -106,11 +106,11 @@ Signed-off-by: Mark Brand <mabrand@mabrand.nl> taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html diff --git a/lib/x509/output.c b/lib/x509/output.c -index bf01834..1ec18de 100644 +index 5cef68c..96ad795 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c -@@ -32,7 +32,11 @@ - #include <extras/randomart.h> +@@ -34,7 +34,11 @@ + #include <gnutls-idna.h> #ifdef HAVE_INET_NTOP -# include <arpa/inet.h> @@ -123,5 +123,5 @@ index bf01834..1ec18de 100644 #define addf _gnutls_buffer_append_printf -- -2.1.2 +2.1.4 diff --git a/src/gnutls.mk b/src/gnutls.mk index c44c0ba..2e7f0c3 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,16 +2,16 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.3.15 -$(PKG)_CHECKSUM := d7f66b0aeaf48ff8621cc1913230635ef672f0a4 +$(PKG)_VERSION := 3.4.2 +$(PKG)_CHECKSUM := f29b4d763aee89c860aa5c54574778537239da08 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.3/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3//$($(PKG)_FILE) +$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4//$($(PKG)_FILE) $(PKG)_DEPS := gcc gettext gmp libgnurx nettle zlib define $(PKG)_UPDATE - $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/ | \ + $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/ | \ $(SED) -n 's,.*gnutls-\([1-9]\+\.[0-9]\+.[0-9]\+\)\..*,\1,p' | \ $(SORT) -V | \ tail -1 @@ -19,7 +19,6 @@ endef define $(PKG)_BUILD $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' - rm '$(1)/ltmain.sh' cd '$(1)' && autoreconf -fi -I m4 -I gl/m4 -I src/libopts/m4 # skip the run test for libregex support since we are cross compiling $(SED) -i 's/libopts_cv_with_libregex=no/libopts_cv_with_libregex=yes/g;' '$(1)/configure' diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index 6398128..376c9a6 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -1,41 +1,32 @@ This file is part of MXE. See index.html for further information. -Contains ad hoc patches for cross building. - -From 186d8a982336f627bafc9b8a3f1487ab124e220b Mon Sep 17 00:00:00 2001 +From 933115892cfe9e4c9942a9667b3362dbf5c64b52 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 23 Oct 2011 21:36:53 +0200 Subject: [PATCH 1/2] support static linking to ntlm diff --git a/configure b/configure -index df6419e..7085c88 100755 +index 5454a6a..8508b30 100755 --- a/configure +++ b/configure -@@ -5023,7 +5023,7 @@ case "${host}" in +@@ -5023,8 +5023,8 @@ case "${host}" in ;; *-*-cygwin*) platform=CYGWIN ;; *-*-mingw*) platform=MINGW - SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm" +- WSDL2H_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm" + SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm" - WSDL2H_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm" ++ WSDL2H_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm" ;; *-*-freebsd*) platform=FREEBSD ;; -@@ -6186,7 +6186,7 @@ $as_echo_n "checking for enable gnutls in library... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lntlm -lgnutls -lgcrypt -lgpg-error -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + *-*-openbsd*) platform=OPENBSD ;; -- -1.8.4.5 +2.1.4 -From 38b02f235f09e907867bf9bc660bbada315d1094 Mon Sep 17 00:00:00 2001 +From b7210831195d6ed4b2f43f8c7b0a8d877b86d65f Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 24 Oct 2011 11:17:13 +0200 Subject: [PATCH 2/2] ntlm support in .pc files @@ -102,5 +93,5 @@ index 365274b..82af331 100644 -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} -- -1.8.4.5 +2.1.4 diff --git a/src/gsoap.mk b/src/gsoap.mk index bd7015f..1ff90a2 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := e66bbdeaa6b5bdcb11de5141e1f17343a023c5c4 $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls libgcrypt libntlm +$(PKG)_DEPS := gcc libgcrypt libntlm openssl define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \ @@ -37,6 +37,9 @@ define $(PKG)_BUILD $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure' $(SED) -i "s^-lgpg-error^`'$(TARGET)-gpg-error-config' --libs`^g;" '$(1)/configure' + # fix hard-coded openssl dependencies + $(SED) -i "s^-lssl -lcrypto^`'$(TARGET)-pkg-config' --libs-only-l openssl`^g;" '$(1)/configure' + # the cross build will need soapcpp2, not soapcpp2.exe $(SED) -i "s,^\(SOAP = \$$(top_builddir)/gsoap/src/soapcpp2\)\$$(EXEEXT)$$,\1,;" '$(1)/gsoap/wsdl/Makefile.in' @@ -47,7 +50,6 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-gnutls \ CPPFLAGS='-DWITH_NTLM -DSOAP_SSLv3=0x40' # Building for mingw requires native soapcpp2 diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index e54fd69..68e5d3a 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.39 -$(PKG)_CHECKSUM := aedc7f7ed8fdca0ca170f9a5bd7304fe4604174d +$(PKG)_VERSION := 0.9.41 +$(PKG)_CHECKSUM := a77d5d061e91322c1196ab23afeeb8c7e4bf62bb $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) @@ -12,7 +12,7 @@ $(PKG)_DEPS := gcc glib cairo freetype-bootstrap icu4c define $(PKG)_UPDATE $(WGET) -q -O- 'http://cgit.freedesktop.org/harfbuzz/refs/tags' | \ - $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ + $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9.]*\\)'.*,\\1,p" | \ $(SORT) -V | \ tail -1 endef diff --git a/src/hdf4.mk b/src/hdf4.mk index c8a361a..db12865 100644 --- a/src/hdf4.mk +++ b/src/hdf4.mk @@ -7,7 +7,7 @@ $(PKG)_VERSION := 4.2.10 $(PKG)_CHECKSUM := 5163543895728dabb536a0659b3d965d55bccf74 $(PKG)_SUBDIR := hdf-$($(PKG)_VERSION) $(PKG)_FILE := hdf-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF/prev-releases/HDF$($(PKG)_VERSION)/src/$($(PKG)_FILE) +$(PKG)_URL := http://www.hdfgroup.org/ftp/HDF/releases/HDF$($(PKG)_VERSION)/src/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg portablexdr define $(PKG)_UPDATE @@ -25,17 +25,18 @@ define $(PKG)_BUILD --disable-fortran \ --disable-netcdf \ AR='$(TARGET)-ar' \ - $(if $(BUILD_SHARED), \ - LIBS="-lportablexdr -lws2_32" CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_DYNAMIC_LIB=1 -DBIG_LONGS", \ - CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1") + LIBS="-lportablexdr -lws2_32" \ + $(if $(BUILD_SHARED), \ + CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_DYNAMIC_LIB=1 -DBIG_LONGS", \ + CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1") $(MAKE) -C '$(1)'/mfhdf/xdr -j '$(JOBS)' \ - LDFLAGS=-no-undefined + LDFLAGS=-no-undefined $(MAKE) -C '$(1)'/hdf/src -j '$(JOBS)' \ - LDFLAGS=-no-undefined + LDFLAGS=-no-undefined $(MAKE) -C '$(1)'/hdf/src -j 1 install $(MAKE) -C '$(1)'/mfhdf/libsrc -j '$(JOBS)' \ - LDFLAGS="-no-undefined -ldf" + LDFLAGS="-no-undefined -ldf" $(MAKE) -C '$(1)'/mfhdf/libsrc -j 1 install endef diff --git a/src/libgsasl-1-fixes.patch b/src/libgsasl-1-fixes.patch deleted file mode 100644 index 561684c..0000000 --- a/src/libgsasl-1-fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 7 Nov 2011 18:01:56 +0100 -Subject: [PATCH] use memxor from nettle - - -diff --git a/gl/memxor.c b/gl/memxor.c -index 7fec454..d9b62cd 100644 ---- a/gl/memxor.c -+++ b/gl/memxor.c -@@ -22,7 +22,7 @@ - #include "memxor.h" - - void * --memxor (void *restrict dest, const void *restrict src, size_t n) -+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n) - { - char const *s = src; - char *d = dest; -diff --git a/libgsasl.pc.in b/libgsasl.pc.in -index b0c477d..d8d8ccc 100644 ---- a/libgsasl.pc.in -+++ b/libgsasl.pc.in -@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/ - Version: @VERSION@ - Libs: -L${libdir} -lgsasl - Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@ -+Requires: nettle - Cflags: -I${includedir} --- -1.7.7 - diff --git a/src/libgsasl.mk b/src/libgsasl.mk index feef05d..e21450a 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 08fd5dfdd3d88154cf06cb0759a732790c47b4f7 $(PKG)_SUBDIR := libgsasl-$($(PKG)_VERSION) $(PKG)_FILE := libgsasl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt nettle +$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ @@ -24,8 +24,7 @@ define $(PKG)_BUILD --with-libgcrypt \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ --with-libidn-prefix='$(PREFIX)/$(TARGET)' \ - --with-libntlm-prefix='$(PREFIX)/$(TARGET)' \ - LIBS="`$(TARGET)-pkg-config --libs-only-l nettle`" + --with-libntlm-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ diff --git a/src/libvpx.mk b/src/libvpx.mk index 4a31575..7060d50 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -3,16 +3,17 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 -$(PKG)_CHECKSUM := 191b95817aede8c136cc3f3745fb1b8c50e6d5dc -$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://webm.googlecode.com/files/$($(PKG)_FILE) +$(PKG)_VERSION := 1.4.0 +$(PKG)_CHECKSUM := d05f4e9a9878886282ac9c9246f8fac080c94c8f +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads yasm define $(PKG)_UPDATE - $(WGET) -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \ - $(SED) -n 's,.*libvpx-v\([0-9][^<]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'http://downloads.webmproject.org/releases/webm/index.html' | \ + $(SED) -n 's,.*libvpx-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SORT) -Vr | \ head -1 endef @@ -3,10 +3,10 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.0 +$(PKG)_VERSION := 5.3.1 # Shared version $(PKG)_SOVERS := 53 -$(PKG)_CHECKSUM := 1c46d1c78c44039939e820126b86a6ae12dadfba +$(PKG)_CHECKSUM := 1676c6a041d90b6982db8cef1e5fb26000ab6dee $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE) diff --git a/src/minizip.mk b/src/minizip.mk index ef7f5ed..92ea0db 100644 --- a/src/minizip.mk +++ b/src/minizip.mk @@ -3,18 +3,14 @@ PKG := minizip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1 -$(PKG)_CHECKSUM := f0a47893d86e48c7336558aa7ec7b6742a1c102f -$(PKG)_COMMIT := 1f38dffc395c1e847eb26dbd921168e8cc2b6db2 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_COMMIT) -$(PKG)_FILE := $(PKG)-$($(PKG)_COMMIT).zip -$(PKG)_URL := https://github.com/nmoinvaz/minizip/archive/$($(PKG)_COMMIT).zip +$(PKG)_VERSION := 0b46a2b +$(PKG)_CHECKSUM := 411f52a78dca8af254993e7a82be26bfc64af885 +$(PKG)_SUBDIR := nmoinvaz-minizip-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/nmoinvaz/minizip/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib -define $(PKG)_UPDATE - echo 'TODO: write update script for $(PKG).' >&2; - echo $($(PKG)_VERSION) -endef +$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, nmoinvaz/minizip, master) define $(PKG)_BUILD cd '$(1)' && $(TARGET)-gcc -c -O '$(1)'/*.c diff --git a/src/mpfr.mk b/src/mpfr.mk index d17850f..82398a7 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -3,8 +3,8 @@ PKG := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.2 -$(PKG)_CHECKSUM := 03e593cc6e26639ef5e60be1af8dc527209e5172 +$(PKG)_VERSION := 3.1.3 +$(PKG)_CHECKSUM := 383303f9de5ebe055b03b94642b03465baf9e6c7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) diff --git a/src/nettle-1.patch b/src/nettle-1.patch new file mode 100644 index 0000000..25436b2 --- /dev/null +++ b/src/nettle-1.patch @@ -0,0 +1,54 @@ +This file is part of MXE. +See index.html for further information. + +From 29cb19fb27ec834473d638fb13a947e0e004116d Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 12 Apr 2015 10:07:58 +0200 +Subject: [PATCH] Revert "Include private dependencies automatically in + pkg-config for non-shared builds" + +This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413. + +diff --git a/configure.ac b/configure.ac +index 5a16151..e6cd467 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -803,10 +803,8 @@ fi + + if test "x$enable_shared" = xyes ; then + IF_SHARED='' +- IF_NOT_SHARED='#' + else + IF_SHARED='#' +- IF_NOT_SHARED='' + fi + + # Documentation tools +@@ -840,7 +838,6 @@ fi + AC_SUBST(IF_HOGWEED) + AC_SUBST(IF_STATIC) + AC_SUBST(IF_SHARED) +-AC_SUBST(IF_NOT_SHARED) + AC_SUBST(IF_DOCUMENTATION) + AC_SUBST(IF_DLL) + AC_SUBST(IF_MINI_GMP) +diff --git a/hogweed.pc.in b/hogweed.pc.in +index 97fb9d4..839f7d0 100644 +--- a/hogweed.pc.in ++++ b/hogweed.pc.in +@@ -11,9 +11,8 @@ Name: Hogweed + Description: Nettle low-level cryptographic library (public-key algorithms) + URL: http://www.lysator.liu.se/~nisse/nettle + Version: @PACKAGE_VERSION@ +-Requires: @IF_NOT_SHARED@ nettle +-Requires.private: @IF_SHARED@ nettle +-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +-Libs.private: @IF_SHARED@ @LIBS@ ++Requires.private: nettle ++Libs: -L${libdir} -lhogweed ++Libs.private: @LIBS@ + Cflags: -I${includedir} + +-- +2.1.4 + diff --git a/src/nettle.mk b/src/nettle.mk index fd6bc35..820dd04 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7 -$(PKG)_CHECKSUM := e17de3678b987841e88a724b7d2f6856d97ab139 +$(PKG)_VERSION := 3.1 +$(PKG)_CHECKSUM := 57ad2aff231ba625c35f77b2bf80d29dfb136ce1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) diff --git a/src/portablexdr-1-castfix.patch b/src/portablexdr-1-castfix.patch index 4015988..df2db90 100644 --- a/src/portablexdr-1-castfix.patch +++ b/src/portablexdr-1-castfix.patch @@ -45,7 +45,7 @@ diff -burN portablexdr-4.9.1.orig/xdr_rec.c portablexdr-4.9.1/xdr_rec.c - register u_long len = (u_long)(rstrm->out_finger) - - (u_long)(rstrm->frag_header) - sizeof(u_long); + register u_long len = (uintptr_t)(rstrm->out_finger) - -+ (uintptr_t)(rstrm->frag_header) - sizeof(u_long); ++ (uintptr_t)(rstrm->frag_header) - sizeof(u_long); *(rstrm->frag_header) = htonl(len | eormask); - len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->out_base); @@ -11,9 +11,10 @@ $(PKG)_URL := http://download.qt.io/official_releases/qt/4.8/$($(PKG)_VERSI $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus define $(PKG)_UPDATE - $(WGET) -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \ - grep '<li><a href="/qt/qt/commit/' | \ - $(SED) -n 's,.*<a[^>]*>v\([0-9][^<-]*\)<.*,\1,p' | \ + $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/4.8/ | \ + $(SED) -n 's,.*href="\(4\.[0-9]\.[^/]*\)/".*,\1,p' | \ + grep -iv -- '-rc' | \ + $(SORT) -V | \ tail -1 endef diff --git a/src/qtbase.mk b/src/qtbase.mk index 58cba58..daa19b8 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -11,7 +11,7 @@ $(PKG)_URL := http://download.qt.io/official_releases/qt/5.4/$($(PKG)_VERSI $(PKG)_DEPS := gcc postgresql freetds openssl harfbuzz zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c define $(PKG)_UPDATE - $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.1/ | \ + $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.4/ | \ $(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \ grep -iv -- '-rc' | \ tail -1 diff --git a/src/sox-1-fixes.patch b/src/sox-1-fixes.patch deleted file mode 100644 index 2850e22..0000000 --- a/src/sox-1-fixes.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 - @@ -3,12 +3,12 @@ PKG := sox $(PKG)_IGNORE := -$(PKG)_VERSION := 14.4.1 -$(PKG)_CHECKSUM := 71f05afc51e3d9b03376b2f98fd452d3a274d595 +$(PKG)_VERSION := 14.4.2 +$(PKG)_CHECKSUM := f69f38f8a7ad6a88ecab3862d74db4edcd796695 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc file flac lame libgomp libmad libpng libsndfile libltdl opencore-amr twolame vorbis wavpack +$(PKG)_DEPS := gcc file flac lame libgomp libmad libpng libsndfile libltdl opencore-amr opus twolame vorbis wavpack define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/sox/files/sox/' | \ @@ -22,7 +22,7 @@ define $(PKG)_BUILD $(SED) -i '/Libs.private/d' '$(1)/sox.pc.in' echo Libs.private: @MAGIC_LIBS@ \ `grep sox_LDADD '$(1)/src/optional-fmts.am' | \ - $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` >>'$(1)/sox.pc.in' + $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` @LIBS@ >>'$(1)/sox.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ @@ -37,7 +37,6 @@ define $(PKG)_BUILD --with-ladspa \ --with-amrwb \ --with-amrnb \ - --without-ffmpeg \ --with-flac \ --with-oggvorbis \ --with-sndfile \ @@ -53,7 +52,8 @@ define $(PKG)_BUILD --without-oss \ --without-pulseaudio \ --without-sndio \ - --without-sunaudio + --without-sunaudio \ + LIBS='-lshlwapi -lgnurx' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install diff --git a/src/speex.mk b/src/speex.mk index c68903a..c1a5555 100644 --- a/src/speex.mk +++ b/src/speex.mk @@ -3,8 +3,8 @@ PKG := speex $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2rc1 -$(PKG)_CHECKSUM := 52daa72572e844e5165315e208da539b2a55c5eb +$(PKG)_VERSION := 1.2rc2 +$(PKG)_CHECKSUM := 03ce8418c4e05cb166374bfadef46e7646da62e1 $(PKG)_SUBDIR := speex-$($(PKG)_VERSION) $(PKG)_FILE := speex-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xiph.org/releases/speex/$($(PKG)_FILE) diff --git a/src/termcap.mk b/src/termcap.mk index 57e0a09..94d16e5 100644 --- a/src/termcap.mk +++ b/src/termcap.mk @@ -11,7 +11,10 @@ $(PKG)_URL := http://ftp.gnu.org/gnu/termcap/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - /bin/false + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/termcap/' | \ + grep 'termcap-' | \ + $(SED) -n 's,.*termcap-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 endef define $(PKG)_BUILD diff --git a/src/xerces-1-fix-pkgconfig.patch b/src/xerces-1-fix-pkgconfig.patch deleted file mode 100644 index 59df5fa..0000000 --- a/src/xerces-1-fix-pkgconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -This patch has been taken from: -https://issues.apache.org/jira/browse/XERCESC-1951 - -diff -r a3f28cf10046 xerces-c.pc.in ---- a/xerces-c.pc.in Mon Nov 29 00:46:50 2010 +0100 -+++ b/xerces-c.pc.in Mon Nov 29 00:58:47 2010 +0100 -@@ -7,4 +7,5 @@ - Description: Validating XML parser library for C++ - Version: @VERSION@ - Libs: -L${libdir} -lxerces-c -+Libs.private: @CURL_LIBS@ - Cflags: -I${includedir} diff --git a/src/xerces.mk b/src/xerces.mk index b62fb82..7662ddd 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -3,8 +3,8 @@ PKG := xerces $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.1 -$(PKG)_CHECKSUM := 177ec838c5119df57ec77eddec9a29f7e754c8b2 +$(PKG)_VERSION := 3.1.2 +$(PKG)_CHECKSUM := 3f9ecc4956df069c1d95b885fc687eb4e474a4ad $(PKG)_SUBDIR := xerces-c-$($(PKG)_VERSION) $(PKG)_FILE := xerces-c-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.apache.org/dist/xerces/c/$(word 1,$(subst ., ,$($(PKG)_VERSION)))/sources/$($(PKG)_FILE) |