From 9b340aa3d4aee2c7a714c97e5bca98e651ce1044 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 10 Jan 2021 19:06:08 +0800 Subject: [PATCH] treewide: drop packages which already in feeds --- package/ctcgfw/spdlog/Makefile | 65 --------- package/zxlhhyccc/syncthing/Makefile | 65 --------- package/zxlhhyccc/tvheadend/Config.in | 17 --- package/zxlhhyccc/tvheadend/Makefile | 132 ------------------ .../tvheadend/files/tvheadend.config | 13 -- .../zxlhhyccc/tvheadend/files/tvheadend.init | 71 ---------- .../tvheadend/patches/010-gcc10.patch | 28 ---- 7 files changed, 391 deletions(-) delete mode 100644 package/ctcgfw/spdlog/Makefile delete mode 100644 package/zxlhhyccc/syncthing/Makefile delete mode 100644 package/zxlhhyccc/tvheadend/Config.in delete mode 100644 package/zxlhhyccc/tvheadend/Makefile delete mode 100644 package/zxlhhyccc/tvheadend/files/tvheadend.config delete mode 100755 package/zxlhhyccc/tvheadend/files/tvheadend.init delete mode 100644 package/zxlhhyccc/tvheadend/patches/010-gcc10.patch diff --git a/package/ctcgfw/spdlog/Makefile b/package/ctcgfw/spdlog/Makefile deleted file mode 100644 index f2bff16610..0000000000 --- a/package/ctcgfw/spdlog/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -#### - # File: /spdlog/Makefile - # Project: ootoc-OpenWRT - # File Created: Thursday, 12th March 2020 11:09:54 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2020 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=spdlog -PKG_VERSION:=1.7.0 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/gabime/spdlog.git -PKG_MIRROR_HASH:=777dff5e8755d942159406c82d6e568f4fd5beda6c37a47eaf839222fdcd0e04 -PKG_SOURCE_VERSION:=616caa5d30172b65cc3a06800894c575d70cb8e6 -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:=ElonH - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_OPTIONS+= -DSPDLOG_BUILD_EXAMPLE:BOOL=OFF \ - -DSPDLOG_BUILD_TESTS:BOOL=OFF -DSPDLOG_BUILD_SHARED:BOOL=ON \ - -DSPDLOG_FMT_EXTERNAL:BOOL=ON -DSPDLOG_FMT_EXTERNAL_HO:BOOL=OFF - -define Package/spdlog - SECTION:=lib - CATEGORY:=Libraries - URL:=https://github.com/gabime/spdlog - TITLE:=Fast C++ logging library. - DEPENDS:=+libfmt - MENU:=1 -endef - -define Package/spdlog/description - Very fast, header-only/compiled, C++ logging library. -endef - - -define Build/InstallDev - $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/include/spdlog/fmt/bundled - $(CP) $(PKG_BUILD_DIR)/include/spdlog/fmt/bundled $(PKG_INSTALL_DIR)/usr/include/spdlog/fmt - $(Build/InstallDev/cmake) -endef - -define Package/spdlog/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspdlog.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,spdlog)) diff --git a/package/zxlhhyccc/syncthing/Makefile b/package/zxlhhyccc/syncthing/Makefile deleted file mode 100644 index da4d5a383c..0000000000 --- a/package/zxlhhyccc/syncthing/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=syncthing -PKG_VERSION:=1.9.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=a4e3e5997b2c4c76512ed9b32a067b2a90e26c0d445f8c3c62af65d2b93d4d8b - -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) - -PKG_MAINTAINER:=Paul Spooren -PKG_LICENSE:=MPL-2.0 -PKG_LICENSE_FILES:=LICENSE -PKG_CPE_ID:=cpe:/a:syncthing:syncthing - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/syncthing/syncthing/ -GO_PKG_BUILD_PKG:=github.com/syncthing/syncthing/cmd/syncthing/ -GO_PKG_INSTALL_EXTRA:=^gui/ - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/syncthing - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=Continuous file synchronization program - URL:=https://syncthing.net - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -GO_PKG_LDFLAGS:= -s -w -GO_PKG_LDFLAGS_X:= \ - github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \ - github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ - github.com/syncthing/syncthing/lib/build.User=ctcgfw \ - github.com/syncthing/syncthing/lib/build.Host=project-openwrt \ - github.com/syncthing/syncthing/lib/build.Program=syncthing -GO_PKG_TAGS:=noupgrade - -define Build/Compile - $(call GoPackage/Build/Compile) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/syncthing -endef - -define Package/syncthing/description - Syncthing replaces proprietary sync and cloud services with something - open, trustworthy and decentralized. Your data is your data alone and - you deserve to choose where it is stored, if it is shared with some - third party and how it's transmitted over the Internet. -endef - -define Package/syncthing/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/syncthing $(1)/usr/bin/syncthing -endef - -$(eval $(call GoBinPackage,syncthing)) -$(eval $(call BuildPackage,syncthing)) diff --git a/package/zxlhhyccc/tvheadend/Config.in b/package/zxlhhyccc/tvheadend/Config.in deleted file mode 100644 index 5bc1a18bc6..0000000000 --- a/package/zxlhhyccc/tvheadend/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config TVHEADEND_NDMS_CWC_SUPPORT - bool "NewCamd support" - default y - -config TVHEADEND_NDMS_LINUXDVB_SUPPORT - bool "Linux DVB support" - default y - -config TVHEADEND_NDMS_DVBSCAN_SUPPORT - bool "Fetch DVB-scan data" - depends on TVHEADEND_NDMS_LINUXDVB_SUPPORT - default TVHEADEND_NDMS_LINUXDVB_SUPPORT - -config TVHEADEND_NDMS_AVAHI_SUPPORT - bool "Avahi client support" - select PACKAGE_libavahi-client - default n diff --git a/package/zxlhhyccc/tvheadend/Makefile b/package/zxlhhyccc/tvheadend/Makefile deleted file mode 100644 index b890f3dafd..0000000000 --- a/package/zxlhhyccc/tvheadend/Makefile +++ /dev/null @@ -1,132 +0,0 @@ -# -# Copyright (C) 2015 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:=tvheadend -PKG_VERSION:=4.3 -PKG_RELEASE:=1 - -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d91f71cfbe0016350dbb3853a42ac4b226d8d47b -# This is stable git version... -# PKG_SOURCE_VERSION:=1a0262f5870e4fabd6b9c70a7bf2ebe420bc956e -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/505575853/tvheadend.git -PKG_MIRROR_HASH:=2e6de0ddcad68da14a6b07217b06b233eea2e9440f2f3e7f136123fcfd6a5b7b -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE.md - -PKG_FIXUP:=autoreconf - -PKG_USE_MIPS16:=0 - -SHORT_GIT_VER:=$(shell echo $(PKG_SOURCE_VERSION) | cut -b -7) - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/tvheadend - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=Tvheadend is a TV streaming server for Linux - DEPENDS:=+libopenssl +librt +zlib +libpcre +libpcre2 +libdvbcsa +TVHEADEND_AVAHI_SUPPORT:libavahi-client $(ICONV_DEPENDS) - URL:=https://tvheadend.org - MAINTAINER:=Jan Čermák -endef - -define Package/tvheadend/description - Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android - supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. - - Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming. -endef - -define Package/tvheadend/config - menu "Configuration" - depends on PACKAGE_tvheadend - source "$(SOURCE)/Config.in" - endmenu -endef - -ifeq ($(CONFIG_TVHEADEND_CWC_SUPPORT),) - CONFIGURE_ARGS += --disable-cwc -endif - -ifeq ($(CONFIG_TVHEADEND_LINUXDVB_SUPPORT),) - CONFIGURE_ARGS += --disable-linuxdvb -endif - -ifeq ($(CONFIG_TVHEADEND_DVBSCAN_SUPPORT),) - CONFIGURE_ARGS += --disable-dvbscan -endif - -ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),) - CONFIGURE_ARGS += --disable-avahi -else - CONFIGURE_ARGS += --enable-avahi -endif - -CONFIGURE_ARGS += \ - --arch=$(ARCH) \ - --disable-dbus_1 \ - --disable-libav \ - --enable-bundle \ - --enable-dvben50221 \ - --enable-tvhcsa \ - --enable-dvbcsa \ - --enable-inotify \ - --enable-epoll \ - --enable-trace \ - --nowerror \ - --disable-dvbscan \ - --disable-avahi \ - --disable-hdhomerun_static \ - --disable-pie \ - --disable-imagecache \ - --disable-ffmpeg_static \ - --disable-libx264 \ - --disable-libx264_static \ - --disable-libx265 \ - --disable-libx265_static \ - --disable-libvpx \ - --disable-libvpx_static \ - --disable-libtheora \ - --disable-libtheora_static \ - --disable-libvorbis \ - --disable-libvorbis_static \ - --disable-libfdkaac \ - --disable-libfdkaac_static \ - --disable-nvenc \ - --disable-libmfx_static \ - --disable-timeshift - - -define Build/Prepare - $(call Build/Prepare/Default) - echo 'Tvheadend $(shell echo $(PKG_VERSION)~$(SHORT_GIT_VER)-$(PKG_RELEASE))' \ - > $(PKG_BUILD_DIR)/debian/changelog -endef - -define Package/conffiles -/etc/config/tvheadend -endef - -define Package/tvheadend/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/tvheadend.init $(1)/etc/init.d/tvheadend - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/tvheadend.config $(1)/etc/config/tvheadend - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,tvheadend)) diff --git a/package/zxlhhyccc/tvheadend/files/tvheadend.config b/package/zxlhhyccc/tvheadend/files/tvheadend.config deleted file mode 100644 index 62c139de53..0000000000 --- a/package/zxlhhyccc/tvheadend/files/tvheadend.config +++ /dev/null @@ -1,13 +0,0 @@ -#config tvheadend service -# option nosyslog '0' -# option use_temp_epgdb '0' -# option config_path '/etc/tvheadend' - -config tvheadend server - option ipv6 '1' -# option bindaddr '0.0.0.0' -# option http_port '9981' -# option http_root '/tvheadend' -# option htsp_port '9982' -# option htsp_port2 '9983' -# option xspf '0' diff --git a/package/zxlhhyccc/tvheadend/files/tvheadend.init b/package/zxlhhyccc/tvheadend/files/tvheadend.init deleted file mode 100755 index 07d96a867e..0000000000 --- a/package/zxlhhyccc/tvheadend/files/tvheadend.init +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=00 - -USE_PROCD=1 -PROG=/usr/bin/tvheadend - -TEMP_CONFIG=/tmp/tvheadend -PERSISTENT_CONFIG=/etc/tvheadend - -execute_first_run() { - "$PROG" -C "$1" -B -C -A >/dev/null 2>&1 -} - -ensure_config_exists() { - local config_path - - config_load tvheadend - config_get config_path service config_path - - if [ -z "$config_path" ]; then - [ -d "$PERSISTENT_CONFIG" ] || execute_first_run "$PERSISTENT_CONFIG" - else - # if the configuration directory is empty, empty config with grant-all ACL is created - [ -d "$config_path" ] && [ "$(ls -A $config_path)" ] || execute_first_run "$config_path" - fi - - # if use_temp_epgdb is enabled (default), most of the config is put to config_path - # (or /etc/config), except for epgdb.v2, which grows quite large and is write-heavy, - # so it's put into volatile tmpfs - # epgdb.v2 is created and symlinked to main config dir upon each start (if it doesn't exist) - config_get_bool use_temp_epgdb service use_temp_epgdb 1 - if [ "$use_temp_epgdb" == "1" ]; then - TEMP_EPG="${TEMP_CONFIG}/epgdb.v2" - [ ! -f "$TEMP_EPG" ] && mkdir -p "$TEMP_CONFIG" && touch "$TEMP_EPG" && chmod 700 "$TEMP_EPG" - [ -z "$config_path" ] && config_path="$PERSISTENT_CONFIG" - ln -sf "$TEMP_EPG" "${config_path}/epgdb.v2" - fi -} - -load_uci_config() { - config_load tvheadend - config_get config_path service config_path "$PERSISTENT_CONFIG" - [ -n "$config_path" ] && procd_append_param command -c "$config_path" - config_get_bool nosyslog service nosyslog 0 - [ "$nosyslog" -eq 1 ] && procd_append_param command --nosyslog - config_get_bool ipv6 server ipv6 0 - [ "$ipv6" -eq 1 ] && procd_append_param command --ipv6 - config_get bindaddr server bindaddr - [ -n "$bindaddr" ] && procd_append_param command --bindaddr "$bindaddr" - config_get http_port server http_port - [ -n "$http_port" ] && procd_append_param command --http_port "$http_port" - config_get http_root server http_root - [ -n "$http_root" ] && procd_append_param command --http_root "$http_root" - config_get htsp_port server htsp_port - [ -n "$htsp_port" ] && procd_append_param command --htsp_port "$htsp_port" - config_get htsp_port2 server htsp_port2 - [ -n "$htsp_port2" ] && procd_append_param command --htsp_port "$htsp_port2" - config_get xspf server xspf 0 - [ "$xspf" -eq 1 ] && procd_append_param command --xspf -} - -start_service() { - ensure_config_exists - procd_open_instance - procd_set_param file /etc/config/tvheadend - procd_set_param command "$PROG" -B -C - load_uci_config - procd_close_instance -} diff --git a/package/zxlhhyccc/tvheadend/patches/010-gcc10.patch b/package/zxlhhyccc/tvheadend/patches/010-gcc10.patch deleted file mode 100644 index b2ef7402ae..0000000000 --- a/package/zxlhhyccc/tvheadend/patches/010-gcc10.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/input.h b/src/input.h -index 516f850ef..378996a80 100644 ---- a/src/input.h -+++ b/src/input.h -@@ -129,8 +129,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); - extern const idclass_t tvh_input_class; - extern const idclass_t tvh_input_instance_class; - --tvh_input_list_t tvh_inputs; --tvh_hardware_list_t tvh_hardware; -+extern tvh_input_list_t tvh_inputs; -+extern tvh_hardware_list_t tvh_hardware; - - #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link) - #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link) -diff --git a/src/input/mpegts.h b/src/input/mpegts.h -index 9d29d56ca..fd46e4f9e 100644 ---- a/src/input/mpegts.h -+++ b/src/input/mpegts.h -@@ -1144,7 +1144,7 @@ typedef struct mpegts_listener - void (*ml_mux_delete) (mpegts_mux_t *mm, void *p); - } mpegts_listener_t; - --LIST_HEAD(,mpegts_listener) mpegts_listeners; -+static LIST_HEAD(,mpegts_listener) mpegts_listeners; - - #define mpegts_add_listener(ml)\ - LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)