contrib: lame: fix sse optimizations build on win32 with gcc 4.9

[vlc] / contrib / src / gcrypt / rules.mak

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index c43ac0949a1d4af22949abe294e17fd8bca39d9d..ced0f4332ed2d5ade78cee3b8aa212e009fd9465 100644 (file)
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,5 +1,5 @@
 # GCRYPT
-GCRYPT_VERSION := 1.6.0
+GCRYPT_VERSION := 1.6.1
 GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 PKGS += gcrypt
@@ -12,6 +12,8 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
        $(UNPACK)
        $(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
+       $(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
+       $(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
        $(MOVE)
 
 DEPS_gcrypt = gpg-error
@@ -42,7 +44,7 @@ endif
 endif
 
 .gcrypt: libgcrypt
-       #$(RECONF)
+       $(RECONF)
        cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
        cd $< && $(MAKE) install
        touch $@