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 BA03B158094 for ; Sun, 11 Sep 2022 15:50:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0CD0E03DF; Sun, 11 Sep 2022 15:50:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 958E7E03DF for ; Sun, 11 Sep 2022 15:50:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BBB99340FA8 for ; Sun, 11 Sep 2022 15:50:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF13057D for ; Sun, 11 Sep 2022 15:50:35 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1662911382.964f41e75f853df5227797adc927139bc7f466e3.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch dev-util/glslang/glslang-1.3.224-r1.ebuild X-VCS-Directories: dev-util/glslang/ dev-util/glslang/files/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 964f41e75f853df5227797adc927139bc7f466e3 X-VCS-Branch: master Date: Sun, 11 Sep 2022 15:50:35 +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: cec162e9-fa00-4bbc-bd6c-714b0dd1836c X-Archives-Hash: 15fa04a685c3e77a9cce6dfc26b7c01e commit: 964f41e75f853df5227797adc927139bc7f466e3 Author: Nick Sarnie gentoo org> AuthorDate: Sun Sep 11 15:48:25 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Sep 11 15:49:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964f41e7 dev-util/glslang: Fix cmake file install dir Closes: https://bugs.gentoo.org/869245 Signed-off-by: Nick Sarnie gentoo.org> ...lslang-1.3.224-Fix-cmake-file-install-dir.patch | 258 +++++++++++++++++++++ dev-util/glslang/glslang-1.3.224-r1.ebuild | 30 +++ 2 files changed, 288 insertions(+) diff --git a/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch b/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch new file mode 100644 index 000000000000..685584eee2c8 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch @@ -0,0 +1,258 @@ +From 1b32fc8eb242f264f2bedb384d3f3e359f3cdd1d Mon Sep 17 00:00:00 2001 +From: Andrea Pappacoda +Date: Thu, 25 Aug 2022 23:15:14 +0200 +Subject: [PATCH] build: install glslang-config.cmake to libdir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As glslang ships architecture dependant files, the Config file should be +installed to libdir, not datadir. See +https://github.com/KhronosGroup/glslang/pull/2989#discussion_r955367103 +for more details. + +Here's the diff between the install tree before and after this patch: + + $ diff <(tree install-datadir) <(tree install) + 1c1 + < install-datadir + --- + > install + 74,99c74,98 + < ├── lib + < │   ├── cmake + < │   │   ├── glslang-default-resource-limitsTargets.cmake + < │   │   ├── glslangTargets.cmake + < │   │   ├── glslangValidatorTargets.cmake + < │   │   ├── HLSLTargets.cmake + < │   │   ├── OGLCompilerTargets.cmake + < │   │   ├── OSDependentTargets.cmake + < │   │   ├── spirv-remapTargets.cmake + < │   │   ├── SPIRVTargets.cmake + < │   │   └── SPVRemapperTargets.cmake + < │   ├── libGenericCodeGen.a + < │   ├── libglslang.a + < │   ├── libglslang-default-resource-limits.a + < │   ├── libHLSL.a + < │   ├── libMachineIndependent.a + < │   ├── libOGLCompiler.a + < │   ├── libOSDependent.a + < │   ├── libSPIRV.a + < │   └── libSPVRemapper.a + < └── share + < └── glslang + < ├── glslang-config.cmake + < ├── glslang-config-version.cmake + < ├── glslang-targets.cmake + < └── glslang-targets-debug.cmake + --- + > └── lib + > ├── cmake + > │   ├── glslang-default-resource-limitsTargets.cmake + > │   ├── glslangTargets.cmake + > │   ├── glslangValidatorTargets.cmake + > │   ├── HLSLTargets.cmake + > │   ├── OGLCompilerTargets.cmake + > │   ├── OSDependentTargets.cmake + > │   ├── spirv-remapTargets.cmake + > │   ├── SPIRVTargets.cmake + > │   └── SPVRemapperTargets.cmake + > ├── glslang + > │   ├── glslang-config.cmake + > │   ├── glslang-config-version.cmake + > │   ├── glslang-targets.cmake + > │   └── glslang-targets-debug.cmake + > ├── libGenericCodeGen.a + > ├── libglslang.a + > ├── libglslang-default-resource-limits.a + > ├── libHLSL.a + > ├── libMachineIndependent.a + > ├── libOGLCompiler.a + > ├── libOSDependent.a + > ├── libSPIRV.a + > └── libSPVRemapper.a + 101c100 + < 15 directories, 83 files + --- + > 14 directories, 83 files +--- + CMakeLists.txt | 8 ++++---- + OGLCompilersDLL/CMakeLists.txt | 2 +- + SPIRV/CMakeLists.txt | 4 ++-- + StandAlone/CMakeLists.txt | 6 +++--- + glslang/CMakeLists.txt | 2 +- + glslang/OSDependent/Unix/CMakeLists.txt | 2 +- + glslang/OSDependent/Windows/CMakeLists.txt | 2 +- + gtests/CMakeLists.txt | 2 +- + hlsl/CMakeLists.txt | 2 +- + 9 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a01168603..b7fe3d775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL) + include("@PACKAGE_PATH_EXPORT_TARGETS@") + ]=]) + +- set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake") ++ set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake") + configure_package_config_file( + "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake" + PATH_VARS + PATH_EXPORT_TARGETS +- INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} + ) + + write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake" +@@ -392,7 +392,7 @@ if(ENABLE_GLSLANG_INSTALL) + install( + EXPORT glslang-targets + NAMESPACE "glslang::" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}" + ) + + install( +@@ -400,6 +400,6 @@ if(ENABLE_GLSLANG_INSTALL) + "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake" + DESTINATION +- "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}" ++ "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}" + ) + endif() +\ No newline at end of file +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +index 8c0e2ba5c..841b3e2c6 100644 +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OGLCompiler) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OGLCompiler ALIAS glslang::OGLCompiler) +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index c26e310da..6724417f4 100644 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -121,7 +121,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::SPVRemapper) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(SPVRemapper ALIAS glslang::SPVRemapper) +@@ -133,7 +133,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::SPIRV) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(SPIRV ALIAS glslang::SPIRV) +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 027575047..d54a1df8c 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -111,7 +111,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::glslangValidator) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(glslangValidator ALIAS glslang::glslangValidator) +@@ -126,7 +126,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::spirv-remap) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(spirv-remap ALIAS glslang::spirv-remap) +@@ -141,7 +141,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::glslang-default-resource-limits) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index 45c9813a8..f63e8fc32 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -209,7 +209,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::glslang) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + if(${BUILD_SHARED_LIBS}) +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +index 96ae21604..ec1eda4a3 100644 +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OSDependent) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OSDependent ALIAS glslang::OSDependent) +diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt +index 548984470..6048bb872 100644 +--- a/glslang/OSDependent/Windows/CMakeLists.txt ++++ b/glslang/OSDependent/Windows/CMakeLists.txt +@@ -55,7 +55,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OSDependent) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OSDependent ALIAS glslang::OSDependent) +diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt +index dd555ecca..8dff7ede0 100644 +--- a/gtests/CMakeLists.txt ++++ b/gtests/CMakeLists.txt +@@ -76,7 +76,7 @@ if(BUILD_TESTING) + message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::glslangtests) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(glslangtests ALIAS glslang::glslangtests) +diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt +index 4616cfe01..b34df3aea 100644 +--- a/hlsl/CMakeLists.txt ++++ b/hlsl/CMakeLists.txt +@@ -52,7 +52,7 @@ if(ENABLE_GLSLANG_INSTALL) + message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::HLSL) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(HLSL ALIAS glslang::HLSL) diff --git a/dev-util/glslang/glslang-1.3.224-r1.ebuild b/dev-util/glslang/glslang-1.3.224-r1.ebuild new file mode 100644 index 000000000000..7d76d7006c5b --- /dev/null +++ b/dev-util/glslang/glslang-1.3.224-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" + inherit git-r3 +else + SNAPSHOT_COMMIT="sdk-${PV}.0" + SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" +fi + +DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" +HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" + +LICENSE="BSD" +SLOT="0" + +BDEPEND="${PYTHON_DEPS}" + +# Bug 698850 +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-Fix-cmake-file-install-dir.patch" )