From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B304158090 for ; Fri, 20 May 2022 11:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37428E0922; Fri, 20 May 2022 11:25:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9636E0928 for ; Fri, 20 May 2022 11:25:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D754D341276 for ; Fri, 20 May 2022 11:25:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A070A474 for ; Fri, 20 May 2022 11:25:15 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1653045911.32003b5f8de209e47294f95b2c0557b04f099290.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/files/osl-1.11.17.0-llvm14.patch media-libs/osl/osl-1.11.17.0-r3.ebuild X-VCS-Directories: media-libs/osl/ media-libs/osl/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 32003b5f8de209e47294f95b2c0557b04f099290 X-VCS-Branch: master Date: Fri, 20 May 2022 11:25:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8341e331-7b38-4370-99c9-28d02efa4506 X-Archives-Hash: 2ec9fc465c607224c325a84d2eae10ff commit: 32003b5f8de209e47294f95b2c0557b04f099290 Author: Sebastian Parborg gmail com> AuthorDate: Mon May 2 14:14:39 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri May 20 11:25:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32003b5f media-libs/osl: Backport LLVM 14 patch to the stable release Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Joonas Niilola gentoo.org> media-libs/osl/files/osl-1.11.17.0-llvm14.patch | 35 +++++++++++++++++++++++++ media-libs/osl/osl-1.11.17.0-r3.ebuild | 6 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/media-libs/osl/files/osl-1.11.17.0-llvm14.patch b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch new file mode 100644 index 000000000000..6a20ce31c589 --- /dev/null +++ b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch @@ -0,0 +1,35 @@ +Backport of the following patch from git main to 1.11.17.0: + +From 8a8c2fd5e6c016eb2d22d2522bdeb9f165f319fa Mon Sep 17 00:00:00 2001 +From: Larry Gritz +Date: Mon, 18 Apr 2022 11:45:34 -0700 +Subject: [PATCH 1/3] Support for LLVM 14 + +API changes we had to take into account: +* TargetRegistry.h location +* No more DisableTailCalls field in PassManagerBuilder. + +Signed-off-by: Larry Gritz +--- + .github/workflows/ci.yml | 10 +++++----- + INSTALL.md | 2 +- + src/build-scripts/build_llvm.bash | 2 +- + src/liboslexec/llvm_util.cpp | 7 ++++++- + 4 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp +index b30c89318..22d4134ba 100644 +--- a/src/liboslexec/llvm_util.cpp ++++ b/src/liboslexec/llvm_util.cpp +@@ -45,7 +45,11 @@ + #include + #include + #include ++#if OSL_LLVM_VERSION < 140 + #include ++#else ++#include ++#endif + + #include + #include diff --git a/media-libs/osl/osl-1.11.17.0-r3.ebuild b/media-libs/osl/osl-1.11.17.0-r3.ebuild index 3f98563dd7a0..0a1926fb5a2d 100644 --- a/media-libs/osl/osl-1.11.17.0-r3.ebuild +++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9,10} ) # check this on updates -LLVM_MAX_SLOT=13 +LLVM_MAX_SLOT=14 CMAKE_REMOVE_MODULES_LIST=() @@ -64,6 +64,10 @@ RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-1.11.17.0-llvm14.patch +) + llvm_check_deps() { has_version -r "sys-devel/clang:${LLVM_SLOT}" }