fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subconverter: bump to latest git HEAD and Makefile cleanups

Browse Source
This commit is contained in:
CN_SZTL 2021-01-09 23:32:48 +08:00
parent 079975eb05
commit b1683afe9a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/ctcgfw/jpcre2/Makefile
View File

@ -1,7 +1,8 @@
#
# Copyright (C) 2019 OpenWrt.org
# Copyright (C) 2020 CTCGFW Project-OpenWrt
# (https://project-openwrt.eu.org)
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk

5
package/ctcgfw/rapidjson/Makefile
View File

@ -1,7 +1,8 @@
#
# Copyright (C) 2019 OpenWrt.org
# Copyright (C) 2020 CTCGFW Project-OpenWrt
# (https://project-openwrt.eu.org)
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk

35
package/ctcgfw/subconverter/Makefile
View File

@ -1,45 +1,42 @@
#
# Copyright (C) 2019 OpenWrt.org
# Copyright (C) 2020 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
#
# This is free software, licensed under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=subconverter
PKG_VERSION:=0.6.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git
PKG_SOURCE_VERSION:=ab4d7543cec46cd9e45680f3b43d82de16f38a3d
PKG_MIRROR_HASH:=c5dc3c224d9229df09428a28a1306bba28790b328f8d644ae41e929bee58426c
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_DATE:=2020-12-19
PKG_SOURCE_VERSION:=a57906c9a6edd04da869b12ffb88f397c3ea8af6
PKG_MIRROR_HASH:=07815478cbfa1644ad016ea4b68a2edc9316f9aa23edf699d82c4c9026e17462
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_LICENSE:=GPLv3
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=[CTCGFW]Project OpenWrt
PKG_MAINTAINER:=CN_SZTL <cnsztl@project-openwrt.eu.org>
PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=duktape jpcre2 rapidjson
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/$(PKG_NAME)
define Package/subconverter
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Utility to convert between various subscription format.
TITLE:=Utility to convert between various subscription format
URL:=https://github.com/tindy2013/subconverter
DEPENDS:=+libpthread +libstdcpp +libevent2 +libyaml-cpp +libpcre2 +libcurl +zlib
endef
define Package/$(PKG_NAME)/description
Utility to convert between various subscription format.
define Package/subconverter/description
Utility to convert between various proxy subscription formats.
endef
TARGET_CXXFLAGS := $(FPIC) $(filter-out -O%,$(TARGET_CXXFLAGS)) -O3
@ -48,7 +45,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections -flto
CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
define Package/$(PKG_NAME)/install
define Package/subconverter/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/subconverter $(1)/usr/bin/subconverter
$(INSTALL_DIR) $(1)/etc/subconverter
@ -57,4 +54,4 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./files/subconverter.init $(1)/etc/init.d/subconverter
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,subconverter))

12
package/ctcgfw/subconverter/patches/010-missing-header.patch
View File

@ -1,12 +0,0 @@
diff --git a/src/misc.h b/src/misc.h
index b98cdc9..484c1e1 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -7,6 +7,7 @@
#include <algorithm>
#include <sys/types.h>
#include <dirent.h>
+#include <string.h>
#include <yaml-cpp/yaml.h>