diff --git a/luci-app-qbittorrent/Makefile b/luci-app-qbittorrent/Makefile index 32a2bb6..7ae7354 100644 --- a/luci-app-qbittorrent/Makefile +++ b/luci-app-qbittorrent/Makefile @@ -11,24 +11,7 @@ PKG_RELEASE:=1 LUCI_TITLE:=LuCI support for qBittorrent LUCI_PKGARCH:=all -LUCI_DEPENDS:= \ - +PACKAGE_luci-app-qbittorrent_static:qBittorrent-static \ - +PACKAGE_luci-app-qbittorrent_dynamic:qbittorrent - -define Package/$(PKG_NAME)/config - choice - prompt "Build Version Selection" - default PACKAGE_luci-app-qbittorrent_dynamic - - config PACKAGE_luci-app-qbittorrent_static - bool "Static Build" - depends on arm||aarch64||x86_64 - - config PACKAGE_luci-app-qbittorrent_dynamic - bool "Dynamic Build" - - endchoice -endef +LUCI_DEPENDS:=+qbittorrent include $(TOPDIR)/feeds/luci/luci.mk diff --git a/qBittorrent-static/Makefile b/qBittorrent-static/Makefile deleted file mode 100644 index dc28d57..0000000 --- a/qBittorrent-static/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2017-2020 -# -# This is free software, licensed under the GNU General Public License v2. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=qBittorrent-static -PKG_VERSION:=4.6.5_v2.0.10 -PKG_RELEASE=1 - -STRIP:=true - -ifeq ($(ARCH),x86_64) - PKG_ARCH:=x86_64 -endif - -ifeq ($(ARCH),aarch64) - PKG_ARCH:=aarch64 -endif - -ifeq ($(ARCH),arm) - PKG_ARCH:=armv7 -endif - -include $(INCLUDE_DIR)/package.mk - -define Package/qBittorrent-static - SECTION:=net - CATEGORY:=Network - DEPENDS:=@(arm||aarch64||x86_64) - SUBMENU:=BitTorrent - TITLE:=bittorrent client programmed in C++ / Qt6 - URL:=https://www.qbittorrent.org/ -endef - -define Package/qBittorrent-static/description - qBittorrent is a bittorrent client programmed in C++ / Qt6 that uses - libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. - It aims to be a good alternative to all other bittorrent clients out - there. qBittorrent is fast, stable and provides unicode support as - well as many features. -endef - -define Download/qbittorrent - URL:=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-$(PKG_VERSION) - URL_FILE:=$(PKG_ARCH)-qbittorrent-nox - FILE:=$(PKG_ARCH)-qbittorrent-nox-$(PKG_VERSION) - HASH:=skip -endef - -define Build/Compile -endef - -define Package/qBittorrent-static/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(DL_DIR)/$(PKG_ARCH)-qbittorrent-nox-$(PKG_VERSION) $(1)/usr/bin/qbittorrent-nox -endef - -$(eval $(call Download,qbittorrent)) -$(eval $(call BuildPackage,qBittorrent-static))