From dc4c17eaf34bdcc2f9ec95d43c545c564072523a Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 3 Feb 2021 22:01:16 +0100 Subject: [PATCH] [ shaderwriter ]Update to version 1.0.0 (#15948) * Updated shaderwriter port to version 1.0.0 * Updated version files. * Fixed license file install script. * Fixed version file again --- ports/shaderwriter/portfile.cmake | 12 ++++++------ ports/shaderwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index ea1eb72d68..0bd79bcccd 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF e978c96c959e8aa41eedaef322dcc6a0ec00ad49 - HEAD_REF master - SHA512 4f1ea1fd97392edc2b3dd9b6453fa395772e75a52f28d7bbd5a63d2fe8eca40c8a0d4016e2017e126f22fc03acf28ab29db6de037d64c7687f95884b8435b7c7 + REF v1.0.0 + SHA512 60e63dd1f519869a5e3b8d4ee699339b2d26dea2a7502d16de578b6164131ea4954b7731a89763cd6a3a4750a1eb15afc2592261cc7c8209e8a3667edecdb94b ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 6b76e6873afe33baeb59c233d3a70bd391f01769 + REF 811d4acb15de70cb81e2a5788333ba4b50d89e81 HEAD_REF master - SHA512 d7834cf8eeff12575acc526d9dc39471ededad1ff25bec0b85e27a36381157f797c1eb168983410a40b60c001b52b787baea498aef80ffa08c9b7d9a9f5eb7ae + SHA512 b546cabc0f1a7c0e73abe22a742629c7e6d9bef7ed2d1de8a528369931e1871a9902d38efc8f77a3aec9923d62ca328b0c3c8c6c51f2ff527682a3197550dae7 ) get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) @@ -29,6 +28,7 @@ vcpkg_configure_cmake( OPTIONS -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF -DSDW_GENERATE_SOURCE=OFF + -DSDW_BUILD_VULKAN_LAYER=OFF -DSDW_BUILD_TESTS=OFF -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} -DSDW_BUILD_EXPORTER_GLSL_STATIC=${BUILD_STATIC} @@ -39,4 +39,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shaderwriter) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/shaderwriter RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index b18788b28c..e039d1c204 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version-string": "2020-10-15", + "version-string": "1.0.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter" } diff --git a/versions/baseline.json b/versions/baseline.json index 72e1648768..8ef915f176 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5329,7 +5329,7 @@ "port-version": 0 }, "shaderwriter": { - "baseline": "2020-10-15", + "baseline": "1.0.0", "port-version": 0 }, "shapelib": { diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 332cf86581..917246b812 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec535c5e829a1afeab64cd517f9f8c6cf453d7bb", + "version-string": "1.0.0", + "port-version": 0 + }, { "git-tree": "f65600030bc48b3b5c3317f4af7affbfa3e2d818", "version-string": "2020-10-15",