jsoncpp: update to version 1.9.2

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>

diff --git a/libs/jsoncpp/Makefile b/libs/jsoncpp/Makefile
index 053a3d3c720f530141a31be245d39cdd4f438e9c..c63daed6ba18d7a9fe168492a2a73c81d7295c07 100644 (file)
--- a/libs/jsoncpp/Makefile
+++ b/libs/jsoncpp/Makefile
@@ -8,22 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jsoncpp
-PKG_VERSION:=1.8.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.9.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+PKG_HASH:=77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0
 
-PKG_MAINTAINER:=
+PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
+PKG_BUILD_DEPENDS:=meson/host
+
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/meson/meson.mk
+
+HOSTCC=$(HOSTCC_NOCACHE)
+HOSTCXX=$(HOSTCXX_NOCACHE)
 
 define Package/jsoncpp
   SECTION:=libs
@@ -42,10 +47,14 @@ define Package/jsoncpp/description
   convenient format to store user input files.
 endef
 
-CMAKE_OPTIONS += \
-       -DBUILD_SHARED_LIBS:BOOL=ON \
-       -DBUILD_STATIC_LIBS:BOOL=OFF \
-       -DJSONCPP_WITH_TESTS:BOOL=OFF
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjsoncpp.so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/jsoncpp.pc $(1)/usr/lib/pkgconfig/
+endef
 
 define Package/jsoncpp/install
        $(INSTALL_DIR) $(1)/usr/lib/

diff --git a/libs/jsoncpp/patches/010-pkgconnfig.patch b/libs/jsoncpp/patches/010-pkgconnfig.patch
deleted file mode 100644 (file)
index 26a7931..0000000
--- a/libs/jsoncpp/patches/010-pkgconnfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 63dc2f77e33e9ff559e051cd2964960b9d3e761e Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Mon, 16 Sep 2019 18:38:24 -0700
-Subject: [PATCH] pkgconfig: Fix for cross compilation
-
-exec_ and prefix must be overridden  in such a case.
-
-Makes the .pc file more consistent with other projects.
----
- pkg-config/jsoncpp.pc.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in
-index dea51f51..d4fa9ef2 100644
---- a/pkg-config/jsoncpp.pc.in
-+++ b/pkg-config/jsoncpp.pc.in
-@@ -1,5 +1,7 @@
--libdir=@CMAKE_INSTALL_FULL_LIBDIR@
--includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- 
- Name: jsoncpp
- Description: A C++ library for interacting with JSON