From 16ad0038706efd55b265374db4e3f2f40577d790 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Wed, 30 Sep 2026 09:22:57 -0700
Subject: [PATCH] Update JsonCpp from 1.8.3 to 1.9.8

---
 FindJsonCpp.cmake                     | 42 +++++++--------------------
 depends/common/jsoncpp/CMakeLists.txt | 17 -----------
 depends/common/jsoncpp/flags.txt      |  1 +
 depends/common/jsoncpp/jsoncpp.sha256 |  2 +-
 depends/common/jsoncpp/jsoncpp.txt    |  2 +-
 5 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 depends/common/jsoncpp/CMakeLists.txt
 create mode 100644 depends/common/jsoncpp/flags.txt

diff --git a/FindJsonCpp.cmake b/FindJsonCpp.cmake
index 1ce3b67..8281d62 100644
--- a/FindJsonCpp.cmake
+++ b/FindJsonCpp.cmake
@@ -1,37 +1,15 @@
-# -*- cmake -*-
-
-# - Find JSONCpp
-# Find the JSONCpp includes and library
-# This module defines
-#  JSONCPP_FOUND, System has libjsoncpp.
-#  JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
-#  JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
-#  JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
-
 find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_JSONCPP jsoncpp QUIET)
+endif()
 
-pkg_check_modules(PC_JSONCPP jsoncpp)
-
-SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
-
-# include dir
-FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
-  HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
-  PATH_SUFFIXES jsoncpp
-)
-
-# library
-FIND_LIBRARY(JSONCPP_LIBRARY
-  NAMES jsoncpp
-  HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
-  PATHS /usr/lib /usr/local/lib
-)
-
-SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
+find_path(JSONCPP_INCLUDE_DIRS json/json.h
+                               PATHS ${PC_JSONCPP_INCLUDEDIR}
+                               PATH_SUFFIXES jsoncpp)
+find_library(JSONCPP_LIBRARIES jsoncpp
+                               PATHS ${PC_JSONCPP_LIBDIR})
 
 include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JsonCpp REQUIRED_VARS JSONCPP_LIBRARIES JSONCPP_INCLUDE_DIRS)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
+mark_as_advanced(JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
diff --git a/depends/common/jsoncpp/CMakeLists.txt b/depends/common/jsoncpp/CMakeLists.txt
deleted file mode 100644
index a26585e..0000000
--- a/depends/common/jsoncpp/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(jsoncpp)
-
-SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-SET(CMAKE_CXX_EXTENSIONS OFF)
-
-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/depends/common/jsoncpp/flags.txt b/depends/common/jsoncpp/flags.txt
new file mode 100644
index 0000000..546b71a
--- /dev/null
+++ b/depends/common/jsoncpp/flags.txt
@@ -0,0 +1 @@
+-DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib
diff --git a/depends/common/jsoncpp/jsoncpp.sha256 b/depends/common/jsoncpp/jsoncpp.sha256
index cc622b8..aee4db6 100644
--- a/depends/common/jsoncpp/jsoncpp.sha256
+++ b/depends/common/jsoncpp/jsoncpp.sha256
@@ -1 +1 @@
-3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f
+51828cf3574281d2b79ec2a1c56a9e4c20cc1103711321ea96384cffb8d2d904
diff --git a/depends/common/jsoncpp/jsoncpp.txt b/depends/common/jsoncpp/jsoncpp.txt
index cd4bcf2..8c2626b 100644
--- a/depends/common/jsoncpp/jsoncpp.txt
+++ b/depends/common/jsoncpp/jsoncpp.txt
@@ -1 +1 @@
-jsoncpp http://mirrors.kodi.tv/build-deps/sources/jsoncpp-1.8.3.tar.gz
+jsoncpp https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/1.9.8.tar.gz