From 702f740038b001ab2fe4a6babc1df2728117f996 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 6 Feb 2021 11:53:01 +0100 Subject: [PATCH 1/2] jsoncpp: only build static library Version 1.9.4 changed default build options so that the shared library is built by default which breaks addons linking against it. Explicitly set the build options so that only the static library is built, as before the bump. Signed-off-by: Matthias Reichl --- packages/textproc/jsoncpp/package.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index f6310bdae1..cceb819b14 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -13,4 +13,8 @@ PKG_LONGDESC="A C++ library for interacting with JSON." PKG_TOOLCHAIN="cmake" PKG_BUILD_FLAGS="+pic" -PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF" +PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF \ + -DJSONCPP_WITH_EXAMPLE=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON \ + -DBUILD_OBJECT_LIBS=OFF" From 09c6460b570aa0b93776591c3f085e88afbfc725 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 6 Feb 2021 12:00:12 +0100 Subject: [PATCH 2/2] rev-bump addons depending on jsoncpp Signed-off-by: Matthias Reichl --- packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk | 2 +- .../mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk | 2 +- .../kodi-binary-addons/pvr.sledovanitv.cz/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk index b89719d442..ca90564efb 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pvr.argustv" PKG_VERSION="7.1.0-Matrix" PKG_SHA256="d91f195c4a91af893231d03a887a340900c4e515597ea059ee6b9e6444717fc9" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.argustv" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk index c6a61a1e7f..cf6ecfe7a5 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pvr.filmon" PKG_VERSION="6.1.0-Matrix" PKG_SHA256="7c2998bdde04acee5c147cb9f82939cfb13af57e5ecf46a4343dcfee15eb02e2" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.filmon" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk index 3c53d848df..363474c91c 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pvr.hdhomerun" PKG_VERSION="7.1.0-Matrix" PKG_SHA256="a31587e00d58efb72aadba3ad1bd67c08332feef0d558e0eeb6fda7c81bf93e8" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.hdhomerun" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk index 8d15a80ea6..f6c80eab61 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk @@ -4,7 +4,7 @@ PKG_NAME="pvr.octonet" PKG_VERSION="4.1.0-2-Matrix" PKG_SHA256="091ba0288a8c12d42f6352b453fb39bcace3174c8763f6cbe3dc8fef40a33f2b" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/DigitalDevices/pvr.octonet" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk index 5d08cfab0c..87c4ca2a81 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pvr.pctv" PKG_VERSION="6.1.0-Matrix" PKG_SHA256="94b8be4988cb6d8c61f6bdf237ddabb04d77fe4900f61411f5abf918eb5a078c" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.pctv" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk index ca18787d2e..e68d85905f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk @@ -4,7 +4,7 @@ PKG_NAME="pvr.sledovanitv.cz" PKG_VERSION="4.4.0-Matrix" PKG_SHA256="7ab303125172c315babbb70f4cb5a3b41c98ac1e318cadd93edf1264d4e4df0b" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/palinek/pvr.sledovanitv.cz" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index 646d0762c0..784fcc3198 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pvr.stalker" PKG_VERSION="7.1.0-Matrix" PKG_SHA256="bce055008d0ae7212924f41753970e3176a218f6a45bd76b202463a43be3d192" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.stalker"