From 8a7d0c548fcd8de1c20aa6081f3c57b8ba1c2c6c Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Tue, 7 Jul 2020 22:41:28 +0800
Subject: [PATCH] subconverter: fix dependency

---
 package/ctcgfw/duktape/Makefile      | 92 ++++++++++++++++++++++++++++
 package/ctcgfw/subconverter/Makefile |  6 +-
 2 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 package/ctcgfw/duktape/Makefile

diff --git a/package/ctcgfw/duktape/Makefile b/package/ctcgfw/duktape/Makefile
new file mode 100644
index 0000000000..4492afa732
--- /dev/null
+++ b/package/ctcgfw/duktape/Makefile
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2019 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=duktape
+PKG_VERSION:=2.99.99-65f1e02
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/svaarala/duktape.git
+PKG_SOURCE_VERSION:=65f1e02e580796929e92e91ba4776d4b0131beb5
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_LICENSE:=GPLv3
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=CN_SZTL <cnsztl@project-openwrt.eu.org>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=python
+
+PKG_FIXUP:=autoreconf
+PKG_USE_MIPS16:=0
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/duktape
+	SECTION:=utils
+	CATEGORY:=Utilities
+	URL:=https://github.com/svaarala/duktape
+	TITLE:=Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint.
+endef
+
+define Package/libduktape
+	$(call Package/duktape)
+	SECTION:=lib
+	CATEGORY:=Libraries
+	TITLE+= (Libraries)
+	VARIANT:=lib
+endef
+
+define Package/duktape/description
+	Duktape is easy to integrate into a C/C++ project: add duktape.c,
+	duktape.h, and duk_config.h to your build, and use the Duktape API
+	to call ECMAScript functions from C code and vice versa.
+endef
+
+define Package/libduktape/description
+	$(call Package/duktape/description)
+endef
+
+define Build/Compile
+( \
+  cd $(PKG_BUILD_DIR); \
+  mkdir dist; \
+  $(STAGING_DIR_HOSTPKG)/bin/pip2 install PyYAML; \
+  $(STAGING_DIR_HOSTPKG)/bin/python2 util/dist.py; \
+  cd dist/source/src; \
+  $(TARGET_CC) -c -O3 -o duktape.o duktape.c; \
+  $(TARGET_CC) -c -O3 -o duk_module_node.o -I. ../extras/module-node/duk_module_node.c; \
+  $(TARGET_AR) cr libduktape.a duktape.o; \
+  $(TARGET_AR) cr libduktape_module.a duk_module_node.o; \
+  cd ../../../..; \
+  env $(call Build/Compile/Default) \
+)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/*.a $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/duk*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/extras/module-node/duk_module_node.h $(1)/usr/include/
+endef
+
+define Package/duktape/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/duk $(1)/usr/bin/duk
+endef
+
+define Package/libduktape/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/*.a $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,duktape))
+$(eval $(call BuildPackage,libduktape))
diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile
index d52d9f3ac4..430758b64c 100644
--- a/package/ctcgfw/subconverter/Makefile
+++ b/package/ctcgfw/subconverter/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subconverter
-PKG_VERSION:=0.6.6-6629f86
+PKG_VERSION:=0.6.0-6629f86
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -26,7 +26,7 @@ PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=jpcre2 rapidjson
+PKG_BUILD_DEPENDS:=duktape jpcre2 rapidjson
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -43,6 +43,8 @@ define Package/$(PKG_NAME)/description
 	Utility to convert between various subscription format.
 endef
 
+# CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/subconverter $(1)/usr/bin/subconverter