update 2023-01-31 23:20:18

cdnspeedtest/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=CloudflareSpeedTest
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.2.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=39a4e4a341330746a8bd0a07769663f08d2fcc9c216e52a8b5e40c3e03fe1b6f
+PKG_HASH:=89fea0443b1501331526d95b3a827d93df3da3e3cd693310627fd80b53a46ee8
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE

naiveproxy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=109.0.5414.74-1
+PKG_VERSION:=109.0.5414.74-2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=eb0b7d4ee7e34aff5bd9f7ff662a707c059e3739da47cd52e6d5edfff988123a
+PKG_HASH:=3c1e9e276e4ae79c8192c25a15df2f564741602ae403712565c48aa6db9d78e7
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -19,7 +19,6 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),)
 PKG_BUILD_DEPENDS+= ninja/host
 endif
-NINJA ?= ninja
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 
@@ -107,13 +106,13 @@ define Build/Configure
 		. ../init_env.sh "$(ARCH)" $(CPU_TYPE) $(CPU_SUBTYPE) "$(TOOLCHAIN_DIR)" ; \
 		export naive_flags+=" $$$${naive_ccache_flags}" ; \
 		mkdir -p "out" ; \
-		./gn/out/gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="$(PYTHON)" ; \
+		./gn/out/gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="python3" ; \
 		popd ; \
 	)
 endef
 
 define Build/Compile
-	+$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive
+	ninja -C "$(PKG_BUILD_DIR)/src/out/Release" naive
 endef
 
 define Package/naiveproxy/install

naiveproxy/src/init_env.sh

@@ -71,6 +71,7 @@ target_sysroot=\"${toolchain_dir}\""
 case "${target_arch}" in
 "arm")
 	naive_flags+=" arm_version=0 arm_cpu=\"${cpu_type}\""
+	case "${cpu_type}" in "arm1176jzf-s"|"arm926ej-s"|"mpcore"|"xscale") naive_flags+=" arm_use_thumb=false" ;; esac
 	if [ -n "${cpu_subtype}" ]; then
 		if grep -q "neon" <<< "${cpu_subtype}"; then
 			neon_flag="arm_use_neon=true"
@@ -81,11 +82,9 @@ case "${target_arch}" in
 	else
 		naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
 	fi
-	case "${cpu_type}" in
-	"arm1176jzf-s"|"arm926ej-s"|"mpcore"|"xscale")
-		naive_flags+=" arm_use_thumb=false"
 	;;
-	esac
+"arm64")
+	[ -n "${cpu_type}" ] && naive_flags+=" arm_cpu=\"${cpu_type}\""
 	;;
 "mipsel"|"mips64el")
 	naive_flags+=" use_thin_lto=false chrome_pgo_phase=0 mips_arch_variant=\"r2\""

qBittorrent-static/Makefile

@@ -1,66 +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.4.5_v2.0.7
-PKG_RELEASE=1
-
-STRIP:=true
-
-ifeq ($(ARCH),x86_64)
-	PKG_ARCH:=x86_64
-endif
-
-ifeq ($(ARCH),arm64)
-	PKG_ARCH:=aarch64
-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++ / Qt
-  URL:=https://www.qbittorrent.org/
-endef
-
-define Package/qBittorrent-static/description
-  qBittorrent is a bittorrent client programmed in C++ / Qt 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:=qbittorrent-nox
-  HASH:=skip
-endef
-
-define Build/Compile
-endef
-
-define Package/qBittorrent-static/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(DL_DIR)/qbittorrent-nox $(1)/usr/bin
-endef
-
-$(eval $(call Download,qbittorrent))
-$(eval $(call BuildPackage,qBittorrent-static))

qtbase/Makefile

