diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-01-05 10:28:27 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-01-05 10:28:27 (GMT) |
| commit | 7fb7d934c38a7400b4d36d3f9afa6d3a440b6710 (patch) | |
| tree | be0c29141a9c774ae8c778f4313938ffea1e78ca | |
| parent | f0ac44f6fede2341f82f5b124fb66cf156c88d6c (diff) | |
| download | mxe-7fb7d934c38a7400b4d36d3f9afa6d3a440b6710.zip mxe-7fb7d934c38a7400b4d36d3f9afa6d3a440b6710.tar.gz mxe-7fb7d934c38a7400b4d36d3f9afa6d3a440b6710.tar.bz2 | |
update packages ffmpeg gnutls openssl
| -rw-r--r-- | src/ffmpeg.mk | 4 | ||||
| -rw-r--r-- | src/gnutls-1-fixes.patch | 20 | ||||
| -rw-r--r-- | src/gnutls.mk | 8 | ||||
| -rw-r--r-- | src/openssl.mk | 4 |
4 files changed, 19 insertions, 17 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index b15e1bb..d2156f4 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -4,8 +4,8 @@ # ffmpeg PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9 -$(PKG)_CHECKSUM := 5f4118496ebe8fc37e8f11cf0303f6f7c85756f9 +$(PKG)_VERSION := 0.9.1 +$(PKG)_CHECKSUM := 89326f93902aee49dac659a63b39b0f69be0e7ee $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.ffmpeg.org/ diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index 5a09c63..7c23f4d 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,7 +3,7 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 1b8300eee68e9768ba628d51facf8183255a6e78 Mon Sep 17 00:00:00 2001 +From 397faf13047eeaacaacf317ac983023eb77f917a Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 28 Oct 2011 09:23:41 +0200 Subject: [PATCH 1/3] add missing static library linking @@ -22,22 +22,22 @@ index 32170b6..de032a2 100644 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -1.7.7.3 +1.7.8 -From 84e79eadf2edae75ecb93792cf9899932b9d3a49 Mon Sep 17 00:00:00 2001 +From 1dae79c5198cbcbdca257ba6bb2a94f5a3fa2833 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 24 Nov 2011 14:40:11 +0100 Subject: [PATCH 2/3] don't try to build crywrap for windows diff --git a/configure.ac b/configure.ac -index 028ffe4..9c183ae 100644 +index dfe00d3..83f2992 100644 --- a/configure.ac +++ b/configure.ac -@@ -431,7 +431,7 @@ AC_CHECK_FUNCS([alarm atexit dup2 epoll_create kqueue memchr memset munmap \ +@@ -435,7 +435,7 @@ PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) - PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) + fi -AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno") +AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$have_win" != "xyes" && test "x$libidn" != "xno") @@ -45,17 +45,17 @@ index 028ffe4..9c183ae 100644 dnl end of crywrap requirements -- -1.7.7.3 +1.7.8 -From fc59afca0261a79ebca4898c6d70434a7f9895f7 Mon Sep 17 00:00:00 2001 +From 9b7cc0267b6f7546cc5db74f357cbdf0f71a1cea Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 24 Nov 2011 15:06:06 +0100 Subject: [PATCH 3/3] disable doc and test (mingw-cross-env specific) diff --git a/Makefile.am b/Makefile.am -index 14c2642..ec86896 100644 +index 16861a2..d48abdf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ @@ -68,5 +68,5 @@ index 14c2642..ec86896 100644 if HAVE_GUILE SUBDIRS += guile -- -1.7.7.3 +1.7.8 diff --git a/src/gnutls.mk b/src/gnutls.mk index 94a3f99..36fb5ed 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -3,8 +3,8 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 3.0.9 -$(PKG)_CHECKSUM := ce0a6a5d56c57a28dc6099e7f84ab85513d86139 +$(PKG)_VERSION := 3.0.10 +$(PKG)_CHECKSUM := 4380a57835f98b5000129eec666f7e1e76c83983 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ @@ -25,6 +25,8 @@ define $(PKG)_BUILD $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' cd '$(1)' && autoconf cd '$(1)' && automake + # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw. + # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ --host='$(TARGET)' \ --enable-static \ @@ -36,7 +38,7 @@ define $(PKG)_BUILD --with-included-libcfg \ --without-p11-kit \ --disable-silent-rules \ - CPPFLAGS='-DWINVER=0x0501' \ + CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400' \ LIBS='-lws2_32' \ ac_cv_prog_AR='$(TARGET)-ar' $(MAKE) -C '$(1)' -j '$(JOBS)' install diff --git a/src/openssl.mk b/src/openssl.mk index a52f5c2..776c744 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -4,8 +4,8 @@ # openssl PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.0e -$(PKG)_CHECKSUM := 235eb68e5a31b0f7a23bc05f52d7a39c596e2e69 +$(PKG)_VERSION := 1.0.0f +$(PKG)_CHECKSUM := f087190fc7702f328324aaa89c297cab6e236564 $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.openssl.org/ |