diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ffmpeg.mk | 4 | ||||
| -rw-r--r-- | src/gnutls-1-fixes.patch | 34 | ||||
| -rw-r--r-- | src/gnutls.mk | 4 |
3 files changed, 34 insertions, 8 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index d0761de..59d345c 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -4,8 +4,8 @@ # ffmpeg PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10.2 -$(PKG)_CHECKSUM := 743f44a71f93b14c9b26ca2424b0da8457cef4be +$(PKG)_VERSION := 0.10 +$(PKG)_CHECKSUM := a3a7fe25db760a99d51266b33386da9c8552feef $(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 ccff9b6..b8915a1 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,10 +3,10 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 +From 19d2c3dbe60872e57b6e897f8a6f66c8b11ca103 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 28 Oct 2011 09:23:41 +0200 -Subject: [PATCH 1/2] add missing static library linking +Subject: [PATCH 1/3] add missing static library linking diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in @@ -25,10 +25,10 @@ index c45f8f3..57d0dbb 100644 1.7.9.2 -From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 +From 02fe82f7e712f6be7dd7305501551ac2661ca540 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/2] disable doc and test (mingw-cross-env specific) +Subject: [PATCH 2/3] disable doc and test (mingw-cross-env specific) diff --git a/Makefile.am b/Makefile.am @@ -47,3 +47,29 @@ index 0afe4bd..da7436a 100644 -- 1.7.9.2 + +From 5f28dc1975988edd7a9527a9e587341cd4cc3101 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Fri, 2 Mar 2012 21:39:39 +0100 +Subject: [PATCH 3/3] no fchmod() for MinGW32 + +taken from +http://lists.gnu.org/archive/html/gnutls-devel/2012-03/msg00005.html + +diff --git a/src/libopts/makeshell.c b/src/libopts/makeshell.c +index 1730c81..45d170b 100644 +--- a/src/libopts/makeshell.c ++++ b/src/libopts/makeshell.c +@@ -164,7 +164,9 @@ optionParseShell(tOptions * pOpts) + printf(SHOW_PROG_ENV, pOpts->pzPROGNAME); + + fflush(stdout); ++#ifndef __MINGW32__ + fchmod(STDOUT_FILENO, 0755); ++#endif + fclose(stdout); + if (ferror(stdout)) { + fputs(zOutputFail, stderr); +-- +1.7.9.2 + diff --git a/src/gnutls.mk b/src/gnutls.mk index c783fe3..5697c72 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -3,8 +3,8 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 3.0.17 -$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada +$(PKG)_VERSION := 3.0.15 +$(PKG)_CHECKSUM := 337ba115ebf2c4bde78e3d182a3bf253400f2f2f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ |