Переглянути джерело

naiveproxy: Update to 95.0.4638.54-2

Signed-off-by: Tianling Shen <[email protected]>
MoetaYuko 4 роки тому
батько
коміт
376f59c84b
3 змінених файлів з 8 додано та 4 видалено
  1. 1 1
      luci-app-ssr-plus/Makefile
  2. 3 3
      naiveproxy/Makefile
  3. 4 0
      naiveproxy/src/init_env.sh

+ 1 - 1
luci-app-ssr-plus/Makefile

@@ -51,7 +51,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
 	bool "Include NaiveProxy"
-	depends on !(arc||armeb||mips||mips64||powerpc)
+	depends on !(arc||armeb||mips||mips64||powerpc||TARGET_gemini)
 	default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2

+ 3 - 3
naiveproxy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=95.0.4638.54-1
+PKG_VERSION:=95.0.4638.54-2
 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:=ccfb2462d91d9c0a77be23aef33962a0ce761a63e8e77c9a34e815c504dceac0
+PKG_HASH:=2d94b7ccf8f33787ee06ee4a291d3c3823803ca7be96628031f804f43504b85d
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -50,7 +50,7 @@ define Package/naiveproxy
   SUBMENU:=Web Servers/Proxies
   URL:=https://github.com/klzgrad/naiveproxy
   TITLE:=Make a fortune quietly
-  DEPENDS:=@!(arc||armeb||mips||mips64||powerpc) +libatomic
+  DEPENDS:=@!(arc||armeb||mips||mips64||powerpc||TARGET_gemini) +libatomic
 endef
 
 define Package/naiveproxy/description

+ 4 - 0
naiveproxy/src/init_env.sh

@@ -73,6 +73,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"
@@ -84,6 +85,9 @@ case "${target_arch}" in
 		naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
 	fi
 	;;
+"arm64")
+	[ -n "${cpu_type}" ] && naive_flags+=" arm_cpu=\"${cpu_type}\""
+	;;
 "mipsel"|"mips64el")
 	naive_flags+=" use_gold=false use_thin_lto=false use_lld=false chrome_pgo_phase=0 mips_arch_variant=\"r2\""
 	[ "${target_arch}" == "mipsel" ] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\""