From owner-svn-ports-head@freebsd.org Tue Nov 27 06:49:27 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B152113C229; Tue, 27 Nov 2018 06:49:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2D026856DE; Tue, 27 Nov 2018 06:49:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01FF117A1B; Tue, 27 Nov 2018 06:49:26 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAR6nQEw026930; Tue, 27 Nov 2018 06:49:26 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAR6nQmt026926; Tue, 27 Nov 2018 06:49:26 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201811270649.wAR6nQmt026926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 27 Nov 2018 06:49:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485985 - in head/www/chromium: . files X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/www/chromium: . files X-SVN-Commit-Revision: 485985 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2D026856DE X-Spamd-Result: default: False [1.69 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.49)[0.491,0]; NEURAL_SPAM_MEDIUM(0.69)[0.687,0]; NEURAL_SPAM_LONG(0.51)[0.511,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 06:49:27 -0000 Author: manu Date: Tue Nov 27 06:49:25 2018 New Revision: 485985 URL: https://svnweb.freebsd.org/changeset/ports/485985 Log: Revert r485933 It was based on an older version of the port, revert until I work on it again Approved by: bapt (mentor, implicit) Deleted: head/www/chromium/files/patch-third__party_zlib_arm__features.c Modified: head/www/chromium/Makefile head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c head/www/chromium/files/patch-third__party_zlib_BUILD.gn head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/Makefile Tue Nov 27 06:49:25 2018 (r485985) @@ -204,14 +204,6 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${ .include -# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only -.if ${ARCH} == aarch64 -PLIST_SUB+= NOT_AARCH64="@comment " -.else -PLIST_SUB+= NOT_AARCH64="" -.endif - - BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base @@ -305,13 +297,11 @@ do-install: .endfor # SwiftShader -.if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor -.endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ Modified: head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c ============================================================================== --- head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c Tue Nov 27 06:49:25 2018 (r485985) @@ -1,11 +1,40 @@ ---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-09-11 22:58:51 UTC -+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c -@@ -60,3 +60,8 @@ void OPENSSL_cpuid_setup(void) { - } +--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2017-09-11 03:00:27.842983000 +0200 ++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2017-09-11 03:02:56.830632000 +0200 +@@ -16,7 +16,9 @@ - #endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP -+ -+#ifdef __FreeBSD__ -+void OPENSSL_cpuid_setup(void) { -+} + #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP) + ++#if defined(OPENSSL_LINUX) + #include +#endif + + #include + +@@ -26,6 +28,7 @@ + extern uint32_t OPENSSL_armcap_P; + + void OPENSSL_cpuid_setup(void) { ++#if defined(OPENSSL_LINUX) + unsigned long hwcap = getauxval(AT_HWCAP); + + /* See /usr/include/asm/hwcap.h on an aarch64 installation for the source of +@@ -41,9 +44,11 @@ + * either. */ + return; + } ++#endif + + OPENSSL_armcap_P |= ARMV7_NEON; + ++#if defined(OPENSSL_LINUX) + if (hwcap & kAES) { + OPENSSL_armcap_P |= ARMV8_AES; + } +@@ -56,6 +61,7 @@ + if (hwcap & kSHA256) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } ++#endif + } + + #endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */ Modified: head/www/chromium/files/patch-third__party_zlib_BUILD.gn ============================================================================== --- head/www/chromium/files/patch-third__party_zlib_BUILD.gn Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/files/patch-third__party_zlib_BUILD.gn Tue Nov 27 06:49:25 2018 (r485985) @@ -1,14 +1,5 @@ ---- third_party/zlib/BUILD.gn.orig 2018-08-08 21:11:58.000000000 +0200 -+++ third_party/zlib/BUILD.gn 2018-09-12 01:00:34.445630000 +0200 -@@ -68,7 +68,7 @@ - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] - } else if (is_linux || is_chromeos) { -- defines += [ "ARMV8_OS_LINUX" ] -+# defines += [ "ARMV8_OS_LINUX" ] - } - } - } +--- third_party/zlib/BUILD.gn.orig 2018-06-13 00:11:08.000000000 +0200 ++++ third_party/zlib/BUILD.gn 2018-07-19 21:36:13.071700000 +0200 @@ -327,7 +327,7 @@ ] } Modified: head/www/chromium/pkg-plist ============================================================================== --- head/www/chromium/pkg-plist Tue Nov 27 05:28:06 2018 (r485984) +++ head/www/chromium/pkg-plist Tue Nov 27 06:49:25 2018 (r485985) @@ -313,8 +313,8 @@ bin/chrome %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js %%DATADIR%%/snapshot_blob.bin -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so +%%DATADIR%%/swiftshader/libEGL.so +%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin %%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator