From de8184aadfb342e73f66f86c0a2a75f4f842e1ca Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 11:52:37 -0500 Subject: [PATCH 01/10] [vsg] Update the glslang minimum required version to the latest version of glslang in vcpkg (15.0.0) to prevent vsg from building without glsl compiler support and causing a runtime error --- ports/vsg/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index 4e2633d1b616b1..f532c2c69cf723 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGLSLANG_MIN_VERSION=15) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") vcpkg_copy_pdbs() From 9da55275409a5ecdf409f1c0288f22bf8f61e8c2 Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 12:19:08 -0500 Subject: [PATCH 02/10] Increment the port-version number in the vcpkg.json file to correspond with the portfile change --- ports/vsg/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index 406d0f74377449..3e56c5a3b0e95f 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vsg", "version": "1.1.7", + "port-version": 2, "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", From 8dc81f9e1ef8749c9915479d7be3ebbd0392b3c0 Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 12:24:22 -0500 Subject: [PATCH 03/10] [vsg] update vcpkg.json with proper port-version and run x-add-version --- ports/vsg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vsg.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index 3e56c5a3b0e95f..3306add5baa25e 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vsg", "version": "1.1.7", - "port-version": 2, + "port-version": 1, "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c5db8207a739e6..09d7b05fa3d92e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9490,7 +9490,7 @@ }, "vsg": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "vsgimgui": { "baseline": "0.3.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index e8a7bac9757566..0b14c14cfb9661 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c50dc080fb15d76840835caf0448969120cb52c", + "version": "1.1.7", + "port-version": 1 + }, { "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", "version": "1.1.7", From bbc2de2761a45403400c74771b55717f9ffec7c6 Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 13:24:27 -0500 Subject: [PATCH 04/10] [vsg] Add a comment to the portfile explaining the option --- ports/vsg/portfile.cmake | 1 + versions/baseline.json | 2 +- versions/v-/vsg.json | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index f532c2c69cf723..f3d2d888c03358 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master ) +# added -DGLSLANG_MIN_VERSION=15 to sync with vcpkg version of glslang vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGLSLANG_MIN_VERSION=15) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") diff --git a/versions/baseline.json b/versions/baseline.json index 09d7b05fa3d92e..c5db8207a739e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9490,7 +9490,7 @@ }, "vsg": { "baseline": "1.1.7", - "port-version": 1 + "port-version": 0 }, "vsgimgui": { "baseline": "0.3.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index 0b14c14cfb9661..e8a7bac9757566 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "0c50dc080fb15d76840835caf0448969120cb52c", - "version": "1.1.7", - "port-version": 1 - }, { "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", "version": "1.1.7", From bb51d5fdb5a12c714ef939bc66b8faf16ac6f9a2 Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 13:25:00 -0500 Subject: [PATCH 05/10] [vsg] x-add-version --- versions/baseline.json | 2 +- versions/v-/vsg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index c5db8207a739e6..09d7b05fa3d92e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9490,7 +9490,7 @@ }, "vsg": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "vsgimgui": { "baseline": "0.3.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index e8a7bac9757566..dc5d1c291ff11d 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc46fa01158df76657864f0bf67916c4ecbb0bbf", + "version": "1.1.7", + "port-version": 1 + }, { "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", "version": "1.1.7", From 98540dd005b8880164c477489e9933e5711bd71a Mon Sep 17 00:00:00 2001 From: Glenn Date: Thu, 21 Nov 2024 13:57:32 -0500 Subject: [PATCH 06/10] Update ports/vsg/portfile.cmake Style suggestions accepted Co-authored-by: Kai Pastor --- ports/vsg/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index f3d2d888c03358..0e326e253a1368 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -7,7 +7,11 @@ vcpkg_from_github( ) # added -DGLSLANG_MIN_VERSION=15 to sync with vcpkg version of glslang -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGLSLANG_MIN_VERSION=15) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGLSLANG_MIN_VERSION=15 +) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") vcpkg_copy_pdbs() From e8c5deffc64ce0c5132a538eb08f6dbb86c3ecfd Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 14:02:45 -0500 Subject: [PATCH 07/10] [vsg] Accepted a style suggestion --- versions/baseline.json | 2 +- versions/v-/vsg.json | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 09d7b05fa3d92e..c5db8207a739e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9490,7 +9490,7 @@ }, "vsg": { "baseline": "1.1.7", - "port-version": 1 + "port-version": 0 }, "vsgimgui": { "baseline": "0.3.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index dc5d1c291ff11d..e8a7bac9757566 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "bc46fa01158df76657864f0bf67916c4ecbb0bbf", - "version": "1.1.7", - "port-version": 1 - }, { "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", "version": "1.1.7", From 3038efa23187f9456ea4b2a93bfa661da9016c3a Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Thu, 21 Nov 2024 14:04:48 -0500 Subject: [PATCH 08/10] [vsg] x-add-version --- versions/baseline.json | 2 +- versions/v-/vsg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index c5db8207a739e6..09d7b05fa3d92e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9490,7 +9490,7 @@ }, "vsg": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "vsgimgui": { "baseline": "0.3.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index e8a7bac9757566..4230105e9c9002 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddb004a4fdb8ddd46977c2fb9909a020817d8073", + "version": "1.1.7", + "port-version": 1 + }, { "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", "version": "1.1.7", From 01325bcd906d34f0a8241c29c04ed863d008eaea Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Mon, 25 Nov 2024 16:53:51 -0500 Subject: [PATCH 09/10] [vsg] Remove glslang min version check per vcpkg team suggestion --- ports/vsg/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index 0e326e253a1368..66b7c1ccababe7 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGLSLANG_MIN_VERSION=15 + -DGLSLANG_MIN_VERSION= ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") From 61bf36faa3e7efb665f6ed613ecf7ddf70c6fb0a Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Tue, 26 Nov 2024 09:07:40 -0500 Subject: [PATCH 10/10] [vsg] x-add-version --- versions/v-/vsg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index 4230105e9c9002..8d17c323b2ea47 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ddb004a4fdb8ddd46977c2fb9909a020817d8073", + "git-tree": "f9710535eb6dade1a009e1a87c5332af3346baf9", "version": "1.1.7", "port-version": 1 },