[xwindow] part 5b (#26851)

* [libice] add new port * [libsm] add new port * add license * v db * [libxi] add port * [libxres] add port * [libxrandr] add port * v db * add license * v db * fix port name * fix vdb * [libxrender] add port * format * v db * fix arm ? * use configure option * arm fixes * v db
2026-01-18 01:11:23 +01:00 · 2022-09-22 23:34:02 +02:00
parent 9c2ee2a7c5
commit 0e0aa20677
14 changed files with 259 additions and 0 deletions
--- a/ports/libxi/portfile.cmake
+++ b/ports/libxi/portfile.cmake
@@ -0,0 +1,35 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxi
+    REF f24d7f43ab4d97203e60677a3d42e11dbc80c8b4 # 1.8
+    SHA512 bc98d03f1c53f26d0c2063de5a0b58951c9db44dfcfb44519efca89f20c8f8f50599c264d11546357164430f3486dd263742657de426cc7fbb3a306be0bc8866
+    HEAD_REF master
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if (VCPKG_CROSSCOMPILING)
+    list(APPEND OPTIONS --enable-malloc0returnsnull)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS ${OPTIONS}
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
--- a/ports/libxi/vcpkg.json
+++ b/ports/libxi/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "libxi",
+  "version": "1.8",
+  "description": "Xlib library for the X Input Extension",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxi",
+  "license": null,
+  "dependencies": [
+    "libxext",
+    "libxfixes"
+  ]
+}
--- a/ports/libxrandr/portfile.cmake
+++ b/ports/libxrandr/portfile.cmake
@@ -0,0 +1,35 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in the triplet!")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxrandr
+    REF 55dcda4518eda8ae03ef25ea29d3c994ad71eb0a # 1.5.2
+    SHA512  63a3a7c5db8d41c73ef2f55e86a47bdae0112ac39802efa5da4fa26a8794066d6906d4a5e4e9af5abb5838a061f2583dc2b8865e38754ee3f2a8e3918de87168
+    HEAD_REF master
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if (VCPKG_CROSSCOMPILING)
+    list(APPEND OPTIONS --enable-malloc0returnsnull)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS ${OPTIONS}
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
--- a/ports/libxrandr/vcpkg.json
+++ b/ports/libxrandr/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "libxrandr",
+  "version": "1.5.2",
+  "description": "Xlib Resize, Rotate and Reflection (RandR) extension library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrandr",
+  "license": null,
+  "dependencies": [
+    "bzip2",
+    "libx11",
+    "libxext",
+    "libxrender",
+    "xorg-macros",
+    "xproto"
+  ]
+}
--- a/ports/libxrender/portfile.cmake
+++ b/ports/libxrender/portfile.cmake
@@ -0,0 +1,35 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxrender
+    REF  845716f8f14963d338e5a8d5d2424baafc90fb30 # 0.9.10
+    SHA512  a7e8d383a8400d63eb726b741cd25a1e9e671c7eadef04beddc4e31fec59b384ae4fa3f305e62a2aecbaedffc76c7b0626f525ec8634c9940a29de058e4a653c
+    HEAD_REF master
+)
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if (VCPKG_CROSSCOMPILING)
+    list(APPEND OPTIONS --enable-malloc0returnsnull)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS ${OPTIONS}
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
--- a/ports/libxrender/vcpkg.json
+++ b/ports/libxrender/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "libxrender",
+  "version": "0.9.10",
+  "description": "library for the Render Extension to the X11 protocol",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrender",
+  "license": null,
+  "dependencies": [
+    "libx11",
+    "xorg-macros"
+  ]
+}
--- a/ports/libxres/build.patch
+++ b/ports/libxres/build.patch
@@ -0,0 +1,16 @@
+diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h
+index 1c816165e..8da68aa23 100644
+--- a/include/X11/extensions/XRes.h
+++ b/include/X11/extensions/XRes.h
+@@ -6,7 +6,10 @@
+ #define _XRES_H
+ 
+ #include <X11/Xfuncproto.h>
+-
+#if defined(_MSC_VER)
+    #include <process.h>
+    typedef int pid_t;
+#endif
+ /* v1.0 */
+ 
+ typedef struct {
--- a/ports/libxres/portfile.cmake
+++ b/ports/libxres/portfile.cmake
@@ -0,0 +1,35 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxres
+    REF c05c6d918b0e2011d4bfa370c321482e34630b17 # 1.2.1
+    SHA512  c2eabf65b03393991b56b84bea4d770e9c0295d685e8b22bb7dabbd37dd6c7c6f5e519cefa790b05c0f124bb739a5abe03249b89e2ce6d5276014e9752c11251
+    HEAD_REF master
+    PATCHES build.patch
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if (VCPKG_CROSSCOMPILING)
+    list(APPEND OPTIONS --enable-malloc0returnsnull)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS ${OPTIONS}
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
--- a/ports/libxres/vcpkg.json
+++ b/ports/libxres/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "libxres",
+  "version": "1.2.1",
+  "description": "Xlib-based X-Resource extension client library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxres",
+  "license": null,
+  "dependencies": [
+    "bzip2",
+    "libx11",
+    "libxext",
+    "xorg-macros",
+    "xproto"
+  ]
+}
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4348,6 +4348,10 @@
      "baseline": "6.0.0",
      "port-version": 0
    },
+    "libxi": {
+      "baseline": "1.8",
+      "port-version": 0
+    },
    "libxkbcommon": {
      "baseline": "1.4.1",
      "port-version": 0
@@ -4380,6 +4384,18 @@
      "baseline": "3.5.11",
      "port-version": 1
    },
+    "libxrandr": {
+      "baseline": "1.5.2",
+      "port-version": 0
+    },
+    "libxrender": {
+      "baseline": "0.9.10",
+      "port-version": 0
+    },
+    "libxres": {
+      "baseline": "1.2.1",
+      "port-version": 0
+    },
    "libxslt": {
      "baseline": "1.1.37",
      "port-version": 0
--- a/versions/l-/libxi.json
+++ b/versions/l-/libxi.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "af8e343976780e89ba9aca93f5dafcf3e0dcfecf",
+      "version": "1.8",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/l-/libxrandr.json
+++ b/versions/l-/libxrandr.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a2319ebdf2506031a67829f725660eba807869cc",
+      "version": "1.5.2",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/l-/libxrender.json
+++ b/versions/l-/libxrender.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f0ef5b766bea2ae48efec7303a59faefdbb0bb96",
+      "version": "0.9.10",
+      "port-version": 0
+    }
+  ]
+}
--- a/versions/l-/libxres.json
+++ b/versions/l-/libxres.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a045d82350a03dfa05a612ae66ec5698c21bf195",
+      "version": "1.2.1",
+      "port-version": 0
+    }
+  ]
+}