From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- dev-util/glslang/Manifest | 3 +- ...lslang-1.3.224-Fix-cmake-file-install-dir.patch | 258 +++++++++++++++++++++ dev-util/glslang/glslang-1.3.224-r1.ebuild | 30 +++ dev-util/glslang/glslang-1.3.224.ebuild | 28 --- 4 files changed, 290 insertions(+), 29 deletions(-) create mode 100644 dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch create mode 100644 dev-util/glslang/glslang-1.3.224-r1.ebuild delete mode 100644 dev-util/glslang/glslang-1.3.224.ebuild (limited to 'dev-util/glslang') diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index e6e59a90f610..17aa94ccba85 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,6 +1,7 @@ +AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c136e3d1aeacb0d7e0a1ddc4d8972a160f8e31e7542526ae9eed9c1acb07dc1bf160e58f8df2582420b9df4532c0aae723729293b0fa5b4bc24df SHA512 8eb4cf63767d83219b56996477521da067f06e0d9db52c8a5a7c842e28f988935181cacb5727795c33fc75ec81d6085c6d30f0498ed4f1a8c3e6fbe33c1cc7be DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e -EBUILD glslang-1.3.224.ebuild 815 BLAKE2B 48e125d4206ab446a51bdf65e6b9cd86e8853ef6c6e7ab704fbd7b6370308187f671866178f4a1191c87916639a38edd61d7400783fa78c85618676b678a699f SHA512 cea3c3fd2565c395b7a01d2e98c0e879b52eef6278b351fff78ccad222554f3d9b5d987aa553254d1a143779a0a4f236054566957cbaab28b57097d0bc823a53 +EBUILD glslang-1.3.224-r1.ebuild 880 BLAKE2B f4e4a13341eb7fd9c6f61777115adeb17ebe6162428d84436b8ca81bcad2e70149c60c7e59724c88b2ae6c04c5c638cb0b17e80c2f4e8891cc6f5cc7070285bc SHA512 0917150e19bffb965bddd8054d35c8385f30f372ae446908d9050bf46e7e5193cf65710634028ce77f10be6d4a7a6e7f6e9cc8d459b4dc404ec5ba2b0a66ba50 EBUILD glslang-9999.ebuild 815 BLAKE2B 5e6986adf59b9c16a8f7792d3cb5317bf5f98b0afdcc8aa6046a3eb3cdd136ed715dde7acc5ed2854ba0064f433f4047f034558f7cc4371bd6cfc4e898a32f64 SHA512 5d935aa37f345e8008d735208ebf4e8a14de4fafbd0cd46675f2cb23068ae8781ca9c60a43783283d775bcf9dfa72ccd99b7283d0600e74f947d9b78907afc4c MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764 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" ) diff --git a/dev-util/glslang/glslang-1.3.224.ebuild b/dev-util/glslang/glslang-1.3.224.ebuild deleted file mode 100644 index ffb48adf4b6f..000000000000 --- a/dev-util/glslang/glslang-1.3.224.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# 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" -- cgit v1.2.3