[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/
commit: 1ba601985bfc3c8cea9676536ea26743aee84326 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 18 15:10:56 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 19 15:30:40 2023 + 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 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.. --- 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 -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 -> │ ├──
[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/
commit: 6790faaf95b65351d3f0512f27a65287848dfcb9 Author: Sergei Chernyadyev gmail com> AuthorDate: Mon Dec 19 20:10:06 2022 + Commit: Nick Sarnie gentoo org> CommitDate: Wed Dec 28 21:39:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6790faaf dev-util/glslang: Version bump Signed-off-by: Sergei Chernyadyev gmail.com> Signed-off-by: Nick Sarnie gentoo.org> dev-util/glslang/Manifest | 1 + .../glslang-1.3.236-Install-static-libs.patch | 39 ++ dev-util/glslang/glslang-1.3.236.ebuild| 37 3 files changed, 77 insertions(+) diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index bb1609390d75..2d49fc095c50 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,3 +1,4 @@ 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 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 new file mode 100644 index ..826e0f6cd856 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch @@ -0,0 +1,39 @@ +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/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild new file mode 100644 index ..519eb9fd2b13 --- /dev/null +++ b/dev-util/glslang/glslang-1.3.236.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == ** ]]; 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" ) +
[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/
commit: 936d585da223430467a31a0f3b4a8c3c04f7c344 Author: Matt Turner gentoo org> AuthorDate: Wed Dec 16 19:57:18 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Dec 16 20:08:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936d585d dev-util/glslang: Drop old versions Signed-off-by: Matt Turner gentoo.org> dev-util/glslang/Manifest | 4 - ...12.3353_pre20191027-fix-relative-includes.patch | 26 - ...E_INSTALL_LIBDIR-in-installed-CMake-files.patch | 105 - .../glslang-7.12.3353_pre20191027-r2.ebuild| 30 -- dev-util/glslang/glslang-8.13.3559.ebuild | 28 -- .../glslang/glslang-8.13.3560_pre20200404.ebuild | 30 -- dev-util/glslang/glslang-8.13.3743-r1.ebuild | 30 -- 7 files changed, 253 deletions(-) diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index e523354ccd7..ba017e8b22d 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,5 +1 @@ DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f -DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7 -DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781 -DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f33669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f -DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa53978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792 diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch deleted file mode 100644 index 4c44cfbbbed..000 --- a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h -index 86e1c23b..3907be43 100755 a/SPIRV/GlslangToSpv.h -+++ b/SPIRV/GlslangToSpv.h -@@ -40,7 +40,7 @@ - #endif - - #include "SpvTools.h" --#include "../glslang/Include/intermediate.h" -+#include "glslang/Include/intermediate.h" - - #include - #include -diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h -index 7422d012..59c914da 100644 a/SPIRV/SpvTools.h -+++ b/SPIRV/SpvTools.h -@@ -46,7 +46,7 @@ - #include - #endif - --#include "../glslang/MachineIndependent/localintermediate.h" -+#include "glslang/MachineIndependent/localintermediate.h" - #include "Logger.h" - - namespace glslang { 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 deleted file mode 100644 index 8838a97809d..000 --- a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch +++ /dev/null @@ -1,105 +0,0 @@ -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
[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/, dev-util/glslang/files/
commit: 868bb8383a826306eec7f8abcc1d4a63856e9b54 Author: Nick Sarnie gentoo org> AuthorDate: Tue Oct 29 02:18:28 2019 + Commit: Nick Sarnie gentoo org> CommitDate: Tue Oct 29 02:18:28 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868bb838 dev-util/glslang: Fix relative includes in headers Needed to fix media-libs/shaderc build. Patch developed and tested by chutzpah Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Nick Sarnie gentoo.org> ...12.3353_pre20191027-fix-relative-includes.patch | 26 ++ .../glslang-7.12.3353_pre20191027-r1.ebuild| 19 dev-util/glslang/glslang-.ebuild | 2 ++ 3 files changed, 47 insertions(+) diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch new file mode 100644 index 000..4c44cfbbbed --- /dev/null +++ b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch @@ -0,0 +1,26 @@ +diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h +index 86e1c23b..3907be43 100755 +--- a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h +@@ -40,7 +40,7 @@ + #endif + + #include "SpvTools.h" +-#include "../glslang/Include/intermediate.h" ++#include "glslang/Include/intermediate.h" + + #include + #include +diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h +index 7422d012..59c914da 100644 +--- a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h +@@ -46,7 +46,7 @@ + #include + #endif + +-#include "../glslang/MachineIndependent/localintermediate.h" ++#include "glslang/MachineIndependent/localintermediate.h" + #include "Logger.h" + + namespace glslang { diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild new file mode 100644 index 000..7c674c7f866 --- /dev/null +++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib cmake-utils + +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" ) diff --git a/dev-util/glslang/glslang-.ebuild b/dev-util/glslang/glslang-.ebuild index 63a6238d03f..4283dcd2371 100644 --- a/dev-util/glslang/glslang-.ebuild +++ b/dev-util/glslang/glslang-.ebuild @@ -13,3 +13,5 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/; LICENSE="BSD" SLOT="0" + +PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )