From e2b1b54854e6a7ea646b8f0c094313320cb0ed41 Mon Sep 17 00:00:00 2001 From: cvh Date: Wed, 22 Nov 2017 14:19:28 +0100 Subject: [PATCH] jsoncpp: update to 1.8.3 --- .../textproc/jsoncpp/config/CMakeLists.txt | 15 --------------- packages/textproc/jsoncpp/package.mk | 18 ++++++++---------- 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 packages/textproc/jsoncpp/config/CMakeLists.txt diff --git a/packages/textproc/jsoncpp/config/CMakeLists.txt b/packages/textproc/jsoncpp/config/CMakeLists.txt deleted file mode 100644 index ffcfd8a5b2..0000000000 --- a/packages/textproc/jsoncpp/config/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -project(jsoncpp) - -cmake_minimum_required(VERSION 2.6) -enable_language(CXX) - -set(SOURCES src/lib_json/json_reader.cpp - src/lib_json/json_value.cpp - src/lib_json/json_writer.cpp) - -include_directories(${PROJECT_SOURCE_DIR}/include) - -add_library(jsoncpp ${SOURCES}) - -install(TARGETS jsoncpp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) -install(DIRECTORY include/json DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jsoncpp) diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index 2ed2fff2a7..6156380cce 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -17,22 +17,20 @@ ################################################################################ PKG_NAME="jsoncpp" -PKG_VERSION="src-0.5.0" -PKG_SHA256="22b14ecd0de8cdad2b6b6839f6d0804d3b84e91f42861ebd843832a26a927433" +PKG_VERSION="1.8.3" +PKG_SHA256="3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.kodi.tv" -PKG_URL="http://sources.openelec.tv/mirror/jsoncpp/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="https://github.com/open-source-parsers/jsoncpp/" +PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="multimedia" -PKG_SHORTDESC="jsoncpp" -PKG_LONGDESC="jsoncpp" +PKG_SHORTDESC="A C++ library for interacting with JSON." +PKG_LONGDESC="A C++ library for interacting with JSON." PKG_TOOLCHAIN="cmake" +PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF" + pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" } - -pre_build_target() { - cp $PKG_DIR/config/CMakeLists.txt $PKG_BUILD -}