From 7ce3854d3200861db81be7a771c4e65bcf2c6b60 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Thu, 5 Mar 2020 21:56:38 -0800 Subject: [PATCH] luci-app-unblockmusic: dependence allow mini-version --- package/lean/UnblockNeteaseMusicGo/Makefile | 1 + package/lean/luci-app-unblockmusic/Config.in | 13 ++++--------- package/lean/luci-app-unblockmusic/Makefile | 2 +- target/linux/x86/Makefile | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile index a8eafc39a..27dad834d 100644 --- a/package/lean/UnblockNeteaseMusicGo/Makefile +++ b/package/lean/UnblockNeteaseMusicGo/Makefile @@ -28,6 +28,7 @@ include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network + SUBMENU:=NeteaseMusic TITLE:=Revive unavailable songs for Netease Cloud Music (Golang) URL:=https://github.com/cnsilvan/UnblockNeteaseMusic DEPENDS:=$(GO_ARCH_DEPENDS) diff --git a/package/lean/luci-app-unblockmusic/Config.in b/package/lean/luci-app-unblockmusic/Config.in index 9b4fd64f7..cf7c75c6f 100644 --- a/package/lean/luci-app-unblockmusic/Config.in +++ b/package/lean/luci-app-unblockmusic/Config.in @@ -1,13 +1,8 @@ -choice - prompt "Select UnblockNeteaseMusic APP" - default UnblockNeteaseMusic_Go config UnblockNeteaseMusic_Go - bool "Go" + bool "UnblockNeteaseMusic Golang Version" + default y config UnblockNeteaseMusic_NodeJS - bool "NodeJS" - -endchoice - - + bool "UnblockNeteaseMusic NodeJS Version" + depends on HAS_FPU || KERNEL_MIPS_FPU_EMULATOR diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 3b0d71a81..015e06959 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.1 -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 78297f4fa..2d1ba021b 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ -htop lm-sensors autocore automount autosamba luci-app-zerotier luci-app-ipsec-vpnd luci-proto-bonding luci-app-v2ray-server luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ +htop lm-sensors autocore automount autosamba luci-app-zerotier luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ alsa-utils kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152