From b6d587abeeef873d4408707a8c584532f96b9f62 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 18 Mar 2023 00:30:24 +0800 Subject: [PATCH] naiveproxy: Update to 111.0.5563.64-1 Signed-off-by: Tianling Shen --- naiveproxy/Makefile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 3c90eb670..5f2f7fb1a 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -5,22 +5,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_VERSION:=110.0.5481.100-1 +PKG_VERSION:=111.0.5563.64-1 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:=b20ea791927426d2da9ba19bc448e902a6aa667706f1cda8f24323546e3b994f +PKG_HASH:=a5411d28943be60a273c58059e3ee81cb8e4623d8286f8e57bf5a34e4fa7e7ac PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Tianling Shen +PKG_BUILD_DEPENDS:=gn/host ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),) PKG_BUILD_DEPENDS+= ninja/host endif -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 ifneq ($(CONFIG_CPU_TYPE)," ") CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE))) @@ -57,31 +58,22 @@ ifneq ($(CONFIG_CCACHE),) export naive_ccache_flags=cc_wrapper="$(CCACHE)" endif -CLANG_VER:=16-init-12251-g87d0ff91-2 +CLANG_VER:=16-init-17653-g39da55e8-2 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz define Download/CLANG URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 URL_FILE:=$(CLANG_FILE) FILE:=$(CLANG_FILE) - HASH:=902060c5657cb99e58332ef33eed52262373734abf841a38efac239b9382969c + HASH:=b4afdf625aa4b72c5d188ed28a13dd352a881a2a4149542f0c903698d0498017 endef -GN_VER:=5e19d2fb166fbd4f6f32147fbb2f497091a54ad8 -GN_FILE:=gn-git_revision-$(GN_VER).zip -define Download/GN_TOOL - URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ - URL_FILE:=git_revision:$(GN_VER) - FILE:=$(GN_FILE) - HASH:=a95c29544e581b56c1d3f1920637a9f518989b3b744d6b2234fe8de634acddf1 -endef - -PGO_VER:=5481-1675162426-393d781cbc3753d814a299bfd43435032b5acfd9 +PGO_VER:=5563-1677886924-aa8d450a18b4f7f1cd41619f60bc5da6beb3c1d0 PGO_FILE:=chrome-linux-$(PGO_VER).profdata define Download/PGO_PROF URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles URL_FILE:=$(PGO_FILE) FILE:=$(PGO_FILE) - HASH:=c58a2775b7287f80ec21b503a0d18bb7b8777d943b16bb2c7b3135c5a89d7acc + HASH:=eb16e7be414614c215ba90538f70f431cf444b9985865ad20d8743b707a235a6 endef define Build/Prepare @@ -94,8 +86,6 @@ define Build/Prepare mkdir -p "third_party/llvm-build/Release+Asserts" ; \ $(TAR) -xzf "$(DL_DIR)/$(CLANG_FILE)" -C "third_party/llvm-build/Release+Asserts" ; \ echo -e "llvmorg-$(CLANG_VER)" > "third_party/llvm-build/Release+Asserts/cr_build_revision" ; \ - mkdir -p "gn/out" ; \ - unzip -o "$(DL_DIR)/$(GN_FILE)" -d "gn/out" ; \ popd ; \ ) endef @@ -106,7 +96,7 @@ 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="python3" ; \ + gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="$(PYTHON)" ; \ popd ; \ ) endef @@ -121,7 +111,6 @@ define Package/naiveproxy/install endef $(eval $(call Download,CLANG)) -$(eval $(call Download,GN_TOOL)) $(eval $(call Download,PGO_PROF)) $(eval $(call BuildPackage,naiveproxy))