From 854e01e893881ed4ea81d307ba937396665ec11e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sun, 15 Jan 2023 09:55:16 -0600
Subject: [PATCH] build: bump libdeflate snapshot to 1.17 (#4596)

* build: bump libdeflate snapshot to 1.17

* Link to static libdeflate

Disable shared library and gzip program (both unused)

* Use platform-specific libdeflate library name

Co-authored-by: Mike Gelfand <mikedld@users.noreply.github.com>
---
 .gitmodules            |  2 +-
 CMakeLists.txt         | 14 +++++++++++---
 third-party/libdeflate |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1aa86a15c..c6831a364 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,7 +32,7 @@
 [submodule "third-party/libdeflate"]
 	path = third-party/libdeflate
 	url = https://github.com/transmission/libdeflate
-	branch = v1.11-plus-cmake
+	branch = v1.17.x
 [submodule "third-party/libpsl"]
 	path = third-party/libpsl
 	url = https://github.com/transmission/libpsl.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a5ea58b..90134b1a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ include(TrMacros)
 
 set(CURL_MINIMUM 7.28.0)
 set(WOLFSSL_MINIMUM 3.4)
-set(DEFLATE_MINIMUM 1.10)
+set(DEFLATE_MINIMUM 1.17)
 set(EVENT2_MINIMUM 2.1.0)
 set(GIOMM_MINIMUM 2.26.0)
 set(GLIBMM_MINIMUM 2.60.0)
@@ -435,8 +435,16 @@ endif()
 
 set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/third-party)
 
-tr_add_external_auto_library(DEFLATE libdeflate deflate
-    TARGET deflate::deflate)
+if(WIN32 AND NOT MINGW)
+    set(DEFLATE_LIB_NAME deflatestatic)
+else()
+    set(DEFLATE_LIB_NAME deflate)
+endif()
+tr_add_external_auto_library(DEFLATE libdeflate ${DEFLATE_LIB_NAME}
+    TARGET deflate::deflate
+    CMAKE_ARGS
+        -DLIBDEFLATE_BUILD_SHARED_LIB=OFF
+        -DLIBDEFLATE_BUILD_GZIP=OFF)
 if(NOT USE_SYSTEM_DEFLATE)
     set(DEFLATE_VERSION ${DEFLATE_MINIMUM})
 endif()
diff --git a/third-party/libdeflate b/third-party/libdeflate
index 45029bc1b..bd925ae68 160000
--- a/third-party/libdeflate
+++ b/third-party/libdeflate
@@ -1 +1 @@
-Subproject commit 45029bc1bc42ff55a0a8d4223ba9d9e8ec0da0d3
+Subproject commit bd925ae68e99f65d69f20181cb845aaba5c8f098