mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-util/glslang: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user