From c309af4c71a39414290f9a13c3ae499f4fd9e306 Mon Sep 17 00:00:00 2001
From: Julian Scholle <julian.scholle@iff.fraunhofer.de>
Date: Fri, 11 Oct 2019 16:55:50 +0200
Subject: fix mixed release and debug build (was always using zstd release)

---
 ports/libarchive/fix-zstd.patch | 28 ++++++++++++++++++++++++++++
 ports/libarchive/portfile.cmake |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 ports/libarchive/fix-zstd.patch

diff --git a/ports/libarchive/fix-zstd.patch b/ports/libarchive/fix-zstd.patch
new file mode 100644
index 000000000..5c3b6cd54
--- /dev/null
+++ b/ports/libarchive/fix-zstd.patch
@@ -0,0 +1,28 @@
+From 9397ed51eddf43481d5710eb80441ce4a64356ea Mon Sep 17 00:00:00 2001
+From: Julian Scholle <julian.scholle@iff.fraunhofer.de>
+Date: Fri, 11 Oct 2019 16:46:06 +0200
+Subject: [PATCH] test
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13da432..911ae5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -588,7 +588,10 @@ IF(ENABLE_ZSTD)
+   ENDIF (ZSTD_INCLUDE_DIR)
+ 
+   FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
+-  FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
++  FIND_LIBRARY(ZSTD_LIBRARY_DEBUG NAMES zstdd libzstdd)
++  FIND_LIBRARY(ZSTD_LIBRARY_RELEASE NAMES zstd libzstd)
++  INCLUDE(SelectLibraryConfigurations)
++  SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
+   INCLUDE(FindPackageHandleStandardArgs)
+   FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
+ ELSE(ENABLE_ZSTD)
+-- 
+2.16.1.windows.1
+
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index c3973d8ab..3b69a69b9 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -7,13 +7,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libarchive/libarchive
-    REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
+    REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
     SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
     HEAD_REF master
     PATCHES
         fix-buildsystem.patch
         fix-dependencies.patch
         fix-lz4.patch
+        fix-zstd.patch
 )
 
 set(BUILD_libarchive_bzip2 OFF)
-- 
cgit v1.2.3


From 1835f4c56c14223b539eaf6e20003fd031392516 Mon Sep 17 00:00:00 2001
From: scholle <julian.scholle@iff.fraunhofer.de>
Date: Mon, 14 Oct 2019 00:09:38 +0200
Subject: bump libarchive CONTROL version

---
 ports/libarchive/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index 78c63e4b5..19bee0af1 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,5 @@
 Source: libarchive
-Version: 3.4.0
+Version: 3.4.0-1
 Homepage: https://github.com/libarchive/libarchive
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib
-- 
cgit v1.2.3