From nobody Sat Aug 05 09:02:45 2023 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 4RHxS60bNkz4TrTg; Sat, 5 Aug 2023 09:02:46 +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 4RHxS56tRSz4rjT; Sat, 5 Aug 2023 09:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691226166; 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=XXpUJjsx44YJc0dQEkP+XdXEkVQl8QuAI+TssJRecpw=; b=cMyWnB5uURKzCLt3PccrecnuIPd8wGt8Jxfvgus+2XoXypTWUHSp0VyMsVLu16QRMNhikr 7TOG+cIRyFDAEdCMFu1u6Dc8F3IAxMtL4Rv3n7ZJ0/vnjK4mnivSt0njUJe/V87Vi2KSGH HUQp0fPs7yw7D7eRLSxcrC2RZsZw9HSwBPfjMbZWH8IrzHc1Fp+s2WdEbiGXfyXuQN3oWg 1YmolxOoGoVzjgzsNdhvI4gLttU5SJdMqgTqTaRP/9JNLEC6qJ3kAHdA7D48XRmlm5Suhu 6IJoh5Pb3woaOcj8k2OXVijq9kqLRziaF3akiz4uvca43cK9Zu9Yo4wyKMT9Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691226166; 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=XXpUJjsx44YJc0dQEkP+XdXEkVQl8QuAI+TssJRecpw=; b=bi9D6b9Lcile4n1ayCM2lxEfnJYixkNxNTeGZjJEou+EH+Dh8HNAv9g5sI1M0L2nIzHcce WHZ9GUTQHhnmQkyHm95gy1BrYMl6s1arWxx4oALl6jjf8+FV9qw7bmQ6F3VqzsH4qNBDkU JwWn/sKtxAOLFLbUDbrMDgzyH7xY5JdYmanmlQkmhzyKvNxzAiLN34t4s5NuvJJjAHk4b9 hoZ92MDKud+WQVo7Bwq07KmfaEe7Q+GTGDaEtBsYasBdw8QIK79eAU3PDy7xIZI7+2PRzx 5A/BEygGFRGhxf2ckZo6GGcK2GLGX+hitIpEn5pL2AeojvaXrktwlsYFErhSuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691226166; a=rsa-sha256; cv=none; b=FSNNat8mvCy8WgWAF0FYBhbyxuTGh10+h2icxjnlIqzXPJN1dtrU9c7KWIhDDhfT0+ndab 6u609yXPlbwbyYQCW2zkhkxETjcSaehL1FctYf6gIi3J20eezFuMpO9HympPfKeW0ne33V QToXgTB0agku5cDRwmxKMhabMb0/caljMcBP9Y4LqdmUKEcnZh9sfTDp/ooQLcdsqxZZ3A bk+HgtNkVxg/l69I1CGtWTOijnvtNjvVLYwGdLLlvM0a4wLUWMx8CXw6ZQv+kFMRY8/yQg qn5FC0JojjJAsqmyscjDEq9eegqaq4s2YIL8QpXIAKsWyoH28f/q4EZ4oP9lLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHxS55xB5z7sv; Sat, 5 Aug 2023 09:02:45 +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 37592j5O092985; Sat, 5 Aug 2023 09:02:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37592jO1092984; Sat, 5 Aug 2023 09:02:45 GMT (envelope-from git) Date: Sat, 5 Aug 2023 09:02:45 GMT Message-Id: <202308050902.37592jO1092984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: db2c219ed302 - main - graphics/openexr: Fix some CPUTYPE builds. 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db2c219ed302f97e47e0801497e0852a0ca233da Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=db2c219ed302f97e47e0801497e0852a0ca233da commit db2c219ed302f97e47e0801497e0852a0ca233da Author: Matthias Andree AuthorDate: 2023-08-05 08:56:12 +0000 Commit: Matthias Andree CommitDate: 2023-08-05 09:02:43 +0000 graphics/openexr: Fix some CPUTYPE builds. Reported by: jkim@FreeBSD.org Obtained from: https://github.com/AcademySoftwareFoundation/openexr/pull/1507 MFH: 2023Q3 --- graphics/openexr/Makefile | 4 +--- .../files/patch-lib_OpenEXRCore_internal__cpuid.h | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index 12db2091f998..e6d3800dec07 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,6 +1,6 @@ PORTNAME= openexr PORTVERSION= 3.1.10 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= mandree@FreeBSD.org @@ -23,8 +23,6 @@ CPPFLAGS+= -I. # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread -PATCH_STRIP= -p1 - _MAJORVER= 3_1 _VER= 30 _MINVER= 10 diff --git a/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h b/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h new file mode 100644 index 000000000000..342cf10762d9 --- /dev/null +++ b/graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h @@ -0,0 +1,24 @@ +https://github.com/AcademySoftwareFoundation/openexr/pull/1507/files + +--- src/lib/OpenEXRCore/internal_cpuid.h.orig 2023-07-31 18:17:50 UTC ++++ src/lib/OpenEXRCore/internal_cpuid.h +@@ -39,14 +39,16 @@ static inline void check_for_x86_simd (int *f16c, int + *f16c = 0; + # endif + +-#elif OPENEXR_ENABLE_X86_SIMD_CHECK ++#elif defined(__AVX__) && defined(__F16C__) + + // shortcut if everything is turned on / compiled in +-# if defined(__AVX__) && defined(__F16C__) + *f16c = 1; + *avx = 1; + *sse2 = 1; +-# elif defined(_MSC_VER) && defined(_WIN32) ++ ++#elif OPENEXR_ENABLE_X86_SIMD_CHECK ++ ++# if defined(_MSC_VER) && defined(_WIN32) + int regs[4], osxsave; + + __cpuid (regs, 0);