From: Markham <markham001@gmx.de>
Date: Sun, 29 Mar 2026 11:27:16 +0000 (+0200)
Subject: add target lua-cjson
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=HEAD;p=bs-cst-neutrino-hd.git

add target lua-cjson
---

diff --git a/make/archives.mk b/make/archives.mk
index 082e0ca..3394823 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -336,6 +336,9 @@ $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.bz2: | $(HOSTPREFIX)/bin/get-git-archiv
 $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.gz:
 	$(WGET) https://github.com/slact/lua-feedparser/archive/$(LUA_FEEDPARSER_VER).tar.gz -O $(@)
 
+$(ARCHIVE)/lua-cjson-$(LUA_CJSON_VER).tar.gz:
+	$(WGET) https://github.com/mpx/lua-cjson/archive/refs/tags/$(LUA_CJSON_VER).tar.gz -O $(@)
+
 $(ARCHIVE)/lua-$(LUA_VER).tar.gz:
 	$(WGET) http://www.lua.org/ftp/lua-$(LUA_VER).tar.gz
 
diff --git a/make/libraries.mk b/make/libraries.mk
index 9856f86..dfb52fd 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1218,6 +1218,19 @@ $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.bz2 $(D)/expat | $(TARG
 	$(REMOVE)/luaexpat-$(LUA_EXPAT_VER)
 	$(TOUCH)
 
+$(D)/lua-cjson: $(ARCHIVE)/lua-cjson-$(LUA_CJSON_VER).tar.gz $(D)/lua | $(TARGETPREFIX)
+	$(START_BUILD)
+	$(REMOVE)/lua-cjson-$(LUA_CJSON_VER)
+	$(UNTAR)/lua-cjson-$(LUA_CJSON_VER).tar.gz
+	set -e; cd $(BUILD_TMP)/lua-cjson-$(LUA_CJSON_VER); \
+		CFLAGS="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/lua$(LUA_ABIVER)" \
+		LUA_INCLUDE_DIR=$(TARGETPREFIX)/include; \
+		$(MAKE) CC=$(TARGET)-gcc CFLAGS="$$CFLAGS"; \
+		$(MAKE) install DESTDIR=$(TARGETPREFIX) LUA_CMODULE_DIR=/lib/lua/$(LUA_ABIVER) LUA_MODULE_DIR=/share/lua/$(LUA_ABIVER); \
+	$(TARGET)-strip $(TARGETPREFIX)/lib/lua/$(LUA_ABIVER)/cjson.so || true
+	#$(REMOVE)/lua-cjson-$(LUA_CJSON_VER)
+	#$(TOUCH)
+
 $(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.gz $(D)/lua $(D)/luasocket $(D)/lua-expat | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(REMOVE)/lua-feedparser-$(LUA_FEEDPARSER_VER)
@@ -1276,8 +1289,8 @@ $(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(ARCHIVE)/luaposix-31.
 		autoreconf -fi; \
 		$(CONFIGURE) --prefix= \
 			--exec-prefix= \
-			--libdir=/lib/lua/5.2 \
-			--datarootdir=/share/lua/5.2 \
+			--libdir=/lib/lua/$(LUA_ABIVER) \
+			--datarootdir=/share/lua/$(LUA_ABIVER) \
 			--mandir=/.remove \
 			--docdir=/.remove \
 			--enable-silent-rules \
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 6afe64a..b4c0c3f 100755
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -242,4 +242,5 @@ $(D)/neutrino-hd-libs:
 			$(D)/libcurl $(D)/libpng $(D)/libjpeg $(D)/freetype \
 			$(D)/libdvbsi++ $(D)/pugixml $(D)/libbluray $(D)/libopenthreads \
 			$(D)/ffmpeg $(D)/libusb $(D)/libfribidi \
-			$(D)/luajson $(D)/luaposix $(D)/luacurl $(D)/luasocket $(D)/lua-expat $(D)/lua-feedparser
+			$(D)/luajson $(D)/luaposix $(D)/luacurl $(D)/luasocket $(D)/lua-expat $(D)/lua-feedparser \
+			$(D)/lua-cjson
diff --git a/make/versions.mk b/make/versions.mk
index 19bfe34..74a94c4 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -182,6 +182,9 @@ LUACURL_GIT = 9f8b6db
 LUA_EXPAT_VER = 1.3.3
 LUA_EXPAT_GIT = 9878960
 
+# lua-cjson JSON C library for Lua
+LUA_CJSON_VER = 2.1.0
+
 # lua-feedparser
 LUA_FEEDPARSER_VER=0.71