use lastet version of json.lua

diff --git a/make/archives.mk b/make/archives.mk
index a824fa8baa154605917bdccf982f130928839913..5affc12f998c526775777ba39de417a54d314ea2 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -342,6 +342,9 @@ $(ARCHIVE)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).tar.bz2:
 $(ARCHIVE)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT).tar.bz2:
        get-git-archive.sh https://github.com/diegonehab/luasocket.git $(LUASOCKET_GIT) $(notdir $@) $(ARCHIVE)
 
+$(ARCHIVE)/JSON.lua:
+       $(WGET) http://regex.info/code/JSON.lua
+
 $(ARCHIVE)/slingshot-v6.tar.gz:
        $(WGET) https://github.com/gvvaughan/slingshot/archive/v6.tar.gz -O $(@)
 

diff --git a/make/libraries.mk b/make/libraries.mk
index 4581c785cb45231f14553b845cde9d1c305f998e..2fbeaf8e24677ee18c3128a99d3ca0e2084e277a 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1145,6 +1145,14 @@ $(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(ARCHIVE)/luaposix-31.
        $(REMOVE)/luaposix-31
        $(TOUCH)
 
+$(D)/luajson: $(D)/lua $(ARCHIVE)/JSON.lua | $(TARGETPREFIX)
+       $(START_BUILD)
+       set -e; cd $(ARCHIVE); \
+               install -m 0644 -D JSON.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/json.lua; \
+               tar -zcvf json_lua.tar.gz $(ARCHIVE)/JSON.lua; \
+               rm -f $(ARCHIVE)/JSON.lua; \
+       $(TOUCH)
+
 # helper for luaposix build
 $(HOSTPREFIX)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
@@ -1170,7 +1178,6 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
        install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so.$(LUA_VER)
        cd $(TARGETPREFIX)/lib; ln -sf liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so
        mkdir -p $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)
-       cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/json.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)
        cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/n_gui.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)
        cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/n_helpers.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)
        install -m 0644 -D $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc

diff --git a/make/neutrino.mk b/make/neutrino.mk
index c9b10b1ce3a1332c9ab5624e382a454c4384e5fd..fffa67190b68c71b1e4c8bb76c374dec560fab75 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -233,4 +233,4 @@ $(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)/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