From b0065af0ce8f5c3c60099663a558745af0043d46 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 18 Jan 2021 00:33:00 -0800 Subject: [PATCH 01/10] [mesa] Remove libs conflicted with angle --- ports/mesa/CONTROL | 1 + ports/mesa/portfile.cmake | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index c29d91e31869a4..8ad3e5474f40e4 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -1,5 +1,6 @@ Source: mesa Version: 20.2.2 +Port-Version: 1 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library Build-Depends: zlib, zstd, tool-meson diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 17e43d2c61be14..fa5009e2f7e398 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -191,6 +191,13 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) +#installed by angle +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.dll) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.pdb) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.dll) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.pdb) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libGLESv2.lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libGLESv2.lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) From e567e5d5aaadcf74a2d71e2bda387174d67c948f Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 18 Jan 2021 00:34:42 -0800 Subject: [PATCH 02/10] Update port_versions check --- port_versions/baseline.json | 2 +- port_versions/m-/mesa.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 250f6157cf862c..036d91386b040c 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3670,7 +3670,7 @@ }, "mesa": { "baseline": "20.2.2", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b-3", diff --git a/port_versions/m-/mesa.json b/port_versions/m-/mesa.json index a4b44389104f6b..4b7e6bd2208203 100644 --- a/port_versions/m-/mesa.json +++ b/port_versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b471b06f53c6fe698827102eab587b3db285363", + "version-string": "20.2.2", + "port-version": 1 + }, { "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", "version-string": "20.2.2", From 60ba5c72e3a82775ee9e45382929be2e8f8bc963 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 21 Jan 2021 02:05:34 -0800 Subject: [PATCH 03/10] Use gles-lib-suffix to avoid conflicts with angle --- ports/mesa/portfile.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index fa5009e2f7e398..5c880f3253d9fa 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -168,7 +168,7 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - #-D gles-lib-suffix=_mesa + -D gles-lib-suffix=_mesa #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} @@ -191,13 +191,6 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) -#installed by angle -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.pdb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.pdb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libGLESv2.lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libGLESv2.lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) From 57ae63b0bd0ab1951049f214e7629df910c31e59 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 18 Jan 2021 00:33:00 -0800 Subject: [PATCH 04/10] [mesa] Remove libs conflicted with angle --- ports/mesa/CONTROL | 1 + ports/mesa/portfile.cmake | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index c29d91e31869a4..8ad3e5474f40e4 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -1,5 +1,6 @@ Source: mesa Version: 20.2.2 +Port-Version: 1 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library Build-Depends: zlib, zstd, tool-meson diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 17e43d2c61be14..fa5009e2f7e398 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -191,6 +191,13 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) +#installed by angle +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.dll) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.pdb) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.dll) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.pdb) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libGLESv2.lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libGLESv2.lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) From 1f7832cfbdc721bbac384145c132d30bb21f97eb Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 18 Jan 2021 00:34:42 -0800 Subject: [PATCH 05/10] Update port_versions check --- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index f45c801d233d49..6c8ca3ff29c0b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "mesa": { "baseline": "20.2.2", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b-3", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index a4b44389104f6b..4b7e6bd2208203 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b471b06f53c6fe698827102eab587b3db285363", + "version-string": "20.2.2", + "port-version": 1 + }, { "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", "version-string": "20.2.2", From 0c7cbccfd88790752f4b32d0d702a5e3d34c6cf0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 21 Jan 2021 02:05:34 -0800 Subject: [PATCH 06/10] Use gles-lib-suffix to avoid conflicts with angle --- ports/mesa/portfile.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index fa5009e2f7e398..5c880f3253d9fa 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -168,7 +168,7 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - #-D gles-lib-suffix=_mesa + -D gles-lib-suffix=_mesa #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} @@ -191,13 +191,6 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) -#installed by angle -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libGLESv2.pdb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libGLESv2.pdb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libGLESv2.lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libGLESv2.lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) From cbdf75fcb685970fd4bc3862caeb83bec58fab3e Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 21 Jan 2021 17:31:18 -0800 Subject: [PATCH 07/10] Update port_versions/m-/mesa.json --- port_versions/m-/mesa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/m-/mesa.json b/port_versions/m-/mesa.json index 4b7e6bd2208203..bd2c73f54213f0 100644 --- a/port_versions/m-/mesa.json +++ b/port_versions/m-/mesa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0b471b06f53c6fe698827102eab587b3db285363", + "git-tree": "d07d7154b121b22c7c7a0eb48cc529f6b757141c", "version-string": "20.2.2", "port-version": 1 }, From 68eb4e4987f79b675d406dab100743632c991f0f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 22 Jan 2021 13:43:38 +0800 Subject: [PATCH 08/10] Update ports/mesa/portfile.cmake --- ports/mesa/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 5c880f3253d9fa..47f142738320d8 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -168,7 +168,8 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -D gles-lib-suffix=_mesa + -Dgles-lib-suffix=_mesa + #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} From 5a95938d00b1140245d60e61119a245203c6521c Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 21 Jan 2021 22:37:09 -0800 Subject: [PATCH 09/10] Update space and versions --- ports/mesa/portfile.cmake | 1 - versions/m-/mesa.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 47f142738320d8..9461dc2c598740 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -169,7 +169,6 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dgles-lib-suffix=_mesa - #-D egl-lib-suffix=_mesa -Dbuild-tests=false ${MESA_OPTIONS} diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index bd2c73f54213f0..e9896db45b8c69 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d07d7154b121b22c7c7a0eb48cc529f6b757141c", + "git-tree": "7ac1b59d88e70cd6c5e8f6f2ef74aaa1809dd93d", "version-string": "20.2.2", "port-version": 1 }, From dd0a6ea689f74ec1d9548771cdebc6fd4d74b1d4 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 22 Jan 2021 00:14:40 -0800 Subject: [PATCH 10/10] Update versions/m-/mesa.json --- versions/m-/mesa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index e9896db45b8c69..b28bb72de859e0 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7ac1b59d88e70cd6c5e8f6f2ef74aaa1809dd93d", + "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a", "version-string": "20.2.2", "port-version": 1 },