@@ -1,200 +0,0 @@
-#
-# Copyright (C) 2020 Openwrt.org
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=qtbase
-PKG_BASE:=5.15
-PKG_BUGFIX:=6
-PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-everywhere-opensource-src-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:= \
-		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
-		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
-		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-PKG_CPE_ID:=cpe:/a:qt:qt
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/qtbase/Default
-	SECTION:=libs
-	CATEGORY:=Libraries
-	SUBMENU:=Qt5
-	TITLE:=qtbase
-	URL:=http://qt-project.org
-	DEPENDS:=+libgcc +libstdcpp @!LINUX_2_6_36
-endef
-
-define Package/qtbase/description
-  This package provides the Qt5 libraries.
-
-  Qt is a cross-platform application development framework for desktop, embedded and mobile.
-  Supported Platforms include Linux, OS X, Windows, VxWorks, QNX, Android, iOS, BlackBerry,
-  Sailfish OS and others.
-
-  Qt is not a programming language on its own. It is a framework written in C++.
-
-  This package provides the following run-time libraries:
-  - core
-  - network
-  - xml
-endef
-
-define Package/qtbase
-	$(call Package/qtbase/Default)
-	TITLE+=all libs
-	DEPENDS+=$(QTBASE_DEPENDS)
-endef
-
-define Package/qtbase/install
-	true
-endef
-
-define Package/qtbase/config
-	config QT5_INCLUDE_ATOMIC
-		bool "Depends on libatomic"
-		default y if !(arm_v7 || ARCH_64BIT || TARGET_x86)
-		default n
-		help
-			Check this options to add the libatomic to the dependences.
-			- You'd better to confirm whether your compiler need the external libatomic.
-			Otherwise, it is not recommended to modify this option mannually.
-
-	menu "Select Qtbase Libraries"
-		comment "Qtbase Libraries"
-
-		$(foreach lib,$(QTBASE_LIBS),
-		config PACKAGE_qt5-$(lib)
-			prompt "Qtbase $(lib) library."
-			default m if ALL
-		)
-	endmenu
-endef
-
-PKG_CONFIG_DEPENDS = CONFIG_QT5_INCLUDE_ATOMIC
-
-EXTRA_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto
-EXTRA_LDFLAGS += -Wl,--gc-sections,--as-needed
-
-CONFIGURE_ARGS = \
-		-sysroot $(STAGING_DIR) \
-		-hostprefix $(STAGING_DIR_HOSTPKG) \
-		-extprefix $(STAGING_DIR)/usr \
-		-prefix /usr \
-		-archdatadir /usr/share/Qt \
-		-datadir /usr/share/Qt \
-		-device linux-generic-g++ \
-		-device-option CROSS_COMPILE="$(TARGET_CROSS)" \
-		-device-option COMPILER_FLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-		-device-option LINKER_FLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
-		-confirm-license \
-		-opensource \
-		-release \
-		-shared \
-		-strip \
-		-no-rpath \
-		-no-use-gold-linker \
-		-ltcg \
-		-mimetype-database \
-		-openssl-linked \
-		-qt-doubleconversion \
-		-system-pcre \
-		-system-zlib \
-		$(if $(findstring i386,$(ARCH)),-no-sse2 -no-sse4.1) \
-		-no-angle \
-		-no-cups \
-		-no-dbus \
-		-no-directfb \
-		-no-dtls\
-		-no-egl \
-		-no-eglfs \
-		-no-freetype \
-		-no-gbm \
-		-no-glib \
-		-no-gtk \
-		-no-gui \
-		-no-harfbuzz \
-		-no-iconv \
-		-no-icu \
-		-no-kms \
-		-no-libjpeg \
-		-no-libmd4c \
-		-no-libpng \
-		-no-libudev \
-		-no-mtdev \
-		-no-opengl \
-		-no-opengles3 \
-		-no-openvg \
-		-no-pch \
-		-no-slog2 \
-		-sql-sqlite \
-		-no-trace \
-		-no-tslib \
-		-no-vulkan \
-		-no-widgets \
-		-no-xcb \
-		-no-xkbcommon \
-		-no-zstd \
-		-no-compile-examples \
-		-no-feature-concurrent \
-		-no-feature-gssapi \
-		-no-feature-testlib \
-		-make libs \
-		-nomake examples \
-		-nomake tests \
-		-nomake tools \
-		-v 
-
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/InstallDev
-	$(MAKE) -C $(PKG_BUILD_DIR) install
-endef
-
-define Package/qtbase/Default/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libQt5$(shell echo $(2) | sed -e 's/\b[[:alpha:]]/\u&/g').so* $(1)/usr/lib
-endef
-
-define DefineQtbaseLibrary
-  QTBASE_DEPENDS+=+qt5-$(1)
-
-  QTBASE_LIBS+=$(1)
-
-  define Package/qt5-$(1)
-    $(call Package/qtbase/Default)
-    TITLE+=$(1)
-    DEPENDS+=$(foreach lib,$(2),+qt5-$(lib)) $(3)
-    HIDDEN:=1
-  endef
-
-  define Package/qt5-$(1)/description
-    This package contains the qt5 $(1) library.
-  endef
-
-  define Package/qt5-$(1)/install
-    $(call Package/qtbase/Default/install,$$(1),$(1))
-  endef
-endef
-
-$(eval $(call DefineQtbaseLibrary,core,,+QT5_INCLUDE_ATOMIC:libatomic +libpcre2-16 +zlib))
-$(eval $(call DefineQtbaseLibrary,network,core,+libopenssl +zlib))
-$(eval $(call DefineQtbaseLibrary,xml,core,))
-$(eval $(call DefineQtbaseLibrary,sql,core))
-
-$(foreach lib,$(QTBASE_LIBS),$(eval $(call BuildPackage,qt5-$(lib))))
-$(eval $(call BuildPackage,qtbase))

