From 9b928dd4207148179c4ee612f71d6cc2328f0d02 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 13 Nov 2018 21:15:04 +0100
Subject: update: freetds, libjpeg-turbo, tiff

---
 src/freetds.mk       |  4 ++--
 src/libjpeg-turbo.mk | 31 ++++++++++++-------------------
 src/tiff.mk          |  4 ++--
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/freetds.mk b/src/freetds.mk
index 70e96c3..53e2ad0 100644
--- a/src/freetds.mk
+++ b/src/freetds.mk
@@ -4,8 +4,8 @@ PKG             := freetds
 $(PKG)_WEBSITE  := http://www.freetds.org/
 $(PKG)_DESCR    := FreeTDS
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.00.107
-$(PKG)_CHECKSUM := 22dd80acad1e4b2805fcf25c5f111c79427ec48d9650fdb26ab6a040105b95ab
+$(PKG)_VERSION  := 1.00.108
+$(PKG)_CHECKSUM := 964ea116cf7b62c66f0076fd80f9be74c90c6aed280405f0502a5bcbe65ab46b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk
index 3177292..c354601 100644
--- a/src/libjpeg-turbo.mk
+++ b/src/libjpeg-turbo.mk
@@ -3,8 +3,8 @@
 PKG             := libjpeg-turbo
 $(PKG)_WEBSITE  := https://libjpeg-turbo.virtualgl.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.3
-$(PKG)_CHECKSUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
+$(PKG)_VERSION  := 2.0.1
+$(PKG)_CHECKSUM := e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -17,25 +17,18 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        $(MXE_CONFIGURE_OPTS) \
-        --libdir='$(PREFIX)/$(TARGET)/lib/$(PKG)' \
-        --includedir='$(PREFIX)/$(TARGET)/include/$(PKG)' \
-        NASM=$(TARGET)-yasm
-    $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1
-    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT)
-
-    # create pkg-config file
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
-    (echo 'Name: jpeg-turbo'; \
-     echo 'Version: $($(PKG)_VERSION)'; \
-     echo 'Description: jpeg-turbo'; \
-     echo 'Cflags: -I$(PREFIX)/$(TARGET)/include/$(PKG)'; \
-     echo 'Libs: -L$(PREFIX)/$(TARGET)/lib/$(PKG) -ljpeg';) \
-     > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg-turbo.pc'
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
+        -DENABLE_SHARED=$(CMAKE_SHARED_BOOL) \
+        -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) \
+        -DCMAKE_INSTALL_BINDIR='$(PREFIX)/$(TARGET)/bin/$(PKG)' \
+        -DCMAKE_INSTALL_INCLUDEDIR='$(PREFIX)/$(TARGET)/include/$(PKG)' \
+        -DCMAKE_INSTALL_LIBDIR='$(PREFIX)/$(TARGET)/lib/$(PKG)' \
+        -DCMAKE_ASM_NASM_COMPILER=$(TARGET)-yasm
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(TOP_DIR)/src/jpeg-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        `'$(TARGET)-pkg-config' jpeg-turbo --cflags --libs`
+        `'$(TARGET)-pkg-config' '$(PREFIX)/$(TARGET)/lib/$(PKG)/pkgconfig/libjpeg.pc' --cflags --libs`
 endef
diff --git a/src/tiff.mk b/src/tiff.mk
index 3b3a530..abe979d 100644
--- a/src/tiff.mk
+++ b/src/tiff.mk
@@ -4,8 +4,8 @@ PKG             := tiff
 $(PKG)_WEBSITE  := http://simplesystems.org/libtiff/
 $(PKG)_DESCR    := LibTIFF
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.9
-$(PKG)_CHECKSUM := 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd
+$(PKG)_VERSION  := 4.0.10
+$(PKG)_CHECKSUM := 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
 $(PKG)_SUBDIR   := tiff-$($(PKG)_VERSION)
 $(PKG)_FILE     := tiff-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://download.osgeo.org/libtiff/$($(PKG)_FILE)
-- 
cgit v0.12