From nobody Sat Aug 5 09:03:08 2023 X-Original-To: dev-commits-ports-all@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 4RHxSX6jFwz4TrmD; Sat, 5 Aug 2023 09:03:08 +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 4RHxSX5mgFz4rLG; Sat, 5 Aug 2023 09:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691226188; 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=HBu0qiW9N3oe5c1nhOTBwgdeSXuw6D95wS+r+RVX8MY=; b=uGrQdiuxleg4/1R72bjytTUfBML8IhwosWEOY5EMWAfWbbLMMHGqYnrdlpUmVrKjWYUWUD SscpD6WpUlGA+4fNVEG/eOq9JI5OsanZOy0GnN0aQSynGbL7z/9sFqdmecepa/LeCdQDAK Mob1rImtQFVaXAomRipfDNH51ccmQR/9hn4FY2d4Co5mRdYyPJ1DaZcmSo60MepzjaDRzv FdHeEycq1fBV7UqWV+GpfdHXbky5MgT9rpyR/940rqz63MmNO4W7RmpY/iB48nzgs+3ffG 7yYt/ehA2XUji1VIDmGVZlvN3Xw3G2wMYXOqo5qo5DVrS+txxvhg08894ymBVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691226188; 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=HBu0qiW9N3oe5c1nhOTBwgdeSXuw6D95wS+r+RVX8MY=; b=dqCqGxdtfnMX7bhG0esAjw3I5TbdGXUkF+QHH6eRa3Hn0KuD/ygkLQAqDNBkyr3zy7WMT+ HOyF7lFzXI6G2iD6wK45yxjAHPQUSJBoolRcVdxUSeLnSHp1lfNtwSVedYS6W2wXQlqv90 1v4yIakyTEVtC0bcxaRIuEsZ7UzYySP/Lb8QTDtX2gB4zy6IgQUooCs+Q1aHSnA/NEqVCb fI5aaJg1D9KJZhEJo2IKsKDkWNNMmqlHW08W+P88d6ZYNJe5mnvQi5CzLHae35p0+agOzE 1LXCvFmuycz9p3uIgvvY7cyIcNpYVvQBjOUk7/qqUuy3lwQb1cCnX3oNFFc5uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691226188; a=rsa-sha256; cv=none; b=cD1oijve1dtMGDMnfD5G0tISxRcUIJso2SjVrNMORgZto7y7dIu4echMAXiG2T3mWKSi8z M6+uGTspFNhl5rl9baOWR9m6CxVJcr3nBSnrYFzaJZwgYQ9BGI3zszY8uB5kBOaAuOQMmu j3dcWq2j1Jj60jfTEkhx5mE5bbJQokZjC7GPGq286WR42kW4pj1Nq8DH4EgcdwnkZHYqYZ PDzTLu7VRT7Rm2gPQDgB+qi8OlDAxOYlZoOD2ppMt2UKmRfxAnP96sE1TEr+bsP7t3C3yJ 7u3ULcmQXM8s73UCdrAtIkzIuSxVyyoCPvXhbHlICOUfMJ5ygicnyI4ytgh/SA== 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 4RHxSX4sWNz7sy; Sat, 5 Aug 2023 09:03:08 +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 375938XA093184; Sat, 5 Aug 2023 09:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375938wI093183; Sat, 5 Aug 2023 09:03:08 GMT (envelope-from git) Date: Sat, 5 Aug 2023 09:03:08 GMT Message-Id: <202308050903.375938wI093183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 59fd742a365e - 2023Q3 - graphics/openexr: Fix some CPUTYPE builds. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 59fd742a365e4a52267390a90735206b2332c868 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=59fd742a365e4a52267390a90735206b2332c868 commit 59fd742a365e4a52267390a90735206b2332c868 Author: Matthias Andree AuthorDate: 2023-08-05 08:56:12 +0000 Commit: Matthias Andree CommitDate: 2023-08-05 09:03:06 +0000 graphics/openexr: Fix some CPUTYPE builds. Reported by: jkim@FreeBSD.org Obtained from: https://github.com/AcademySoftwareFoundation/openexr/pull/1507 MFH: 2023Q3 (cherry picked from commit db2c219ed302f97e47e0801497e0852a0ca233da) --- 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);