From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/
Date: Sun, 19 Feb 2023 15:30:48 +0000 (UTC) [thread overview]
Message-ID: <1676820640.1ba601985bfc3c8cea9676536ea26743aee84326.asturm@gentoo> (raw)
commit: 1ba601985bfc3c8cea9676536ea26743aee84326
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 15:10:56 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 15:30:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba60198
dev-util/glslang: drop 1.3.216, 1.3.224-r1, 1.3.231-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/glslang/Manifest | 3 -
...lslang-1.3.224-Fix-cmake-file-install-dir.patch | 258 ---------------------
.../glslang-1.3.231-Install-static-libs.patch | 57 -----
dev-util/glslang/glslang-1.3.216.ebuild | 28 ---
dev-util/glslang/glslang-1.3.224-r1.ebuild | 30 ---
dev-util/glslang/glslang-1.3.231-r2.ebuild | 37 ---
6 files changed, 413 deletions(-)
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index d9a584643019..746769091ad3 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,5 +1,2 @@
-DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
-DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
-DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3
DIST glslang-1.3.239.tar.gz 3683945 BLAKE2B ffc690522814d7a28bea7168744d390a5a1c7e34e67f2037c72b2a040c8c48fbb9d46f37d74ea58b2bcf7621b0008498a9dd592da08e9e93037e3f45c5b920d6 SHA512 a7cd35c76dc4f3a4f2f1015e7495b87313472d7c766075256c0d2d0004f395f62d38d715675b49f13f66a12645175c421af4622129aeb588528397e92f51790b
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
deleted file mode 100644
index 685584eee2c8..000000000000
--- a/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-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/files/glslang-1.3.231-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
deleted file mode 100644
index b7ed014d92b3..000000000000
--- a/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
+++ /dev/null
@@ -1,57 +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
-@@ -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.216.ebuild b/dev-util/glslang/glslang-1.3.216.ebuild
deleted file mode 100644
index 995dd4fbb89b..000000000000
--- a/dev-util/glslang/glslang-1.3.216.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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"
diff --git a/dev-util/glslang/glslang-1.3.224-r1.ebuild b/dev-util/glslang/glslang-1.3.224-r1.ebuild
deleted file mode 100644
index 7cfc6b2a1243..000000000000
--- a/dev-util/glslang/glslang-1.3.224-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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.231-r2.ebuild b/dev-util/glslang/glslang-1.3.231-r2.ebuild
deleted file mode 100644
index 85c685266e96..000000000000
--- a/dev-util/glslang/glslang-1.3.231-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-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"
-
-PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
-
-LICENSE="BSD"
-SLOT="0/1"
-
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
next reply other threads:[~2023-02-19 15:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-19 15:30 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-28 21:39 [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/ Nick Sarnie
2020-12-16 20:09 Matt Turner
2019-10-29 2:19 Nick Sarnie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1676820640.1ba601985bfc3c8cea9676536ea26743aee84326.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox