From dfc4e9af8c6193d34a33964258c69f4d2266b318 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 30 Dec 2020 05:28:11 +0000 Subject: [PATCH 1/5] jsoncpp: update to 1.9.4 --- packages/textproc/jsoncpp/package.mk | 6 ++--- .../jsoncpp-0001-disable-examples.patch | 22 ------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index b590d1fa31..e520d42997 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="jsoncpp" -PKG_VERSION="1.9.2" -PKG_SHA256="77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0" +PKG_VERSION="1.9.4" +PKG_SHA256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999" PKG_LICENSE="GPL" PKG_SITE="https://github.com/open-source-parsers/jsoncpp/" PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz" @@ -13,4 +13,4 @@ PKG_LONGDESC="A C++ library for interacting with JSON." PKG_TOOLCHAIN="cmake" PKG_BUILD_FLAGS="+pic" -PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF" +PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF" diff --git a/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch b/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch deleted file mode 100644 index 663e6395a2..0000000000 --- a/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2d8dab16808ab6ceda83c33e2f662ca07271c288 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Sun, 16 Feb 2020 10:33:04 +0000 -Subject: [PATCH] Disable building examples, fails due to deprecated methods - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a7d3ef..24f518d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -228,4 +228,4 @@ add_subdirectory( src ) - add_subdirectory( include ) - - #install the example --add_subdirectory( example ) -+#add_subdirectory( example ) --- -2.7.4 - From effe253de9930bd96fb902b88b87ef424837a8c7 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 2 Jan 2021 07:20:00 +0000 Subject: [PATCH 2/5] libxml2: build host --with-python --- packages/textproc/libxml2/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index a3177ca063..e1708f5f2e 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="zlib:host" +PKG_DEPENDS_HOST="zlib:host Python3:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files." @@ -21,7 +21,7 @@ PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \ --with-zlib=$TOOLCHAIN \ --without-lzma" -PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN" +PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN --with-python" PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX" From 128225d376859e4e8062ef80b34b1232b0163982 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Tue, 29 Dec 2020 04:32:13 +0000 Subject: [PATCH 3/5] nlohmann-json: update to 3.9.1 --- packages/textproc/nlohmann-json/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/textproc/nlohmann-json/package.mk b/packages/textproc/nlohmann-json/package.mk index 57148cb6ba..8235d68db5 100644 --- a/packages/textproc/nlohmann-json/package.mk +++ b/packages/textproc/nlohmann-json/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nlohmann-json" -PKG_VERSION="3.7.3" -PKG_SHA256="249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31" +PKG_VERSION="3.9.1" +PKG_SHA256="4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b" PKG_LICENSE="MIT" PKG_SITE="https://nlohmann.github.io/json/" PKG_URL="https://github.com/nlohmann/json/archive/v$PKG_VERSION.tar.gz" From 5a19e5403de099221685101a9d0f46ac71bd596b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 30 Dec 2020 12:08:00 +0000 Subject: [PATCH 4/5] pugixml: update to 1.11.4 --- packages/textproc/pugixml/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/textproc/pugixml/package.mk b/packages/textproc/pugixml/package.mk index 6e2e02acef..3c9c17d15d 100644 --- a/packages/textproc/pugixml/package.mk +++ b/packages/textproc/pugixml/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pugixml" -PKG_VERSION="1.10" -PKG_SHA256="10f1f0a32b559ca8435d95855928d990cfbb9796e339efb638080c897728174c" +PKG_VERSION="1.11.4" +PKG_SHA256="017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade" PKG_LICENSE="MIT" PKG_SITE="https://pugixml.org/" PKG_URL="https://github.com/zeux/pugixml/archive/v${PKG_VERSION}.tar.gz" From 5062d512e762706f664d00a425fb39f715a8a18e Mon Sep 17 00:00:00 2001 From: heitbaum Date: Thu, 31 Dec 2020 03:10:05 +0000 Subject: [PATCH 5/5] tinyxml2: update to 8.0 --- packages/textproc/tinyxml2/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/textproc/tinyxml2/package.mk b/packages/textproc/tinyxml2/package.mk index cb7fd13d79..4420b9fe54 100644 --- a/packages/textproc/tinyxml2/package.mk +++ b/packages/textproc/tinyxml2/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tinyxml2" -PKG_VERSION="7.1.0" -PKG_SHA256="68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3" +PKG_VERSION="8.0.0" +PKG_SHA256="6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c" PKG_LICENSE="zlib" PKG_SITE="http://www.grinninglizard.com/tinyxml2/index.html" PKG_URL="https://github.com/leethomason/tinyxml2/archive/$PKG_VERSION.tar.gz"