From 1311f8c4a9f3edc1d06b930045dd8108bb6e8a2c Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 6 Jan 2019 15:59:04 +0100
Subject: update: freexl, gdal, libftdi1. libircclient. libqrencode
---
src/freexl.mk | 4 ++--
src/gdal.mk | 6 +++---
src/libftdi1.mk | 4 ++--
src/libircclient-1-fixes.patch | 22 +---------------------
src/libircclient.mk | 4 ++--
src/libqrencode-1-fixes.patch | 26 --------------------------
src/libqrencode.mk | 4 ++--
7 files changed, 12 insertions(+), 58 deletions(-)
delete mode 100644 src/libqrencode-1-fixes.patch
diff --git a/src/freexl.mk b/src/freexl.mk
index df3acc7..20abd90 100644
--- a/src/freexl.mk
+++ b/src/freexl.mk
@@ -4,8 +4,8 @@ PKG := freexl
$(PKG)_WEBSITE := https://www.gaia-gis.it/fossil/freexl/index
$(PKG)_DESCR := FreeXL
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.0.3
-$(PKG)_CHECKSUM := f8ed29e03a6155454e538fce621e53991a270fcee31120ded339cff2523650a8
+$(PKG)_VERSION := 1.0.5
+$(PKG)_CHECKSUM := 3dc9b150d218b0e280a3d6a41d93c1e45f4d7155829d75f1e5bf3e0b0de6750d
$(PKG)_SUBDIR := freexl-$($(PKG)_VERSION)
$(PKG)_FILE := freexl-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://www.gaia-gis.it/gaia-sins/freexl-sources/$($(PKG)_FILE)
diff --git a/src/gdal.mk b/src/gdal.mk
index 64536f1..65b1adb 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -4,10 +4,10 @@ PKG := gdal
$(PKG)_WEBSITE := https://www.gdal.org/
$(PKG)_DESCR := GDAL
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.2.3
-$(PKG)_CHECKSUM := 52f01bda8968643633016769607e6082a8ba1c746fadc2c1abe12cf7dc8f61dd
+$(PKG)_VERSION := 2.2.4
+$(PKG)_CHECKSUM := 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278
$(PKG)_SUBDIR := gdal-$($(PKG)_VERSION)
-$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := cc armadillo curl expat geos giflib gta hdf4 hdf5 \
jpeg json-c libgeotiff libmysqlclient libpng libxml2 \
diff --git a/src/libftdi1.mk b/src/libftdi1.mk
index 8a5d1ec..be91419 100644
--- a/src/libftdi1.mk
+++ b/src/libftdi1.mk
@@ -4,8 +4,8 @@ PKG := libftdi1
$(PKG)_WEBSITE := https://www.intra2net.com/en/developer/libftdi/index.php
$(PKG)_DESCR := LibFTDI1
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.2
-$(PKG)_CHECKSUM := a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b558488d6
+$(PKG)_VERSION := 1.4
+$(PKG)_CHECKSUM := ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://www.intra2net.com/en/developer/libftdi/download/$($(PKG)_FILE)
diff --git a/src/libircclient-1-fixes.patch b/src/libircclient-1-fixes.patch
index a745ccc..d38763b 100644
--- a/src/libircclient-1-fixes.patch
+++ b/src/libircclient-1-fixes.patch
@@ -4,28 +4,8 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 8 Oct 2013 22:37:07 +0200
-Subject: [PATCH 1/2] use the proper WIN32 define
-
-
-diff --git a/include/libircclient.h b/include/libircclient.h
-index 1111111..2222222 100644
---- a/include/libircclient.h
-+++ b/include/libircclient.h
-@@ -46,7 +46,7 @@
-
- #include <stdlib.h>
-
--#if !defined (WIN32)
-+#if !defined (_WIN32)
- #include <sys/select.h> /* fd_set */
- #else
- #include <winsock2.h>
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 8 Oct 2013 22:37:29 +0200
-Subject: [PATCH 2/2] fix missing header
+Subject: [PATCH 1/1] fix missing header
diff --git a/include/libircclient.h b/include/libircclient.h
diff --git a/src/libircclient.mk b/src/libircclient.mk
index c73285c..a4e487f 100644
--- a/src/libircclient.mk
+++ b/src/libircclient.mk
@@ -5,8 +5,8 @@
PKG := libircclient
$(PKG)_WEBSITE := https://sourceforge.net/projects/libircclient/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.8
-$(PKG)_CHECKSUM := 2cf8523ac683588f2785b08159a2df3e4d15939ee655c0024aa86334149de8f6
+$(PKG)_VERSION := 1.10
+$(PKG)_CHECKSUM := bbb26f3af348b252c5204917a7f91cfdf172f1b6afbf4df1e561b03e20503c2d
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/libqrencode-1-fixes.patch b/src/libqrencode-1-fixes.patch
deleted file mode 100644
index 087aa29..0000000
--- a/src/libqrencode-1-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Tue, 31 Oct 2017 16:56:24 +1100
-Subject: [PATCH 1/1] install *.dll to bin
-
-taken from:
-https://github.com/fukuchi/libqrencode/issues/112
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1111111..2222222 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,7 +120,8 @@ configure_file(libqrencode.pc.in libqrencode.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qrencode.1 DESTINATION share/man/man1)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqrencode.pc DESTINATION lib/pkgconfig)
- install(FILES qrencode.h DESTINATION include)
--install(TARGETS qrencode DESTINATION lib)
-+install(TARGETS qrencode DESTINATION lib
-+ RUNTIME DESTINATION bin)
-
- ## Build utility tools
- if(WITH_TOOLS AND TARGET PNG::PNG)
diff --git a/src/libqrencode.mk b/src/libqrencode.mk
index 52e764b..01b2bcb 100644
--- a/src/libqrencode.mk
+++ b/src/libqrencode.mk
@@ -4,8 +4,8 @@ PKG := libqrencode
$(PKG)_WEBSITE := https://fukuchi.org/works/qrencode/
$(PKG)_DESCR := a fast and compact QR Code encoding library
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 4.0.0
-$(PKG)_CHECKSUM := c2c8a8110354463a3332cb48abf8581c8d94136af4dc1418f891cc9c7719e3c1
+$(PKG)_VERSION := 4.0.2
+$(PKG)_CHECKSUM := 43091fea4752101f0fe61a957310ead10a7cb4b81e170ce61e5baa73a6291ac2
$(PKG)_GH_CONF := fukuchi/libqrencode/tags,v
$(PKG)_DEPS := cc pthreads
--
cgit v0.12