From nobody Sun Oct 9 19:20:48 2022 X-Original-To: dev-commits-ports-branches@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 4MlsMj0HHSz4fLr5; Sun, 9 Oct 2022 19:20:49 +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 4MlsMh6qnSz3KLg; Sun, 9 Oct 2022 19:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665343249; 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=txGCuy4Tu1DDZ3PpOaS/RdaEhc/bfl8gu4cr9My2wJg=; b=PfHOWqgUOSB/jD2da3U801F1WEMhCMwbVRGVxSsQYHlENHWyzyzjNR1EYgtzM3KvTj8AWZ h+tG2/D53J7/U1x3gPh4MWRyJIk9ShNy2l0YiaxC6CDAjvomZbBRRn21vqRZJ+ljLzgITP jed2PbMR+Zc5a5RHYeGjxO+AMHJsNQpA//Mxt5tpppQAKwRWpEA5/ykbD+2PQm2QUR3e3e lS/xp7Rsnz+KPxMyNLDoI+I4vBts8Dq9hTzED9GK4bgnmVU1x3OnYCY34CGKFSdjW+bJtV E2DsWNZZQD+kDRXff7ZYwcDAqqSPSqmFLHUvz/nXv1HyJTveAqUeKm+juE9qDA== 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 4MlsMh5vlLzNFT; Sun, 9 Oct 2022 19:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 299JKmuw028764; Sun, 9 Oct 2022 19:20:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299JKm4X028763; Sun, 9 Oct 2022 19:20:48 GMT (envelope-from git) Date: Sun, 9 Oct 2022 19:20:48 GMT Message-Id: <202210091920.299JKm4X028763@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christian Weisgerber Subject: git: 26a312df8800 - 2022Q4 - audio/flac: fix build of x86 intrinsic-optimized code for clang 14+ List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 26a312df880099350f58d2756766c00bb664b9bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665343249; 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=txGCuy4Tu1DDZ3PpOaS/RdaEhc/bfl8gu4cr9My2wJg=; b=FPpCFoebBpcNLVKuFZOdgiW9fKSxpxKO/PHV8V0CTZqSjn8qm+opvrNxLFW+M1jho9PhW8 FL1Krd9gdx+ELGVNg3LMFGs8phzzYEq4z4zi8xiaCHPzdfqola8a8BbgLPiQcj32q2KbtK 6X+jWaX5TN0gG/JQId7M2aFgFiWXox17u7BGs+VZXi31LCcfucZO8BilTmwaul1HRKjA4j VH5gBT98fhNlXf/eaRWWiyvTuV7Fjzcy0uTfPu/QE8DVovqfQl8Pw3lPKx5fzS0kueoRxq NU5rOhnNZwJ1Txwc5H36KL4g6xGbNWYrVDfwhTj3QKQN22Ha+V/Z6tpC/YlYBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665343249; a=rsa-sha256; cv=none; b=AY414Y4lVM7cyLBr/eR7efiufGBfDi9zM+yd+cflQquYm/RLGnKjVV3WbRuvdCvJH2ca8M 4A7zof5fsYCz8jFnC3h7Th238YNPb5itzNbVQXwC1Ra3AZ+ZJH3JA15GhjJy476n258I3C tvLWmaBiZ95yMf+/G83sGOJarmsnNDnz9w1VDz9pfGOdPCOH89aXWgz9BkvoMhCTVJU7W7 bru/4rRg0XxffpWEbkX0Pj9Vomp708SZMqG1vJdLxTGajaHsgKXfRbVU6qjPdbN27n9YOp pUtbtEPaqYbfFbbAz26uxgfjz1pGF+aezZvmZKuobzpw9YFw4pbh1VlgGiBr0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26a312df880099350f58d2756766c00bb664b9bf commit 26a312df880099350f58d2756766c00bb664b9bf Author: Christian Weisgerber AuthorDate: 2022-10-09 15:09:16 +0000 Commit: Christian Weisgerber CommitDate: 2022-10-09 19:20:08 +0000 audio/flac: fix build of x86 intrinsic-optimized code for clang 14+ Add upstream fix "Assume Clang supports x86 intrinsics up to FMA" to keep support for SSSE3, AVX2, etc. when compiled with clang versions 14 and later. Obtained from: https://github.com/xiph/flac/commit/90c0562d4eb302b01d9b82c75a7f6a66261c5546 MFH: 2022Q4 (cherry picked from commit 482804eb2cc0482d2e0e87dfc9d1e7bf6eb78d02) --- audio/flac/Makefile | 1 + .../files/patch-src_libFLAC_include_private_cpu.h | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/audio/flac/Makefile b/audio/flac/Makefile index b0d23cd0a4ca..29c6f0fe134a 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,5 +1,6 @@ PORTNAME= flac PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://downloads.xiph.org/releases/flac/ \ https://ftp.osuosl.org/pub/xiph/releases/flac/ diff --git a/audio/flac/files/patch-src_libFLAC_include_private_cpu.h b/audio/flac/files/patch-src_libFLAC_include_private_cpu.h new file mode 100644 index 000000000000..9837d6f10ae2 --- /dev/null +++ b/audio/flac/files/patch-src_libFLAC_include_private_cpu.h @@ -0,0 +1,41 @@ +Assume Clang supports x86 intrinsics up to FMA +https://github.com/xiph/flac/commit/90c0562d4eb302b01d9b82c75a7f6a66261c5546 + +--- src/libFLAC/include/private/cpu.h.orig 2022-09-21 18:57:31 UTC ++++ src/libFLAC/include/private/cpu.h +@@ -82,28 +82,14 @@ + #elif defined __clang__ && __has_attribute(__target__) /* clang */ + #define FLAC__SSE_TARGET(x) __attribute__ ((__target__ (x))) + #define FLAC__FAST_MATH_TARGET(x) __attribute__ ((__target__ (x))) +- #if __has_builtin(__builtin_ia32_maxps) +- #define FLAC__SSE_SUPPORTED 1 +- #endif +- #if __has_builtin(__builtin_ia32_pmuludq128) +- #define FLAC__SSE2_SUPPORTED 1 +- #endif +- #if __has_builtin(__builtin_ia32_pabsd128) +- #define FLAC__SSSE3_SUPPORTED 1 +- #endif +- #if __has_builtin(__builtin_ia32_pmuldq128) +- #define FLAC__SSE4_1_SUPPORTED 1 +- #endif ++ #define FLAC__SSE_SUPPORTED 1 ++ #define FLAC__SSE2_SUPPORTED 1 ++ #define FLAC__SSSE3_SUPPORTED 1 ++ #define FLAC__SSE4_1_SUPPORTED 1 + #ifdef FLAC__USE_AVX +- #if __has_builtin(__builtin_ia32_maxps256) +- #define FLAC__AVX_SUPPORTED 1 +- #endif +- #if __has_builtin(__builtin_ia32_pabsd256) +- #define FLAC__AVX2_SUPPORTED 1 +- #endif +- #if __has_builtin(__builtin_ia32_vfmaddps) +- #define FLAC__FMA_SUPPORTED 1 +- #endif ++ #define FLAC__AVX_SUPPORTED 1 ++ #define FLAC__AVX2_SUPPORTED 1 ++ #define FLAC__FMA_SUPPORTED 1 + #endif + #elif defined __GNUC__ && !defined __clang__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) /* GCC 4.9+ */ + #define FLAC__SSE_TARGET(x) __attribute__ ((__target__ (x)))