qttools/Makefile

@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2019 Openwrt.org
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=qttools
-PKG_BASE:=5.15
-PKG_BUGFIX:=6
-PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-everywhere-opensource-src-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:= \
-		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
-		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
-		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=qtbase
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/qttools
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=Qt5
-  TITLE:=qttools
-  URL:=http://qt-project.org
-  BUILDONLY:=1
-endef
-
-define Build/Configure
-	cd $(PKG_BUILD_DIR) && qmake -o Makefile qttools.pro
-endef
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/InstallDev
-	$(MAKE) -C $(PKG_BUILD_DIR) install
-endef
-
-$(eval $(call BuildPackage,qttools))

rblibtorrent/Makefile

@@ -1,62 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rblibtorrent
-PKG_VERSION:=1.2.17
-PKG_RELEASE=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/arvidn/libtorrent.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2d34455ad2b828d3da23634f7de93fafded5442d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=3fa86163d370584f747d34737a556a5426fd5eb4ce1ba1dc594dce3357594d90
-
-PKG_LICENSE:=BSD
-PKG_LICENSE_FILES:=COPYING
-
-PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/rblibtorrent
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Rasterbar BitTorrent library
-  URL:=https://www.libtorrent.org/
-  DEPENDS:=+libgcc +libstdcpp +libopenssl +boost +boost-system +boost-chrono +boost-random +libatomic
-  MAINTAINER:=Arvid Norberg <arvid@libtorrent.org>
-endef
-
-define Package/rblibtorrent/description
-Rasterbar libtorrent is a C++ library that aims to be a good alternative to
-all the other bittorrent implementations around. It is a library and not a
-full featured client, although it comes with a working example client.
-endef
-
-TARGET_CFLAGS += $(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC -ffunction-sections -fdata-sections -flto
-EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_VERSION_4_8),-std=gnu++11,-std=gnu++17) 
-TARGET_LDFLAGS += -lstdc++ -Wl,--gc-sections,--as-needed -flto
-
-CMAKE_OPTIONS += \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_CXX_STANDARD=17 \
-	-DBUILD_SHARED_LIBS=ON \
-	-Ddeprecated-functions=ON  \
-	-Dencryption=ON \
-	-Diconv=ON \
-	-Dstatic_runtime=ON \
-	-Dlogging=OFF
-	
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)
-endef
-
-define Package/rblibtorrent/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,rblibtorrent))

v2raya/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.9.1698.1
+PKG_VERSION:=2.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=247a357230c616bf48309c61d119686e4ad56939c05afef584c45051e9dc6220
+PKG_HASH:=5f79a42c4a720dec778a5c03c925dbbeb8d0fedebbb38ddf90d2d9712480b6a4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
@@ -37,8 +37,6 @@ define Package/v2raya
   SUBMENU:=Web Servers/Proxies
   DEPENDS:=$(GO_ARCH_DEPENDS) \
     +ca-bundle \
-    +iptables \
-    +IPV6:ip6tables \
     +iptables-mod-conntrack-extra \
     +iptables-mod-extra \
     +iptables-mod-filter \

v2raya/test.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-v2raya --version | grep "$PKG_VERSION"