From nobody Sun May 19 15:46:58 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vj4nb0ZDGz5KVrd; Sun, 19 May 2024 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vj4nZ6xYNz4WJb; Sun, 19 May 2024 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716133619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6KEduY7j7dZX4HHSo9SJN+52uP+zdnAT7CmqmZoTT/4=; b=ZRU/om6bNh5yCXHMZfpzcJ+AzzQ8Suq7FoSBITFIQm03kTXgfwXFlChjj5lGW0FHEHUeQ2 bxtRgPqYHWrVvF88sEor2GcG8FnhHaq2NvITJpm/sSXkMWp0/v/YDQod3ZN1hV5XUpGypi LZ7hJ2ZbYyOf7hAKYEfjSL83VxnnrYmguzl/mVntVyv5cbM9Sied0NC27xZ6iaLyJRksJf fS47TuAFa20UKEtZdECJ7CPNHGnblVohcA81QTtO5hvhCjI65go7OeCoWwXSgWy7E+Gcfb MTvCh8W4CWU7WIIz6IVTFeW9l0OXpQibGm2hLmxWhDXF/rSD5Xm5kHhhjjsHjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716133619; a=rsa-sha256; cv=none; b=dpJXNwOYtpZGbAp5fZHgKTdNHMICuMMOD6FP4O2o5+ilQ2BtSPgF9hr64CMWT50aDew4mn 0x7ImeKXfm20XPkug/k11Zbvc8xxG6e8kYleOF/SMOXWzzLxpQjw8ieS4OyJrlOWUr2yC5 zoze3il4drwzFi9z30z3aeotcyVT4ZyBHykm/PBdovngI6Lbx56qx3/yhnJHvGynS1og5Z t4YSPBurfqgO6kURfRQ9IZOAKlSatPWP0eZh5/PhC2byXs3og2sihUHfa8yuYpBNYNpVY9 YfLFFAZRqIdegQ0SlnGVdufwf8cqh6MeWaCJYNVGzXBkw2lRBN78ucNZKz2a5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716133619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6KEduY7j7dZX4HHSo9SJN+52uP+zdnAT7CmqmZoTT/4=; b=xLCzI9+cVzNTXpEq/TnTO1+v9faJ0zv8PXub4xz9JEJxSCIKU3KGKUK5pfbRP2DIHOGBA2 xRrQvg+dN/cafP1cjhuQ5ixqTdJGzNx8vGI2WvEcNaC2eo9jmUW0EWblpCfMmYgmYAdj93 b+UA6OpB7KJcNE2vPN2lAyc5HOaeyyMmhVSSqsBMHeEsL4qycr7YAiKwvn0Wz5udk9sEcH APB8HcoRxrSHQNt0BrYk6ZcwMjNfeR267lF8ZmIf+VOOk+qJkVXwPq24XWmmi9EEPAM4S5 YGFSLTNl1QerRGd2Z6hvjz1zFEQemJvr5recnstmB8XqOXu3R+4ORE9P4Cwu8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vj4nZ6QFGz1F0F; Sun, 19 May 2024 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44JFkw09082226; Sun, 19 May 2024 15:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44JFkw1D082223; Sun, 19 May 2024 15:46:58 GMT (envelope-from git) Date: Sun, 19 May 2024 15:46:58 GMT Message-Id: <202405191546.44JFkw1D082223@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 86ab24e19ebb - main - graphics/bgfx: correction for fix build on i386 with CPUTYPE=nehalem and newer List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86ab24e19ebb6f64d34ef2fd10d5185e1c3c742a Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=86ab24e19ebb6f64d34ef2fd10d5185e1c3c742a commit 86ab24e19ebb6f64d34ef2fd10d5185e1c3c742a Author: Vladimir Druzenko AuthorDate: 2024-05-19 15:37:58 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-19 15:37:58 +0000 graphics/bgfx: correction for fix build on i386 with CPUTYPE=nehalem and newer Previous patch truncating the value to 32-bits before taking the popcount. Upstream made correct patch: https://github.com/ARM-software/astc-encoder/issues/468#issuecomment-2119169136 This patch will be included in next release of the astc-encoder 4.9. Also we can apply this patch to misc/astc-encoder (4.7 in ports). PR: 278722 Fixes: 656401a (fix build on i386 with CPUTYPE=nehalem and newer) --- ...mg_3rdparty_astc-encoder_source_astcenc__vecmathlib__sse__4.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/graphics/bgfx/files/patch-bimg_3rdparty_astc-encoder_source_astcenc__vecmathlib__sse__4.h b/graphics/bgfx/files/patch-bimg_3rdparty_astc-encoder_source_astcenc__vecmathlib__sse__4.h index 1f80efad67d4..2ca0c47c7db0 100644 --- a/graphics/bgfx/files/patch-bimg_3rdparty_astc-encoder_source_astcenc__vecmathlib__sse__4.h +++ b/graphics/bgfx/files/patch-bimg_3rdparty_astc-encoder_source_astcenc__vecmathlib__sse__4.h @@ -1,10 +1,11 @@ --- bimg/3rdparty/astc-encoder/source/astcenc_vecmathlib_sse_4.h.orig 2024-03-28 05:00:55 UTC +++ bimg/3rdparty/astc-encoder/source/astcenc_vecmathlib_sse_4.h -@@ -1309,5 +1309,7 @@ ASTCENC_SIMD_INLINE int popcount(uint64_t v) +@@ -1307,7 +1307,7 @@ ASTCENC_SIMD_INLINE vfloat4 dot3(vfloat4 a, vfloat4 b) + */ + ASTCENC_SIMD_INLINE int popcount(uint64_t v) { - #if defined(__MINGW32__) +-#if defined(__MINGW32__) ++#if !defined(__x86_64__) return static_cast(__builtin_popcountll(v)); -+#elif defined(__FreeBSD__) && !defined(__x86_64__) -+ return static_cast(_mm_popcnt_u32(static_cast(v))); #else return static_cast(_mm_popcnt_u64(v));