From 703b01e487bc33bfab131baad540269f351b946b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 16 Dec 2024 17:28:00 +0200 Subject: [PATCH] aedi: update glslang to 15.1.0 --- aedi/target/tool_tier2.py | 5 +++-- patch/glslang-old-cmake.diff | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 patch/glslang-old-cmake.diff diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py index 54fbc780..b5cbcaf2 100644 --- a/aedi/target/tool_tier2.py +++ b/aedi/target/tool_tier2.py @@ -134,8 +134,9 @@ class GlslangTarget(base.CMakeStaticDependencyTarget): def prepare_source(self, state: BuildState): state.download_source( - 'https://github.com/KhronosGroup/glslang/archive/refs/tags/15.0.0.tar.gz', - 'c31c8c2e89af907507c0631273989526ee7d5cdf7df95ececd628fd7b811e064') + 'https://github.com/KhronosGroup/glslang/archive/refs/tags/15.1.0.tar.gz', + '4bdcd8cdb330313f0d4deed7be527b0ac1c115ff272e492853a6e98add61b4bc', + patches='glslang-old-cmake') def configure(self, state: BuildState): args = ('python3', 'update_glslang_sources.py') diff --git a/patch/glslang-old-cmake.diff b/patch/glslang-old-cmake.diff new file mode 100644 index 00000000..8e9138f5 --- /dev/null +++ b/patch/glslang-old-cmake.diff @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ + # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. +-cmake_minimum_required(VERSION 3.27) ++cmake_minimum_required(VERSION 3.17) + project(glslang) + + if (CMAKE_VERSION VERSION_LESS "3.21")