diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 6bdc869394..83dad0f2dc 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -85,6 +85,11 @@ $(eval $(call SetupHostCommand,find,Please install GNU 'find', \ $(eval $(call SetupHostCommand,bash,Please install GNU 'bash', \ bash --version 2>&1 | grep GNU)) +$(eval $(call SetupHostCommand,xargs, \ + Please install 'xargs' that supports '-r/--no-run-if-empty', \ + gxargs -r --version, \ + xargs -r --version)) + $(eval $(call SetupHostCommand,patch,Please install GNU 'patch', \ gpatch --version 2>&1 | grep 'Free Software Foundation', \ patch --version 2>&1 | grep 'Free Software Foundation')) diff --git a/package/lean/gmediarender/Makefile b/package/lean/gmediarender/Makefile new file mode 100644 index 0000000000..f80287595e --- /dev/null +++ b/package/lean/gmediarender/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2020 coolsnowwolf@gmail.com +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gmediarender +PKG_VERSION:=2020-01-10 +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/hzeller/gmrender-resurrect.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=26d8f7edf5336bc30f7334c6ad459bf7f4f90ff2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_FIXUP:=autoreconf +PKG_INSTALL=1 +PKG_REMOVE_FILES:=autogen.sh aclocal.m4 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/gmediarender + SECTION:=multimedia + CATEGORY:=Multimedia + DEPENDS:= +gstreamer1 +libgstreamer1 +glib2 +libupnp + TITLE:=A Headless UPnP Renderer +endef + +define Package/gmediarender/description + gmediarender implements the server component that provides UPnP + controllers a means to render media content (audio, video and images) + from a UPnP media server. +endef + +CONFIGURE_ARGS+= \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" --with-build-cc="$(HOSTCC)" \ + --prefix="\usr" + +define Package/gmediarender/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,gmediarender)) + diff --git a/package/lean/luci-app-flowoffload/root/etc/config/flowoffload b/package/lean/luci-app-flowoffload/root/etc/config/flowoffload index 1a4f0b4647..2724309b3f 100644 --- a/package/lean/luci-app-flowoffload/root/etc/config/flowoffload +++ b/package/lean/luci-app-flowoffload/root/etc/config/flowoffload @@ -1,11 +1,11 @@ config flow - option flow_offloading '0' + option flow_offloading '1' option flow_offloading_hw '0' option bbr '0' option dns '0' option dnscache_enable '1' option dns_server '114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8' - option ipv6dns_server '2001:4860:4860::8888,2001:4860:4860::8844,2001:2001::1111,2001:2001::1001,2400:da00::6666,240C::6666,240C::6644' + option ipv6dns_server '240c::6666,240c::6644,2400:da00::6666,2001:da8::666' diff --git a/package/lean/luci-app-sfe/root/etc/config/sfe b/package/lean/luci-app-sfe/root/etc/config/sfe index b48624ca65..acb880a942 100644 --- a/package/lean/luci-app-sfe/root/etc/config/sfe +++ b/package/lean/luci-app-sfe/root/etc/config/sfe @@ -1,10 +1,10 @@ config sfe - option enabled '0' + option enabled '1' option ipv6 '0' option wifi '0' option bbr '0' option dns '0' option dnscache_enable '1' option dns_server '114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8' - option ipv6dns_server '2001:4860:4860::8888,2001:4860:4860::8844,2001:2001::1111,2001:2001::1001,2400:da00::6666,240C::6666,240C::6644' + option ipv6dns_server '240c::6666,240c::6644,2400:da00::6666,2001:da8::666' diff --git a/package/lean/npc/Makefile b/package/lean/npc/Makefile index 3b415f44e7..92fb45e369 100644 --- a/package/lean/npc/Makefile +++ b/package/lean/npc/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=npc -PKG_VERSION:=0.26.7 -PKG_RELEASE:=2 +PKG_VERSION:=0.26.8 +PKG_RELEASE:=1 ifeq ($(ARCH),mipsel) NPC_ARCH:=mipsle diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 2e684ec482..4c1e345a45 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.24.2 +PKG_VERSION:=4.25.0 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b58b4477020034b67a7649341fae65ea7bdc81851cad47ae7e4a591c0663e4c9 +PKG_HASH:=473936a19c63aaa2a51047230fc955c6236c4c9002e25307dd2f7a2673c40161 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile index e132f43d7c..a79f1fa30e 100644 --- a/package/lienol/ipt2socks/Makefile +++ b/package/lienol/ipt2socks/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipt2socks -PKG_VERSION:=1.1.2 +PKG_VERSION:=1.1.3 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zfl9/ipt2socks.git -PKG_SOURCE_VERSION:=cfbc2189356aba7fcafb0bc961a95419f313d8a7 +PKG_SOURCE_VERSION:=384dab4bae5ed9402e07ec1950e502c05812bc26 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) diff --git a/package/lienol/ipt2socks/patches/001-fix-splice.patch b/package/lienol/ipt2socks/patches/001-fix-splice.patch deleted file mode 100644 index d39eda94ba..0000000000 --- a/package/lienol/ipt2socks/patches/001-fix-splice.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/ipt2socks.c -+++ b/ipt2socks.c -@@ -28,6 +28,36 @@ - - #define IPT2SOCKS_VERSION "ipt2socks v1.1.2 " - -+#ifdef __MUSL__ -+#include -+#include -+ -+ssize_t splice(int __fdin, __off64_t *__offin, int __fdout, -+ __off64_t *__offout, size_t __len, unsigned int __flags) { -+#ifdef __NR_splice -+ return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags); -+#else -+ (void)__fdin; -+ (void)__offin; -+ (void)__fdout; -+ (void)__offout; -+ (void)__len; -+ (void)__flags; -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+#undef SPLICE_F_MOVE -+#undef SPLICE_F_NONBLOCK -+#undef SPLICE_F_MORE -+ -+#define SPLICE_F_MOVE 1 -+#define SPLICE_F_NONBLOCK 2 -+#define SPLICE_F_MORE 4 -+ -+#endif /* __MUSL__ */ -+ - enum { - OPT_ENABLE_TCP = 0x01 << 0, // enable tcp proxy - OPT_ENABLE_UDP = 0x01 << 1, // enable udp proxy - ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CC = gcc --CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread -+CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread -D __MUSL__ - LIBS = -lm - SRCS = ipt2socks.c logutils.c lrucache.c netutils.c protocol.c - OBJS = $(SRCS:.c=.o) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 469954916d..f08f1e8709 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -493,7 +493,7 @@ define Device/gl-ar300m DEVICE_PACKAGES := kmod-usb-core kmod-usb2 BOARDNAME := GL-AR300M IMAGE_SIZE := 16000k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot),64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar300m @@ -539,7 +539,7 @@ define Device/gl-mifi BOARDNAME := GL-MIFI IMAGE_SIZE := 16000k CONSOLE := ttyATH0,115200 - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot),64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-mifi diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info index ad83d90b4c..1dfa6796ee 100644 --- a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info +++ b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info @@ -4,10 +4,6 @@ set_rpi_info() { case "$(board_name)" in raspberrypi,4-model-b) sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh - sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm - ;; - *) - sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm ;; esac } diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 8d35286d4a..c3a5e3e089 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,10 +19,10 @@ KERNELNAME:=bzImage 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-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ -luci-app-airplay2 luci-app-music-remote-center luci-app-qbittorrent luci-app-amule luci-app-openvpn-server \ +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-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs \ +htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-xlnetacc luci-app-zerotier ca-certificates ddns-scripts_aliyun ddns-scripts_dnspod \ +luci-app-airplay2 luci-app-music-remote-center luci-app-qbittorrent luci-app-amule luci-app-openvpn-server luci-app-unblockmusic \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 diff --git a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch new file mode 100644 index 0000000000..46c6a5ea0f --- /dev/null +++ b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch @@ -0,0 +1,43 @@ +From fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 26 Jan 2020 18:35:13 +0000 +Subject: [PATCH] squashfs-tools: fix build failure against gcc-10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +cc ... -o mksquashfs +ld: read_fs.o:(.bss+0x0): + multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here +ld: read_fs.o:(.bss+0x8): + multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/706456 +Signed-off-by: Sergei Trofimovich +--- + squashfs-tools/mksquashfs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h +index 1beefef7..b6503063 100644 +--- a/squashfs-tools/mksquashfs.h ++++ b/squashfs-tools/mksquashfs.h +@@ -143,7 +143,7 @@ struct append_file { + #endif + + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; +-struct cache *bwriter_buffer, *fwriter_buffer; ++extern struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, + *to_frag, *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping;