* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2019-11-22 23:29 Nick Sarnie
0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-11-22 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 80f125854feafee201a007bd5e6812e89f704389
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 23:24:21 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 23:24:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f12585
dev-util/glslang: Respect CMAKE_INSTALL_LIBDIR
Backported from: bd69a4fb1206c3441ed56a9a058adfb6e46d55a6
Fixes: https://bugs.gentoo.org/699416
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...E_INSTALL_LIBDIR-in-installed-CMake-files.patch | 105 +++++++++++++++++++++
.../glslang-7.12.3353_pre20191027-r2.ebuild | 30 ++++++
2 files changed, 135 insertions(+)
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
new file mode 100644
index 00000000000..8838a97809d
--- /dev/null
+++ b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
@@ -0,0 +1,105 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index af4ab587..e0096743 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -11,5 +11,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
++ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index e25ec0a1..364f04cc 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+
+- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
+- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
++ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+
+ install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index 0878965c..d9d71d1a 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS spirv-remap EXPORT spirv-remapTargets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
+- install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
++ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+
+ if(BUILD_SHARED_LIBS)
+ install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
++ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif()
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 42df1d1e..446cabb9 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS glslang EXPORT glslangTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+- install(EXPORT glslangTargets DESTINATION lib/cmake)
++ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+
+ if(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 91fb45a7..9994314f 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -22,5 +22,5 @@ endif()
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OSDependent EXPORT OSDependentTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
+index f6bd4e9d..c050ef61 100644
+--- a/glslang/OSDependent/Windows/CMakeLists.txt
++++ b/glslang/OSDependent/Windows/CMakeLists.txt
+@@ -17,5 +17,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OSDependent EXPORT OSDependentTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
+index 77d217f1..aadf9a54 100644
+--- a/gtests/CMakeLists.txt
++++ b/gtests/CMakeLists.txt
+@@ -33,7 +33,7 @@ if(BUILD_TESTING)
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS glslangtests EXPORT glslangtestsTargets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+- install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
++ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+
+ set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
+diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
+index 44f9d6a2..ae0d4d4e 100644
+--- a/hlsl/CMakeLists.txt
++++ b/hlsl/CMakeLists.txt
+@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS HLSL EXPORT HLSLTargets
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+- install(EXPORT HLSLTargets DESTINATION lib/cmake)
++ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
new file mode 100644
index 00000000000..d0fcd6b8e02
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{3_6,3_7})
+
+inherit cmake-multilib cmake-utils python-any-r1
+
+SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-relative-includes.patch"
+ "${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
+ )
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2022-09-11 15:50 Nick Sarnie
0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2022-09-11 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 964f41e75f853df5227797adc927139bc7f466e3
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 15:48:25 2022 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> 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 <sarnex <AT> 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 <andrea@pappacoda.it>
+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" )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2022-11-08 23:57 Nick Sarnie
0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2022-11-08 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 5b3406b932a28470270a2b83993c1358d9d0a62a
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 5 22:10:54 2022 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 23:56:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3406b9
dev-util/glslang: Add subslot, install static libs
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
.../glslang-1.3.231-Install-static-libs.patch | 57 ++++++++++++++++++++++
...ng-1.3.231.ebuild => glslang-1.3.231-r1.ebuild} | 4 +-
dev-util/glslang/glslang-9999.ebuild | 4 +-
3 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
new file mode 100644
index 000000000000..b7ed014d92b3
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
@@ -0,0 +1,57 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index b44cbc73..41f6de93 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+ source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OGLCompiler EXPORT glslang-targets)
+
+ # Backward compatibility
+@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+ 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_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+ endif()
+
+ add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index a8b14911..57ec1efd 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ ################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS glslang EXPORT glslang-targets)
+- if(NOT BUILD_SHARED_LIBS)
++ if(BUILD_SHARED_LIBS)
+ install(TARGETS MachineIndependent EXPORT glslang-targets)
+ install(TARGETS GenericCodeGen EXPORT glslang-targets)
+
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 16eb939b..959788dc 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+ target_link_libraries(OSDependent Threads::Threads)
+ endif()
+
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OSDependent EXPORT glslang-targets)
+
+ # Backward compatibility
+@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+ 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_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+ endif()
+
+ add_library(OSDependent ALIAS glslang::OSDependent)
diff --git a/dev-util/glslang/glslang-1.3.231.ebuild b/dev-util/glslang/glslang-1.3.231-r1.ebuild
similarity index 92%
rename from dev-util/glslang/glslang-1.3.231.ebuild
rename to dev-util/glslang/glslang-1.3.231-r1.ebuild
index a87aaeeb9345..dc652e36d9b8 100644
--- a/dev-util/glslang/glslang-1.3.231.ebuild
+++ b/dev-util/glslang/glslang-1.3.231-r1.ebuild
@@ -19,8 +19,10 @@ 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"
+PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
+
LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
BDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index a87aaeeb9345..1f9728bad96e 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -19,8 +19,10 @@ 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"
+PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" )
+
LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
BDEPEND="${PYTHON_DEPS}"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2023-11-10 18:24 Nick Sarnie
0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2023-11-10 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 202e24f69e75a8910144ec7f3ee617b3598653dd
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 18:23:47 2023 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 18:24:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202e24f6
dev-util/glslang: Fix cmake targets
Closes: https://bugs.gentoo.org/917110
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
.../files/glslang-1.3.238-Fix-cmake-targets.patch | 26 ++++++++++++++++++++++
...1.3.268-r1.ebuild => glslang-1.3.268-r2.ebuild} | 4 +++-
dev-util/glslang/glslang-9999.ebuild | 4 +++-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
new file mode 100644
index 000000000000..3afcec329f07
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
@@ -0,0 +1,26 @@
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index a80e74ed..8a15f00d 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -106,7 +106,7 @@ if(ENABLE_OPT)
+ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
+ target_include_directories(SPIRV PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>)
+ else()
+ target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif()
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index ad88442c..db2ca5ff 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -69,7 +69,7 @@ endif()
+ target_link_libraries(glslang-standalone ${LIBRARIES})
+ target_include_directories(glslang-standalone PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+ if(ENABLE_OPT)
+ target_include_directories(glslang-standalone
diff --git a/dev-util/glslang/glslang-1.3.268-r1.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild
similarity index 89%
rename from dev-util/glslang/glslang-1.3.268-r1.ebuild
rename to dev-util/glslang/glslang-1.3.268-r2.ebuild
index 809e9b2f1e97..2ac7f3ffb59c 100644
--- a/dev-util/glslang/glslang-1.3.268-r1.ebuild
+++ b/dev-util/glslang/glslang-1.3.268-r2.ebuild
@@ -31,7 +31,9 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
+ "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
+)
multilib_src_configure() {
local mycmakeargs=(
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 7ba69afd1dbe..dd1be10214bc 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -31,7 +31,9 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
+ "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
+)
multilib_src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2024-03-03 17:08 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2024-03-03 17:08 UTC (permalink / raw
To: gentoo-commits
commit: aaeb7d0e77864ff685977982dc56f2b0e3773531
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 17:06:57 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 17:07:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaeb7d0e
dev-util/glslang: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/glslang/Manifest | 3 --
.../glslang-1.3.236-Install-static-libs.patch | 39 -------------------
.../files/glslang-1.3.238-Fix-cmake-targets.patch | 26 -------------
dev-util/glslang/glslang-1.3.250.ebuild | 37 ------------------
dev-util/glslang/glslang-1.3.261.ebuild | 37 ------------------
dev-util/glslang/glslang-1.3.268-r2.ebuild | 44 ----------------------
6 files changed, 186 deletions(-)
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 56ac5caaed4e..017e4df7b206 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1 @@
-DIST glslang-1.3.250.tar.gz 3707963 BLAKE2B 24096c88307dfca765bb5fdbcebe1ec8f658ee640408f89cf2e17b3dd35c4870fa2de07403fe754991d953a4b171a75f499638c599c3045e2560fae0c871dabe SHA512 deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c
-DIST glslang-1.3.261.tar.gz 3705459 BLAKE2B 0576d87d6172910ec8853c44920614745be7c244bd70e1f424f07de3befabf93745142ddbc242cedde7ca3c646017104bd6dec2bc6a4c1ff29ac3b4041d68a7a SHA512 dc26a6b4311319e2897141bbb424eac6fc7deec99b90ac87c1f734701a8d52d55e5a6884183583f526580fe173ace01f5a5bc666658e1699a57d2e522f0edc84
-DIST glslang-1.3.268.tar.gz 3765735 BLAKE2B 20e4063c080da6fa7427d8b9af9af27a6e5e8895e870620e4b5e14e4d5548020de38b932b24df5596df0452ab2511497605343f9ff4511fad325aa696ab565cd SHA512 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f
DIST glslang-1.3.275.tar.gz 3773036 BLAKE2B 6bb30d6972fd64a9acde4b4c22e3db48d77c49a885efc47208c1c5a641d1e01d687b016ada94c89da6c48c735394023bd3efea5d77108d0fed9ab0b4fa92adfe SHA512 0c06b07e2424a24dc6b87eb1e76d866bb8d72d632e874e6f100140e24f3a5f562e66b275673677165ee8c7f7c619d09cb272bcd528be6801c7c1702a100b0f4a
diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
deleted file mode 100644
index 826e0f6cd856..000000000000
--- a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index b44cbc73..41f6de93 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -41,7 +41,7 @@ if(WIN32)
- source_group("Source" FILES ${SOURCES})
- endif(WIN32)
-
--if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
-+if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT glslang-targets)
-
- # Backward compatibility
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index a8b14911..57ec1efd 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -203,7 +203,7 @@ endif()
- ################################################################################
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslang EXPORT glslang-targets)
-- if(NOT BUILD_SHARED_LIBS)
-+ if(BUILD_SHARED_LIBS)
- install(TARGETS MachineIndependent EXPORT glslang-targets)
- install(TARGETS GenericCodeGen EXPORT glslang-targets)
-
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 16eb939b..959788dc 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -52,7 +52,7 @@ else()
- target_link_libraries(OSDependent Threads::Threads)
- endif()
-
--if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
-+if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT glslang-targets)
-
- # Backward compatibility
diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
deleted file mode 100644
index 3afcec329f07..000000000000
--- a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index a80e74ed..8a15f00d 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -106,7 +106,7 @@ if(ENABLE_OPT)
- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
- target_include_directories(SPIRV PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
-- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>)
- else()
- target_link_libraries(SPIRV PRIVATE MachineIndependent)
- endif()
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index ad88442c..db2ca5ff 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -69,7 +69,7 @@ endif()
- target_link_libraries(glslang-standalone ${LIBRARIES})
- target_include_directories(glslang-standalone PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
-- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
- if(ENABLE_OPT)
- target_include_directories(glslang-standalone
diff --git a/dev-util/glslang/glslang-1.3.250.ebuild b/dev-util/glslang/glslang-1.3.250.ebuild
deleted file mode 100644
index d720251291ea..000000000000
--- a/dev-util/glslang/glslang-1.3.250.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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/12"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.261.ebuild b/dev-util/glslang/glslang-1.3.261.ebuild
deleted file mode 100644
index d720251291ea..000000000000
--- a/dev-util/glslang/glslang-1.3.261.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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/12"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.268-r2.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild
deleted file mode 100644
index af9b2a33b3dd..000000000000
--- a/dev-util/glslang/glslang-1.3.268-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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="vulkan-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/13"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}
- ~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]
-"
-
-DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
- "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- -DALLOW_EXTERNAL_SPIRV_TOOLS=ON
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/
@ 2024-08-03 2:58 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-08-03 2:58 UTC (permalink / raw
To: gentoo-commits
commit: f17a695c19ac2e1c176f6f2a4af91305bc640787
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 02:48:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 02:48:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17a695c
dev-util/glslang: fix build w/ gcc-15
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../glslang/files/glslang-1.3.283.0-gcc15.patch | 24 ++++++++++++++++++++++
dev-util/glslang/glslang-1.3.283.0.ebuild | 4 ++++
2 files changed, 28 insertions(+)
diff --git a/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch
new file mode 100644
index 000000000000..aea224c37b69
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch
@@ -0,0 +1,24 @@
+https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd
+
+From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:44:21 +0100
+Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
+
+Without the change `glslang` build fails on upcoming `gcc-15` as:
+
+ In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
+ SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
+ 248 | Id makeDebugLexicalBlock(uint32_t line);
+ | ^~~~~~~~
+--- a/SPIRV/SpvBuilder.h
++++ b/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+
diff --git a/dev-util/glslang/glslang-1.3.283.0.ebuild b/dev-util/glslang/glslang-1.3.283.0.ebuild
index 0f9664315560..3097d8e30d64 100644
--- a/dev-util/glslang/glslang-1.3.283.0.ebuild
+++ b/dev-util/glslang/glslang-1.3.283.0.ebuild
@@ -32,6 +32,10 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.283.0-gcc15.patch
+)
+
multilib_src_configure() {
local mycmakeargs=(
-DENABLE_PCH=OFF
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-03 2:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-08 23:57 [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/files/, dev-util/glslang/ Nick Sarnie
-- strict thread matches above, loose matches on Subject: below --
2024-08-03 2:58 Sam James
2024-03-03 17:08 Matt Turner
2023-11-10 18:24 Nick Sarnie
2022-09-11 15:50 Nick Sarnie
2019-11-22 23:29 Nick Sarnie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox