From 88121e57766803633a8800e7ffc97577afd5c65d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 12 Aug 2019 13:24:10 +0200
Subject: [PATCH] update: ffmpeg, harfbuzz, libevent, libgsasl, zstd

---
 src/ffmpeg.mk   |  4 ++--
 src/harfbuzz.mk | 17 ++++-------------
 src/libevent.mk |  4 ++--
 src/libgsasl.mk |  6 ++++--
 src/zstd.mk     |  4 ++--
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 31bd2471..1df65a13 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,8 +3,8 @@
 PKG             := ffmpeg
 $(PKG)_WEBSITE  := https://ffmpeg.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.1.4
-$(PKG)_CHECKSUM := a7e71bd8901b0cfe7087d776263e5d60b94ec5dad6410a07116caf529f278407
+$(PKG)_VERSION  := 4.2
+$(PKG)_CHECKSUM := 306bde5f411e9ee04352d1d3de41bd3de986e42e2af2a4c44052dce1ada26fb8
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://ffmpeg.org/releases/$($(PKG)_FILE)
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index def6f11b..f7517368 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -4,23 +4,14 @@ PKG             := harfbuzz
 $(PKG)_WEBSITE  := https://wiki.freedesktop.org/www/Software/HarfBuzz/
 $(PKG)_DESCR    := HarfBuzz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.0
-$(PKG)_CHECKSUM := 9035005903da74667d28bb181986e879e11da3d5986722759fa145cca781ead6
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)
+$(PKG)_VERSION  := 2.5.3
+$(PKG)_CHECKSUM := 2042ce713dc8f48e600b50ed8e52c727045c42f52cd424766ca6d04620f16317
+$(PKG)_GH_CONF  := harfbuzz/harfbuzz/releases
 $(PKG)_DEPS     := cc cairo freetype-bootstrap glib icu4c
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://cgit.freedesktop.org/harfbuzz/refs/tags' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?h=[^0-9]*\\([0-9.]*\\)'.*,\\1,p" | \
-    $(SORT) -V | \
-    tail -1
-endef
-
 define $(PKG)_BUILD
     # mman-win32 is only a partial implementation
-    cd '$(1)' && ./configure \
+    cd '$(1)' && ./autogen.sh && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         ac_cv_header_sys_mman_h=no \
         CXXFLAGS='-std=c++11' \
diff --git a/src/libevent.mk b/src/libevent.mk
index 33e65c4a..a98b320b 100644
--- a/src/libevent.mk
+++ b/src/libevent.mk
@@ -3,8 +3,8 @@
 PKG             := libevent
 $(PKG)_WEBSITE  := https://libevent.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.1.10
-$(PKG)_CHECKSUM := 52c9db0bc5b148f146192aa517db0762b2a5b3060ccc63b2c470982ec72b9a79
+$(PKG)_VERSION  := 2.1.11
+$(PKG)_CHECKSUM := 229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e
 $(PKG)_GH_CONF  := libevent/libevent/tags, release-, -stable
 $(PKG)_DEPS     := cc openssl
 
diff --git a/src/libgsasl.mk b/src/libgsasl.mk
index 9eaaeaf2..8a0e85f7 100644
--- a/src/libgsasl.mk
+++ b/src/libgsasl.mk
@@ -4,11 +4,12 @@ PKG             := libgsasl
 $(PKG)_WEBSITE  := https://www.gnu.org/software/gsasl/
 $(PKG)_DESCR    := Libgsasl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.0
-$(PKG)_CHECKSUM := 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720
+$(PKG)_VERSION  := 1.8.1
+$(PKG)_CHECKSUM := 19e2f90525c531010918c50bb1febef0d7115d620150cc66153b9ce73ff814e6
 $(PKG)_SUBDIR   := libgsasl-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsasl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://download.savannah.nongnu.org/releases/gsasl/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc libgcrypt libiconv libidn libntlm
 
 define $(PKG)_UPDATE
@@ -23,6 +24,7 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-nls \
         --with-libgcrypt \
+        --with-libgcrypt-prefix='$(PREFIX)/$(TARGET)' \
         --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \
         --with-libidn-prefix='$(PREFIX)/$(TARGET)' \
         --with-libntlm-prefix='$(PREFIX)/$(TARGET)'
diff --git a/src/zstd.mk b/src/zstd.mk
index 7ec798dd..5757e2e3 100644
--- a/src/zstd.mk
+++ b/src/zstd.mk
@@ -4,8 +4,8 @@ PKG             := zstd
 $(PKG)_WEBSITE  := https://github.com/facebook/zstd
 $(PKG)_DESCR    := Zstandard is a fast lossless compression algorithm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.1
-$(PKG)_CHECKSUM := f91ea3397e6cc65d398e1bc0713cf2f0b0de2fb85ea9dabb1eb3e8f1b22f8d6f
+$(PKG)_VERSION  := 1.4.2
+$(PKG)_CHECKSUM := 7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6a7
 $(PKG)_GH_CONF  := facebook/zstd/tags,v
 $(PKG)_DEPS     := cc