From aad88ec459fc1d86de3ea5991365fd711ffdb02d Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 16 Feb 2020 03:43:02 +0000
Subject: [PATCH] libarchive: update to libarchive-3.4.2

---
 packages/compress/libarchive/package.mk       | 13 +++--
 .../patches/libarchive-01-die-Werror.patch    | 52 -------------------
 2 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 packages/compress/libarchive/patches/libarchive-01-die-Werror.patch

diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk
index ed1ff230c8..f4f6f563ad 100644
--- a/packages/compress/libarchive/package.mk
+++ b/packages/compress/libarchive/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libarchive"
-PKG_VERSION="3.3.3"
-PKG_SHA256="ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e"
+PKG_VERSION="3.4.2"
+PKG_SHA256="b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libarchive.org"
 PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
@@ -11,7 +11,14 @@ PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SHORTDESC="A multi-format archive and compression library."
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0"
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
+                       -DENABLE_EXPAT=0 \
+                       -DENABLE_ICONV=0 \
+                       -DENABLE_LIBXML2=0 \
+                       -DENABLE_LZO=1 \
+                       -DENABLE_TEST=0 \
+                       -DENABLE_COVERAGE=0 \
+                       -DENABLE_WERROR=0"
 
 post_makeinstall_target() {
   rm -rf $INSTALL
diff --git a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch
deleted file mode 100644
index d3410e234f..0000000000
--- a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cd88d92aa23f6f32aedd54f9a83c118ede4ee799 Mon Sep 17 00:00:00 2001
-From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
-Date: Sat, 11 Nov 2017 23:42:40 +0100
-Subject: [PATCH] die Werror
-
----
- CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80871bc..9bd5165 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
-   #################################################################
-   # Set compile flags for debug build.
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
--  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
-@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
-   # Set compile flags for debug build.
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
--  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
-@@ -133,7 +133,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
- ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
--IF (MSVC)
-+IF (0)
-   #################################################################
-   # Set compile flags for debug build.
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-@@ -172,7 +172,7 @@ IF (MSVC)
-   #################################################################
-   # Set compile flags for release build.
-   SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Oi")
--ENDIF (MSVC)
-+ENDIF (0)
- 
- # Enable CTest/CDash support
- include(CTest)
--- 
-2.7.4
-