From ddf5db8651d153ea482f1bd445dae2965a576201 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 28 Jun 2021 01:43:56 -0700 Subject: [PATCH 1/4] [glew] Fix the dependency --- ports/glew/CONTROL | 6 ------ ports/glew/portfile.cmake | 4 ++++ ports/glew/vcpkg.json | 13 +++++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) delete mode 100644 ports/glew/CONTROL create mode 100644 ports/glew/vcpkg.json diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL deleted file mode 100644 index 5d8250fd5b7665..00000000000000 --- a/ports/glew/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: glew -Version: 2.1.0 -Port-Version: 10 -Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. -Homepage: https://github.com/nigels-com/glew -Build-Depends: opengl diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 6ca6591d9f47ee..6916d782167803 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") +endif() + # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 vcpkg_download_distfile(ARCHIVE diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json new file mode 100644 index 00000000000000..e85ea311246057 --- /dev/null +++ b/ports/glew/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "glew", + "version-string": "2.1.0", + "port-version": 11, + "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", + "homepage": "https://github.com/nigels-com/glew", + "dependencies": [ + { + "name": "opengl", + "platform": "windows" + } + ] +} From e886769d2e5f19c7644aebe6f993f8bd46ae7f7e Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 28 Jun 2021 03:59:10 -0700 Subject: [PATCH 2/4] Update baseline version --- versions/baseline.json | 6 +++--- versions/g-/glew.json | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index be3a643283f6b7..8b301df39771fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2290,7 +2290,7 @@ }, "glew": { "baseline": "2.1.0", - "port-version": 10 + "port-version": 11 }, "glfw3": { "baseline": "3.3.4", @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 78ebd98dd8f36b..e86209296e8130 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d1692409b7a934c21fc44652ffac9ec508c0a9", + "version-string": "2.1.0", + "port-version": 11 + }, { "git-tree": "c87d7f619c69630fa4d1bd0bf3767f0d31ef22d6", "version-string": "2.1.0", From 762d4223b1dd0a53d4d4f3c20f61e085300030a4 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:47:47 -0700 Subject: [PATCH 3/4] Adress the review suggestions --- ports/glew/portfile.cmake | 2 +- ports/glew/vcpkg.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 6916d782167803..5dd0c03ce3dfb9 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") + message(WARNING "${PORT} requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") endif() # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json index e85ea311246057..22271d883d6107 100644 --- a/ports/glew/vcpkg.json +++ b/ports/glew/vcpkg.json @@ -5,9 +5,6 @@ "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", "homepage": "https://github.com/nigels-com/glew", "dependencies": [ - { - "name": "opengl", - "platform": "windows" - } + "opengl" ] } From 8dcb72de5053f388e40f246919263bcee6d8e83c Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:48:47 -0700 Subject: [PATCH 4/4] Update the baseline revision --- versions/g-/glew.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/glew.json b/versions/g-/glew.json index e86209296e8130..8969554ac1c67c 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f0d1692409b7a934c21fc44652ffac9ec508c0a9", + "git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69", "version-string": "2.1.0", "port-version": 11 },