[wayland(-protocols)] update ports (#27440)

* Update wayland libs * v db
microsoft · Oct 26, 2022 · b3dfa25 · b3dfa25
1 parent 5e730c2
commit b3dfa25
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 51 deletions.
diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake
@@ -9,24 +9,17 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wayland/wayland-protocols
-    REF  cd153943618bcf157896a6d0f1154d0ad62078a7 #1.23 
-    SHA512 aae49d168e467d554ada638887511fa696a9fae900c93067d97f9e3d405068dc87883933f09ca2a3ef8a04631fdcffb629c178ec6e4c247f0c2ff6c1aaaaa952
+    REF  e631010ab7b96988e7c64c24b7d90f64717eaeee
+    SHA512 ea10d840b89eb081f0d5e2fbc034f24a53beceb8da03aecc6faccf35f1fc78e5d5e29a5d602a823ab4774c264599d05456020f50886ccdde196af246b7c601fd
     HEAD_REF master
 )
 
-set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/wayland/aclocal/")
-
-vcpkg_configure_make(
+vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
+    OPTIONS
+            -Dtests=false
 )
-
-vcpkg_install_make()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig")
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/")
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/")
-endif()
+vcpkg_install_meson()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/wayland-protocols/vcpkg.json b/ports/wayland-protocols/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wayland-protocols",
-  "version": "1.23",
+  "version": "1.27",
   "description": "wayland-protocols contains Wayland protocols that add functionality not available in the Wayland core protocol.",
   "homepage": "https://wayland.freedesktop.org",
   "license": "MIT",

diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake
@@ -7,17 +7,23 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wayland/wayland
-    REF  e60398b1755bfcdf09f040d3769131fe0d9762fc #1.19.0
-    SHA512 f2f7dd9ff71e99cf3621ab45160f59b679de763e3fdef6fcef7e14947ad43ed7a86845a213c75bb7117fdda11a51035566225a12d3eb33e8c3fe2e4456eb801d
+    REF  8135e856ebd79872f886466e9cee39affb7d9ee8
+    SHA512 c4115187826083e5f01a24dad0c4377458b7ca22973ea161ec9d4aeeb21869bdb9acd7ba7e89aba964571ce2fde319cb01808e94e502ff09061bf5fbd3a60079
     HEAD_REF master
-    PATCHES tests.patch
-) 
+)
+
+if(VCPKG_CROSSCOMPILING)
+    set(OPTIONS -Dscanner=false)
+else()
+    set(OPTIONS -Dscanner=true)
+endif()
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS -Ddtd_validation=false
             -Ddocumentation=false
             -Dtests=false
+            ${OPTIONS}
 )
 vcpkg_install_meson()
 

diff --git a/ports/wayland/tests.patch b/ports/wayland/tests.patch
diff --git a/ports/wayland/vcpkg.json b/ports/wayland/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wayland",
-  "version": "1.19.0",
+  "version": "1.21.0",
   "description": "Core Wayland window system code and protocol",
   "homepage": "https://wayland.freedesktop.org",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7865,11 +7865,11 @@
       "port-version": 0
     },
     "wayland": {
-      "baseline": "1.19.0",
+      "baseline": "1.21.0",
       "port-version": 0
     },
     "wayland-protocols": {
-      "baseline": "1.23",
+      "baseline": "1.27",
       "port-version": 0
     },
     "websocketpp": {

diff --git a/versions/w-/wayland-protocols.json b/versions/w-/wayland-protocols.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d0a9ad9c309ad60b1d8d2586ecbf269d65bd977",
+      "version": "1.27",
+      "port-version": 0
+    },
     {
       "git-tree": "c50a34c552f4b5bc2b867c5732ad0c27cfa8996a",
       "version": "1.23",

diff --git a/versions/w-/wayland.json b/versions/w-/wayland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "638381423adec9c24b18a622ef02d1f75f102428",
+      "version": "1.21.0",
+      "port-version": 0
+    },
     {
       "git-tree": "353490d29b62e597126db445b5f2a49301002f5b",
       "version": "1.19.0",