diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/curl.mk | 6 | ||||
| -rw-r--r-- | src/gnutls-1-fixes.patch | 63 | ||||
| -rw-r--r-- | src/gnutls.mk | 4 | ||||
| -rw-r--r-- | src/libcaca-2-vsnprintf.patch | 187 | ||||
| -rw-r--r-- | src/libdvdcss.mk | 13 | ||||
| -rw-r--r-- | src/libpng.mk | 4 | ||||
| -rw-r--r-- | src/qtservice.mk | 10 | ||||
| -rw-r--r-- | src/qtsystems.mk | 10 |
8 files changed, 222 insertions, 75 deletions
diff --git a/src/curl.mk b/src/curl.mk index e2a0eee..f27e4a1 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.37.0 -$(PKG)_CHECKSUM := 0bcd1bd7901ee1d7059189d2b3807fdb6a271bc6 +$(PKG)_VERSION := 7.37.1 +$(PKG)_CHECKSUM := 0f3f8a3eb3019d2e671552e8425784818123dc09 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) @@ -25,7 +25,7 @@ define $(PKG)_BUILD --enable-sspi \ --enable-ipv6 \ --with-libssh2 - $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_DOCS) ln -sf '$(PREFIX)/$(TARGET)/bin/curl-config' '$(PREFIX)/bin/$(TARGET)-curl-config' '$(TARGET)-gcc' \ diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index c30b290..c43efbd 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,15 +1,15 @@ This file is part of MXE. See index.html for further information. -From dbae911f9d1b79fde473c1ca23e5535c7d1db39c Mon Sep 17 00:00:00 2001 +From b4e25d3d5b94f99a3eb754fadd271eb881e03515 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" +Subject: [PATCH 1/4] Revert "make dist will also make lzip compressed tarball" This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. diff --git a/configure.ac b/configure.ac -index a81d85f..44fe48a 100644 +index b082047..02a6d5f 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -25,16 +25,16 @@ index a81d85f..44fe48a 100644 1.8.4.5 -From 951caab5f444f0c90cb43b5937c7273963e443d8 Mon Sep 17 00:00:00 2001 +From 7031296f8bbb2fe4bea63616045862bc234ad9c7 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 +Subject: [PATCH 2/4] AM_PROG_AR for automake 1.12 compatibility Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac -index 44fe48a..1e80e23 100644 +index 02a6d5f..789db75 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ ggl_EARLY @@ -49,10 +49,10 @@ index 44fe48a..1e80e23 100644 1.8.4.5 -From ade9bae0c0af5b6eec402c228c8d048e8a7b5ce6 Mon Sep 17 00:00:00 2001 +From 14a3e086bb17c031c650775d89550b184dd564e5 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 +Subject: [PATCH 3/4] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in @@ -71,14 +71,14 @@ index a25fcdf..3860c68 100644 1.8.4.5 -From 36afa9bd2427b6c71c49c832d8a06686920ac8c9 Mon Sep 17 00:00:00 2001 +From e0b47757e468049c0c30dfc54f6b6003fe036add 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 +Subject: [PATCH 4/4] relax automake version check diff --git a/configure.ac b/configure.ac -index 1e80e23..0415ead 100644 +index 789db75..54f2232 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -93,44 +93,3 @@ index 1e80e23..0415ead 100644 -- 1.8.4.5 - -From fc0b1030e357d2de86417a1a442d5ef3643e6fc0 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Wed, 5 Feb 2014 09:42:41 +0100 -Subject: [PATCH 5/5] gnulib fix-ups for error, setenv, unsetenv - - -diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am -index c25328d..14d592b 100644 ---- a/src/gl/Makefile.am -+++ b/src/gl/Makefile.am -@@ -121,7 +121,7 @@ EXTRA_DIST += errno.in.h - - EXTRA_DIST += error.c error.h - --EXTRA_libgnu_gpl_la_SOURCES += error.c -+libgnu_gpl_la_SOURCES += error.c - - ## end gnulib module error - -@@ -230,7 +230,7 @@ libgnu_gpl_la_SOURCES += progname.h progname.c - - EXTRA_DIST += setenv.c - --EXTRA_libgnu_gpl_la_SOURCES += setenv.c -+libgnu_gpl_la_SOURCES += setenv.c - - ## end gnulib module setenv - -@@ -914,7 +914,7 @@ EXTRA_DIST += unistd.in.h - - EXTRA_DIST += unsetenv.c - --EXTRA_libgnu_gpl_la_SOURCES += unsetenv.c -+libgnu_gpl_la_SOURCES += unsetenv.c - - ## end gnulib module unsetenv - --- -1.8.4.5 - diff --git a/src/gnutls.mk b/src/gnutls.mk index 6d287f5..be076a2 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.2.15 -$(PKG)_CHECKSUM := 31f289b48b0bf054f5f8c16d3b878615d0ae06fc +$(PKG)_VERSION := 3.2.17 +$(PKG)_CHECKSUM := c48b02912c5dc77b627f1f17dcc05c2be1d59b0f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.2/$($(PKG)_FILE) diff --git a/src/libcaca-2-vsnprintf.patch b/src/libcaca-2-vsnprintf.patch new file mode 100644 index 0000000..b3b3105 --- /dev/null +++ b/src/libcaca-2-vsnprintf.patch @@ -0,0 +1,187 @@ +This file is part of MXE. +See index.html for further information. + +From 28a0c250320661a3fe15d3f0373ace044cccd8e5 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Fri, 22 Aug 2014 10:02:58 -0700 +Subject: [PATCH 1/2] Add more [v]snprintf() fallback + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> +--- + caca/driver/ncurses.c | 4 ++++ + caca/driver/slang.c | 4 ++++ + caca/driver/x11.c | 4 ++++ + caca/prof.c | 4 ++++ + 4 files changed, 16 insertions(+) + +diff --git a/caca/driver/ncurses.c b/caca/driver/ncurses.c +index 8161c0f..53c76c1 100644 +--- a/caca/driver/ncurses.c ++++ b/caca/driver/ncurses.c +@@ -634,7 +634,11 @@ static void ncurses_uninstall_terminal(caca_display_t *dp) + if(!dp->drv.p->term) + return; + ++#if defined(HAVE_SNPRINTF) + snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term); ++#else ++ sprintf(termenv, "TERM=%s", dp->drv.p->term); ++#endif + free(dp->drv.p->term); + (void)putenv(termenv); + } +diff --git a/caca/driver/slang.c b/caca/driver/slang.c +index 4dd9fb6..cf38ecf 100644 +--- a/caca/driver/slang.c ++++ b/caca/driver/slang.c +@@ -576,7 +576,11 @@ static void slang_uninstall_terminal(caca_display_t *dp) + if(!dp->drv.p->term) + return; + ++#if defined(HAVE_SNPRINTF) + snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term); ++#else ++ sprintf(termenv, "TERM=%s", dp->drv.p->term); ++#endif + free(dp->drv.p->term); + (void)putenv(termenv); + } +diff --git a/caca/driver/x11.c b/caca/driver/x11.c +index 6bd04cf..24bcdbf 100644 +--- a/caca/driver/x11.c ++++ b/caca/driver/x11.c +@@ -155,7 +155,11 @@ static int x11_init_graphics(caca_display_t *dp) + + if (dp->drv.p->font_set) + XFreeFontSet(dp->drv.p->dpy, dp->drv.p->font_set); ++#if defined(HAVE_SNPRINTF) + snprintf(buf, BUFSIZ - 1, "%s,*", *parser); ++#else ++ sprintf(buf, "%s,*", *parser); ++#endif + dp->drv.p->font_set = XCreateFontSet(dp->drv.p->dpy, buf, + &missing_charset_list, + &missing_charset_count, +diff --git a/caca/prof.c b/caca/prof.c +index 4581aaf..6aaa295 100644 +--- a/caca/prof.c ++++ b/caca/prof.c +@@ -59,7 +59,11 @@ void _caca_init_stat(struct caca_stat *s, const char *format, ...) + s->name = malloc(128 * sizeof(char)); + va_list args; + va_start(args, format); ++#if defined(HAVE_VSNPRINTF) + vsnprintf(s->name, 128, format, args); ++#else ++ vsprintf(s->name, format, args); ++#endif + s->name[127] = '\0'; + va_end(args); + +-- +1.9.1 + + +From 2d9f0f378261d19b56a66f9f0f0508f11f31e56c Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Fri, 22 Aug 2014 10:04:06 -0700 +Subject: [PATCH 2/2] string: remove broken vsnprintf[_s] implementation + +This interferes mingw-w64, which as a proper vsnprintf definition. + +The usage of vsnprintf in the file is guarded with HAVE_VSNPRINF +with appropriate fallback, so removing it should not break anything. + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> +--- + caca/figfont.c | 26 -------------------------- + caca/string.c | 22 ---------------------- + 2 files changed, 48 deletions(-) + +diff --git a/caca/figfont.c b/caca/figfont.c +index caa44d5..4e10186 100644 +--- a/caca/figfont.c ++++ b/caca/figfont.c +@@ -29,11 +29,6 @@ + #include "caca.h" + #include "caca_internals.h" + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 +-int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK; +-int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; +-#endif +- + struct caca_charfont + { + int term_width; +@@ -633,27 +628,6 @@ static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule) + } + + /* +- * Functions for the mingw32 runtime +- */ +- +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 +-int sprintf_s(char *s, size_t n, const char *fmt, ...) +-{ +- va_list args; +- int ret; +- va_start(args, fmt); +- ret = vsnprintf(s, n, fmt, args); +- va_end(args); +- return ret; +-} +- +-int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) +-{ +- return 0; +-} +-#endif +- +-/* + * XXX: The following functions are aliases. + */ + +diff --git a/caca/string.c b/caca/string.c +index 22e0af2..db79e30 100644 +--- a/caca/string.c ++++ b/caca/string.c +@@ -36,12 +36,6 @@ + #include "caca.h" + #include "caca_internals.h" + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 +-int vsnprintf_s(char *s, size_t n, size_t c, +- const char *fmt, va_list ap) CACA_WEAK; +-int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; +-#endif +- + /** \brief Set cursor position. + * + * Put the cursor at the given coordinates. Functions making use of the +@@ -607,22 +601,6 @@ int caca_set_canvas_boundaries(caca_canvas_t *cv, int x, int y, int w, int h) + } + + /* +- * Functions for the mingw32 runtime +- */ +- +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 +-int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap) +-{ +- return vsnprintf(s, n, fmt, ap); +-} +- +-int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) +-{ +- return 0; +-} +-#endif +- +-/* + * XXX: The following functions are aliases. + */ + +-- +1.9.1 + diff --git a/src/libdvdcss.mk b/src/libdvdcss.mk index 9206d0a..0dba5cc 100644 --- a/src/libdvdcss.mk +++ b/src/libdvdcss.mk @@ -3,16 +3,17 @@ PKG := libdvdcss $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.13 -$(PKG)_CHECKSUM := 1a4a5e55c7529da46386c1c333340eee2c325a77 +$(PKG)_VERSION := 1.3.0 +$(PKG)_CHECKSUM := b3ccd70a510aa04d644f32b398489a3122a7e11a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := http://download.videolan.org/pub/libdvdcss/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://download.videolan.org/pub/libdvdcss/last/' | \ - $(SED) -n 's,.*libdvdcss-\([0-9][^<]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'http://download.videolan.org/pub/libdvdcss/' | \ + $(SED) -n 's,.*<a href="\([0-9][^<]*\)/".*,\1,p' | \ + $(SORT) -Vr | \ head -1 endef @@ -20,6 +21,6 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --disable-doc - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) endef diff --git a/src/libpng.mk b/src/libpng.mk index 288f5c0..f8a2004 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.12 -$(PKG)_CHECKSUM := c3d54f9ab683d63218361487269380fb8e0cf3b6 +$(PKG)_VERSION := 1.6.13 +$(PKG)_CHECKSUM := 5ae32b6b99cef6c5c85feab8edf9d619e1773b15 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://downloads.sourceforge.net/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/qtservice.mk b/src/qtservice.mk index f3e9d13..cb2bdf7 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -2,11 +2,11 @@ # See index.html for further information. PKG := qtservice $(PKG)_IGNORE := -$(PKG)_VERSION := fd22bee22274975c56f1c10d87ee9fd2c0818f83 -$(PKG)_CHECKSUM := 83325103e2b883f8a7fee28362909dd6528ffca6 -$(PKG)_SUBDIR := qt-solutions-qt-solutions -$(PKG)_FILE := $($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://qt.gitorious.org/qt-solutions/qt-solutions/archive/$($(PKG)_FILE) +$(PKG)_VERSION := fd22bee +$(PKG)_CHECKSUM := 0d83dc54d692da3557213144140e74a63a6f4911 +$(PKG)_SUBDIR := qtproject-qt-solutions-$($(PKG)_VERSION) +$(PKG)_FILE := qt-solutions-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/qtproject/qt-solutions/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc qtbase define $(PKG)_UPDATE diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 34b0cea..b204349 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -2,11 +2,11 @@ # See index.html for further information. PKG := qtsystems $(PKG)_IGNORE := -$(PKG)_VERSION := 341352b4bb1e729f384a3af1ca966ebd123f16e3 -$(PKG)_CHECKSUM := fa566f556dcf531b6ae63812769499f258dd7de9 -$(PKG)_SUBDIR := qt-$(PKG) -$(PKG)_FILE := $($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://qt.gitorious.org/qt/qtsystems/archive/$($(PKG)_FILE) +$(PKG)_VERSION := 341352b +$(PKG)_CHECKSUM := b649b50eff33e00da264c18ae6d643f784f283be +$(PKG)_SUBDIR := qtproject-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/qtproject/qtsystems/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc qtbase qtdeclarative qtxmlpatterns define $(PKG)_UPDATE |