From 445f411ade67d43e4c8d176eec7a282c1cfa3b12 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:11:54 +0200 Subject: [PATCH 001/142] [xcb-cursor] add port --- ports/xcb-cursor/build.patch | 121 ++++++++++++++++++++++++++++++++ ports/xcb-cursor/portfile.cmake | 36 ++++++++++ ports/xcb-cursor/vcpkg.json | 13 ++++ 3 files changed, 170 insertions(+) create mode 100644 ports/xcb-cursor/build.patch create mode 100644 ports/xcb-cursor/portfile.cmake create mode 100644 ports/xcb-cursor/vcpkg.json diff --git a/ports/xcb-cursor/build.patch b/ports/xcb-cursor/build.patch new file mode 100644 index 00000000000000..b2875fe06463a3 --- /dev/null +++ b/ports/xcb-cursor/build.patch @@ -0,0 +1,121 @@ +diff --git a/cursor/cursor.h b/cursor/cursor.h +index 455dc3485..f1bfd60db 100644 +--- a/cursor/cursor.h ++++ b/cursor/cursor.h +@@ -106,18 +106,32 @@ struct xcb_cursor_context_t { + /* little-endian */ + #define XCURSOR_MAGIC 0x72756358 + ++#ifdef _MSC_VER ++ #define PACKED ++#else ++ #define PACKED __attribute__((packed)) ++#endif ++ ++#ifdef _MSC_VER ++#pragma pack(push,1) ++#endif ++ + typedef struct xcint_file_header_t { + uint32_t magic; + uint32_t header; + uint32_t version; + uint32_t ntoc; +-} __attribute__((packed)) xcint_file_header_t; ++} PACKED xcint_file_header_t; + + typedef struct xcint_file_toc_t { + uint32_t type; + uint32_t subtype; + uint32_t position; +-} __attribute__((packed)) xcint_file_toc_t; ++} PACKED xcint_file_toc_t; ++ ++#ifdef _MSC_VER ++#pragma pack(pop) ++#endif + + typedef struct xcint_cursor_file_t { + xcint_file_header_t header; +@@ -140,12 +154,16 @@ typedef struct xcint_cursor_file_t { + * CARD32 version chunk type version + */ + ++#ifdef _MSC_VER ++#pragma pack(push,1) ++#endif ++ + typedef struct xcint_chunk_header_t { + uint32_t header; + uint32_t type; + uint32_t subtype; + uint32_t version; +-} __attribute__((packed)) xcint_chunk_header_t; ++} PACKED xcint_chunk_header_t; + + #define XCURSOR_IMAGE_TYPE 0xfffd0002 + #define XCURSOR_IMAGE_VERSION 1 +@@ -158,7 +176,13 @@ typedef struct xcint_image_t { + uint32_t yhot; + uint32_t delay; + uint32_t *pixels; +-} __attribute__((packed)) xcint_image_t; ++} PACKED xcint_image_t; ++ ++#ifdef _MSC_VER ++#pragma pack(pop) ++#endif ++ ++#undef PACKED + + /* shape_to_id.c */ + const int cursor_shape_to_id(const char *name); +diff --git a/cursor/load_cursor.c b/cursor/load_cursor.c +index e82fc63e9..1d574a7d2 100644 +--- a/cursor/load_cursor.c ++++ b/cursor/load_cursor.c +@@ -35,7 +35,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + + #include + #include +@@ -223,7 +228,11 @@ xcb_cursor_t xcb_cursor_load_cursor(xcb_cursor_context_t *c, const char *name) { + close(fd); + + /* create a cursor from it */ ++#ifdef _MSC_VER ++ xcb_render_animcursorelt_t * elements =(xcb_render_animcursorelt_t*)_alloca(nimg*sizeof(xcb_render_animcursorelt_t)); ++#else + xcb_render_animcursorelt_t elements[nimg]; ++#endif + xcb_render_picture_t pic = xcb_generate_id(c->conn); + + for (int n = 0; n < nimg; n++) { +diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c +index 21f72bf5b..c43dd82b4 100644 +--- a/cursor/parse_cursor_file.c ++++ b/cursor/parse_cursor_file.c +@@ -34,9 +34,15 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + ++#ifdef _MSC_VER ++# include ++#endif ++ + #ifdef HAVE_ENDIAN_H + #include + #endif diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake new file mode 100644 index 00000000000000..679c987c6b2fcd --- /dev/null +++ b/ports/xcb-cursor/portfile.cmake @@ -0,0 +1,36 @@ +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/libxcb-cursor + REF 95b9a8fd876fdbbc854cdf3d90317be3846c7417 #0.1.3 + SHA512 cca7bf1f2aeaab8d256052a676098d7c600b90dc47cf9bc84d11229e59fbf5c83f7f877b8538f7cc662983807566d28c87b3501abc7cab76cc553d9db29eceb9 + HEAD_REF master + PATCHES build.patch +) + +vcpkg_find_acquire_program(GPERF) +get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY) +vcpkg_add_to_path("${GPERF_DIR}") + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE +) + +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() + diff --git a/ports/xcb-cursor/vcpkg.json b/ports/xcb-cursor/vcpkg.json new file mode 100644 index 00000000000000..60b85ca80ee119 --- /dev/null +++ b/ports/xcb-cursor/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "xcb-cursor", + "version": "0.1.3", + "description": "XCB port of libXcursor", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb", + "xcb-image", + "xcb-render-util", + "xcb-util" + ] +} From ca7d9eb3a38289475c1d1576c3dec4e256d84287 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:12:04 +0200 Subject: [PATCH 002/142] [xcb-errors] add port --- ports/xcb-errors/fix_python.patch | 20 +++++++++++++++++ ports/xcb-errors/portfile.cmake | 37 +++++++++++++++++++++++++++++++ ports/xcb-errors/vcpkg.json | 11 +++++++++ 3 files changed, 68 insertions(+) create mode 100644 ports/xcb-errors/fix_python.patch create mode 100644 ports/xcb-errors/portfile.cmake create mode 100644 ports/xcb-errors/vcpkg.json diff --git a/ports/xcb-errors/fix_python.patch b/ports/xcb-errors/fix_python.patch new file mode 100644 index 00000000000000..e6cba0939bb9d7 --- /dev/null +++ b/ports/xcb-errors/fix_python.patch @@ -0,0 +1,20 @@ +diff --git a/src/extensions.py b/src/extensions.py +index 94d7d57fe..022d4003e 100644 +--- a/src/extensions.py ++++ b/src/extensions.py +@@ -1,5 +1,6 @@ + #!/usr/bin/env python + import sys ++import glob + from xml.etree.cElementTree import parse + + class Module(object): +@@ -83,7 +84,7 @@ def parseFile(filename): + + # Parse the xml file + output_file = sys.argv[1] +-for input_file in sys.argv[2:]: ++for input_file in glob.glob(sys.argv[2]): + parseFile(input_file) + + assert xproto != None diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake new file mode 100644 index 00000000000000..b11aeb4f106384 --- /dev/null +++ b/ports/xcb-errors/portfile.cmake @@ -0,0 +1,37 @@ +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/libxcb-errors + REF 332f357aa662ad61625ee804f93c5503b2a0c3ec #1.0 + SHA512 e2b1ad74434760b94035ba91a2f43012523f007e82a1c99380be9f08ca8545f31dcfd772cef593c709cef941ff6d8ab421f47b2f3f01ba956cbaa15e4b928b8b + HEAD_REF master + PATCHES fix_python.patch +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright + configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/xcb-errors/copyright" COPYONLY) +endif() + diff --git a/ports/xcb-errors/vcpkg.json b/ports/xcb-errors/vcpkg.json new file mode 100644 index 00000000000000..d0d843de749d6d --- /dev/null +++ b/ports/xcb-errors/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xcb-errors", + "version": "1.0", + "description": "XCB port of Xlib's XImage and XShmImage functions.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb", + "xcb-util" + ] +} From ac1d3daeaafad570cd2e1bf39f6c32131efb364b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:12:17 +0200 Subject: [PATCH 003/142] [xcb-image] add port --- ports/xcb-image/add_return_value.patch | 12 ++++++++++ ports/xcb-image/portfile.cmake | 32 ++++++++++++++++++++++++++ ports/xcb-image/vcpkg.json | 11 +++++++++ 3 files changed, 55 insertions(+) create mode 100644 ports/xcb-image/add_return_value.patch create mode 100644 ports/xcb-image/portfile.cmake create mode 100644 ports/xcb-image/vcpkg.json diff --git a/ports/xcb-image/add_return_value.patch b/ports/xcb-image/add_return_value.patch new file mode 100644 index 00000000000000..a36858cc250c28 --- /dev/null +++ b/ports/xcb-image/add_return_value.patch @@ -0,0 +1,12 @@ +diff --git a/image/xcb_bitops.h b/image/xcb_bitops.h +index a6872a1f3..bf6fdc179 100644 +--- a/image/xcb_bitops.h ++++ b/image/xcb_bitops.h +@@ -207,6 +207,7 @@ xcb_host_byte_order(void) { + return XCB_IMAGE_ORDER_LSB_FIRST; + } + assert(0); ++ return -1; + } + + #endif /* __XCB_BITOPS_H__ */ diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake new file mode 100644 index 00000000000000..3f39911d5f49a0 --- /dev/null +++ b/ports/xcb-image/portfile.cmake @@ -0,0 +1,32 @@ +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/libxcb-image + REF d882052fb2ce439c6483fce944ba8f16f7294639 #v 0.4.0 + SHA512 60d933d60351071fa47540a7943a34fd57bd46ebcd7441020c8f3f0ef4abc44fbb8e86e72e328d64992254ce20d5b718bede9f4994dbd0674fbf5ce88050c307 + HEAD_REF master + PATCHES add_return_value.patch +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto +endif() diff --git a/ports/xcb-image/vcpkg.json b/ports/xcb-image/vcpkg.json new file mode 100644 index 00000000000000..d42e2f08805088 --- /dev/null +++ b/ports/xcb-image/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xcb-image", + "version": "0.4.0", + "description": "XCB port of Xlib's XImage and XShmImage functions.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb", + "xcb-util" + ] +} From fdd292df84fd44047a056137a6acc475164aa7d8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:12:31 +0200 Subject: [PATCH 004/142] [xcb-keysyms] add port --- ports/xcb-keysyms/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/xcb-keysyms/vcpkg.json | 13 +++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ports/xcb-keysyms/portfile.cmake create mode 100644 ports/xcb-keysyms/vcpkg.json diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake new file mode 100644 index 00000000000000..376ed00dc98c3b --- /dev/null +++ b/ports/xcb-keysyms/portfile.cmake @@ -0,0 +1,30 @@ +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/libxcb-keysyms + REF 439be15cde3c7b5ba07b175dcf7b724d155d30aa #v 0.4.0 + SHA512 1bd5002d669c4b31b200bdaba9a620c87dcab712a895c70851bdc33651c098e12f62cc20428a0b09e8e9d937939e2d92704e1df551bcb9b460596fa53a8a956c + HEAD_REF master +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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() diff --git a/ports/xcb-keysyms/vcpkg.json b/ports/xcb-keysyms/vcpkg.json new file mode 100644 index 00000000000000..dc5c5776cfb2d5 --- /dev/null +++ b/ports/xcb-keysyms/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "xcb-keysyms", + "version": "0.4.0", + "description": "Standard X key constants and conversion to/from keycodes", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "bzip2", + "xcb", + "xorg-macros", + "xproto" + ] +} From f5ba36219947355bacef9f907b2687324b1047a9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:12:43 +0200 Subject: [PATCH 005/142] [xcb-util] add port --- ports/xcb-util/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ ports/xcb-util/ssize.patch | 19 +++++++++++++++++++ ports/xcb-util/vcpkg.json | 12 ++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 ports/xcb-util/portfile.cmake create mode 100644 ports/xcb-util/ssize.patch create mode 100644 ports/xcb-util/vcpkg.json diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake new file mode 100644 index 00000000000000..58729792b0a519 --- /dev/null +++ b/ports/xcb-util/portfile.cmake @@ -0,0 +1,32 @@ +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/libxcb-util + REF acf790d7752f36e450d476ad79807d4012ec863b #v0.4.0 + SHA512 d1ef49c1e16b7643a7afeca1495a96ab9ab9c537ea7669a13b3adda400a204626714afc8ed7fcc3d7532ebe1f89a3aa31e3ca0ee9617330d4df5b65b0c8e6dbc + HEAD_REF master + PATCHES ssize.patch +) + +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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() diff --git a/ports/xcb-util/ssize.patch b/ports/xcb-util/ssize.patch new file mode 100644 index 00000000000000..71ad7eb96ae19b --- /dev/null +++ b/ports/xcb-util/ssize.patch @@ -0,0 +1,19 @@ +diff --git a/src/event.c b/src/event.c +index 88058c4e7..3bc0d635f 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -38,6 +38,14 @@ + + #include + ++#ifndef ssize_t ++ #ifdef _WIN64 ++ #define ssize_t __int64 ++ #else ++ #define ssize_t long ++ #endif ++#endif ++ + #define ssizeof(foo) (ssize_t)sizeof(foo) + #define countof(foo) (ssizeof(foo) / ssizeof(foo[0])) + diff --git a/ports/xcb-util/vcpkg.json b/ports/xcb-util/vcpkg.json new file mode 100644 index 00000000000000..5ed3da56bea562 --- /dev/null +++ b/ports/xcb-util/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "xcb-util", + "version": "0.4.0", + "description": "C interface to the X Window System protocol, which replaces the traditional Xlib interface.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb", + "xcb-util-m4", + "xorg-macros" + ] +} From c833799440e97026ebf2b2fadc69c2693d33c060 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:12:57 +0200 Subject: [PATCH 006/142] [xcb-wm] add port --- ports/xcb-wm/build.patch | 51 +++++++++++++++++++++++++++++++++++++ ports/xcb-wm/portfile.cmake | 32 +++++++++++++++++++++++ ports/xcb-wm/vcpkg.json | 13 ++++++++++ 3 files changed, 96 insertions(+) create mode 100644 ports/xcb-wm/build.patch create mode 100644 ports/xcb-wm/portfile.cmake create mode 100644 ports/xcb-wm/vcpkg.json diff --git a/ports/xcb-wm/build.patch b/ports/xcb-wm/build.patch new file mode 100644 index 00000000000000..9018bf919312eb --- /dev/null +++ b/ports/xcb-wm/build.patch @@ -0,0 +1,51 @@ +diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4 +index b986105f6..a0ce37c2a 100644 +--- a/ewmh/ewmh.c.m4 ++++ b/ewmh/ewmh.c.m4 +@@ -45,7 +45,7 @@ + + #include + +-#define ssizeof(foo) (ssize_t)sizeof(foo) ++#define ssizeof(foo) (size_t)sizeof(foo) + #define countof(foo) (ssizeof(foo) / ssizeof(foo[0])) + + /** +@@ -1119,12 +1119,13 @@ xcb_ewmh_append_wm_icon_checked(xcb_ewmh_connection_t *ewmh, + uint32_t img_len, uint32_t *img) + { + const uint32_t data_len = img_len + 2; +- uint32_t data[data_len]; ++ uint32_t *data = (uint32_t*)malloc(data_len*sizeof(uint32_t)); + +- set_wm_icon_data(data, width, height, img_len, img); +- +- return xcb_ewmh_set_wm_icon_checked(ewmh, XCB_PROP_MODE_APPEND, window, +- data_len, data); ++ set_wm_icon_data(data, width, height, img_len, img); ++ const xcb_void_cookie_t res = xcb_ewmh_set_wm_icon_checked(ewmh, XCB_PROP_MODE_APPEND, window, ++ data_len, data); ++ free(data); ++ return res; + } + + xcb_void_cookie_t +@@ -1134,12 +1135,13 @@ xcb_ewmh_append_wm_icon(xcb_ewmh_connection_t *ewmh, + uint32_t img_len, uint32_t *img) + { + const uint32_t data_len = img_len + 2; +- uint32_t data[data_len]; +- +- set_wm_icon_data(data, width, height, img_len, img); ++ uint32_t *data = (uint32_t*)malloc(data_len*sizeof(uint32_t)); + +- return xcb_ewmh_set_wm_icon(ewmh, XCB_PROP_MODE_APPEND, window, +- data_len, data); ++ set_wm_icon_data(data, width, height, img_len, img); ++ const xcb_void_cookie_t res = xcb_ewmh_set_wm_icon(ewmh, XCB_PROP_MODE_APPEND, window, ++ data_len, data); ++ free(data); ++ return res; + } + + DO_GET_PROPERTY(wm_icon, _NET_WM_ICON, XCB_ATOM_CARDINAL, UINT_MAX) diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake new file mode 100644 index 00000000000000..b14393ca547080 --- /dev/null +++ b/ports/xcb-wm/portfile.cmake @@ -0,0 +1,32 @@ +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/libxcb-wm + REF 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 #v 0.4.1 + SHA512 6af514465eaa98d5417de352bd3e4f3880180f886dc1202c64496cb5a07c82c377afeb9396acf57e20caa73e858fe7e6309f3ed7a74e88eb58e1da1f31ac0bd8 + HEAD_REF master + PATCHES build.patch +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/xcb-wm/vcpkg.json b/ports/xcb-wm/vcpkg.json new file mode 100644 index 00000000000000..922584cbebf28b --- /dev/null +++ b/ports/xcb-wm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "xcb-wm", + "version": "0.4.1", + "description": "XCB client and window-manager helpers for ICCCM & EWMH.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/", + "license": null, + "dependencies": [ + "bzip2", + "xcb", + "xorg-macros", + "xproto" + ] +} From b9fb808ed39c0c564910732e0ab3283c617f255e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:13:43 +0200 Subject: [PATCH 007/142] v db --- versions/baseline.json | 24 ++++++++++++++++++++++++ versions/x-/xcb-cursor.json | 9 +++++++++ versions/x-/xcb-errors.json | 9 +++++++++ versions/x-/xcb-image.json | 9 +++++++++ versions/x-/xcb-keysyms.json | 9 +++++++++ versions/x-/xcb-util.json | 9 +++++++++ versions/x-/xcb-wm.json | 9 +++++++++ 7 files changed, 78 insertions(+) create mode 100644 versions/x-/xcb-cursor.json create mode 100644 versions/x-/xcb-errors.json create mode 100644 versions/x-/xcb-image.json create mode 100644 versions/x-/xcb-keysyms.json create mode 100644 versions/x-/xcb-util.json create mode 100644 versions/x-/xcb-wm.json diff --git a/versions/baseline.json b/versions/baseline.json index e0f71bffa86fd4..71c930d8bd132f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7952,6 +7952,22 @@ "baseline": "1.14", "port-version": 0 }, + "xcb-cursor": { + "baseline": "0.1.3", + "port-version": 0 + }, + "xcb-errors": { + "baseline": "1.0", + "port-version": 0 + }, + "xcb-image": { + "baseline": "0.4.0", + "port-version": 0 + }, + "xcb-keysyms": { + "baseline": "0.4.0", + "port-version": 0 + }, "xcb-proto": { "baseline": "1.14.1", "port-version": 0 @@ -7960,10 +7976,18 @@ "baseline": "0.3.9", "port-version": 0 }, + "xcb-util": { + "baseline": "0.4.0", + "port-version": 0 + }, "xcb-util-m4": { "baseline": "2022-01-24", "port-version": 0 }, + "xcb-wm": { + "baseline": "0.4.1", + "port-version": 0 + }, "xerces-c": { "baseline": "3.2.3", "port-version": 4 diff --git a/versions/x-/xcb-cursor.json b/versions/x-/xcb-cursor.json new file mode 100644 index 00000000000000..824a4fab4c9dc2 --- /dev/null +++ b/versions/x-/xcb-cursor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4c4580d327e0da114f7cd704e2423ae90dfc733c", + "version": "0.1.3", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-errors.json b/versions/x-/xcb-errors.json new file mode 100644 index 00000000000000..5b0fb4eb791a03 --- /dev/null +++ b/versions/x-/xcb-errors.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eb53667b3debd4012a4b12ed904c2c148f73b376", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-image.json b/versions/x-/xcb-image.json new file mode 100644 index 00000000000000..0bbacd1ee640b4 --- /dev/null +++ b/versions/x-/xcb-image.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0308ff836b0bebda6b9f9a08400363f750d55301", + "version": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-keysyms.json b/versions/x-/xcb-keysyms.json new file mode 100644 index 00000000000000..4881d1db8403fe --- /dev/null +++ b/versions/x-/xcb-keysyms.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3b58993d153b991cd41e75ec45fc0741a6c4b159", + "version": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-util.json b/versions/x-/xcb-util.json new file mode 100644 index 00000000000000..6de9b974a0bb17 --- /dev/null +++ b/versions/x-/xcb-util.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0c09f15c42dec14a7c0276079dd9ce711cad5623", + "version": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-wm.json b/versions/x-/xcb-wm.json new file mode 100644 index 00000000000000..598aeb7c6535ef --- /dev/null +++ b/versions/x-/xcb-wm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b384497e888ccba54bc2079c80284f40b476b19", + "version": "0.4.1", + "port-version": 0 + } + ] +} From cdfa4d104b6ebec1a837eaae882ec9d27b6f0fa6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:45:26 +0200 Subject: [PATCH 008/142] remove xcb-cursor --- ports/xcb-cursor/build.patch | 121 -------------------------------- ports/xcb-cursor/portfile.cmake | 36 ---------- ports/xcb-cursor/vcpkg.json | 13 ---- versions/baseline.json | 4 -- versions/x-/xcb-cursor.json | 9 --- 5 files changed, 183 deletions(-) delete mode 100644 ports/xcb-cursor/build.patch delete mode 100644 ports/xcb-cursor/portfile.cmake delete mode 100644 ports/xcb-cursor/vcpkg.json delete mode 100644 versions/x-/xcb-cursor.json diff --git a/ports/xcb-cursor/build.patch b/ports/xcb-cursor/build.patch deleted file mode 100644 index b2875fe06463a3..00000000000000 --- a/ports/xcb-cursor/build.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/cursor/cursor.h b/cursor/cursor.h -index 455dc3485..f1bfd60db 100644 ---- a/cursor/cursor.h -+++ b/cursor/cursor.h -@@ -106,18 +106,32 @@ struct xcb_cursor_context_t { - /* little-endian */ - #define XCURSOR_MAGIC 0x72756358 - -+#ifdef _MSC_VER -+ #define PACKED -+#else -+ #define PACKED __attribute__((packed)) -+#endif -+ -+#ifdef _MSC_VER -+#pragma pack(push,1) -+#endif -+ - typedef struct xcint_file_header_t { - uint32_t magic; - uint32_t header; - uint32_t version; - uint32_t ntoc; --} __attribute__((packed)) xcint_file_header_t; -+} PACKED xcint_file_header_t; - - typedef struct xcint_file_toc_t { - uint32_t type; - uint32_t subtype; - uint32_t position; --} __attribute__((packed)) xcint_file_toc_t; -+} PACKED xcint_file_toc_t; -+ -+#ifdef _MSC_VER -+#pragma pack(pop) -+#endif - - typedef struct xcint_cursor_file_t { - xcint_file_header_t header; -@@ -140,12 +154,16 @@ typedef struct xcint_cursor_file_t { - * CARD32 version chunk type version - */ - -+#ifdef _MSC_VER -+#pragma pack(push,1) -+#endif -+ - typedef struct xcint_chunk_header_t { - uint32_t header; - uint32_t type; - uint32_t subtype; - uint32_t version; --} __attribute__((packed)) xcint_chunk_header_t; -+} PACKED xcint_chunk_header_t; - - #define XCURSOR_IMAGE_TYPE 0xfffd0002 - #define XCURSOR_IMAGE_VERSION 1 -@@ -158,7 +176,13 @@ typedef struct xcint_image_t { - uint32_t yhot; - uint32_t delay; - uint32_t *pixels; --} __attribute__((packed)) xcint_image_t; -+} PACKED xcint_image_t; -+ -+#ifdef _MSC_VER -+#pragma pack(pop) -+#endif -+ -+#undef PACKED - - /* shape_to_id.c */ - const int cursor_shape_to_id(const char *name); -diff --git a/cursor/load_cursor.c b/cursor/load_cursor.c -index e82fc63e9..1d574a7d2 100644 ---- a/cursor/load_cursor.c -+++ b/cursor/load_cursor.c -@@ -35,7 +35,12 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - - #include - #include -@@ -223,7 +228,11 @@ xcb_cursor_t xcb_cursor_load_cursor(xcb_cursor_context_t *c, const char *name) { - close(fd); - - /* create a cursor from it */ -+#ifdef _MSC_VER -+ xcb_render_animcursorelt_t * elements =(xcb_render_animcursorelt_t*)_alloca(nimg*sizeof(xcb_render_animcursorelt_t)); -+#else - xcb_render_animcursorelt_t elements[nimg]; -+#endif - xcb_render_picture_t pic = xcb_generate_id(c->conn); - - for (int n = 0; n < nimg; n++) { -diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c -index 21f72bf5b..c43dd82b4 100644 ---- a/cursor/parse_cursor_file.c -+++ b/cursor/parse_cursor_file.c -@@ -34,9 +34,15 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - -+#ifdef _MSC_VER -+# include -+#endif -+ - #ifdef HAVE_ENDIAN_H - #include - #endif diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake deleted file mode 100644 index 679c987c6b2fcd..00000000000000 --- a/ports/xcb-cursor/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -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/libxcb-cursor - REF 95b9a8fd876fdbbc854cdf3d90317be3846c7417 #0.1.3 - SHA512 cca7bf1f2aeaab8d256052a676098d7c600b90dc47cf9bc84d11229e59fbf5c83f7f877b8538f7cc662983807566d28c87b3501abc7cab76cc553d9db29eceb9 - HEAD_REF master - PATCHES build.patch -) - -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY) -vcpkg_add_to_path("${GPERF_DIR}") - -set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") - -vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE -) - -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() - diff --git a/ports/xcb-cursor/vcpkg.json b/ports/xcb-cursor/vcpkg.json deleted file mode 100644 index 60b85ca80ee119..00000000000000 --- a/ports/xcb-cursor/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "xcb-cursor", - "version": "0.1.3", - "description": "XCB port of libXcursor", - "homepage": "https://xcb.freedesktop.org/", - "license": null, - "dependencies": [ - "xcb", - "xcb-image", - "xcb-render-util", - "xcb-util" - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 71c930d8bd132f..619a1cda3e89f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7952,10 +7952,6 @@ "baseline": "1.14", "port-version": 0 }, - "xcb-cursor": { - "baseline": "0.1.3", - "port-version": 0 - }, "xcb-errors": { "baseline": "1.0", "port-version": 0 diff --git a/versions/x-/xcb-cursor.json b/versions/x-/xcb-cursor.json deleted file mode 100644 index 824a4fab4c9dc2..00000000000000 --- a/versions/x-/xcb-cursor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "4c4580d327e0da114f7cd704e2423ae90dfc733c", - "version": "0.1.3", - "port-version": 0 - } - ] -} From e27c10ebc23cfdc1020bdd53d2ab665cece450ed Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 17 Oct 2022 16:56:17 +0200 Subject: [PATCH 009/142] CI without X libs possible? --- scripts/azure-pipelines/azure-pipelines.yml | 54 ------------------- .../azure-pipelines/linux/azure-pipelines.yml | 2 + triplets/x64-linux.cmake | 2 + 3 files changed, 4 insertions(+), 54 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 0277b12a79f353..f63e44acb02147 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -13,60 +13,6 @@ parameters: default: 'use default' jobs: -- template: windows/azure-pipelines.yml - parameters: - triplet: x86-windows - jobName: x86_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows - jobName: x64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static - jobName: x64_windows_static - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static-md - jobName: x64_windows_static_md - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-uwp - jobName: x64_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm64-windows - jobName: arm64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm-uwp - jobName: arm_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - - template: linux/azure-pipelines.yml parameters: poolName: $(linux-pool) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 3b0d41be46a95c..34d4d9194df47a 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -44,6 +44,8 @@ jobs: - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} displayName: "Build vcpkg with CMake" condition: ne('use default', '${{ parameters.vcpkgToolSha }}') + - bash: apt-get remove --yes libxt-dev libxaw7-dev libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev libxrandr-dev xutils-dev libgles2-mesa-dev libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-res0-dev libwayland-dev libxdamage-dev libdbus-1-dev libxtst-dev + displayName: 'Remove system x libs' - task: PowerShell@2 displayName: '*** Test Modified Ports' inputs: diff --git a/triplets/x64-linux.cmake b/triplets/x64-linux.cmake index 88221345605fd9..6003276973e31a 100644 --- a/triplets/x64-linux.cmake +++ b/triplets/x64-linux.cmake @@ -4,3 +4,5 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) # save time by only building release libs +set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON) \ No newline at end of file From 1fdf2fe38a4abe910597cbc31594f4824b4196cc Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 17 Oct 2022 17:03:03 +0200 Subject: [PATCH 010/142] try sudo. (but probably won't work) --- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 34d4d9194df47a..7f16832e712710 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -44,7 +44,7 @@ jobs: - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} displayName: "Build vcpkg with CMake" condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - - bash: apt-get remove --yes libxt-dev libxaw7-dev libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev libxrandr-dev xutils-dev libgles2-mesa-dev libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-res0-dev libwayland-dev libxdamage-dev libdbus-1-dev libxtst-dev + - bash: sudo apt-get remove --yes libxt-dev libxaw7-dev libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev libxrandr-dev xutils-dev libgles2-mesa-dev libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-res0-dev libwayland-dev libxdamage-dev libdbus-1-dev libxtst-dev displayName: 'Remove system x libs' - task: PowerShell@2 displayName: '*** Test Modified Ports' From d7072ed6fd3d3259cfce52cf97b0b0c74e2f30aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Oct 2022 21:13:31 +0200 Subject: [PATCH 011/142] single config fixes --- ports/libe57/portfile.cmake | 4 +++- ports/libe57/vcpkg.json | 2 +- ports/xtrans/portfile.cmake | 9 ++++++--- ports/xtrans/vcpkg.json | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake index afb1b4af4c42e6..31db434256ae5d 100644 --- a/ports/libe57/portfile.cmake +++ b/ports/libe57/portfile.cmake @@ -16,7 +16,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57") +endif() vcpkg_cmake_install() vcpkg_cmake_config_fixup() diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index 03f74169f585ee..8688922e123ca7 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libe57", "version-semver": "1.1.332", - "port-version": 2, + "port-version": 3, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", "license": "BSL-1.0", diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index e7e726e0628f10..a9e5fb6d80a00d 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -30,13 +30,15 @@ if(NOT WIN32) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/") # the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig") +if(NOT VCPKG_BUILD_TYPE) file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") endif() @@ -48,8 +50,9 @@ file(READ "${_file}" _contents) string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" ) -if(EXISTS "${_file}") +if(NOT VCPKG_BUILD_TYPE) file(READ "${_file}" _contents) string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") diff --git a/ports/xtrans/vcpkg.json b/ports/xtrans/vcpkg.json index 151d527b8c138c..c6cd8267605621 100644 --- a/ports/xtrans/vcpkg.json +++ b/ports/xtrans/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xtrans", "version": "1.4.0", + "port-version": 1, "description": "xtrans - X Network Transport layer shared code", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtrans", "license": null, From 523d19a754d4c8976fd75127897dee9d3545d3ac Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Oct 2022 21:14:00 +0200 Subject: [PATCH 012/142] v db --- versions/baseline.json | 4 ++-- versions/l-/libe57.json | 5 +++++ versions/x-/xtrans.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a848462bf3a882..786757b4492598 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3670,7 +3670,7 @@ }, "libe57": { "baseline": "1.1.332", - "port-version": 2 + "port-version": 3 }, "libe57format": { "baseline": "2.2.0", @@ -8070,7 +8070,7 @@ }, "xtrans": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "xxhash": { "baseline": "0.8.1", diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index 647a2835154d35..cefe0269e3fd99 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecdcbb16ecd99e8d8a25b7dde4b2b1f040c5c3ed", + "version-semver": "1.1.332", + "port-version": 3 + }, { "git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca", "version-semver": "1.1.332", diff --git a/versions/x-/xtrans.json b/versions/x-/xtrans.json index 5c6c6557a2b3e4..868cb3df6bf6ab 100644 --- a/versions/x-/xtrans.json +++ b/versions/x-/xtrans.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f270ddca7ea9e55a992a4923b373c4e47ad24ebd", + "version": "1.4.0", + "port-version": 1 + }, { "git-tree": "ef94e0330a53876e074a09a3cd9c311c4ca0aa28", "version": "1.4.0", From fa635f444a2474df82192d16abb1d6a532c11c6f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 19 Oct 2022 14:08:50 -0700 Subject: [PATCH 013/142] Remove a bunch of X packages as requested by Neumann-A. --- .../azure-pipelines/linux/provision-image.sh | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index a5d9eec8842521..13a6af40bdd20e 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -29,30 +29,15 @@ apt-get -y dist-upgrade APT_PACKAGES="git curl zip unzip tar" ## common build dependencies -APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ - build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ - libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ - libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin \ - flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ - xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ +APT_PACKAGES="$APT_PACKAGES at gperf cifs-utils \ + build-essential g++ gfortran yasm libnuma1 libnuma-dev libtool-bin \ + flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool \ + dh-autoreconf autoconf-archive ruby-full \ pkg-config meson nasm cmake ninja-build" -## required by qt5-base -APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ - libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" - -## required by qt5-base for qt5-x11extras -APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ - libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ - libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ - libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" - ## required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" -## required by kf5windowsystem -APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" - ## required by mesa APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" @@ -62,24 +47,12 @@ APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" ## required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" -## required by qtwayland -APT_PACKAGES="$APT_PACKAGES libwayland-dev" - ## required by all GN projects APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" ## required by libctl APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" -## required by gtk -APT_PACKAGES="$APT_PACKAGES libxdamage-dev" - -## required by gtk3 and at-spi2-atk -APT_PACKAGES="$APT_PACKAGES libdbus-1-dev" - -## required by at-spi2-atk -APT_PACKAGES="$APT_PACKAGES libxtst-dev" - ## required by bond APT_PACKAGES="$APT_PACKAGES haskell-stack" From 1365d384688e7895ff0e4c95065fff11c4fd01b3 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 19 Oct 2022 14:09:20 -0700 Subject: [PATCH 014/142] DO NOT MERGE: Add "NoX" to Linux names. --- scripts/azure-pipelines/linux/create-image.ps1 | 2 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 932d25aecde22b..935dc84877af21 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -16,7 +16,7 @@ This script assumes you have installed the OpenSSH Client optional Windows compo #> $Location = 'eastasia' -$Prefix = 'Lin-' +$Prefix = 'LinNoX-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 54ed2142bb9e99..ace1715e38806e 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -29,7 +29,7 @@ Param( ) $Location = 'eastasia' -$Prefix = 'PrLin-' +$Prefix = 'PrLinNoX-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' $LiveVMPrefix = 'BUILD' From 0fcb727f9c4b2b5e42a76be9afd73a99da74a198 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 19 Oct 2022 14:37:52 -0700 Subject: [PATCH 015/142] DO NOT MERGE Update pool and disable non-Linux --- scripts/azure-pipelines/azure-pipelines.yml | 56 +-------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 0277b12a79f353..1ebaae2206e89e 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -3,7 +3,7 @@ # variables: windows-pool: 'PrWin-2022-10-12' - linux-pool: 'PrLin-2022-10-12' + linux-pool: 'PrLinNoX-2022-10-19' osx-pool: 'PrOsx-2022-02-04' parameters: @@ -13,60 +13,6 @@ parameters: default: 'use default' jobs: -- template: windows/azure-pipelines.yml - parameters: - triplet: x86-windows - jobName: x86_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows - jobName: x64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static - jobName: x64_windows_static - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static-md - jobName: x64_windows_static_md - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: x64-uwp - jobName: x64_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm64-windows - jobName: arm64_windows - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: windows/azure-pipelines.yml - parameters: - triplet: arm-uwp - jobName: arm_uwp - poolName: $(windows-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - -- template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) - vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - - template: linux/azure-pipelines.yml parameters: poolName: $(linux-pool) From 7c491f4382147b211e145585f16dc8a4d49a1f95 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Oct 2022 23:48:00 +0200 Subject: [PATCH 016/142] break all x stuff for the first run. --- ports/xorg-macros/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 75bdc7e35d753d..61a1412a2e46da 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -64,4 +64,5 @@ vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +message(FATAL_ERROR "Just error to make sure all of x is deactivated for the first run!") endif() From bbdd8f0218eb4133346420b749cfd1bd844ffc61 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Oct 2022 23:53:41 +0200 Subject: [PATCH 017/142] fix font-util single build --- ports/font-util/portfile.cmake | 13 +++++++------ ports/font-util/vcpkg.json | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index 026c224c770722..ecaa42370a5d36 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -45,12 +45,13 @@ string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/sh string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") -file(READ "${_file}" _contents) -string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") -string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") -file(WRITE "${_file}" "${_contents}") - +if(NOT VCPKG_BUILD_TYPE) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") + file(READ "${_file}" _contents) + string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") + string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") endif() \ No newline at end of file diff --git a/ports/font-util/vcpkg.json b/ports/font-util/vcpkg.json index d04e3eb55546bc..2e9f1996f3c4ca 100644 --- a/ports/font-util/vcpkg.json +++ b/ports/font-util/vcpkg.json @@ -1,6 +1,7 @@ { "name": "font-util", "version": "1.3.2", + "port-version": 1, "description": "X.Org font package creation/installation utilities", "homepage": "https://gitlab.freedesktop.org/xorg/font/util", "license": null, From a22c2c3a3c63acc5dce11e635d3f4af9c84cd89f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 00:01:03 +0200 Subject: [PATCH 018/142] add dbus dep --- ports/at-spi2-core/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index bab5f6f62ed462..6f629128f1132c 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -6,6 +6,7 @@ "license": null, "supports": "linux", "dependencies": [ + "dbus", "glib", { "name": "glib", From ba99f2d07da21d55acd995891385c72f2c4318bd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 00:02:14 +0200 Subject: [PATCH 019/142] fix font-util --- ports/font-util/portfile.cmake | 13 +++++++------ ports/font-util/vcpkg.json | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index 026c224c770722..ecaa42370a5d36 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -45,12 +45,13 @@ string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/sh string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") -file(READ "${_file}" _contents) -string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") -string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") -file(WRITE "${_file}" "${_contents}") - +if(NOT VCPKG_BUILD_TYPE) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") + file(READ "${_file}" _contents) + string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") + string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") endif() \ No newline at end of file diff --git a/ports/font-util/vcpkg.json b/ports/font-util/vcpkg.json index d04e3eb55546bc..2e9f1996f3c4ca 100644 --- a/ports/font-util/vcpkg.json +++ b/ports/font-util/vcpkg.json @@ -1,6 +1,7 @@ { "name": "font-util", "version": "1.3.2", + "port-version": 1, "description": "X.Org font package creation/installation utilities", "homepage": "https://gitlab.freedesktop.org/xorg/font/util", "license": null, From 808959cf03d774bb9991a51d6923cfdd6a63a263 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 00:02:30 +0200 Subject: [PATCH 020/142] v db --- versions/baseline.json | 2 +- versions/f-/font-util.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 786757b4492598..ff92e09862e73d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2386,7 +2386,7 @@ }, "font-util": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "fontconfig": { "baseline": "2.14.0", diff --git a/versions/f-/font-util.json b/versions/f-/font-util.json index 645967e70854ee..56022e74411f56 100644 --- a/versions/f-/font-util.json +++ b/versions/f-/font-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0e594376a070a10aeb06cc14e29309d7ed6d611", + "version": "1.3.2", + "port-version": 1 + }, { "git-tree": "752c6b7df7c1181d4c27b64da1c20c03137ed3c6", "version": "1.3.2", From e7f7e9e59707257ca699f54af054243190e21dd2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:10:58 +0200 Subject: [PATCH 021/142] Apply CR Co-authored-by: Billy O'Neal --- ports/xcb-errors/portfile.cmake | 3 +-- ports/xcb-image/add_return_value.patch | 1 + ports/xcb-keysyms/portfile.cmake | 1 - ports/xcb-util/portfile.cmake | 1 - ports/xcb-wm/build.patch | 2 +- ports/xcb-wm/portfile.cmake | 2 -- 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake index b11aeb4f106384..1329d3bd4baec1 100644 --- a/ports/xcb-errors/portfile.cmake +++ b/ports/xcb-errors/portfile.cmake @@ -31,7 +31,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# # Handle copyright - configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/xcb-errors/copyright" COPYONLY) +file(INSTALL "${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/xcb-image/add_return_value.patch b/ports/xcb-image/add_return_value.patch index a36858cc250c28..15f2cf6c0e28ce 100644 --- a/ports/xcb-image/add_return_value.patch +++ b/ports/xcb-image/add_return_value.patch @@ -6,6 +6,7 @@ index a6872a1f3..bf6fdc179 100644 return XCB_IMAGE_ORDER_LSB_FIRST; } assert(0); ++ exit(EXIT_FAILURE); + return -1; } diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index 376ed00dc98c3b..1ec6f9c4a9972d 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -25,6 +25,5 @@ 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() diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake index 58729792b0a519..f7070a4ff1ef1a 100644 --- a/ports/xcb-util/portfile.cmake +++ b/ports/xcb-util/portfile.cmake @@ -27,6 +27,5 @@ 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() diff --git a/ports/xcb-wm/build.patch b/ports/xcb-wm/build.patch index 9018bf919312eb..1b72f5bf55e8f4 100644 --- a/ports/xcb-wm/build.patch +++ b/ports/xcb-wm/build.patch @@ -7,7 +7,7 @@ index b986105f6..a0ce37c2a 100644 #include -#define ssizeof(foo) (ssize_t)sizeof(foo) -+#define ssizeof(foo) (size_t)sizeof(foo) ++#define ssizeof(foo) (ptrdiff_t)sizeof(foo) #define countof(foo) (ssizeof(foo) / ssizeof(foo[0])) /** diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake index b14393ca547080..e058c9be0d01e6 100644 --- a/ports/xcb-wm/portfile.cmake +++ b/ports/xcb-wm/portfile.cmake @@ -26,7 +26,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() From f660962f1b8546eb2efef46100fab2749f882446 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:25:53 +0200 Subject: [PATCH 022/142] update ports to new version --- ports/xcb-errors/portfile.cmake | 4 ++-- ports/xcb-errors/vcpkg.json | 2 +- ports/xcb-image/add_return_value.patch | 2 +- ports/xcb-image/portfile.cmake | 8 +++----- ports/xcb-image/vcpkg.json | 2 +- ports/xcb-keysyms/portfile.cmake | 4 ++-- ports/xcb-keysyms/vcpkg.json | 2 +- ports/xcb-render-util/portfile.cmake | 4 ++-- ports/xcb-render-util/vcpkg.json | 2 +- ports/xcb-util/ssize.patch | 10 +++------- ports/xcb-wm/portfile.cmake | 2 +- ports/xcb-wm/vcpkg.json | 2 +- 12 files changed, 19 insertions(+), 25 deletions(-) diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake index 1329d3bd4baec1..6845558bf64a6e 100644 --- a/ports/xcb-errors/portfile.cmake +++ b/ports/xcb-errors/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-errors - REF 332f357aa662ad61625ee804f93c5503b2a0c3ec #1.0 - SHA512 e2b1ad74434760b94035ba91a2f43012523f007e82a1c99380be9f08ca8545f31dcfd772cef593c709cef941ff6d8ab421f47b2f3f01ba956cbaa15e4b928b8b + REF 517dd82c079de762a7426f20166a44f11e8d38c5 #1.0.1 + SHA512 391f6bc9452bf4d6a3f1fa69232cdbef43f9fcd339b8d1965132a3b227ed7ebcbaad553fe64d42bc525811caedf3ff9d5bec108f6ac2efd5a014f75fb35cbf85 HEAD_REF master PATCHES fix_python.patch ) diff --git a/ports/xcb-errors/vcpkg.json b/ports/xcb-errors/vcpkg.json index d0d843de749d6d..38de3e0c156d2b 100644 --- a/ports/xcb-errors/vcpkg.json +++ b/ports/xcb-errors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xcb-errors", - "version": "1.0", + "version": "1.0.1", "description": "XCB port of Xlib's XImage and XShmImage functions.", "homepage": "https://xcb.freedesktop.org/", "license": null, diff --git a/ports/xcb-image/add_return_value.patch b/ports/xcb-image/add_return_value.patch index 15f2cf6c0e28ce..5c3a1db0f3a861 100644 --- a/ports/xcb-image/add_return_value.patch +++ b/ports/xcb-image/add_return_value.patch @@ -2,7 +2,7 @@ diff --git a/image/xcb_bitops.h b/image/xcb_bitops.h index a6872a1f3..bf6fdc179 100644 --- a/image/xcb_bitops.h +++ b/image/xcb_bitops.h -@@ -207,6 +207,7 @@ xcb_host_byte_order(void) { +@@ -207,6 +207,8 @@ xcb_host_byte_order(void) { return XCB_IMAGE_ORDER_LSB_FIRST; } assert(0); diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index 3f39911d5f49a0..2e612e547dc747 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-image - REF d882052fb2ce439c6483fce944ba8f16f7294639 #v 0.4.0 - SHA512 60d933d60351071fa47540a7943a34fd57bd46ebcd7441020c8f3f0ef4abc44fbb8e86e72e328d64992254ce20d5b718bede9f4994dbd0674fbf5ce88050c307 + REF 525ce59fe2329d4b23fc0c52ed9dd92daac8ac2a #v 0.4.1 + SHA512 e91471c45983bb3a56fb96a9ab627a5b65fcbc21424f62bed10dba283c97fdd6475d4f380d268a30a99b6544bc804f8263e7b945a4c4d22c79535e3c3b1e10db HEAD_REF master PATCHES add_return_value.patch ) @@ -26,7 +26,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") -file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/xcb-image/vcpkg.json b/ports/xcb-image/vcpkg.json index d42e2f08805088..299921b12f4791 100644 --- a/ports/xcb-image/vcpkg.json +++ b/ports/xcb-image/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xcb-image", - "version": "0.4.0", + "version": "0.4.1", "description": "XCB port of Xlib's XImage and XShmImage functions.", "homepage": "https://xcb.freedesktop.org/", "license": null, diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index 1ec6f9c4a9972d..a624dac0f87d54 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-keysyms - REF 439be15cde3c7b5ba07b175dcf7b724d155d30aa #v 0.4.0 - SHA512 1bd5002d669c4b31b200bdaba9a620c87dcab712a895c70851bdc33651c098e12f62cc20428a0b09e8e9d937939e2d92704e1df551bcb9b460596fa53a8a956c + REF 85e093f14b0ade2956e0a5d1c37cfde06d8b1ba6 #v 0.4.1 + SHA512 cee1224ba673c637d20387d22d445be92970dd1b169247550befe64908e1b7f8cc4311018b7e7854e46ccaa62b8c6258293dcb144a94e320bee5a1e060b194f1 HEAD_REF master ) file(TOUCH "${SOURCE_PATH}/m4/dummy") diff --git a/ports/xcb-keysyms/vcpkg.json b/ports/xcb-keysyms/vcpkg.json index dc5c5776cfb2d5..a5eb8ac91de1e1 100644 --- a/ports/xcb-keysyms/vcpkg.json +++ b/ports/xcb-keysyms/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xcb-keysyms", - "version": "0.4.0", + "version": "0.4.1", "description": "Standard X key constants and conversion to/from keycodes", "homepage": "https://xcb.freedesktop.org/", "license": null, diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake index 2bad743750fc39..c15e8e8442c04a 100644 --- a/ports/xcb-render-util/portfile.cmake +++ b/ports/xcb-render-util/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-render-util - REF 0317caf63de532fd7a0493ed6afa871a67253747 #v 0.3.9 - SHA512 9a16c3eb3575586fce85a548cb5fd8b23aa8e42363b2c6d4e074e45f5c04089301ef2ff3012cf9cc94490359d4e28ff062feaecb97a880c9240bf7dbe5d03612 + REF 5293d8b6165f23b9f7a8bcc903da0e4d7a75984c #v 0.3.10 + SHA512 ecd1876b62c1345ce3c06ac525f1af4f59dcce3c8d76003c59dd64c80f7787d6d2754c481e585507d6bcaf443026a7aa22ab9eac28b5153eff78d216e53eb29f HEAD_REF master # branch name PATCHES pthread.patch # required since this port directly depends on pthread functions. So it has to directly link it! ) diff --git a/ports/xcb-render-util/vcpkg.json b/ports/xcb-render-util/vcpkg.json index 8c3d47baca0d2e..31fec040242174 100644 --- a/ports/xcb-render-util/vcpkg.json +++ b/ports/xcb-render-util/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xcb-render-util", - "version": "0.3.9", + "version": "0.3.10", "description": "XCB convenience functions for the Render extension.", "homepage": "https://xcb.freedesktop.org/", "license": null, diff --git a/ports/xcb-util/ssize.patch b/ports/xcb-util/ssize.patch index 71ad7eb96ae19b..3b327133ea8fb7 100644 --- a/ports/xcb-util/ssize.patch +++ b/ports/xcb-util/ssize.patch @@ -2,16 +2,12 @@ diff --git a/src/event.c b/src/event.c index 88058c4e7..3bc0d635f 100644 --- a/src/event.c +++ b/src/event.c -@@ -38,6 +38,14 @@ +@@ -38,6 +38,10 @@ #include -+#ifndef ssize_t -+ #ifdef _WIN64 -+ #define ssize_t __int64 -+ #else -+ #define ssize_t long -+ #endif ++#if !defined ssize_t && defined(_WIN32) ++ #define ssize_t ptrdiff_t +#endif + #define ssizeof(foo) (ssize_t)sizeof(foo) diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake index e058c9be0d01e6..c097f2afc20e9e 100644 --- a/ports/xcb-wm/portfile.cmake +++ b/ports/xcb-wm/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-wm - REF 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 #v 0.4.1 + REF 0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 #v 0.4.2 SHA512 6af514465eaa98d5417de352bd3e4f3880180f886dc1202c64496cb5a07c82c377afeb9396acf57e20caa73e858fe7e6309f3ed7a74e88eb58e1da1f31ac0bd8 HEAD_REF master PATCHES build.patch diff --git a/ports/xcb-wm/vcpkg.json b/ports/xcb-wm/vcpkg.json index 922584cbebf28b..c89c04e9dafef7 100644 --- a/ports/xcb-wm/vcpkg.json +++ b/ports/xcb-wm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xcb-wm", - "version": "0.4.1", + "version": "0.4.2", "description": "XCB client and window-manager helpers for ICCCM & EWMH.", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/", "license": null, From 21731e263bd12acc26e5bccd234974028d20c954 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:29:09 +0200 Subject: [PATCH 023/142] v db --- versions/baseline.json | 10 +++++----- versions/x-/xcb-errors.json | 4 ++-- versions/x-/xcb-image.json | 4 ++-- versions/x-/xcb-keysyms.json | 4 ++-- versions/x-/xcb-render-util.json | 4 ++-- versions/x-/xcb-util.json | 2 +- versions/x-/xcb-wm.json | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 9c402308be4446..56d4199bde0be4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8009,15 +8009,15 @@ "port-version": 0 }, "xcb-errors": { - "baseline": "1.0", + "baseline": "1.0.1", "port-version": 0 }, "xcb-image": { - "baseline": "0.4.0", + "baseline": "0.4.1", "port-version": 0 }, "xcb-keysyms": { - "baseline": "0.4.0", + "baseline": "0.4.1", "port-version": 0 }, "xcb-proto": { @@ -8025,7 +8025,7 @@ "port-version": 0 }, "xcb-render-util": { - "baseline": "0.3.9", + "baseline": "0.3.10", "port-version": 0 }, "xcb-util": { @@ -8037,7 +8037,7 @@ "port-version": 0 }, "xcb-wm": { - "baseline": "0.4.1", + "baseline": "0.4.2", "port-version": 0 }, "xerces-c": { diff --git a/versions/x-/xcb-errors.json b/versions/x-/xcb-errors.json index 5b0fb4eb791a03..cf57469ad58fb8 100644 --- a/versions/x-/xcb-errors.json +++ b/versions/x-/xcb-errors.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "eb53667b3debd4012a4b12ed904c2c148f73b376", - "version": "1.0", + "git-tree": "a807401107f8315c783b3c390a7abff29c57bddb", + "version": "1.0.1", "port-version": 0 } ] diff --git a/versions/x-/xcb-image.json b/versions/x-/xcb-image.json index 0bbacd1ee640b4..4e67e364fe7644 100644 --- a/versions/x-/xcb-image.json +++ b/versions/x-/xcb-image.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "0308ff836b0bebda6b9f9a08400363f750d55301", - "version": "0.4.0", + "git-tree": "b58e6a2e9c723399f786bf4c53ec133baaf3abf2", + "version": "0.4.1", "port-version": 0 } ] diff --git a/versions/x-/xcb-keysyms.json b/versions/x-/xcb-keysyms.json index 4881d1db8403fe..a74a1e51fabe29 100644 --- a/versions/x-/xcb-keysyms.json +++ b/versions/x-/xcb-keysyms.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "3b58993d153b991cd41e75ec45fc0741a6c4b159", - "version": "0.4.0", + "git-tree": "3cfe91d00cc0022de24c02a2355502d2b9392dd0", + "version": "0.4.1", "port-version": 0 } ] diff --git a/versions/x-/xcb-render-util.json b/versions/x-/xcb-render-util.json index b14709327f49fa..e55fb19a491f6e 100644 --- a/versions/x-/xcb-render-util.json +++ b/versions/x-/xcb-render-util.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "c33cb9ea07d2bd0e8662ad5d8a1368aae2144da2", - "version": "0.3.9", + "git-tree": "630a72ed63679891d45f81a2d323aff929984217", + "version": "0.3.10", "port-version": 0 } ] diff --git a/versions/x-/xcb-util.json b/versions/x-/xcb-util.json index 6de9b974a0bb17..2311be8cf0388d 100644 --- a/versions/x-/xcb-util.json +++ b/versions/x-/xcb-util.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c09f15c42dec14a7c0276079dd9ce711cad5623", + "git-tree": "d5b50a3e395fcee958321601e06a2cfcbc75d925", "version": "0.4.0", "port-version": 0 } diff --git a/versions/x-/xcb-wm.json b/versions/x-/xcb-wm.json index 598aeb7c6535ef..9b7acce1dd8540 100644 --- a/versions/x-/xcb-wm.json +++ b/versions/x-/xcb-wm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "6b384497e888ccba54bc2079c80284f40b476b19", - "version": "0.4.1", + "git-tree": "c51622a0e236cb98519894d2aae8b99f65606633", + "version": "0.4.2", "port-version": 0 } ] From 5911a2cb2b14ebfd06b5f2fd5da6efd41ee23ee6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:30:27 +0200 Subject: [PATCH 024/142] fix v db --- versions/x-/xcb-render-util.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/x-/xcb-render-util.json b/versions/x-/xcb-render-util.json index e55fb19a491f6e..b53608c8600001 100644 --- a/versions/x-/xcb-render-util.json +++ b/versions/x-/xcb-render-util.json @@ -4,6 +4,11 @@ "git-tree": "630a72ed63679891d45f81a2d323aff929984217", "version": "0.3.10", "port-version": 0 + }, + { + "git-tree": "c33cb9ea07d2bd0e8662ad5d8a1368aae2144da2", + "version": "0.3.9", + "port-version": 0 } ] } From 40f1f573f83925f429855f1b9bce366deea63579 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:10:47 +0200 Subject: [PATCH 025/142] add libdrm --- ports/libdrm/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/libdrm/vcpkg.json | 11 +++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/libdrm/portfile.cmake create mode 100644 ports/libdrm/vcpkg.json diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake new file mode 100644 index 00000000000000..0079387839d516 --- /dev/null +++ b/ports/libdrm/portfile.cmake @@ -0,0 +1,28 @@ +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_DRM_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/drm + REF d76c387125c7ad336f39121b9c3148361731bdad #v2.4.108 + SHA512 cefa58f0f04d96c3b9c4540ab94863c0781d46e7ef0e23a03b35d4e4033231a79f692eb601bbbba730f731a629336484df5d39c8dc0e4550e3db1634f4c2dbf2 + HEAD_REF master # branch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #No license in source? +endif() \ No newline at end of file diff --git a/ports/libdrm/vcpkg.json b/ports/libdrm/vcpkg.json new file mode 100644 index 00000000000000..c69458ede4370f --- /dev/null +++ b/ports/libdrm/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libdrm", + "version": "2.4.108", + "description": "Direct Rendering Manager library and headers", + "homepage": "https://gitlab.freedesktop.org/mesa/drm", + "license": null, + "dependencies": [ + "libpciaccess", + "tool-meson" + ] +} From 667b0d327361b7c0b55fe98067a360fd6febd283 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:10:59 +0200 Subject: [PATCH 026/142] add libpciaccess --- ports/libpciaccess/portfile.cmake | 35 +++++++++++++++++++++++++++++++ ports/libpciaccess/vcpkg.json | 12 +++++++++++ 2 files changed, 47 insertions(+) create mode 100644 ports/libpciaccess/portfile.cmake create mode 100644 ports/libpciaccess/vcpkg.json diff --git a/ports/libpciaccess/portfile.cmake b/ports/libpciaccess/portfile.cmake new file mode 100644 index 00000000000000..200c3f3cddcc4d --- /dev/null +++ b/ports/libpciaccess/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/libpciaccess + REF fbd1f0fe79ba25b72635f8e36a6c33d7e0ca19f6 #0.16 + SHA512 e148e513453e4d6c131287d69910fa14b66557039acdfe3c59ec8de280841a62b9c727203331ebc2e9f0f1797dccbe22ca99aeecae78314448ef3cca017bc883 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS_DEBUG + --with-zlib=${CURRENT_INSTALLED_DIR} + OPTIONS_RELEASE + --with-zlib=${CURRENT_INSTALLED_DIR}/debug +) + +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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libpciaccess/vcpkg.json b/ports/libpciaccess/vcpkg.json new file mode 100644 index 00000000000000..3e19590bd42132 --- /dev/null +++ b/ports/libpciaccess/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libpciaccess", + "version": "0.16", + "description": "Generic PCI access library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libpciaccess", + "license": null, + "supports": "!(windows | osx)", + "dependencies": [ + "xorg-macros", + "zlib" + ] +} From a3583f832b8f7f21929a90f316c654e2c7409c31 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:11:39 +0200 Subject: [PATCH 027/142] add libxshmfence --- ports/libxshmfence/portfile.cmake | 32 +++++++++++++++++++++++++++++++ ports/libxshmfence/vcpkg.json | 14 ++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 ports/libxshmfence/portfile.cmake create mode 100644 ports/libxshmfence/vcpkg.json diff --git a/ports/libxshmfence/portfile.cmake b/ports/libxshmfence/portfile.cmake new file mode 100644 index 00000000000000..a698d719018231 --- /dev/null +++ b/ports/libxshmfence/portfile.cmake @@ -0,0 +1,32 @@ +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/libxshmfence + REF f38b2e73071ba516127f8f5ae47f48df58dc9d53 #1.3 + SHA512 d3342db68b24b2b139977655fc42fde9b22cc1b786e1df6f14c5084e195d2208c11391b9a1769b4d6f9d41d21c163c1d9aa92f72059ada468375daaeee8dffdb + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() + diff --git a/ports/libxshmfence/vcpkg.json b/ports/libxshmfence/vcpkg.json new file mode 100644 index 00000000000000..61ed8057d19a3a --- /dev/null +++ b/ports/libxshmfence/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxshmfence", + "version": "1.3", + "description": "Shared memory 'SyncFence' synchronization primitive", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxshmfence", + "license": null, + "supports": "!windows", + "dependencies": [ + "bzip2", + "pthread", + "xorg-macros", + "xproto" + ] +} From 2828a3eaf6f0c5967bf928191669b596cdb101d5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:12:03 +0200 Subject: [PATCH 028/142] v db --- versions/baseline.json | 12 ++++++++++++ versions/l-/libdrm.json | 9 +++++++++ versions/l-/libpciaccess.json | 9 +++++++++ versions/l-/libxshmfence.json | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 versions/l-/libdrm.json create mode 100644 versions/l-/libpciaccess.json create mode 100644 versions/l-/libxshmfence.json diff --git a/versions/baseline.json b/versions/baseline.json index 92ee5e1ebefa00..bbb721926fdf7f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3668,6 +3668,10 @@ "baseline": "0.16.0", "port-version": 0 }, + "libdrm": { + "baseline": "2.4.108", + "port-version": 0 + }, "libdshowcapture": { "baseline": "0.6.0", "port-version": 3 @@ -4064,6 +4068,10 @@ "baseline": "1.10.1", "port-version": 1 }, + "libpciaccess": { + "baseline": "0.16", + "port-version": 0 + }, "libpff": { "baseline": "2021-11-14", "port-version": 0 @@ -4468,6 +4476,10 @@ "baseline": "1.2.3", "port-version": 0 }, + "libxshmfence": { + "baseline": "1.3", + "port-version": 0 + }, "libxslt": { "baseline": "1.1.37", "port-version": 0 diff --git a/versions/l-/libdrm.json b/versions/l-/libdrm.json new file mode 100644 index 00000000000000..28121681892b97 --- /dev/null +++ b/versions/l-/libdrm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e89237372fa701c92cb41a14f20f511de345b62", + "version": "2.4.108", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libpciaccess.json b/versions/l-/libpciaccess.json new file mode 100644 index 00000000000000..a1a7a2c7549041 --- /dev/null +++ b/versions/l-/libpciaccess.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "75b10fd74aafa6a37761a37ea98d5bf453a41656", + "version": "0.16", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxshmfence.json b/versions/l-/libxshmfence.json new file mode 100644 index 00000000000000..9000d039de4834 --- /dev/null +++ b/versions/l-/libxshmfence.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7b7cacb13061a2afd277f3f84117394c8c04527", + "version": "1.3", + "port-version": 0 + } + ] +} From 41e5041421dbad8774f05947b55f74bcffc6b1c2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 22 Sep 2022 15:37:44 +0200 Subject: [PATCH 029/142] add newline --- ports/libdrm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index 0079387839d516..04d5023dd6e02b 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -25,4 +25,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #No license in source? -endif() \ No newline at end of file +endif() From 589da76531a10ffe7e75282e75585e49f4212b9c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 22 Sep 2022 15:38:04 +0200 Subject: [PATCH 030/142] v db --- versions/l-/libdrm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libdrm.json b/versions/l-/libdrm.json index 28121681892b97..d4d352e97c0e8d 100644 --- a/versions/l-/libdrm.json +++ b/versions/l-/libdrm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5e89237372fa701c92cb41a14f20f511de345b62", + "git-tree": "30769c67778d28abf781c02760990363f29add84", "version": "2.4.108", "port-version": 0 } From 40a1933b1075b93a5b239d44b0ae6061d495d8c3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 00:07:04 +0200 Subject: [PATCH 031/142] Actually build the ports once in CI --- ports/libdrm/portfile.cmake | 3 ++- ports/libpciaccess/portfile.cmake | 3 ++- ports/libxshmfence/portfile.cmake | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index 04d5023dd6e02b..aa031a3258c7c1 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -1,4 +1,5 @@ -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(0) + 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_DRM_LIBRARIES in your triplet") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) else() diff --git a/ports/libpciaccess/portfile.cmake b/ports/libpciaccess/portfile.cmake index 200c3f3cddcc4d..8b130a6e626697 100644 --- a/ports/libpciaccess/portfile.cmake +++ b/ports/libpciaccess/portfile.cmake @@ -1,4 +1,5 @@ -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(0) + 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() diff --git a/ports/libxshmfence/portfile.cmake b/ports/libxshmfence/portfile.cmake index a698d719018231..accf314baf532a 100644 --- a/ports/libxshmfence/portfile.cmake +++ b/ports/libxshmfence/portfile.cmake @@ -1,4 +1,5 @@ -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(0) + 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() From 1f923be8bae2c9ce89f1a4428cdd8eee365e6bff Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:40:21 +0200 Subject: [PATCH 032/142] make xorg macros build on osx --- ports/xorg-macros/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 75bdc7e35d753d..3dc4d53341cdbc 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(0) 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() From 4801462f8c9c723c178a2e4ee9de65c883d69f5c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:47:37 +0200 Subject: [PATCH 033/142] xproto also required for osx run --- ports/xproto/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 87380da9aee29c..27331e80facba4 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(0) 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() From f861934aef94da688d0f0c77447721aff075788d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:50:14 +0200 Subject: [PATCH 034/142] add newline --- ports/font-util/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index ecaa42370a5d36..21c1d2c031a414 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -54,4 +54,4 @@ if(NOT VCPKG_BUILD_TYPE) endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") -endif() \ No newline at end of file +endif() From fac44147f111cc7afd9c67ae5c7c2ecff216c797 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:50:36 +0200 Subject: [PATCH 035/142] v db --- versions/f-/font-util.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/font-util.json b/versions/f-/font-util.json index 56022e74411f56..0d765cf2eeff99 100644 --- a/versions/f-/font-util.json +++ b/versions/f-/font-util.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a0e594376a070a10aeb06cc14e29309d7ed6d611", + "git-tree": "67faf30776c5600c8cfe00f9def5143b5e36eb08", "version": "1.3.2", "port-version": 1 }, From 4dd35aa2d3e9155cc3cbca7a1bc2dc47483e8fb5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:01:48 +0200 Subject: [PATCH 036/142] add missing DESTINATION parameter --- ports/xcb-errors/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake index 6845558bf64a6e..0d7b9daf3ebc5e 100644 --- a/ports/xcb-errors/portfile.cmake +++ b/ports/xcb-errors/portfile.cmake @@ -31,6 +31,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() From b416db2fc8931f7437cce094c201d5c5fea81abb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:02:08 +0200 Subject: [PATCH 037/142] v db --- versions/x-/xcb-errors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/x-/xcb-errors.json b/versions/x-/xcb-errors.json index cf57469ad58fb8..0b76c62a832759 100644 --- a/versions/x-/xcb-errors.json +++ b/versions/x-/xcb-errors.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a807401107f8315c783b3c390a7abff29c57bddb", + "git-tree": "6826cd41ffe5f341b28a6f1d5eba21eed3a4765f", "version": "1.0.1", "port-version": 0 } From 86ed1e89dec1f2262e23f7ad7e263f611e4c8d71 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:36:48 +0200 Subject: [PATCH 038/142] fix single config? --- ports/freerdp/portfile.cmake | 57 +++++++++++--------- ports/freerdp/vcpkg.json | 1 + ports/libassuan/portfile.cmake | 4 +- ports/libassuan/vcpkg.json | 2 +- ports/libcanberra/portfile.cmake | 5 +- ports/libcanberra/vcpkg.json | 2 +- ports/libmysql/portfile.cmake | 9 ++-- ports/libmysql/vcpkg.json | 2 +- ports/libodb/portfile.cmake | 8 +-- ports/libodb/vcpkg.json | 2 +- ports/libusb/vcpkg-cmake-wrapper.cmake | 7 ++- ports/libusb/vcpkg.json | 2 +- ports/pthread-stubs/portfile.cmake | 34 ++++++------ ports/pthread-stubs/vcpkg.json | 1 + ports/skia/portfile.cmake | 6 ++- ports/skia/vcpkg.json | 1 + ports/spdk-dpdk/portfile.cmake | 4 +- ports/spdk-dpdk/vcpkg.json | 2 +- ports/spdk-ipsec/portfile.cmake | 4 +- ports/spdk-ipsec/vcpkg.json | 2 +- ports/zeroc-ice/portfile.cmake | 74 +++++++++++++------------- ports/zeroc-ice/vcpkg.json | 2 +- ports/zopfli/portfile.cmake | 18 ++++--- ports/zopfli/vcpkg.json | 2 +- 24 files changed, 140 insertions(+), 111 deletions(-) diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index ac36220adbae39..49bd3bfe0c9e66 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -51,7 +51,6 @@ file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe") if(TOOLS_RELEASE) file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG}) endif() @@ -65,11 +64,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${FREERDP_DLL}") endforeach() - file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") - foreach(FREERDP_DLL ${FREERDP_DLLS}) - file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE "${FREERDP_DLL}") - endforeach() + if(NOT VCPKG_BUILD_TYPE) + file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + foreach(FREERDP_DLL ${FREERDP_DLLS}) + file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${FREERDP_DLL}") + endforeach() + endif() else() file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") foreach(FREERDP_TOOL ${FREERDP_TOOLS}) @@ -82,8 +83,10 @@ endif() foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}") + endif() endforeach() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client) @@ -92,14 +95,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME W vcpkg_fixup_pkgconfig(SKIP_CHECK) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" - "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" - "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" -) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" - "debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" - "debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" -) +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" + "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" + "debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + ) +endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake" "lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" @@ -108,18 +113,22 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.c "lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake" - "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" - "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" -) +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake" + "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + ) +endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake" "lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake" - "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" - "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" -) +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake" + "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + ) +endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake" "lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 1fd40a6f51b617..b9dd512fb3127c 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freerdp", "version": "2.7.0", + "port-version": 1, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake index 1d0451406bc63b..4fdc1599e81d85 100644 --- a/ports/libassuan/portfile.cmake +++ b/ports/libassuan/portfile.cmake @@ -23,7 +23,9 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libassuan/vcpkg.json b/ports/libassuan/vcpkg.json index eb2e6a2d86df08..030240d2731697 100644 --- a/ports/libassuan/vcpkg.json +++ b/ports/libassuan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libassuan", "version": "2.5.3", - "port-version": 4, + "port-version": 5, "description": "A library implementing the so-called Assuan protocol", "homepage": "https://gnupg.org/software/libassuan/index.html", "supports": "!windows", diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake index 9b862ca23eb998..75bbc1a4fc99b2 100644 --- a/ports/libcanberra/portfile.cmake +++ b/ports/libcanberra/portfile.cmake @@ -82,8 +82,9 @@ vcpkg_configure_make( vcpkg_install_make() configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) -configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) - +if(NOT VCPKG_BUILD_TYPE) + configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) +endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libcanberra/vcpkg.json b/ports/libcanberra/vcpkg.json index 44c64d07b21e44..0fbd36624b5582 100644 --- a/ports/libcanberra/vcpkg.json +++ b/ports/libcanberra/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcanberra", "version": "0.30", - "port-version": 2, + "port-version": 3, "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", "homepage": "http://0pointer.de/lennart/projects/libcanberra/", "supports": "!(windows | uwp)", diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index f70ec00a6a54c8..7005d7dedb232f 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -99,11 +99,14 @@ endif() vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}") + +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}") +endif() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql) diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 15ae0c3932d1b0..83107deceef41e 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 8, + "port-version": 9, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index c7046bc8210dc8..76fd7c968b2aa5 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -26,9 +26,11 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +if(NOT VCPKG_BUILD_TYPE) + file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) + string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json index 5c3fe94c21c7a1..8e10e1cf7f067c 100644 --- a/ports/libodb/vcpkg.json +++ b/ports/libodb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb", "version": "2.4.0", - "port-version": 8, + "port-version": 9, "description": "ODB library, base runtime for the ODB ORM solution", "homepage": "https://www.codesynthesis.com/products/odb/" } diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake index 61f9d54bacf44a..6689dc4bcc0c69 100644 --- a/ports/libusb/vcpkg-cmake-wrapper.cmake +++ b/ports/libusb/vcpkg-cmake-wrapper.cmake @@ -1,13 +1,12 @@ include(SelectLibraryConfigurations) find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0) -find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) +find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) select_library_configurations(LIBUSB) -set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR}) -set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY}) +set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}") if (@VCPKG_TARGET_IS_LINUX@) list(APPEND LIBUSB_LIBRARIES udev) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index e7d498d40ba347..78afef0f56ee48 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26", - "port-version": 1, + "port-version": 2, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1", diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake index 10f0df6955f621..b1d1cccf49cc4e 100644 --- a/ports/pthread-stubs/portfile.cmake +++ b/ports/pthread-stubs/portfile.cmake @@ -33,19 +33,21 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/pthreadGC3.lib") endif() file(WRITE "${_file}" "${_contents}") -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pthread-stubs.pc") -file(READ "${_file}" _contents) -string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") -if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3.lib") - string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") -endif() -if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3.lib") - string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") -endif() -if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib") - string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3d" _contents "${_contents}") -endif() -if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3d.lib") - string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3d" _contents "${_contents}") -endif() -file(WRITE "${_file}" "${_contents}") +if(NOT VCPKG_BUILD_TYPE) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pthread-stubs.pc") + file(READ "${_file}" _contents) + string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3d" _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3d" _contents "${_contents}") + endif() + file(WRITE "${_file}" "${_contents}") +endif() \ No newline at end of file diff --git a/ports/pthread-stubs/vcpkg.json b/ports/pthread-stubs/vcpkg.json index f72f2ae2ec0df0..b0b25b30b56932 100644 --- a/ports/pthread-stubs/vcpkg.json +++ b/ports/pthread-stubs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pthread-stubs", "version": "0.4", + "port-version": 1, "description": "Stub replacements for POSIX Threads functions.", "homepage": "https://gitlab.freedesktop.org/xorg/lib/pthread-stubs", "license": "X11-distribute-modifications-variant", diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 1f4f3296e579bc..6d7fa3eefcb529 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -105,8 +105,10 @@ function(replace_skia_dep NAME INCLUDES LIBS_DBG LIBS_REL DEFINITIONS) list(TRANSFORM INCLUDES PREPEND "${CURRENT_INSTALLED_DIR}") cmake_to_gn_list(_INCLUDES "${INCLUDES}") - find_libraries(_LIBS_DBG "${LIBS_DBG}" "${CURRENT_INSTALLED_DIR}/debug/lib") - cmake_to_gn_list(_LIBS_DBG "${_LIBS_DBG}") + if(NOT VCPKG_BUILD_TYPE) + find_libraries(_LIBS_DBG "${LIBS_DBG}" "${CURRENT_INSTALLED_DIR}/debug/lib") + cmake_to_gn_list(_LIBS_DBG "${_LIBS_DBG}") + endif() find_libraries(_LIBS_REL "${LIBS_REL}" "${CURRENT_INSTALLED_DIR}/lib") cmake_to_gn_list(_LIBS_REL "${_LIBS_REL}") diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 803246125caa37..aedf114f3666ba 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "skia", "version": "0.36.0", + "port-version": 1, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index f8a8d46e17661c..8c226d6624a9cb 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -36,7 +36,9 @@ FOREACH (HEADER ${HEADERS}) ENDFOREACH () FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +if(NOT VCPKG_BUILD_TYPE) + FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +endif() FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json index ec63984b9b438d..3c3d6fd4ef725b 100644 --- a/ports/spdk-dpdk/vcpkg.json +++ b/ports/spdk-dpdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdk-dpdk", "version-string": "20181124", - "port-version": 1, + "port-version": 2, "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", "supports": "linux" } diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake index df7ee677140ec1..456f8a51842672 100644 --- a/ports/spdk-ipsec/portfile.cmake +++ b/ports/spdk-ipsec/portfile.cmake @@ -49,7 +49,9 @@ VCPKG_CONFIGURE_CMAKE( VCPKG_INSTALL_CMAKE() FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +if(NOT VCPKG_BUILD_TYPE) + FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +endif() FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/spdk-ipsec/vcpkg.json b/ports/spdk-ipsec/vcpkg.json index e41c9d957141d3..74c3b48b68827f 100644 --- a/ports/spdk-ipsec/vcpkg.json +++ b/ports/spdk-ipsec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdk-ipsec", "version-string": "20180711", - "port-version": 1, + "port-version": 2, "description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library", "supports": "x64 & linux" } diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index c1cf8c1d36fc35..ff083f4a2d3cba 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -160,46 +160,46 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ICE_BUILD_CONFIG "static cpp11-static") endif() - + if(NOT VCPKG_BUILD_TYPE) message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_build_process( - COMMAND make - V=1 - "prefix=${CURRENT_PACKAGES_DIR}/debug" - linux_id=vcpkg - "CONFIGS=${ICE_BUILD_CONFIG}" - USR_DIR_INSTALL=yes - OPTIMIZE=no - ${ICE_OPTIONAL_COMPONENTS_MAKE} - "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${SOURCE_PATH}/cpp - LOGNAME make-${TARGET_TRIPLET}-dbg - ) - - # Install debug libraries to packages directory - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") - if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") - file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") - else() - file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") - endif() - file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - - # Clean up for the next round - vcpkg_execute_build_process( - COMMAND make distclean - WORKING_DIRECTORY ${SOURCE_PATH}/cpp - LOGNAME make-clean-${TARGET_TRIPLET} - ) + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}/debug" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=no + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-dbg + ) + + # Install debug libraries to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") - file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") - endif() - if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") - file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") - endif() - file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + # Clean up for the next round + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + endif() # TODO: get-cmake-vars! # Release build set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib") message(STATUS "Building ${TARGET_TRIPLET}-rel") diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index 2335597fc32261..c0c8bb2f8a9f00 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeroc-ice", "version": "3.7.7", - "port-version": 2, + "port-version": 3, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", diff --git a/ports/zopfli/portfile.cmake b/ports/zopfli/portfile.cmake index d796980a8e1055..070b0f6ac66ab3 100644 --- a/ports/zopfli/portfile.cmake +++ b/ports/zopfli/portfile.cmake @@ -39,14 +39,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Zopfli") # vcpkg_cmake_config_fixup can not handles this on UNIX currently. if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" - "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\"" - "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" - ) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" - "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\"" - "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" - ) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" + "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" + "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" + ) + endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake" "\"\${_IMPORT_PREFIX}/bin/zopfli\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" diff --git a/ports/zopfli/vcpkg.json b/ports/zopfli/vcpkg.json index f0f895ab326fbc..15377e0c02a672 100644 --- a/ports/zopfli/vcpkg.json +++ b/ports/zopfli/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zopfli", "version": "1.0.3", - "port-version": 2, + "port-version": 3, "description": "Zopfli Compression Algorithm compression library programmed in C", "homepage": "https://github.com/google/zopfli", "license": "Apache-2.0", From 28dcc9dc7e01de1b61183e8f657c79a84ac17fe0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:36:59 +0200 Subject: [PATCH 039/142] add libglvnd --- ports/libglvnd/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/libglvnd/vcpkg.json | 15 +++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 ports/libglvnd/portfile.cmake create mode 100644 ports/libglvnd/vcpkg.json diff --git a/ports/libglvnd/portfile.cmake b/ports/libglvnd/portfile.cmake new file mode 100644 index 00000000000000..876ffcb5d1f7f1 --- /dev/null +++ b/ports/libglvnd/portfile.cmake @@ -0,0 +1,26 @@ + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO glvnd/libglvnd + REF c7cdf0cc4395b57563294d1f340b6bb1b95366a0 + SHA512 3fda563239a9048c21c62005d074dafb79ec20213f8f02ffd8ac529d821a5ddb87ae44fb49159fce2a97581d9b7cff875ed7478621b6cf8191e2f5fd7f20a974 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dx11=enabled + -Degl=true + -Dgles1=true + -Dgles2=true + -Dglx=enabled + -Dentrypoint-patching=enabled +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +# This needs some cleanup. Copyright is at end of README.md +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libglvnd/vcpkg.json b/ports/libglvnd/vcpkg.json new file mode 100644 index 00000000000000..da89a1c31ed9bb --- /dev/null +++ b/ports/libglvnd/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libglvnd", + "version": "1.5.0", + "description": "libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors. It allows multiple drivers from different vendors to coexist on the same filesystem, and determines which vendor to dispatch each API call to at runtime.", + "homepage": "https://gitlab.freedesktop.org/glvnd/libglvnd", + "license": null, + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + }, + "libx11", + "libxext" + ] +} From 9b94eafa10116b5be8e36814e43c19cc8d7569c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:37:25 +0200 Subject: [PATCH 040/142] deactivate registries have opengl instead. --- ports/egl-registry/portfile.cmake | 2 ++ ports/opengl-registry/portfile.cmake | 3 ++- ports/opengl/vcpkg.json | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index 268f9830ba98c3..bd76e07eeaf8be 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -1,3 +1,4 @@ +if(0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/EGL-Registry @@ -26,3 +27,4 @@ file( ) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) +endif() \ No newline at end of file diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 15dcf2a5ef643e..14580cc7d4bd57 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -1,3 +1,4 @@ +if(0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenGL-Registry @@ -25,7 +26,7 @@ file( DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) - +endif() # pc layout from cygwin (consumed in xserver!) file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/khronos-opengl-registry.pc" [=[ prefix=${pcfiledir}/../.. diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index ea5e3d1c856d4d..1d06a0ee9ee97c 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -3,5 +3,11 @@ "version-date": "2022-03-14", "port-version": 1, "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", - "license": null + "license": null, + "dependencies": [ + { + "name": "libglvnd", + "platform": "!windows" + } +] } From 74568d0b2dee379330d2680ccee051eccd92ff36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:55:52 +0200 Subject: [PATCH 041/142] fix hdf5 issues? --- ports/hdf5/portfile.cmake | 27 +++++++++++---------------- ports/hdf5/vcpkg.json | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index da9f53e78edf35..b5dc37a893b2d6 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -102,37 +102,32 @@ string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] ) file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) +set(HDF5_TOOLS "") if("tools" IN_LIST FEATURES) - set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug - h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import + list(APPEND HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug + h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch h5import ) + if("parallel" IN_LIST FEATURES) + list(APPEND HDF5_TOOLS ph5diff) + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(TRANSFORM HDF5_TOOLS REPLACE "^(.+)$" "\\1-shared") - else() endif() - foreach(HDF5_TOOL IN LISTS HDF5_TOOLS) - if (NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" - OR NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - list(REMOVE_ITEM HDF5_TOOLS "${HDF5_TOOL}") - endif() - endforeach() - if("parallel" IN_LIST FEATURES) list(APPEND HDF5_TOOLS h5perf) else() list(APPEND HDF5_TOOLS h5perf_serial) endif() - - vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) endif() if ("utils" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES mirror_server mirror_server_stop - AUTO_CLEAN - ) + list(APPEND HDF5_TOOLS mirror_server mirror_server_stop) +endif() + +if(HDF5_TOOLS) + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 36371957146222..92cfbb0ea06864 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.2", - "port-version": 1, + "port-version": 2, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "license": "BSD-3-Clause", From 6aa5ea30b600215325efe3ceeba9e39dc8fd8a6e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:56:16 +0200 Subject: [PATCH 042/142] at-spi2-core fix dbus dependency --- ports/at-spi2-core/vcpkg.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index bab5f6f62ed462..7bd08cd8e8baef 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -1,11 +1,13 @@ { "name": "at-spi2-core", "version": "2.44.1", + "port-version": 1, "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", "homepage": "https://www.gtk.org/", "license": null, "supports": "linux", "dependencies": [ + "dbus", "glib", { "name": "glib", From c718cc7b4685c212411742486801e363de079299 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:56:56 +0200 Subject: [PATCH 043/142] add first todo list --- TODO.txt | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000000000..40c5fab8905a69 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,56 @@ +allegro5: OpenGL GLES1 GLES2; X11 (GLX); Xcursor Xpm XInput2(Xi) (XF86VIDMOD;XINERAMA;XRANDR;XSCREENSAVER) +cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm) +coin: OpenGL; X11 (Opt on mac?) +ffmpeg: OpenGL; +fltk: X11; +freeglut: Opengl (+ext); x11 ;Xinput; Xxf86vm_libs xrandr (wayland-client wayland-cursor -lwayland-egl xkbcommon) +ftgl: opengl +gainput: x11 +gl3w: opengl +glew: opengl +glfw3: X11 +hpx: MPI ? +irrlicht: opengl; +libepoxy: x11 +libspnav: x11 +llgl: x11 +magnum: OpenGL +mathgl: OpenGL +minifb: x11 +OIS: X11 +opencascada: x11 +openexr-loader: x11: xcb xcb-glx; wayland-client;probably more? +plib: opengl +qtbase: a lot of extra deps. +sfml: x11 +skia: single config; opengl; xcb? +soil: opengl +soil2: opengl +urho3d: x11 + + + +Single Config issues: +skia: single config; opengl; xcb? +freerdp: single config +libassuan: single config +libcanbarra: single config +libmysql: single config +libobd: single config +libuvc: broken libusb wrapper; single config +nmap: single config +spdk-dpdk: single config +spdk-ipsec: single config +zeroc-ice: single config +zopfli: single config + +hdf5 issues: +cgns: h5diff ? +h5py-lzf: h5diff ? +highfive: h5diff ? +ismrmrd: h5diff ? +kealib: h5diff ? +matio: hdf5? +minc: hdf5 +netcdf-c: hdf5 +shogun: hdf5 \ No newline at end of file From 461165c6c4b3f921fba1f266723d8533ee2b8da5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:11:20 +0200 Subject: [PATCH 044/142] todo libglvnd --- ports/libglvnd/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/libglvnd/portfile.cmake b/ports/libglvnd/portfile.cmake index 876ffcb5d1f7f1..a6d56db4e4cdc7 100644 --- a/ports/libglvnd/portfile.cmake +++ b/ports/libglvnd/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_FIXUP_ELF_RPATH ON) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -8,6 +10,9 @@ vcpkg_from_gitlab( HEAD_REF master ) +# TODO: Setup DEFAULT_EGL_VENDOR_CONFIG_DIRS +# TODO: Fix absolute paths in libX11.a (will get integrated in the so here) + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From 8e8c2f99f823b1e6448d25b5d651017e3941ecaf Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:33:41 +0200 Subject: [PATCH 045/142] todo update --- TODO.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TODO.txt b/TODO.txt index 40c5fab8905a69..ca5c472109012b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -28,8 +28,6 @@ soil: opengl soil2: opengl urho3d: x11 - - Single Config issues: skia: single config; opengl; xcb? freerdp: single config @@ -53,4 +51,6 @@ kealib: h5diff ? matio: hdf5? minc: hdf5 netcdf-c: hdf5 -shogun: hdf5 \ No newline at end of file +shogun: hdf5 + +libX11.a needs fixing of hardcoding absolute paths. \ No newline at end of file From bd2a420cfa80e72f164c25b2f9089de8e6d69f90 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:59:01 +0200 Subject: [PATCH 046/142] fix stuff. Lets ci remaining CI errors. --- TODO.txt | 42 ++++++++++++++++++------------------ ports/cairo/portfile.cmake | 2 ++ ports/cairo/vcpkg.json | 9 +++++++- ports/coin/vcpkg.json | 2 +- ports/fltk/vcpkg.json | 3 ++- ports/gainput/vcpkg.json | 2 ++ ports/glfw3/vcpkg.json | 1 + ports/irrlicht/vcpkg.json | 1 + ports/libepoxy/vcpkg.json | 1 + ports/libglvnd/vcpkg.json | 6 +++--- ports/libspnav/vcpkg.json | 5 ++++- ports/llgl/vcpkg.json | 7 ++++-- ports/magnum/vcpkg.json | 1 + ports/minifb/vcpkg.json | 8 ++++++- ports/nmap/portfile.cmake | 6 +++--- ports/ois/vcpkg.json | 4 ++++ ports/opencascade/vcpkg.json | 4 ++++ ports/opengl/vcpkg.json | 6 +++--- ports/plib/vcpkg.json | 5 ++++- ports/soil/vcpkg.json | 5 ++++- ports/soil2/vcpkg.json | 1 + ports/urho3d/vcpkg.json | 1 + 22 files changed, 83 insertions(+), 39 deletions(-) diff --git a/TODO.txt b/TODO.txt index ca5c472109012b..9217f9516bbb93 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,31 +1,31 @@ allegro5: OpenGL GLES1 GLES2; X11 (GLX); Xcursor Xpm XInput2(Xi) (XF86VIDMOD;XINERAMA;XRANDR;XSCREENSAVER) -cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm) -coin: OpenGL; X11 (Opt on mac?) -ffmpeg: OpenGL; -fltk: X11; +#cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm) +~coin: OpenGL; X11 (Opt on mac?) +~ffmpeg: OpenGL; +~fltk: X11; freeglut: Opengl (+ext); x11 ;Xinput; Xxf86vm_libs xrandr (wayland-client wayland-cursor -lwayland-egl xkbcommon) -ftgl: opengl -gainput: x11 -gl3w: opengl -glew: opengl -glfw3: X11 +~ftgl: opengl +~gainput: x11, xinput? +~gl3w: opengl +~glew: opengl +~glfw3: X11 hpx: MPI ? -irrlicht: opengl; -libepoxy: x11 -libspnav: x11 -llgl: x11 -magnum: OpenGL -mathgl: OpenGL -minifb: x11 -OIS: X11 -opencascada: x11 +#irrlicht: opengl; +#libepoxy: x11 +#libspnav: x11 +#llgl: x11 +~magnum: OpenGL +~mathgl: OpenGL +~minifb: x11 +~OIS: X11 +~opencascada: x11 openexr-loader: x11: xcb xcb-glx; wayland-client;probably more? -plib: opengl +~plib: opengl qtbase: a lot of extra deps. sfml: x11 skia: single config; opengl; xcb? -soil: opengl -soil2: opengl +~soil: opengl +~soil2: opengl urho3d: x11 Single Config issues: diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 737f310cf8a08a..9ad24f1467ade6 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -17,6 +17,8 @@ vcpkg_from_gitlab( ${PATCHES} ) +#TODO . Add xcb, xlib-xcb feature? + if("fontconfig" IN_LIST FEATURES) list(APPEND OPTIONS -Dfontconfig=enabled) else() diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index e5e135c2c1f1b4..4d86d45732b4c5 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -10,6 +10,7 @@ "expat", "libpng", "lzo", + "opengl", "pixman", "pthread", { @@ -43,7 +44,13 @@ }, "x11": { "description": "build with x11 support", - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + "libx11", + "libxext", + "libxrender", + "libxshmfence" + ] } } } diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index 02430c7651a32a..5ec154c14ada9a 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -12,7 +12,7 @@ "boost-math", "boost-smart-ptr", "boost-static-assert", - "opengl-registry" + "opengl" ], "default-features": [ "simage", diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index ada834120680d6..a8af207c561df4 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fltk", "version": "1.3.8", - "port-version": 2, + "port-version": 3, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "supports": "!uwp", @@ -12,6 +12,7 @@ }, "libjpeg-turbo", "libpng", + "libx11", { "name": "vcpkg-cmake", "host": true diff --git a/ports/gainput/vcpkg.json b/ports/gainput/vcpkg.json index ca764891c5bf1e..d0a92d94043751 100644 --- a/ports/gainput/vcpkg.json +++ b/ports/gainput/vcpkg.json @@ -7,6 +7,8 @@ "license": "MIT", "supports": "!uwp", "dependencies": [ + "libx11", + "libxi", { "name": "vcpkg-cmake", "host": true diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index b10ace797c5fad..fa53a4cf873866 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -5,6 +5,7 @@ "homepage": "https://github.com/glfw/glfw", "license": "Zlib", "dependencies": [ + "libx11", { "name": "vcpkg-cmake", "host": true diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index 1815c8040208e3..2c33131fb2908d 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -9,6 +9,7 @@ "bzip2", "libjpeg-turbo", "libpng", + "opengl", "vcpkg-cmake", "vcpkg-cmake-config", "zlib" diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json index a28f326718086f..aaeabf277f9d79 100644 --- a/ports/libepoxy/vcpkg.json +++ b/ports/libepoxy/vcpkg.json @@ -5,6 +5,7 @@ "description": "Epoxy is a library for handling OpenGL function pointer management for you", "homepage": "https://github.com/anholt/libepoxy", "dependencies": [ + "opengl", { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/libglvnd/vcpkg.json b/ports/libglvnd/vcpkg.json index da89a1c31ed9bb..bfa2915714cc2e 100644 --- a/ports/libglvnd/vcpkg.json +++ b/ports/libglvnd/vcpkg.json @@ -5,11 +5,11 @@ "homepage": "https://gitlab.freedesktop.org/glvnd/libglvnd", "license": null, "dependencies": [ + "libx11", + "libxext", { "name": "vcpkg-tool-meson", "host": true - }, - "libx11", - "libxext" + } ] } diff --git a/ports/libspnav/vcpkg.json b/ports/libspnav/vcpkg.json index 1c9557d3e6a22c..33e301bbead3c0 100644 --- a/ports/libspnav/vcpkg.json +++ b/ports/libspnav/vcpkg.json @@ -4,5 +4,8 @@ "port-version": 2, "description": "Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices.", "homepage": "https://github.com/FreeSpacenav/libspnav", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "libx11" + ] } diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index f653d01f597d1f..aeb31b91a6a270 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llgl", "version-string": "2019-08-15", - "port-version": 2, + "port-version": 3, "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", "homepage": "https://github.com/LukasBanana/LLGL", "supports": "!uwp", @@ -10,7 +10,10 @@ "description": "Support for direct3d11" }, "opengl": { - "description": "Support for opengl" + "description": "Support for opengl", + "dependencies": [ + "opengl" + ] } } } diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index 26c23155fda574..6fbdc2493f0cb4 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -12,6 +12,7 @@ "utility" ] }, + "opengl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/minifb/vcpkg.json b/ports/minifb/vcpkg.json index 760b9d2aac5d03..43fae7e6ab62c1 100644 --- a/ports/minifb/vcpkg.json +++ b/ports/minifb/vcpkg.json @@ -4,5 +4,11 @@ "port-version": 2, "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.", "homepage": "https://github.com/emoon/minifb", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "libx11", + "platform": "!windows" + } + ] } diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index c0252af8dac02e..33ab71032a94d8 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -83,7 +83,7 @@ else() ) message(STATUS "Installing ${TARGET_TRIPLET}-rel") - file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(INSTALL "${source_path_release}/nmap" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) @@ -111,10 +111,10 @@ else() file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) endif() - set(SOURCE_PATH "${source_path_release}") + set(SOURCE_PATH "${source_path_release}") ## TODO: vcpkg_configure_make? endif() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index c73ac9131e911c..ee726c94485bb4 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -7,6 +7,10 @@ "license": "Zlib", "supports": "!(arm | arm64 | uwp)", "dependencies": [ + { + "name": "libx11", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 1b16eece7b9217..eee80aa83340d1 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -9,6 +9,10 @@ "dependencies": [ "fontconfig", "freetype", + { + "name": "libx11", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index 1d06a0ee9ee97c..d530b54dee83da 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -5,9 +5,9 @@ "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", "license": null, "dependencies": [ - { + { "name": "libglvnd", "platform": "!windows" - } -] + } + ] } diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json index 421823aff3c706..7f7d6597f4dbf8 100644 --- a/ports/plib/vcpkg.json +++ b/ports/plib/vcpkg.json @@ -2,5 +2,8 @@ "name": "plib", "version-string": "1.8.5", "port-version": 5, - "description": "A suite of portable game libraries" + "description": "A suite of portable game libraries", + "dependencies": [ + "opengl" + ] } diff --git a/ports/soil/vcpkg.json b/ports/soil/vcpkg.json index 11ef3473b0921d..c1a2596a04412f 100644 --- a/ports/soil/vcpkg.json +++ b/ports/soil/vcpkg.json @@ -4,5 +4,8 @@ "port-version": 1, "description": "SOIL is a tiny C library used primarily for uploading textures into OpenGL.", "homepage": "https://github.com/paralin/soil", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "opengl" + ] } diff --git a/ports/soil2/vcpkg.json b/ports/soil2/vcpkg.json index 55acddbbb1086c..02d84e3f4de9ce 100644 --- a/ports/soil2/vcpkg.json +++ b/ports/soil2/vcpkg.json @@ -5,6 +5,7 @@ "homepage": "https://github.com/SpartanJ/SOIL2", "license": "MIT-0", "dependencies": [ + "opengl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 5ba230f157a0b5..5e9e083e5ba412 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -7,6 +7,7 @@ "homepage": "https://github.com/urho3d/Urho3D", "supports": "!(arm | uwp)", "dependencies": [ + "opengl", { "name": "vcpkg-cmake", "host": true From 9e0ce342be23ac4f081181999c9ed01a72f3b68c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:02:40 +0200 Subject: [PATCH 047/142] Revert "Actually build the ports once in CI" This reverts commit 40a1933b1075b93a5b239d44b0ae6061d495d8c3. --- ports/libdrm/portfile.cmake | 3 +-- ports/libpciaccess/portfile.cmake | 3 +-- ports/libxshmfence/portfile.cmake | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index aa031a3258c7c1..04d5023dd6e02b 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -1,5 +1,4 @@ -if(0) - +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_DRM_LIBRARIES in your triplet") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) else() diff --git a/ports/libpciaccess/portfile.cmake b/ports/libpciaccess/portfile.cmake index 8b130a6e626697..200c3f3cddcc4d 100644 --- a/ports/libpciaccess/portfile.cmake +++ b/ports/libpciaccess/portfile.cmake @@ -1,5 +1,4 @@ -if(0) - +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() diff --git a/ports/libxshmfence/portfile.cmake b/ports/libxshmfence/portfile.cmake index accf314baf532a..a698d719018231 100644 --- a/ports/libxshmfence/portfile.cmake +++ b/ports/libxshmfence/portfile.cmake @@ -1,5 +1,4 @@ -if(0) - +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() From 2f5f0c46098809aa25fac8666f47408ccd7e4e10 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:02:47 +0200 Subject: [PATCH 048/142] Revert "make xorg macros build on osx" This reverts commit 1f923be8bae2c9ce89f1a4428cdd8eee365e6bff. --- ports/xorg-macros/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 3dc4d53341cdbc..75bdc7e35d753d 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -if(0) +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() From 532037ae633ce8066fbb41bca27f4d132c316ef8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:02:54 +0200 Subject: [PATCH 049/142] Revert "xproto also required for osx run" This reverts commit 4801462f8c9c723c178a2e4ee9de65c883d69f5c. --- ports/xproto/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 27331e80facba4..87380da9aee29c 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -1,4 +1,4 @@ -if(0) +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() From 45d0a64bcb06091b733c134aa0cf9dd2f7acfecb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:36:10 +0200 Subject: [PATCH 050/142] minor fixes reenable xorg-macros --- ports/egl-registry/portfile.cmake | 3 ++- ports/freeglut/vcpkg.json | 1 + ports/llgl/vcpkg.json | 6 ++++++ ports/opengl-registry/portfile.cmake | 1 + ports/xorg-macros/portfile.cmake | 1 - 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index bd76e07eeaf8be..bd5bc53377e0bf 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -27,4 +27,5 @@ file( ) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) -endif() \ No newline at end of file +endif() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index d1708bd73a8555..e0508606e1d150 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -5,6 +5,7 @@ "homepage": "https://sourceforge.net/projects/freeglut/", "license": null, "dependencies": [ + "opengl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index aeb31b91a6a270..7dcd51d5f670ff 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -5,6 +5,12 @@ "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", "homepage": "https://github.com/LukasBanana/LLGL", "supports": "!uwp", + "dependencies": [ + { + "name": "libx11", + "platform": "linux" + } + ], "features": { "direct3d11": { "description": "Support for direct3d11" diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 14580cc7d4bd57..f705e1040a076c 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -36,3 +36,4 @@ Name: khronos-opengl-registry Description: Khronos OpenGL registry Version: git4594c03239fb76580bc5d5a13acb2a8f563f0158 ]=]) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 61a1412a2e46da..75bdc7e35d753d 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -64,5 +64,4 @@ vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -message(FATAL_ERROR "Just error to make sure all of x is deactivated for the first run!") endif() From 4b4a8e0eb74eb5433805bc726c1b6ea6da15b9af Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:19:17 +0200 Subject: [PATCH 051/142] add libglu --- ports/libglu/portfile.cmake | 21 +++++++++++++++++++++ ports/libglu/vcpkg.json | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/libglu/portfile.cmake create mode 100644 ports/libglu/vcpkg.json diff --git a/ports/libglu/portfile.cmake b/ports/libglu/portfile.cmake new file mode 100644 index 00000000000000..6131503db37f22 --- /dev/null +++ b/ports/libglu/portfile.cmake @@ -0,0 +1,21 @@ +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +#set(VCPKG_FIXUP_ELF_RPATH ON) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/glu + REF cbbff8857e49c5e4615e2f8e21dd18cc6317c252 + SHA512 b4e928413ac0d8a6e8dec4781425526f5fad42588fa52b7e41ff42d1925084586367ba580004930c58697af899c1cf468666b20e4037be0e36fce1827f91c484 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/libglu/vcpkg.json b/ports/libglu/vcpkg.json new file mode 100644 index 00000000000000..74738666be21cb --- /dev/null +++ b/ports/libglu/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libglu", + "version": "9.0.2", + "description": "Mesa OpenGL Utility library", + "homepage": "https://gitlab.freedesktop.org/mesa/glu", + "license": "SGI-B-1.1 AND SGI-B-2.0 AND MIT", + "dependencies": [ + "libglvnd" + ] +} From 5adf163e40b7dd586360513e332244491f4e057f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:19:34 +0200 Subject: [PATCH 052/142] more detailes fixed --- TODO.txt | 5 ++++- ports/libodb-boost/portfile.cmake | 22 ++++++++++++---------- ports/libodb-boost/vcpkg.json | 4 ++-- ports/libodb-mysql/portfile.cmake | 16 ++++++++-------- ports/libodb-mysql/vcpkg.json | 2 +- ports/libodb-pgsql/vcpkg.json | 2 +- ports/libodb-sqlite/portfile.cmake | 19 ++++++++++--------- ports/libodb-sqlite/vcpkg.json | 4 ++-- ports/minifb/vcpkg.json | 5 +---- ports/opengl/portfile.cmake | 1 + ports/opengl/vcpkg-cmake-wrapper.cmake | 2 ++ ports/opengl/vcpkg.json | 8 +++++++- 12 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 ports/opengl/vcpkg-cmake-wrapper.cmake diff --git a/TODO.txt b/TODO.txt index 9217f9516bbb93..e1f3b1121ba2fa 100644 --- a/TODO.txt +++ b/TODO.txt @@ -53,4 +53,7 @@ minc: hdf5 netcdf-c: hdf5 shogun: hdf5 -libX11.a needs fixing of hardcoding absolute paths. \ No newline at end of file +TODOS: +libX11.a needs fixing of hardcoding absolute paths. +libinput? +libudev? \ No newline at end of file diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index adf571bea7e891..ef71f524fc4115 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -6,17 +6,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in - DESTINATION ${SOURCE_PATH}) + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" + DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF @@ -25,10 +25,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +if(NOT VCPKG_BUILD_TYPE) + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake" LIBODB_DEBUG_TARGETS) + string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}") +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libodb-boost/vcpkg.json b/ports/libodb-boost/vcpkg.json index 0294b5004ffe81..422bcc80891f50 100644 --- a/ports/libodb-boost/vcpkg.json +++ b/ports/libodb-boost/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-boost", - "version-string": "2.4.0", - "port-version": 5, + "version": "2.4.0", + "port-version": 6, "description": "Description: Boost support for the ODB ORM library", "dependencies": [ "libodb" diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index ac78846ddd39f0..dc199f4661e8ce 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES adapter_mysql_8.0.patch @@ -14,16 +14,16 @@ vcpkg_extract_source_archive_ex( file(REMOVE "${SOURCE_PATH}/version") file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in - DESTINATION ${SOURCE_PATH}) + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" + DESTINATION "${SOURCE_PATH}") set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") find_library(MYSQL_LIB NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH REQUIRED) -find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS @@ -41,5 +41,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/odb TARGET_PATH share/odb) vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libodb-mysql/vcpkg.json b/ports/libodb-mysql/vcpkg.json index c0fa1b01d07d7c..cad4c39f135f41 100644 --- a/ports/libodb-mysql/vcpkg.json +++ b/ports/libodb-mysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-mysql", "version": "2.4.0", - "port-version": 9, + "port-version": 10, "description": "MySQL support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/ports/libodb-pgsql/vcpkg.json b/ports/libodb-pgsql/vcpkg.json index 10a86d94b2aaed..dbc4b807ccf8b0 100644 --- a/ports/libodb-pgsql/vcpkg.json +++ b/ports/libodb-pgsql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-pgsql", "version": "2.4.0", - "port-version": 6, + "port-version": 7, "description": "Description: PostgreSQL support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 58fbb3a377c2ee..7d78ded7edff80 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -6,17 +6,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in - DESTINATION ${SOURCE_PATH}) + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" + DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF @@ -24,11 +24,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS) +if(NOT VCPKG_BUILD_TYPE) +file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake" LIBODB_DEBUG_TARGETS) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libodb-sqlite/vcpkg.json b/ports/libodb-sqlite/vcpkg.json index 466dc4da3578df..3fbf5a8354ac01 100644 --- a/ports/libodb-sqlite/vcpkg.json +++ b/ports/libodb-sqlite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-sqlite", - "version-string": "2.4.0", - "port-version": 9, + "version": "2.4.0", + "port-version": 10, "description": "Sqlite support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/ports/minifb/vcpkg.json b/ports/minifb/vcpkg.json index 43fae7e6ab62c1..a07bde1dc2aa93 100644 --- a/ports/minifb/vcpkg.json +++ b/ports/minifb/vcpkg.json @@ -6,9 +6,6 @@ "homepage": "https://github.com/emoon/minifb", "supports": "!uwp", "dependencies": [ - { - "name": "libx11", - "platform": "!windows" - } + "opengl" ] } diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index cd209dbb28b279..8a607e9f8af3f4 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -61,4 +61,5 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore vcpkg_fixup_pkgconfig() else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/opengl/vcpkg-cmake-wrapper.cmake" @ONLY) endif() diff --git a/ports/opengl/vcpkg-cmake-wrapper.cmake b/ports/opengl/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..af4eb31708ea72 --- /dev/null +++ b/ports/opengl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,2 @@ +set(OpenGL_GL_PREFERENCE "GLVND") +_find_package(${ARGS}) diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index d530b54dee83da..c15fa46ac0de24 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -7,7 +7,13 @@ "dependencies": [ { "name": "libglvnd", - "platform": "!windows" + "platform": "linux" + "$comment": "on osx framework opengl will be found!" + }, + { + "name": "libglu", + "platform": "linux" } + ] } From b7f80ed3346f4f7e342a605cfde765942e721903 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:22:10 +0200 Subject: [PATCH 053/142] format manifest --- ports/llgl/vcpkg.json | 4 ++-- ports/opengl/vcpkg.json | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index 7dcd51d5f670ff..7dd612666cf7d0 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -7,8 +7,8 @@ "supports": "!uwp", "dependencies": [ { - "name": "libx11", - "platform": "linux" + "name": "libx11", + "platform": "linux" } ], "features": { diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index c15fa46ac0de24..dbeb7c8a0f0c29 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -6,14 +6,13 @@ "license": null, "dependencies": [ { - "name": "libglvnd", + "name": "libglu", "platform": "linux" - "$comment": "on osx framework opengl will be found!" }, { - "name": "libglu", + "$comment": "on osx framework opengl will be found!", + "name": "libglvnd", "platform": "linux" } - ] } From f30a7fc934da3f370243e391d6dab553886a15ce Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:47:47 +0200 Subject: [PATCH 054/142] more fixes --- ports/glfw3/vcpkg.json | 17 ++++++++++++++++- ports/gtk/vcpkg.json | 4 ++++ ports/opengl-registry/portfile.cmake | 14 +++++++------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index fa53a4cf873866..67d01728ab8b9a 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -5,7 +5,22 @@ "homepage": "https://github.com/glfw/glfw", "license": "Zlib", "dependencies": [ - "libx11", + { + "name": "libx11", + "platform": "linux + }, + { + "name": "libxrandr", + "platform": "linux + }, + { + "name": "libxinerama", + "platform": "linux + }, + { + "name": "libxi", + "platform": "linux + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 214a524c60d712..01aa8e0390be55 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -22,6 +22,10 @@ ], "platform": "linux" }, + { + "name": "libxrandr", + "platform": "linux" + }, "gdk-pixbuf", "gettext", { diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index f705e1040a076c..327d0f8ebe0a17 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -1,4 +1,4 @@ -if(0) +if(1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenGL-Registry @@ -7,12 +7,12 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY "${SOURCE_PATH}/api/GL" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/api/GLES" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/api/GLES2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/api/GLES3" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/api/GLSC" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/api/GLSC2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GL" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GLES" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GLES2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GLES3" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GLSC" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +#file(COPY "${SOURCE_PATH}/api/GLSC2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(GLOB reg_files "${SOURCE_PATH}/xml/*.xml" "${SOURCE_PATH}/xml/readme.pdf" "${SOURCE_PATH}/xml/*.rnc" "${SOURCE_PATH}/xml/reg.py") file(COPY From fa4aff92130db9460260935d19e8177a6797b202 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:54:39 +0200 Subject: [PATCH 055/142] fix typos and format manifest --- ports/glfw3/vcpkg.json | 12 ++++++------ ports/gtk/vcpkg.json | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index 67d01728ab8b9a..f5671da0f0343c 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -7,19 +7,19 @@ "dependencies": [ { "name": "libx11", - "platform": "linux + "platform": "linux" }, { - "name": "libxrandr", - "platform": "linux + "name": "libxi", + "platform": "linux" }, { "name": "libxinerama", - "platform": "linux + "platform": "linux" }, { - "name": "libxi", - "platform": "linux + "name": "libxrandr", + "platform": "linux" }, { "name": "vcpkg-cmake", diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 01aa8e0390be55..25158cf264f845 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -22,10 +22,6 @@ ], "platform": "linux" }, - { - "name": "libxrandr", - "platform": "linux" - }, "gdk-pixbuf", "gettext", { @@ -43,6 +39,10 @@ }, "graphene", "libepoxy", + { + "name": "libxrandr", + "platform": "linux" + }, "pango", { "name": "sassc", From c47948a9552466f1869dea692b1c67e4dd2499b5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:35:21 +0200 Subject: [PATCH 056/142] add libxcursor --- ports/libxcursor/portfile.cmake | 34 +++++++++++++++++++++++++++++++++ ports/libxcursor/vcpkg.json | 15 +++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 ports/libxcursor/portfile.cmake create mode 100644 ports/libxcursor/vcpkg.json diff --git a/ports/libxcursor/portfile.cmake b/ports/libxcursor/portfile.cmake new file mode 100644 index 00000000000000..fe365f93066647 --- /dev/null +++ b/ports/libxcursor/portfile.cmake @@ -0,0 +1,34 @@ +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") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcursor + REF b84b5d100f193fda0630c4d6fa889cd3e05ca033 # 1.2.0 + SHA512 b260aed8ae833cbbdef1e7f027d92c3705d60fc6a1174f6ee1fe5b6374ba2c90145f90ed687ad57daf229231b0e0548cb2773c418bdca85b55bee8bc3a803cce + HEAD_REF master # branch name +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "$ENV{LIBS} -lm") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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() diff --git a/ports/libxcursor/vcpkg.json b/ports/libxcursor/vcpkg.json new file mode 100644 index 00000000000000..175513643813dd --- /dev/null +++ b/ports/libxcursor/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libxcursor", + "version": "1.2.0", + "description": "Xlib-based Cursor management library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcursor", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxfixes", + "xorg-macros", + "xproto", + "libxrender" + ] +} From e638cd0af16966cfe163573f7254c0c7000967c9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:35:56 +0200 Subject: [PATCH 057/142] manifest format --- ports/libxcursor/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libxcursor/vcpkg.json b/ports/libxcursor/vcpkg.json index 175513643813dd..8dcd8c65ca6940 100644 --- a/ports/libxcursor/vcpkg.json +++ b/ports/libxcursor/vcpkg.json @@ -8,8 +8,8 @@ "bzip2", "libx11", "libxfixes", + "libxrender", "xorg-macros", - "xproto", - "libxrender" + "xproto" ] } From a0acf62cfdf03922e9696490a58114497a22d494 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:36:05 +0200 Subject: [PATCH 058/142] dep fixes --- ports/allegro5/vcpkg.json | 1 + ports/ogre/vcpkg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index 3c5f701c628df7..5cf139d9781e0d 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -13,6 +13,7 @@ "libpng", "libtheora", "libvorbis", + "libxcursor", "openal-soft", "opengl", "opus", diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index abdb7333a2aaff..9a4d7849e50224 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -6,6 +6,7 @@ "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "dependencies": [ + "opengl", "pugixml", { "name": "sdl2", From d76f1ed1e49fbeceb7ccebbb100774b6a67544aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:57:01 +0200 Subject: [PATCH 059/142] add missing deps --- ports/fltk/vcpkg.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index a8af207c561df4..3a35b6218d696f 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -13,6 +13,12 @@ "libjpeg-turbo", "libpng", "libx11", + "libxcursor", + "libxext", + "libxfixes", + "libxft", + "libxinerama", + "libxrender", { "name": "vcpkg-cmake", "host": true From cce966860f67d2933ebab191da9f4391a76ae781 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:08:30 +0200 Subject: [PATCH 060/142] fix mpi for hpx --- ports/mpi/mpi.pc.in | 8 ++++++++ ports/mpi/portfile.cmake | 2 ++ ports/openmpi/vcpkg.json | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ports/mpi/mpi.pc.in diff --git a/ports/mpi/mpi.pc.in b/ports/mpi/mpi.pc.in new file mode 100644 index 00000000000000..9a59223a5a6877 --- /dev/null +++ b/ports/mpi/mpi.pc.in @@ -0,0 +1,8 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: mpi +Description: vcpkg mpi redirection to open mpi +Requires: ompi +Version: 4.1.3 diff --git a/ports/mpi/portfile.cmake b/ports/mpi/portfile.cmake index 89bec5e34c61b1..b628bd2a3f8f56 100644 --- a/ports/mpi/portfile.cmake +++ b/ports/mpi/portfile.cmake @@ -2,4 +2,6 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) if (VCPKG_TARGET_IS_WINDOWS) file(INSTALL "${CURRENT_INSTALLED_DIR}/share/msmpi/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME vcpkg-cmake-wrapper.cmake) +elseif() + configure_file("${CURRENT_PORT_DIR}/mpi.pc.in" "${CURRENT_PACKAGES_DIR}/share/pkgconfig/mpi.pc" @ONLY) endif() diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 51c5f27a74c955..3fd4f101bf341d 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -3,5 +3,8 @@ "version": "4.1.3", "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", - "supports": "!(windows | uwp)" + "supports": "!(windows | uwp)", + "dependencies": [ + { "name": "libpciaccess", "platform": "!windows | !osx"} + ] } From e3ff0a5fc4e167984ca000cc78158f68b1c51741 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:31:07 +0200 Subject: [PATCH 061/142] rename xcb-errors and xcb-wm --- ports/{xcb-errors => xcb-util-errors}/fix_python.patch | 0 ports/{xcb-errors => xcb-util-errors}/portfile.cmake | 0 ports/{xcb-errors => xcb-util-errors}/vcpkg.json | 4 ++-- ports/{xcb-wm => xcb-util-wm}/build.patch | 0 ports/{xcb-wm => xcb-util-wm}/portfile.cmake | 0 ports/{xcb-wm => xcb-util-wm}/vcpkg.json | 2 +- versions/baseline.json | 8 -------- versions/x-/xcb-errors.json | 9 --------- versions/x-/xcb-wm.json | 9 --------- 9 files changed, 3 insertions(+), 29 deletions(-) rename ports/{xcb-errors => xcb-util-errors}/fix_python.patch (100%) rename ports/{xcb-errors => xcb-util-errors}/portfile.cmake (100%) rename ports/{xcb-errors => xcb-util-errors}/vcpkg.json (51%) rename ports/{xcb-wm => xcb-util-wm}/build.patch (100%) rename ports/{xcb-wm => xcb-util-wm}/portfile.cmake (100%) rename ports/{xcb-wm => xcb-util-wm}/vcpkg.json (91%) delete mode 100644 versions/x-/xcb-errors.json delete mode 100644 versions/x-/xcb-wm.json diff --git a/ports/xcb-errors/fix_python.patch b/ports/xcb-util-errors/fix_python.patch similarity index 100% rename from ports/xcb-errors/fix_python.patch rename to ports/xcb-util-errors/fix_python.patch diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-util-errors/portfile.cmake similarity index 100% rename from ports/xcb-errors/portfile.cmake rename to ports/xcb-util-errors/portfile.cmake diff --git a/ports/xcb-errors/vcpkg.json b/ports/xcb-util-errors/vcpkg.json similarity index 51% rename from ports/xcb-errors/vcpkg.json rename to ports/xcb-util-errors/vcpkg.json index 38de3e0c156d2b..8202f6fcefb36f 100644 --- a/ports/xcb-errors/vcpkg.json +++ b/ports/xcb-util-errors/vcpkg.json @@ -1,7 +1,7 @@ { - "name": "xcb-errors", + "name": "xcb-util-errors", "version": "1.0.1", - "description": "XCB port of Xlib's XImage and XShmImage functions.", + "description": "XCB utility library that gives human readable names to error, event, & request codes.", "homepage": "https://xcb.freedesktop.org/", "license": null, "dependencies": [ diff --git a/ports/xcb-wm/build.patch b/ports/xcb-util-wm/build.patch similarity index 100% rename from ports/xcb-wm/build.patch rename to ports/xcb-util-wm/build.patch diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-util-wm/portfile.cmake similarity index 100% rename from ports/xcb-wm/portfile.cmake rename to ports/xcb-util-wm/portfile.cmake diff --git a/ports/xcb-wm/vcpkg.json b/ports/xcb-util-wm/vcpkg.json similarity index 91% rename from ports/xcb-wm/vcpkg.json rename to ports/xcb-util-wm/vcpkg.json index c89c04e9dafef7..2d264d52788ec7 100644 --- a/ports/xcb-wm/vcpkg.json +++ b/ports/xcb-util-wm/vcpkg.json @@ -1,5 +1,5 @@ { - "name": "xcb-wm", + "name": "xcb-util-wm", "version": "0.4.2", "description": "XCB client and window-manager helpers for ICCCM & EWMH.", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/", diff --git a/versions/baseline.json b/versions/baseline.json index 56d4199bde0be4..a6b9ace8edd3d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8008,10 +8008,6 @@ "baseline": "1.14", "port-version": 0 }, - "xcb-errors": { - "baseline": "1.0.1", - "port-version": 0 - }, "xcb-image": { "baseline": "0.4.1", "port-version": 0 @@ -8036,10 +8032,6 @@ "baseline": "2022-01-24", "port-version": 0 }, - "xcb-wm": { - "baseline": "0.4.2", - "port-version": 0 - }, "xerces-c": { "baseline": "3.2.3", "port-version": 4 diff --git a/versions/x-/xcb-errors.json b/versions/x-/xcb-errors.json deleted file mode 100644 index 0b76c62a832759..00000000000000 --- a/versions/x-/xcb-errors.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "6826cd41ffe5f341b28a6f1d5eba21eed3a4765f", - "version": "1.0.1", - "port-version": 0 - } - ] -} diff --git a/versions/x-/xcb-wm.json b/versions/x-/xcb-wm.json deleted file mode 100644 index 9b7acce1dd8540..00000000000000 --- a/versions/x-/xcb-wm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "c51622a0e236cb98519894d2aae8b99f65606633", - "version": "0.4.2", - "port-version": 0 - } - ] -} From 12dfb328aa7c3403820b83ec36ead788ebb5be2b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:31:33 +0200 Subject: [PATCH 062/142] v db --- versions/baseline.json | 8 ++++++++ versions/x-/xcb-util-errors.json | 9 +++++++++ versions/x-/xcb-util-wm.json | 9 +++++++++ 3 files changed, 26 insertions(+) create mode 100644 versions/x-/xcb-util-errors.json create mode 100644 versions/x-/xcb-util-wm.json diff --git a/versions/baseline.json b/versions/baseline.json index a6b9ace8edd3d8..552dae3c66ee87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8028,10 +8028,18 @@ "baseline": "0.4.0", "port-version": 0 }, + "xcb-util-errors": { + "baseline": "1.0.1", + "port-version": 0 + }, "xcb-util-m4": { "baseline": "2022-01-24", "port-version": 0 }, + "xcb-util-wm": { + "baseline": "0.4.2", + "port-version": 0 + }, "xerces-c": { "baseline": "3.2.3", "port-version": 4 diff --git a/versions/x-/xcb-util-errors.json b/versions/x-/xcb-util-errors.json new file mode 100644 index 00000000000000..deea9208902a9b --- /dev/null +++ b/versions/x-/xcb-util-errors.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3e4a3a99747f57bde0201e4624c7d4501d0b05d0", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-util-wm.json b/versions/x-/xcb-util-wm.json new file mode 100644 index 00000000000000..30b0940738e63d --- /dev/null +++ b/versions/x-/xcb-util-wm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "da4d2d3ad49ae54dbeacc5e99c3700cdce16d9bb", + "version": "0.4.2", + "port-version": 0 + } + ] +} From 554a57470c905edda512dfab3ee8c9fe11b4f15b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:33:05 +0200 Subject: [PATCH 063/142] add libxtst --- ports/libxtst/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/libxtst/vcpkg.json | 13 +++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ports/libxtst/portfile.cmake create mode 100644 ports/libxtst/vcpkg.json diff --git a/ports/libxtst/portfile.cmake b/ports/libxtst/portfile.cmake new file mode 100644 index 00000000000000..b23b6ec380bae5 --- /dev/null +++ b/ports/libxtst/portfile.cmake @@ -0,0 +1,30 @@ +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/libxtst + REF 99b89c3bcb0ebb0b6dd86bfdc9d276715eaea889 + SHA512 6479294057c73e91a086891e461e98d2717ae1fbe746cd74c9d13036a59bce931b8b0d5293d3c5ab4feeea426f2297647335179997e06a040b847697c7557199 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +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() \ No newline at end of file diff --git a/ports/libxtst/vcpkg.json b/ports/libxtst/vcpkg.json new file mode 100644 index 00000000000000..2f76f3867aa75c --- /dev/null +++ b/ports/libxtst/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libxtst", + "version": "1.2.4", + "description": "Xlib-based library for XTEST & RECORD extensions", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtst", + "license": null, + "dependencies": [ + "libx11", + "libxi", + "libxext", + "xproto" + ] +} From 2167c600d09a4f2dbcd3b52522e3ea514feaac1b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:50:47 +0200 Subject: [PATCH 064/142] fix deps --- ports/at-spi2-core/portfile.cmake | 5 +---- ports/at-spi2-core/vcpkg.json | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake index 304e512d8ef398..fda926f29e3299 100644 --- a/ports/at-spi2-core/portfile.cmake +++ b/ports/at-spi2-core/portfile.cmake @@ -14,10 +14,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dintrospection=no - ADDITIONAL_NATIVE_BINARIES - glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES + ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index 7bd08cd8e8baef..b74e3d2d2d17e0 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -13,6 +13,9 @@ "name": "glib", "host": true }, + "libx11", + "libxi", + "libxtst", { "name": "vcpkg-tool-meson", "host": true From f4b7d1170118892218e5ae75831e6bd6523ff301 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:50:53 +0200 Subject: [PATCH 065/142] more deps to fix --- ports/openmpi/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 3fd4f101bf341d..1ed132f5fb6753 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -5,6 +5,9 @@ "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)", "dependencies": [ - { "name": "libpciaccess", "platform": "!windows | !osx"} + { + "name": "libpciaccess", + "platform": "!windows | !osx" + } ] } From ac29febf173de56c65580fa55c617222848ae274 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:51:02 +0200 Subject: [PATCH 066/142] format manifest --- ports/libxtst/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libxtst/vcpkg.json b/ports/libxtst/vcpkg.json index 2f76f3867aa75c..796f433ba19e1c 100644 --- a/ports/libxtst/vcpkg.json +++ b/ports/libxtst/vcpkg.json @@ -6,8 +6,8 @@ "license": null, "dependencies": [ "libx11", - "libxi", "libxext", + "libxi", "xproto" ] } From 78abee5b0abab78a920b71ac25eed3a73e4922e8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:56:46 +0200 Subject: [PATCH 067/142] qtbase fix deps --- ports/qtbase/vcpkg.json | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 787bdb96ad364e..9fedb5efab235f 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -97,7 +97,10 @@ ] }, "dbus": { - "description": "Qt D-Bus" + "description": "Qt D-Bus", + "dependencies": [ + "dbus" + ] }, "default-features": { "description": "Platform-dependent default features", @@ -133,7 +136,8 @@ "egl": { "description": "EGL", "dependencies": [ - "egl-registry" + "egl-registry", + "opengl" ] }, "fontconfig": { @@ -171,6 +175,14 @@ "gui": { "description": "Qt Gui", "dependencies": [ + { + "name": "libdrm", + "platform": "!windows" + }, + "libice", + "libsm", + "libx11", + "opengl", { "name": "qtbase", "default-features": false, @@ -338,7 +350,13 @@ "xkbcommon-x11", "xlib" ] - } + }, + "xcb", + "xcb-cursor", + "xcb-image", + "xcb-keysyms", + "xcb-renderutil", + "xcb-util-wm" ] }, "xcb-xlib": { @@ -354,7 +372,16 @@ ] }, "xkb": { - "description": "XKB" + "description": "XKB", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "xkbcommon" + ] + } + ] }, "xkbcommon-x11": { "description": "xkbcommon_x11", @@ -374,6 +401,7 @@ "xrender": { "description": "XRender for native painting", "dependencies": [ + "libxrender", { "name": "qtbase", "default-features": false, From f6dc91dd37a1024ab9fd5cf89fe1d56d6b42897d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 11:14:27 +0200 Subject: [PATCH 068/142] fix naming --- ports/qt5-base/vcpkg.json | 1 + ports/qtbase/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 21902bc92fd448..db7e6ee9da2d3e 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -24,6 +24,7 @@ }, "libjpeg-turbo", "libpng", + "opengl", "openssl", "pcre2", { diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 9fedb5efab235f..9c200a98b8ddf7 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -355,7 +355,7 @@ "xcb-cursor", "xcb-image", "xcb-keysyms", - "xcb-renderutil", + "xcb-render-util", "xcb-util-wm" ] }, From 877399c5738d2541c6411af59b778e35ce66d7e4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 11:16:47 +0200 Subject: [PATCH 069/142] remove xcb-cursor since i dont have that port here --- ports/qtbase/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 9c200a98b8ddf7..09505af350a18c 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -352,7 +352,6 @@ ] }, "xcb", - "xcb-cursor", "xcb-image", "xcb-keysyms", "xcb-render-util", From fc6b03c4f86459493d40dfae2e9b6618bb6b2a3a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 11:20:07 +0200 Subject: [PATCH 070/142] fix deps --- ports/qtbase/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 09505af350a18c..460dea794e388e 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -377,7 +377,7 @@ "name": "qtbase", "default-features": false, "features": [ - "xkbcommon" + "xkbcommon-x11" ] } ] From f6dd8b099c987543c701a50dc4e84c7e34dbda46 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 12:05:51 +0200 Subject: [PATCH 071/142] fix single config cmake-user --- scripts/test_ports/cmake-user/portfile.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index 96e204b2bd50df..96a362e18e7702 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -222,9 +222,11 @@ foreach(executable IN LISTS cmake_commands) OPTIONS "-DCMAKE_BUILD_TYPE=Release" ) - test_cmake_project(NAME "debug" - CMAKE_COMMAND "${executable}" - OPTIONS - "-DCMAKE_BUILD_TYPE=Debug" - ) + if(NOT VCPKG_BUILD_TYPE) + test_cmake_project(NAME "debug" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Debug" + ) + endif() endforeach() From be0be1fa63698e8447c12e03ff4974a474aeeaca Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:47:39 +0200 Subject: [PATCH 072/142] xcb wrapper --- ports/xcb/portfile.cmake | 2 ++ ports/xcb/vcpkg-cmake-wrapper.cmake | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 ports/xcb/vcpkg-cmake-wrapper.cmake diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index a8fcbd51311e38..78fd0dae8ad760 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -104,4 +104,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND NOT "__declspec(dllimport) extern xcb_extension_t") endforeach() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/xcb/vcpkg-cmake-wrapper.cmake" @ONLY) endif() diff --git a/ports/xcb/vcpkg-cmake-wrapper.cmake b/ports/xcb/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..a541c885293b9e --- /dev/null +++ b/ports/xcb/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +_find_package(X11 COMPONENTS Xau Xdmcp) +_find_package(${ARGS}) +if(TARGET XCB::XCB) + if(TARGET X11::Xdmcp) + target_link_libraries(XCB::XCB INTERFACE X11::Xdmcp) + endif() + if(TARGET X11::Xau) + target_link_libraries(XCB::XCB INTERFACE X11::Xau) + endif() +endif() From 29b4bf3f4cb16c85d38a15bd2c65b939b36a6786 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:47:52 +0200 Subject: [PATCH 073/142] make patch only apply on windows --- ports/xcb-util-errors/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/xcb-util-errors/portfile.cmake b/ports/xcb-util-errors/portfile.cmake index 0d7b9daf3ebc5e..516cf6090db21c 100644 --- a/ports/xcb-util-errors/portfile.cmake +++ b/ports/xcb-util-errors/portfile.cmake @@ -3,6 +3,10 @@ if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) else() +if(VCPKG_TARGET_IS_WINDOWS) + set(PATCHES fix_python.patch) +endif() + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -10,7 +14,7 @@ vcpkg_from_gitlab( REF 517dd82c079de762a7426f20166a44f11e8d38c5 #1.0.1 SHA512 391f6bc9452bf4d6a3f1fa69232cdbef43f9fcd339b8d1965132a3b227ed7ebcbaad553fe64d42bc525811caedf3ff9d5bec108f6ac2efd5a014f75fb35cbf85 HEAD_REF master - PATCHES fix_python.patch + PATCHES ${PATCHES} ) file(TOUCH "${SOURCE_PATH}/m4/dummy") set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") From 062b5825088ab1e0ce594e8fb1e40e370d9d777a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:48:00 +0200 Subject: [PATCH 074/142] fix libx11 wrapper --- ports/libx11/vcpkg-cmake-wrapper.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake index 9d0d3e2270f9f3..a5af64b9afc570 100644 --- a/ports/libx11/vcpkg-cmake-wrapper.cmake +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -1,12 +1,12 @@ _find_package(${ARGS}) +if(TARGET X11:X11 AND TARGET X11::xcb) + target_link_libraries(X11::X11 INTERFACE X11:xcb) +endif() if(TARGET X11::xcb) - if(TARGET X11:X11) - target_link_libraries(X11::X11 INTERFACE X11:xcb) - endif() - if(TARGET X11:xdmcp) - target_link_libraries(X11::xcb INTERFACE X11:xdmcp) + if(TARGET X11::Xdmcp) + target_link_libraries(X11::xcb INTERFACE X11::Xdmcp) endif() - if(TARGET X11:xau) - target_link_libraries(X11::xcb INTERFACE X11:xau) + if(TARGET X11::Xau) + target_link_libraries(X11::xcb INTERFACE X11::Xau) endif() endif() From 0a071a931d8a1256bb287b99ac8fd07ea2f45529 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:48:08 +0200 Subject: [PATCH 075/142] add libxcursor --- ports/libxcursor/portfile.cmake | 33 +++++++++++++++++++++++++++++++++ ports/libxcursor/vcpkg.json | 14 ++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 ports/libxcursor/portfile.cmake create mode 100644 ports/libxcursor/vcpkg.json diff --git a/ports/libxcursor/portfile.cmake b/ports/libxcursor/portfile.cmake new file mode 100644 index 00000000000000..b08c3a15a3e892 --- /dev/null +++ b/ports/libxcursor/portfile.cmake @@ -0,0 +1,33 @@ +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/libxcursor + REF b84b5d100f193fda0630c4d6fa889cd3e05ca033 + SHA512 b260aed8ae833cbbdef1e7f027d92c3705d60fc6a1174f6ee1fe5b6374ba2c90145f90ed687ad57daf229231b0e0548cb2773c418bdca85b55bee8bc3a803cce + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "$ENV{LIBS} -lm") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxcursor/vcpkg.json b/ports/libxcursor/vcpkg.json new file mode 100644 index 00000000000000..ec349e14756255 --- /dev/null +++ b/ports/libxcursor/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxcursor", + "version": "1.2.0", + "description": "Xlib-based Cursor management library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcursor", + "dependencies": [ + "bzip2", + "libx11", + "libxfixes", + "xorg-macros", + "xproto", + "libxrender" + ] +} From 349cb987e6e4ad016cba0b026267319e1dd9ff3f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:16:47 +0200 Subject: [PATCH 076/142] more fixes --- ports/glfw3/vcpkg.json | 4 ++++ ports/libx11/vcpkg-cmake-wrapper.cmake | 4 ++-- ports/libxcursor/vcpkg.json | 4 ++-- ports/qtbase/portfile.cmake | 2 +- ports/qtbase/vcpkg.json | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index f5671da0f0343c..5144a8a957600e 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -9,6 +9,10 @@ "name": "libx11", "platform": "linux" }, + { + "name": "libxcursor", + "platform": "linux" + }, { "name": "libxi", "platform": "linux" diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake index a5af64b9afc570..099f108ed08d53 100644 --- a/ports/libx11/vcpkg-cmake-wrapper.cmake +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -4,9 +4,9 @@ if(TARGET X11:X11 AND TARGET X11::xcb) endif() if(TARGET X11::xcb) if(TARGET X11::Xdmcp) - target_link_libraries(X11::xcb INTERFACE X11::Xdmcp) + set_property(TARGET X11::xcb APPEND PROPERTY INTERFACE_LINK_LIBRARIES X11::Xdmcp) endif() if(TARGET X11::Xau) - target_link_libraries(X11::xcb INTERFACE X11::Xau) + set_property(TARGET X11::xcb APPEND PROPERTY INTERFACE_LINK_LIBRARIES X11::Xau) endif() endif() diff --git a/ports/libxcursor/vcpkg.json b/ports/libxcursor/vcpkg.json index ec349e14756255..42db97d3f79bb9 100644 --- a/ports/libxcursor/vcpkg.json +++ b/ports/libxcursor/vcpkg.json @@ -7,8 +7,8 @@ "bzip2", "libx11", "libxfixes", + "libxrender", "xorg-macros", - "xproto", - "libxrender" + "xproto" ] } diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 0c923dab304c57..533b3e47c0fcd0 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -165,7 +165,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS #"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated "harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz "jpeg" CMAKE_DISABLE_FIND_PACKAGE_JPEG - "png" CMAKE_DISABLE_FIND_PACKAGE_PNG + #"png" CMAKE_DISABLE_FIND_PACKAGE_PNG # Required by Freetype "xlib" CMAKE_DISABLE_FIND_PACKAGE_X11 "xkb" CMAKE_DISABLE_FIND_PACKAGE_XKB "xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 460dea794e388e..f9544cd261b6e8 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -405,6 +405,7 @@ "name": "qtbase", "default-features": false, "features": [ + "fontconfig", "xcb" ] } From 01f054d15ba2ab27e9d869f133f5ada00c4101ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:34:40 +0200 Subject: [PATCH 077/142] add deps to qt5-base --- ports/qt5-base/vcpkg.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index db7e6ee9da2d3e..b6c277b3d8bfb0 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -24,6 +24,11 @@ }, "libjpeg-turbo", "libpng", + "libx11", + "libxext", + "libxfixes", + "libxi", + "libxrender", "opengl", "openssl", "pcre2", @@ -41,6 +46,12 @@ "name": "vcpkg-pkgconfig-get-modules", "host": true }, + "xcb", + "xcb-image", + "xcb-keysyms", + "xcb-render-util", + "xcb-util-wm", + "xkbcommon", "zlib", "zstd" ], From 06cce4b93566f920522555e7963241bad385c9ee Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:33:54 +0200 Subject: [PATCH 078/142] fix dep name --- ports/qt5-base/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index b6c277b3d8bfb0..449ed4c3c0013c 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -51,7 +51,7 @@ "xcb-keysyms", "xcb-render-util", "xcb-util-wm", - "xkbcommon", + "libxkbcommon", "zlib", "zstd" ], From dedac4d9caab294deb009a63fa1e9bce7be03be4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 17:58:43 +0200 Subject: [PATCH 079/142] few fixes --- ports/egl-registry/portfile.cmake | 7 ++++--- ports/llgl/opengl.patch | 30 ++++++++++++++++++++++++++++++ ports/llgl/portfile.cmake | 5 ++--- ports/llgl/x11.patch | 15 +++++++++++++++ ports/minifb/portfile.cmake | 5 +---- ports/minifb/x11.patch | 22 ++++++++++++++++++++++ ports/qt5-base/portfile.cmake | 3 --- ports/xcb-image/pc_dep.patch | 12 ++++++++++++ ports/xcb-image/portfile.cmake | 1 + 9 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 ports/llgl/opengl.patch create mode 100644 ports/llgl/x11.patch create mode 100644 ports/minifb/x11.patch create mode 100644 ports/xcb-image/pc_dep.patch diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index bd5bc53377e0bf..1b0bd36ea262ec 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -1,4 +1,4 @@ -if(0) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/EGL-Registry @@ -7,13 +7,14 @@ vcpkg_from_github( HEAD_REF master ) +if(0) file( COPY "${SOURCE_PATH}/api/KHR" "${SOURCE_PATH}/api/EGL" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) - +endif() file( COPY "${SOURCE_PATH}/api/egl.xml" @@ -27,5 +28,5 @@ file( ) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) -endif() + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/llgl/opengl.patch b/ports/llgl/opengl.patch new file mode 100644 index 00000000000000..fea092b635404b --- /dev/null +++ b/ports/llgl/opengl.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57882aa3e..37a7b3597 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -613,7 +613,7 @@ if(LLGL_BUILD_RENDERER_OPENGL) + endif() + + set_target_properties(LLGL_OpenGL PROPERTIES LINKER_LANGUAGE CXX DEBUG_POSTFIX "D") +- target_link_libraries(LLGL_OpenGL LLGL ${OPENGL_LIBRARIES}) ++ target_link_libraries(LLGL_OpenGL LLGL OpenGL::OpenGL) + + ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGL) + +diff --git a/cmake/FindOpenGLES.cmake b/cmake/FindOpenGLES.cmake +index 78cbd5e5a..d7c898b3d 100644 +--- a/cmake/FindOpenGLES.cmake ++++ b/cmake/FindOpenGLES.cmake +@@ -230,10 +230,10 @@ ELSE (WIN32) + + IF (OPENGLES_gl_LIBRARY) + IF(NOT X11_FOUND) +- INCLUDE(FindX11) ++ find_package(X11) + ENDIF(NOT X11_FOUND) + IF (X11_FOUND) +- SET (OPENGLES_LIBRARIES ${X11_LIBRARIES}) ++ SET (OPENGLES_LIBRARIES X11::X11) + ENDIF (X11_FOUND) + ENDIF (OPENGLES_gl_LIBRARY) + diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index 6ee4bed6b91522..93e9454f802693 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -1,6 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} currently doesn't supports UWP.") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,6 +8,8 @@ vcpkg_from_github( PATCHES fix-install-error.patch fix-arm64-build-error.patch + opengl.patch + x11.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/llgl/x11.patch b/ports/llgl/x11.patch new file mode 100644 index 00000000000000..4ac9a57789baf8 --- /dev/null +++ b/ports/llgl/x11.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57882aa3e..7626f10c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,7 +558,9 @@ if(APPLE) + target_link_libraries(LLGL ${COCOA_LIBRARY}) + endif() + elseif(UNIX) +- target_link_libraries(LLGL X11 pthread Xxf86vm Xrandr) ++ find_package(X11) ++ find_package(Threads) ++ target_link_libraries(LLGL X11::X11 X11::Xrandr X11::Xxf86vm Threads::Threads) + elseif(WIN32) + target_link_libraries(LLGL gdi32 shell32) + endif() diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index 26b8138891a9b7..7792ec45f46777 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} currently doesn't supports UWP.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emoon/minifb @@ -14,6 +10,7 @@ vcpkg_from_github( fix-install-error.patch fix-build-error.patch fix-arm-build-error.patch + x11.patch ) vcpkg_configure_cmake( diff --git a/ports/minifb/x11.patch b/ports/minifb/x11.patch new file mode 100644 index 00000000000000..8b302aeb4103c3 --- /dev/null +++ b/ports/minifb/x11.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03b5e5994..192720fac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -137,12 +137,13 @@ elseif (UNIX) + + target_link_libraries(multiple_windows -lwayland-client -lwayland-cursor) + else() +- target_link_libraries(noise -lX11) ++ find_package(X11 REQUIRED) ++ target_link_libraries(noise X11::X11) + +- target_link_libraries(input_events -lX11) +- target_link_libraries(input_events_cpp -lX11) ++ target_link_libraries(input_events X11::X11) ++ target_link_libraries(input_events_cpp X11::X11) + +- target_link_libraries(multiple_windows -lX11) ++ target_link_libraries(multiple_windows X11::X11) + endif() + endif() + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 4ce376a6f26300..8a02e7287755af 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -258,9 +258,6 @@ if(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_LINUX) list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb) - if (NOT EXISTS "/usr/include/GL/glu.h") - message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") - endif() list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}" diff --git a/ports/xcb-image/pc_dep.patch b/ports/xcb-image/pc_dep.patch new file mode 100644 index 00000000000000..59f0cb4a163379 --- /dev/null +++ b/ports/xcb-image/pc_dep.patch @@ -0,0 +1,12 @@ +diff --git a/image/xcb-image.pc.in b/image/xcb-image.pc.in +index 403fdd05b..de92afa65 100644 +--- a/image/xcb-image.pc.in ++++ b/image/xcb-image.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: XCB Image library + Description: XCB image convenience library + Version: @PACKAGE_VERSION@ ++Requires.private: xcb-util + Requires: xcb xcb-shm + Libs: -L${libdir} -lxcb-image @LIBS@ + Cflags: -I${includedir} diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index 2e612e547dc747..500d0d1e6d4b50 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_gitlab( SHA512 e91471c45983bb3a56fb96a9ab627a5b65fcbc21424f62bed10dba283c97fdd6475d4f380d268a30a99b6544bc804f8263e7b945a4c4d22c79535e3c3b1e10db HEAD_REF master PATCHES add_return_value.patch + pc_dep.patch ) file(TOUCH "${SOURCE_PATH}/m4/dummy") set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") From c89cffecd4b40a43a194ec7e5d63143cfdeb345a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 19:48:02 +0200 Subject: [PATCH 080/142] fix stuff --- ports/allegro5/vcpkg.json | 5 +++- ports/irrlicht/CMakeLists.txt | 9 ++++--- ports/irrlicht/vcpkg.json | 4 ++++ ports/libodb-sqlite/portfile.cmake | 9 +++---- ports/libxxf86vm/portfile.cmake | 28 ++++++++++++++++++++++ ports/libxxf86vm/vcpkg.json | 12 ++++++++++ ports/llgl/portfile.cmake | 3 ++- ports/llgl/vcpkg.json | 4 ++++ ports/minifb/portfile.cmake | 7 +++--- ports/minifb/x11.patch | 3 ++- ports/plib/CMakeLists.txt | 5 ++-- ports/qt5-base/cmake/configure_qt.cmake | 1 + ports/qt5-base/vcpkg.json | 2 +- ports/raylib/vcpkg.json | 24 +++++++++++++++++++ ports/urho3d/vcpkg.json | 32 +++++++++++++++++++++++++ 15 files changed, 131 insertions(+), 17 deletions(-) create mode 100644 ports/libxxf86vm/portfile.cmake create mode 100644 ports/libxxf86vm/vcpkg.json diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index 5cf139d9781e0d..7b03124b9ef388 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -13,7 +13,10 @@ "libpng", "libtheora", "libvorbis", - "libxcursor", + { + "name": "libxcurser", + "platform": "!windows" + }, "openal-soft", "opengl", "opus", diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index cc6edc785b5916..febe68b0e1fa8d 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -220,10 +220,13 @@ elseif(UNIX) # X11 and OpenGL if(NOT APPLE) + find_package(X11 REQUIRED) + find_package(OpenGL REQUIRED) + target_link_libraries(Irrlicht - PRIVATE X11 - PRIVATE GL - PRIVATE Xxf86vm) + PRIVATE X11::X11 + PRIVATE OpenGL::GL + PRIVATE X11::Xxf86vm) endif() endif() diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index 2c33131fb2908d..1ce697415954e1 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -9,6 +9,10 @@ "bzip2", "libjpeg-turbo", "libpng", + { + "name": "libxxf86vm", + "platform": "!windows" + }, "opengl", "vcpkg-cmake", "vcpkg-cmake-config", diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 7d78ded7edff80..a8b6d18df38bda 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -25,10 +25,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if(NOT VCPKG_BUILD_TYPE) -file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake" LIBODB_DEBUG_TARGETS) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake" LIBODB_DEBUG_TARGETS) + string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() vcpkg_copy_pdbs() diff --git a/ports/libxxf86vm/portfile.cmake b/ports/libxxf86vm/portfile.cmake new file mode 100644 index 00000000000000..081a0e7d417e46 --- /dev/null +++ b/ports/libxxf86vm/portfile.cmake @@ -0,0 +1,28 @@ +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/libxxf86vm + REF 7fe2d41f164d3015216c1079cc7fbce1eea90c98 + SHA512 c7ee07478bcc5db18e47a5a7b8965d89172bbab733f60fb13b9527b7888445fdd86d5d99aa67d6436fc2ef3ea0bd8d9c6e4f10fbef351f229de982bd6f21f9c9 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxxf86vm/vcpkg.json b/ports/libxxf86vm/vcpkg.json new file mode 100644 index 00000000000000..d57465e9dadd6e --- /dev/null +++ b/ports/libxxf86vm/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxxf86vm", + "version": "1.1.5", + "description": "Xlib-based library for the XFree86-VidMode X extension", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm", + "dependencies": [ + "bzip2", + "libxext", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index 93e9454f802693..53873a340f74ae 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -12,7 +12,8 @@ vcpkg_from_github( x11.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES opengl LLGL_BUILD_RENDERER_OPENGL direct3d11 LLGL_BUILD_RENDERER_DIRECT3D11 ) diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index 7dd612666cf7d0..fa2bd0e0298cbd 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -9,6 +9,10 @@ { "name": "libx11", "platform": "linux" + }, + { + "name": "libxxf86vm", + "platform": "linux" } ], "features": { diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index 7792ec45f46777..837bb3f44fec28 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -20,8 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/minifb/x11.patch b/ports/minifb/x11.patch index 8b302aeb4103c3..9b5beabfe77b11 100644 --- a/ports/minifb/x11.patch +++ b/ports/minifb/x11.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 03b5e5994..192720fac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -137,12 +137,13 @@ elseif (UNIX) +@@ -137,12 +137,14 @@ elseif (UNIX) target_link_libraries(multiple_windows -lwayland-client -lwayland-cursor) else() @@ -17,6 +17,7 @@ index 03b5e5994..192720fac 100644 - target_link_libraries(multiple_windows -lX11) + target_link_libraries(multiple_windows X11::X11) ++ target_link_libraries(minifb X11::X11) endif() endif() diff --git a/ports/plib/CMakeLists.txt b/ports/plib/CMakeLists.txt index ac35b6674333b7..468c91edf73b55 100644 --- a/ports/plib/CMakeLists.txt +++ b/ports/plib/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.3.0) project(plib VERSION 1.8.5) -set(CMAKE_DEBUG_POSTFIX d) - # Sources & Headers set(fnt_SOURCES src/fnt/fnt.cxx @@ -295,6 +293,9 @@ set(ul_HEADERS src/util/ulLocal.h src/util/ulRTTI.h) +find_package(OpenGL REQUIRED) +link_libraries(OpenGL::OpenGL) + # Create and configure the targets add_library(plib_fnt STATIC ${fnt_SOURCES} ${fnt_HEADERS}) target_include_directories(plib_fnt PRIVATE src/sg src/util) diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index 32aa35220e57d4..3a232b208bcff4 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -121,6 +121,7 @@ function(configure_qt) else() set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") endif() + MESSAGE(STATUS "$ENV{PKG_CONFIG_PATH}") set(_build_triplet ${TARGET_TRIPLET}-${_short_name_${_buildname}}) message(STATUS "Configuring ${_build_triplet}") diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 449ed4c3c0013c..37ce0f27b48e1d 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -28,6 +28,7 @@ "libxext", "libxfixes", "libxi", + "libxkbcommon", "libxrender", "opengl", "openssl", @@ -51,7 +52,6 @@ "xcb-keysyms", "xcb-render-util", "xcb-util-wm", - "libxkbcommon", "zlib", "zstd" ], diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 467dbf5ef340a5..3b2fc482a97db7 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -10,6 +10,30 @@ "name": "glfw3", "platform": "!windows" }, + { + "name": "glfw3", + "platform": "!windows" + }, + { + "name": "libx11", + "platform": "!windows" + }, + { + "name": "libxcurser", + "platform": "!windows" + }, + { + "name": "libxinerama", + "platform": "!windows" + }, + { + "name": "libxrandr", + "platform": "!windows" + }, + { + "name": "opengl", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 5e9e083e5ba412..bb16739c2a9939 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -7,6 +7,38 @@ "homepage": "https://github.com/urho3d/Urho3D", "supports": "!(arm | uwp)", "dependencies": [ + { + "name": "libx11", + "platform": "!windows" + }, + { + "name": "libxcurser", + "platform": "!windows" + }, + { + "name": "libxi", + "platform": "!windows" + }, + { + "name": "libxinerama", + "platform": "!windows" + }, + { + "name": "libxrandr", + "platform": "!windows" + }, + { + "name": "libxrender", + "platform": "!windows" + }, + { + "name": "libxscrnsaver", + "platform": "!windows" + }, + { + "name": "libxxf86vm", + "platform": "!windows" + }, "opengl", { "name": "vcpkg-cmake", From 3076541c0dd261d420d010e89ad27a4e6465cfef Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 20:02:25 +0200 Subject: [PATCH 081/142] fix typo --- ports/allegro5/vcpkg.json | 2 +- ports/raylib/vcpkg.json | 2 +- ports/urho3d/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index 7b03124b9ef388..e0f02382a61772 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -14,7 +14,7 @@ "libtheora", "libvorbis", { - "name": "libxcurser", + "name": "libxcursor", "platform": "!windows" }, "openal-soft", diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 3b2fc482a97db7..b607c4164670fa 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -19,7 +19,7 @@ "platform": "!windows" }, { - "name": "libxcurser", + "name": "libxcursor", "platform": "!windows" }, { diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index bb16739c2a9939..7de5607f44f944 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -12,7 +12,7 @@ "platform": "!windows" }, { - "name": "libxcurser", + "name": "libxcursor", "platform": "!windows" }, { From b60c29e0ad32650bfde8fd3f83a83d3e284ec2f3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Oct 2022 21:40:09 +0200 Subject: [PATCH 082/142] fix qt5 pkgconfig paths --- ports/qt5-base/cmake/configure_qt.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index 3a232b208bcff4..a68f9cc10f2d8a 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -111,10 +111,10 @@ function(configure_qt) vcpkg_add_to_path("${PKGCONFIG_PATH}") foreach(_buildname ${BUILDTYPES}) - set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig") + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/pkgconfig") + set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") + set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${_path_suffix_${_buildname}}/lib/pkgconfig") + set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig") if(DEFINED ENV{PKG_CONFIG_PATH}) set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH}) set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") From 576819ac21b1dd3fae81541c861939d7e194f770 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 00:07:21 +0200 Subject: [PATCH 083/142] fix stuff --- ports/fltk/portfile.cmake | 1 + ports/fltk/x11.patch | 102 ++++++++++++++++++++++++ ports/kf5plotting/portfile.cmake | 4 +- ports/libx11/vcpkg-cmake-wrapper.cmake | 4 +- ports/qt5-base/cmake/configure_qt.cmake | 1 - 5 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 ports/fltk/x11.patch diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index d43a8fcb549519..21157f146172c9 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( config-path.patch include.patch fix-system-link.patch + x11.patch ) if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") diff --git a/ports/fltk/x11.patch b/ports/fltk/x11.patch new file mode 100644 index 00000000000000..78695899ad6e38 --- /dev/null +++ b/ports/fltk/x11.patch @@ -0,0 +1,102 @@ +diff --git a/CMake/options.cmake b/CMake/options.cmake +index ddd650f0a..d678b270e 100644 +--- a/CMake/options.cmake ++++ b/CMake/options.cmake +@@ -63,10 +63,11 @@ endif (APPLE) + # find X11 libraries and headers + set (PATH_TO_XLIBS) + if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32) +- include (FindX11) ++ #include (FindX11) ++ find_package(X11 REQUIRED) + if (X11_FOUND) + set (USE_X11 1) +- list (APPEND FLTK_LDLIBS -lX11) ++ list (APPEND FLTK_LDLIBS -lX11 -lxcb -lxau -lxdmcp) + if (X11_Xext_FOUND) + list (APPEND FLTK_LDLIBS -lXext) + endif (X11_Xext_FOUND) +@@ -463,7 +464,8 @@ if (OPTION_USE_XFT) + list (APPEND FLTK_LDLIBS -lXft) + set (FLTK_XFT_FOUND TRUE) + if (APPLE AND OPTION_APPLE_X11) +- find_library(LIB_fontconfig fontconfig "/opt/X11/lib") ++ find_package(Fontconfig) ++ set(LIB_fontconfig Fontconfig::Fontconfig) + endif (APPLE AND OPTION_APPLE_X11) + else() + set (FLTK_XFT_FOUND FALSE) +diff --git a/CMake/resources.cmake b/CMake/resources.cmake +index 149aa62e4..5e35f9f1c 100644 +--- a/CMake/resources.cmake ++++ b/CMake/resources.cmake +@@ -173,13 +173,18 @@ mark_as_advanced (FREETYPE_PATH) + # libraries + find_library (LIB_dl dl) + if ((NOT APPLE) OR OPTION_APPLE_X11) +- find_library (LIB_fontconfig fontconfig) ++ find_package(Fontconfig) ++ set (LIB_fontconfig Fontconfig::Fontconfig) + endif ((NOT APPLE) OR OPTION_APPLE_X11) +-find_library (LIB_freetype freetype) +-find_library (LIB_GL GL) +-find_library (LIB_MesaGL MesaGL) +-find_library (LIB_GLEW GLEW) +-find_library (LIB_jpeg jpeg) ++find_package(Freetype) ++set (LIB_freetype Freetype::Freetype) ++find_package(OpenGL) ++set (LIB_GL OpenGL::GL) ++#find_library (LIB_MesaGL MesaGL) ++find_package(GLEW) ++set (LIB_GLEW GLEW::GLEW) ++find_package(JPEG) ++set (LIB_jpeg JPEG::JPEG) + + mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype) + mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1cd7..6023ef039 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -269,7 +269,7 @@ if (USE_THREADS) + endif (USE_THREADS) + + if (USE_X11) +- list (APPEND OPTIONAL_LIBS ${X11_LIBRARIES}) ++ list (APPEND OPTIONAL_LIBS X11::X11) + endif (USE_X11) + + if (WIN32) +@@ -281,25 +281,25 @@ if (FLTK_HAVE_CAIRO) + endif (FLTK_HAVE_CAIRO) + + if (HAVE_XINERAMA) +- list (APPEND OPTIONAL_LIBS ${X11_Xinerama_LIB}) ++ list (APPEND OPTIONAL_LIBS X11::Xinerama) + endif (HAVE_XINERAMA) + + if (HAVE_XFIXES) +- list (APPEND OPTIONAL_LIBS ${X11_Xfixes_LIB}) ++ list (APPEND OPTIONAL_LIBS X11::Xfixes) + endif (HAVE_XFIXES) + + if (HAVE_XCURSOR) +- list (APPEND OPTIONAL_LIBS ${X11_Xcursor_LIB}) ++ list (APPEND OPTIONAL_LIBS X11::Xcursor) + endif (HAVE_XCURSOR) + + if (HAVE_XRENDER) +- list (APPEND OPTIONAL_LIBS ${X11_Xrender_LIB}) ++ list (APPEND OPTIONAL_LIBS X11::Xrender) + endif (HAVE_XRENDER) + + if (USE_XFT) +- list (APPEND OPTIONAL_LIBS ${X11_Xft_LIB}) ++ list (APPEND OPTIONAL_LIBS X11::Xft) + if (LIB_fontconfig) +- list (APPEND OPTIONAL_LIBS ${LIB_fontconfig}) ++ list (APPEND OPTIONAL_LIBS Fontconfig::Fontconfig) + endif (LIB_fontconfig) + endif (USE_XFT) + diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index 548bcf6baf24a8..31d6bce08e30b7 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -20,7 +20,9 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plott vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake index 099f108ed08d53..e3f1998c968314 100644 --- a/ports/libx11/vcpkg-cmake-wrapper.cmake +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,6 @@ _find_package(${ARGS}) -if(TARGET X11:X11 AND TARGET X11::xcb) - target_link_libraries(X11::X11 INTERFACE X11:xcb) +if(TARGET X11::X11 AND TARGET X11::xcb) + target_link_libraries(X11::X11 INTERFACE X11::xcb) endif() if(TARGET X11::xcb) if(TARGET X11::Xdmcp) diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index a68f9cc10f2d8a..7951086bb751f9 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -121,7 +121,6 @@ function(configure_qt) else() set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") endif() - MESSAGE(STATUS "$ENV{PKG_CONFIG_PATH}") set(_build_triplet ${TARGET_TRIPLET}-${_short_name_${_buildname}}) message(STATUS "Configuring ${_build_triplet}") From 0aec142267426fb9876f9c100cfab179628e7053 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 00:14:56 +0200 Subject: [PATCH 084/142] fix config --- ports/fltk/x11.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ports/fltk/x11.patch b/ports/fltk/x11.patch index 78695899ad6e38..6d2e81247e34cf 100644 --- a/ports/fltk/x11.patch +++ b/ports/fltk/x11.patch @@ -1,3 +1,18 @@ +diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in +index e2de914e4..6755b1def 100644 +--- a/CMake/FLTKConfig.cmake.in ++++ b/CMake/FLTKConfig.cmake.in +@@ -28,6 +28,10 @@ + + set (FLTK_VERSION @FLTK_VERSION@) + ++include(CMakeFindDependencyMacro) ++find_dependency(X11) ++find_dependency(Fontconfig) ++ + include (${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake) + + set (FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@") diff --git a/CMake/options.cmake b/CMake/options.cmake index ddd650f0a..d678b270e 100644 --- a/CMake/options.cmake From 519edfaa3706597f549cc041db73bc65d6102804 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 09:51:34 +0200 Subject: [PATCH 085/142] update glfw3 --- ports/glfw3/portfile.cmake | 4 ++-- ports/glfw3/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 6de23f8e2b23d8..c20bcabb10f39f 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8 - SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87 + REF dd8a678a66f1967372e5a5e3deac41ebf65ee127 + SHA512 f653a5580a3b31c26940a076e53cdc32a353330ef52f9638e9e1a4cc57db133bb3ac650f15516d0c6ce963af4807a39f7f964328f4a1642949b9c01a653d07dd HEAD_REF master ) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index f32b18550cedb7..fa25d6498686f3 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glfw3", - "version-semver": "3.3.8", - "port-version": 1, + "version-date": "2022-09-20", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", "homepage": "https://github.com/glfw/glfw", "license": "Zlib", From 67adaeda2aad456712bca74ce072f7a27104c7ed Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 09:51:52 +0200 Subject: [PATCH 086/142] fix some ports --- ports/ois/portfile.cmake | 1 + ports/ois/vcpkg.json | 2 +- ports/ois/x11.patch | 28 ++++++++++++++++++++++ ports/openxr-loader/fix-x11-include.patch | 15 ++++++++++++ ports/openxr-loader/portfile.cmake | 1 + ports/openxr-loader/vcpkg.json | 15 +++++++++++- ports/raylib/fix-linkGlfw.patch | 29 ----------------------- ports/raylib/portfile.cmake | 2 +- ports/raylib/vcpkg.json | 9 +------ ports/soil/fix_opengl.patch | 15 ++++++++++++ ports/soil/portfile.cmake | 11 +++++---- ports/soil/soilConfig.cmake.in | 2 ++ ports/soil2/CMakeLists.txt | 2 +- ports/soil2/soil2Config.cmake.in | 2 ++ ports/urho3d/portfile.cmake | 1 + ports/urho3d/vcpkg.json | 4 ++++ scripts/test_ports/cmake/portfile.cmake | 1 + 17 files changed, 94 insertions(+), 46 deletions(-) create mode 100644 ports/ois/x11.patch create mode 100644 ports/openxr-loader/fix-x11-include.patch delete mode 100644 ports/raylib/fix-linkGlfw.patch create mode 100644 ports/soil/fix_opengl.patch diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index e7b5d2bce00fca..8b145a1cfbf513 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001_install_pkgconfig_win32.patch + x11.patch ) vcpkg_cmake_configure( diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index ee726c94485bb4..bc74fd55d5cf07 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ois", "version": "1.5.1", - "port-version": 1, + "port-version": 2, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", "license": "Zlib", diff --git a/ports/ois/x11.patch b/ports/ois/x11.patch new file mode 100644 index 00000000000000..04fe1666927001 --- /dev/null +++ b/ports/ois/x11.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f65b86000..fece41e9c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,8 +188,9 @@ endif() + if(UNIX) + + if (NOT APPLE) +- add_dependencies(OIS X11) +- target_link_libraries(OIS X11) ++ find_package(X11) ++ target_link_libraries(OIS X11::X11) ++ set(OIS_REQUIRES x11) + endif() + + set_target_properties(OIS PROPERTIES +diff --git a/OIS.pc.in b/OIS.pc.in +index 8c8c89af5..5ccf0e202 100644 +--- a/OIS.pc.in ++++ b/OIS.pc.in +@@ -5,6 +5,7 @@ includedir=${prefix}/include + + Name: OIS + Description: Cross platform C++ Input Framework ++Requires: @OIS_REQUIRES@ + Version: @OIS_VERSION@ + Libs: -L${libdir} -lOIS@OIS_POSTFIX@ + Cflags: -I${includedir} -I${includedir}/ois diff --git a/ports/openxr-loader/fix-x11-include.patch b/ports/openxr-loader/fix-x11-include.patch new file mode 100644 index 00000000000000..ed4b135c12cadb --- /dev/null +++ b/ports/openxr-loader/fix-x11-include.patch @@ -0,0 +1,15 @@ +diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt +index b02cd4f45..c6ad5cb7c 100644 +--- a/src/loader/CMakeLists.txt ++++ b/src/loader/CMakeLists.txt +@@ -165,7 +165,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + endif() + + set_target_properties(openxr_loader PROPERTIES SOVERSION "${MAJOR}" VERSION "${MAJOR}.${MINOR}.${PATCH}") +- ++ if(BUILD_WITH_XLIB_HEADERS) ++ target_link_libraries(openxr_loader PRIVATE X11:X11) ++ endif() + add_custom_target( + libopenxr_loader.so.${MAJOR}.${MINOR} ALL + COMMAND ${CMAKE_COMMAND} -E create_symlink libopenxr_loader.so.${MAJOR}.${MINOR}.${PATCH} diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index 04a518602f4190..99b888f92c7843 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch + fix-x11-include.patch ) vcpkg_from_github( diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index c2e6b9a404490c..ec4edcb1376a20 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -15,7 +15,20 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + { + "name": "libx11", + "platform": "!windows" + }, + { + "name": "libxrandr", + "platform": "!windows" + }, + { + "name": "libxxf86vm", + "platform": "!windows" + }, + "opengl" ], "features": { "vulkan": { diff --git a/ports/raylib/fix-linkGlfw.patch b/ports/raylib/fix-linkGlfw.patch deleted file mode 100644 index d495e281462229..00000000000000 --- a/ports/raylib/fix-linkGlfw.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake -index 1b94cdf..4cc8f8f 100644 ---- a/cmake/GlfwImport.cmake -+++ b/cmake/GlfwImport.cmake -@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") - find_package(glfw3 3.3.3 QUIET) - endif() - if (glfw3_FOUND) -- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) -+ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) - endif() - - # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option -@@ -32,3 +32,4 @@ else() - MESSAGE(STATUS "Using external GLFW") - set(GLFW_PKG_DEPS glfw3) - endif() -+set(GLFW_PKG_DEPS glfw3) -diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake -index c156d6b..55c5bca 100644 ---- a/cmake/LibraryConfigurations.cmake -+++ b/cmake/LibraryConfigurations.cmake -@@ -104,5 +104,5 @@ endif () - set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) - - if (${PLATFORM} MATCHES "Desktop") -- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) -+ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) - endif () diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 4b7eed0678adbb..f72ad51816469b 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -44,7 +44,7 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DSHARED=${SHARED} -DSTATIC=${STATIC} - -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows + -DUSE_EXTERNAL_GLFW=ON ${FEATURE_OPTIONS} OPTIONS_DEBUG -DENABLE_ASAN=${DEBUG_ENABLE_SANITIZERS} diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index b607c4164670fa..794dcb93e00fb8 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -6,14 +6,7 @@ "license": "Zlib", "supports": "!(arm | uwp)", "dependencies": [ - { - "name": "glfw3", - "platform": "!windows" - }, - { - "name": "glfw3", - "platform": "!windows" - }, + "glfw3", { "name": "libx11", "platform": "!windows" diff --git a/ports/soil/fix_opengl.patch b/ports/soil/fix_opengl.patch new file mode 100644 index 00000000000000..0659753e8d1166 --- /dev/null +++ b/ports/soil/fix_opengl.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc66b851c..22de9bde9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,10 @@ ADD_LIBRARY( soil STATIC + + target_include_directories(soil INTERFACE $) + ++ ++find_package(OpenGL) ++target_link_libraries(soil OpenGL::OpenGL) ++ + install(TARGETS soil + EXPORT soilTargets + ARCHIVE DESTINATION lib diff --git a/ports/soil/portfile.cmake b/ports/soil/portfile.cmake index 4d591dbe19df6e..c706bb336e10dc 100644 --- a/ports/soil/portfile.cmake +++ b/ports/soil/portfile.cmake @@ -5,16 +5,17 @@ vcpkg_from_github( SHA512 6cbaa10d8b2a274c389fda723db53a3f1ba7d25a7367df40efec4d0553c09f0d67fb16f927bba2ff0aed4234e3a83922edcc574ffac72dd7e05d6cec768b561b HEAD_REF master PATCHES fix-cmakelists.patch + fix_opengl.patch ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/soilConfig.cmake.in - ${CMAKE_CURRENT_LIST_DIR}/soilConfigVersion.cmake.in - DESTINATION ${SOURCE_PATH} + "${CMAKE_CURRENT_LIST_DIR}/soilConfig.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/soilConfigVersion.cmake.in" + DESTINATION "${SOURCE_PATH}" ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) @@ -23,4 +24,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/soil/soilConfig.cmake.in b/ports/soil/soilConfig.cmake.in index 0c15a254c3a5fb..d0124a5c850372 100644 --- a/ports/soil/soilConfig.cmake.in +++ b/ports/soil/soilConfig.cmake.in @@ -5,6 +5,8 @@ # Load targets get_filename_component(SOIL_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include(CMakeFindDependencyMacro) +find_dependency(OpenGL) include("${SOIL_CMAKE_DIR}/soilTargets.cmake") # Set properties diff --git a/ports/soil2/CMakeLists.txt b/ports/soil2/CMakeLists.txt index ca0b7ca6a0f53c..58b54ab4939a4e 100644 --- a/ports/soil2/CMakeLists.txt +++ b/ports/soil2/CMakeLists.txt @@ -43,7 +43,7 @@ add_library(soil2 STATIC ${SOIL2_SRC}) target_include_directories(soil2 INTERFACE $) # link opengl32 -target_link_libraries(soil2 PRIVATE ${OPENGL_gl_LIBRARY}) +target_link_libraries(soil2 PRIVATE OpenGL::OpenGL) # If its msvc mute the secure warnings if(MSVC) diff --git a/ports/soil2/soil2Config.cmake.in b/ports/soil2/soil2Config.cmake.in index 4d9d8b4caba76f..b76673b8d39c08 100644 --- a/ports/soil2/soil2Config.cmake.in +++ b/ports/soil2/soil2Config.cmake.in @@ -5,6 +5,8 @@ # Load targets get_filename_component(SOIL2_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include(CMakeFindDependencyMacro) +find_dependency(OpenGL) include("${SOIL2_CMAKE_DIR}/soil2Targets.cmake") # Set properties diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index a79dcf22589204..641dc3f8c879e0 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_INCLUDE_PATH="${CURRENT_INSTALLED_DIR}/include" ${FEATURE_OPTIONS} -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} -DURHO3D_PCH=OFF diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 7de5607f44f944..1e651e563a3726 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -11,6 +11,10 @@ "name": "libx11", "platform": "!windows" }, + { + "name": "libxext", + "platform": "!windows" + }, { "name": "libxcursor", "platform": "!windows" diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake index 87ad4eb6d82083..55f41a557b1478 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -34,6 +34,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + --trace-expand ${OPTIONS} -DBUILD_TESTING=OFF #-DCMAKE_USE_SYSTEM_LIBRARIES=ON From 5abe33fca3e3cf172c8e8f71916f161febe689d4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 21:32:04 +0200 Subject: [PATCH 087/142] more fixes --- ports/freeglut/vcpkg.json | 12 ++ ports/libice/portfile.cmake | 1 + ports/libice/replace_macros.patch | 15 +++ ports/libice/vcpkg.json | 1 + ports/libx11/add_dl_pc.patch | 36 ++++++ ports/libx11/portfile.cmake | 13 +- ports/libxaw/getpagesize.patch | 14 +++ ports/libxaw/portfile.cmake | 29 +++++ ports/libxaw/vcpkg.json | 17 +++ ports/libxmu/cl-build.patch | 38 ++++++ ports/libxmu/portfile.cmake | 31 +++++ ports/libxmu/unistd.patch | 15 +++ ports/libxmu/vcpkg.json | 12 ++ ports/libxt/globals.patch | 96 +++++++++++++++ ports/libxt/portfile.cmake | 78 ++++++++++++ ports/libxt/vcpkg.json | 20 ++++ ports/libxt/windows_build.patch | 178 ++++++++++++++++++++++++++++ ports/ogre/vcpkg.json | 8 ++ ports/openxr-loader/vcpkg.json | 18 +-- ports/sdl2/portfile.cmake | 1 + ports/sdl2/use-x11-targets.patch | 25 ++++ ports/sdl2/vcpkg.json | 36 +++++- ports/urho3d/vcpkg.json | 4 +- ports/xcb/vcpkg-cmake-wrapper.cmake | 5 + 24 files changed, 687 insertions(+), 16 deletions(-) create mode 100644 ports/libice/replace_macros.patch create mode 100644 ports/libx11/add_dl_pc.patch create mode 100644 ports/libxaw/getpagesize.patch create mode 100644 ports/libxaw/portfile.cmake create mode 100644 ports/libxaw/vcpkg.json create mode 100644 ports/libxmu/cl-build.patch create mode 100644 ports/libxmu/portfile.cmake create mode 100644 ports/libxmu/unistd.patch create mode 100644 ports/libxmu/vcpkg.json create mode 100644 ports/libxt/globals.patch create mode 100644 ports/libxt/portfile.cmake create mode 100644 ports/libxt/vcpkg.json create mode 100644 ports/libxt/windows_build.patch create mode 100644 ports/sdl2/use-x11-targets.patch diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index e0508606e1d150..25794465cb7bec 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -5,6 +5,18 @@ "homepage": "https://sourceforge.net/projects/freeglut/", "license": null, "dependencies": [ + { + "name": "libxi", + "platform": "!windows" + }, + { + "name": "libxrandr", + "platform": "!windows" + }, + { + "name": "libxxf86vm", + "platform": "!windows" + }, "opengl", { "name": "vcpkg-cmake", diff --git a/ports/libice/portfile.cmake b/ports/libice/portfile.cmake index e0edd0975cdf2b..3c8470d0132435 100644 --- a/ports/libice/portfile.cmake +++ b/ports/libice/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_gitlab( SHA512 ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040 HEAD_REF master PATCHES fix_build.patch + replace_macros.patch ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") diff --git a/ports/libice/replace_macros.patch b/ports/libice/replace_macros.patch new file mode 100644 index 00000000000000..dcae31cf972cf7 --- /dev/null +++ b/ports/libice/replace_macros.patch @@ -0,0 +1,15 @@ +diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h +index 402cbc8bd..506c18baf 100644 +--- a/include/X11/ICE/ICElib.h ++++ b/include/X11/ICE/ICElib.h +@@ -32,8 +32,8 @@ Author: Ralph Mor, X Consortium + #include + #include + +-#define Bool int +-#define Status int ++typedef int Bool; ++typedef int Status; + #define True 1 + #define False 0 + diff --git a/ports/libice/vcpkg.json b/ports/libice/vcpkg.json index f216bd2e21dae5..3286ea25bb56ec 100644 --- a/ports/libice/vcpkg.json +++ b/ports/libice/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libice", "version": "1.0.10", + "port-version": 1, "description": "Inter-Client Exchange Library", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libice", "license": "MIT-open-group", diff --git a/ports/libx11/add_dl_pc.patch b/ports/libx11/add_dl_pc.patch new file mode 100644 index 00000000000000..35069b1a0ad93e --- /dev/null +++ b/ports/libx11/add_dl_pc.patch @@ -0,0 +1,36 @@ +diff --git a/configure.ac b/configure.ac +index 92b740b88..083e37ee5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -106,8 +106,12 @@ if test "x$ac_cv_search_dlopen" = xno; then + AC_DEFINE(HAVE_SHL_LOAD,1, + [Use shl_load to load shared libraries]) + AC_CHECK_HEADERS([dl.h]) ++ XLDLIB="$ac_cv_search_shl_load" + fi + else ++ if test "x$ac_cv_search_dlopen" != 'xnone required'; then ++ XLDLIB="$ac_cv_search_dlopen" ++ fi + AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries]) + AC_CHECK_HEADERS([dlfcn.h]) + fi +@@ -116,6 +120,7 @@ if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then + else + HAVE_LOADABLE_MODULES=no + fi ++AC_SUBST(XLDLIB) + AC_MSG_RESULT($HAVE_LOADABLE_MODULES) + + AC_MSG_CHECKING([if loadable i18n module support should be enabled]) +diff --git a/x11.pc.in b/x11.pc.in +index 25c7e7cd0..4ecf23e8d 100644 +--- a/x11.pc.in ++++ b/x11.pc.in +@@ -11,5 +11,5 @@ Version: @PACKAGE_VERSION@ + Requires: xproto @XKBPROTO_REQUIRES@ + Requires.private: @X11_EXTRA_DEPS@ + Cflags: -I${includedir} @XTHREAD_CFLAGS@ +-Libs: -L${libdir} -lX11 ++Libs: -L${libdir} -lX11 @XLDLIB@ + Libs.private: @XTHREADLIB@ diff --git a/ports/libx11/portfile.cmake b/ports/libx11/portfile.cmake index 51a5c24d8e808d..6c75cb56c0013f 100644 --- a/ports/libx11/portfile.cmake +++ b/ports/libx11/portfile.cmake @@ -5,6 +5,8 @@ else() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(PATCHES dllimport.patch) +else() + #set(OPTIONS --disable-loadable-xcursor) endif() vcpkg_from_gitlab( @@ -18,26 +20,31 @@ vcpkg_from_gitlab( io_include.patch ${PATCHES} vcxserver.patch + add_dl_pc.patch ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(ENV{CPP} "cl_cpp_wrapper") + list(APPEND OPTIONS + --enable-loadable-i18n=no #Pointer conversion errors + --enable-unix-transport=no + ) endif() set(OPTIONS "") if(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS --enable-malloc0returnsnull=yes #Configure fails to run the test for some reason - --enable-loadable-i18n=no #Pointer conversion errors --enable-ipv6 --enable-hyperv --enable-tcp-transport --with-launchd=no --with-lint=no --disable-selective-werror - --enable-unix-transport=no) + ${OPTIONS} + ) endif() if(NOT XLSTPROC) find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin") diff --git a/ports/libxaw/getpagesize.patch b/ports/libxaw/getpagesize.patch new file mode 100644 index 00000000000000..54bee1761f052b --- /dev/null +++ b/ports/libxaw/getpagesize.patch @@ -0,0 +1,14 @@ +diff --git a/src/OS.c b/src/OS.c +index 4c69005..cd0c517 100644 +--- a/src/OS.c ++++ b/src/OS.c +@@ -37,6 +37,9 @@ _XawGetPageSize(void) + #endif + + #ifdef HAVE_GETPAGESIZE ++# if defined(_WIN32) ++extern int getpagesize(void); ++# endif + if (pagesize == -1) + pagesize = getpagesize(); + #endif diff --git a/ports/libxaw/portfile.cmake b/ports/libxaw/portfile.cmake new file mode 100644 index 00000000000000..66e2f2aa1bee52 --- /dev/null +++ b/ports/libxaw/portfile.cmake @@ -0,0 +1,29 @@ +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/libxaw + REF 9cfeba9db7f3ac4e0b351969c9ff5ab8f58ec7ef + SHA512 15b7afc706fe50c55391846892961e3286165e43513009664cfca7c443f9f9eafa32e17e8ba8089a0ae2d568aab4117f7e5ff696052ee58f6da78e3d9ad7e721 + HEAD_REF master + PATCHES getpagesize.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxaw/vcpkg.json b/ports/libxaw/vcpkg.json new file mode 100644 index 00000000000000..e70f375621a552 --- /dev/null +++ b/ports/libxaw/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libxaw", + "version": "1.0.13", + "description": "X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxaw", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxext", + "libxmu", + "libxpm", + "libxt", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxmu/cl-build.patch b/ports/libxmu/cl-build.patch new file mode 100644 index 00000000000000..d11b838dc9be1a --- /dev/null +++ b/ports/libxmu/cl-build.patch @@ -0,0 +1,38 @@ +diff --git a/src/EditresCom.c b/src/EditresCom.c +index 716a2b3c6..d570e19e4 100644 +--- a/src/EditresCom.c ++++ b/src/EditresCom.c +@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group. + #include /* To get into the composite and core widget + structures. */ + #include /* For XtIs macros. */ ++#ifdef _MSC_VER ++#define XTSTRINGDEFINES // Otherwise XtRImmediate is not a constant expression ++#endif + #include /* for XtRString. */ + #include /* for Application Shell Widget class. */ + +@@ -60,6 +60,8 @@ typedef enum { + BlockAll + } EditresBlock; + ++const EditresBlock editDefault(BlockNone); ++ + typedef struct _SetValuesEvent { + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; +diff --git a/src/GetHost.c b/src/GetHost.c +index 2f0bccded..2d698f664 100644 +--- a/src/GetHost.c ++++ b/src/GetHost.c +@@ -35,7 +35,10 @@ in this Software without prior written authorization from The Open Group. + #endif + #include + #include ++ ++#ifdef HAVE_UNISTD_H + #include ++#endif + + #ifdef WIN32 + #include diff --git a/ports/libxmu/portfile.cmake b/ports/libxmu/portfile.cmake new file mode 100644 index 00000000000000..8eb05f51a36324 --- /dev/null +++ b/ports/libxmu/portfile.cmake @@ -0,0 +1,31 @@ +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/libxmu + REF e9efe2d027b4c46cf6834cc532222f8ad1d1d3c3 # 1.1.3 + SHA512 9d3ab7534afbb3d220ce846ecfc209536def28e707e68f393673bda6f92054e7a14212ae2400092afdc06bbb61d8315d460feaf5b551dc447390d6d952a5aa1f + HEAD_REF master # branch name + PATCHES cl-build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + lt_cv_deplibs_check_method=pass_all +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxmu/unistd.patch b/ports/libxmu/unistd.patch new file mode 100644 index 00000000000000..e570f130938b3d --- /dev/null +++ b/ports/libxmu/unistd.patch @@ -0,0 +1,15 @@ +diff --git a/src/GetHost.c b/src/GetHost.c +index 2f0bccded..2d698f664 100644 +--- a/src/GetHost.c ++++ b/src/GetHost.c +@@ -35,7 +35,10 @@ in this Software without prior written authorization from The Open Group. + #endif + #include + #include ++ ++#ifdef HAVE_UNISTD_H + #include ++#endif + + #ifdef WIN32 + #include diff --git a/ports/libxmu/vcpkg.json b/ports/libxmu/vcpkg.json new file mode 100644 index 00000000000000..cbcb4ebad3db3b --- /dev/null +++ b/ports/libxmu/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxmu", + "version": "1.1.3", + "description": "X miscellaneous utility routines library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxmu", + "license": null, + "dependencies": [ + "bzip2", + "libxt", + "xorg-macros" + ] +} diff --git a/ports/libxt/globals.patch b/ports/libxt/globals.patch new file mode 100644 index 00000000000000..8a2c32027b9975 --- /dev/null +++ b/ports/libxt/globals.patch @@ -0,0 +1,96 @@ +diff --git a/util/StrDefs.ct b/util/StrDefs.ct +index b597b2051..b682255ad 100644 +--- a/util/StrDefs.ct ++++ b/util/StrDefs.ct +@@ -46,6 +46,8 @@ SOFTWARE. + ******************************************************************/ + + #define Const const ++#include "StringDefs.h" ++#include "Shell.h" + + <<>> + +diff --git a/util/StrDefs.ht b/util/StrDefs.ht +index 2ce20562f..ceab2610f 100644 +--- a/util/StrDefs.ht ++++ b/util/StrDefs.ht +@@ -52,6 +52,18 @@ SOFTWARE. + #define _XtStringDefs_h_Const const + #endif + ++#ifndef XT_EXTERN_API ++# if defined(_MSC_VER) && defined(XT_DLL_EXPORTS) ++# ifdef XT_BUILD ++# define XT_EXTERN_API extern __declspec(dllexport) ++# else ++# define XT_EXTERN_API extern __declspec(dllimport) ++# endif ++# else ++# define XT_EXTERN_API extern ++# endif ++#endif ++ + <<>> + + #ifndef XTSTRINGDEFINES +diff --git a/util/string.list b/util/string.list +index 49ba7476e..753c592b3 100644 +--- a/util/string.list ++++ b/util/string.list +@@ -6,7 +6,7 @@ + + #prefix Xt + #feature XTSTRINGDEFINES +-#externref extern ++#externref XT_EXTERN_API + #externdef + ! note that the trailing space is required in the #externdef line. + #ctmpl util/StrDefs.ct +diff --git a/util/Shell.ht b/util/Shell.ht +index 500e0fd75..ac8fc2a2e 100644 +--- a/util/Shell.ht ++++ b/util/Shell.ht +@@ -64,6 +64,18 @@ SOFTWARE. + #define _XtShell_h_Const const + #endif + ++#ifndef XT_EXTERN_API ++# if defined(_MSC_VER) && defined(XT_DLL_EXPORTS) ++# ifdef XT_BUILD ++# define XT_EXTERN_API extern __declspec(dllexport) ++# else ++# define XT_EXTERN_API extern __declspec(dllimport) ++# endif ++# else ++# define XT_EXTERN_API extern ++# endif ++#endif ++ + <<>> + + #ifndef XTSTRINGDEFINES +diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h +index 559697aa0..d11eb0955 100644 +--- a/include/X11/Intrinsic.h ++++ b/include/X11/Intrinsic.h +@@ -106,7 +106,18 @@ typedef char *String; + #define externalref globalref + #define externaldef(psect) globaldef {"psect"} noshare + #else +-#define externalref extern ++#ifndef XT_EXTERN_API ++# if defined(_MSC_VER) && defined(XT_DLL_EXPORTS) ++# ifdef XT_BUILD ++# define XT_EXTERN_API extern __declspec(dllexport) ++# else ++# define XT_EXTERN_API extern __declspec(dllimport) ++# endif ++# else ++# define XT_EXTERN_API extern ++# endif ++#endif ++#define externalref XT_EXTERN_API + #define externaldef(psect) + #endif /* VMS */ + diff --git a/ports/libxt/portfile.cmake b/ports/libxt/portfile.cmake new file mode 100644 index 00000000000000..4aee9bce017c1f --- /dev/null +++ b/ports/libxt/portfile.cmake @@ -0,0 +1,78 @@ +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() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + # Downstream uses &widgetClassRec in a const context which doesn't work + # if this is a dynamic library since the memory adress is only known at runtime +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxt + REF edd70bdfbbd16247e3d9564ca51d864f82626eb7 # 1.2.1 + SHA512 c49876253dfd187e7d56a098d3d992157daefa2c25ee732eaae5818ee04513bedd807d2f265085db2e82c0b1821e152a88fb4998c0002f6ac57204543fe18566 + HEAD_REF master + PATCHES windows_build.patch + globals.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +string(APPEND VCPKG_C_FLAGS " -DXT_BUILD") +string(APPEND VCPKG_CXX_FLAGS " -DXT_BUILD") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + string(APPEND VCPKG_C_FLAGS " -DXT_DLL_EXPORTS") + string(APPEND VCPKG_CXX_FLAGS " -DXT_DLL_EXPORTS") +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") + if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + message(BLUB) + vcpkg_find_acquire_program(CLANG) + cmake_path(GET CLANG PARENT_PATH CLANG_PARENT_PATH) + set(CLANG_CL "${CLANG_PARENT_PATH}/clang-cl.exe") + file(READ "${cmake_vars_file}" contents) + string(APPEND contents "\nset(VCPKG_DETECTED_CMAKE_C_COMPILER \"${CLANG_CL}\")") + string(APPEND contents "\nset(VCPKG_DETECTED_CMAKE_CXX_COMPILER \"${CLANG_CL}\")") + file(WRITE "${cmake_vars_file}" "${contents}") + endif() + set(cmake_vars_file "${cmake_vars_file}" CACHE INTERNAL "") # Don't run z_vcpkg_get_cmake_vars twice + set(OPTIONS --disable-selective-werror) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --with-xfile-search-path=X11 + --with-appdefaultdir=share/X11/app-defaults + --enable-malloc0returnsnull=yes + xorg_cv_malloc0_returns_null=yes + ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/X11/StringDefs.h" "defined(XT_DLL_EXPORTS)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/X11/Shell.h" "defined(XT_DLL_EXPORTS)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/X11/Intrinsic.h" "defined(XT_DLL_EXPORTS)" "1") + # XTSTRINGDEFINES is required since the "strings" are often used in a const context which doesn't work if they are adresses of a global array in another dll + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/X11/StringDefs.h" "#define _XtStringDefs_h_" "#define _XtStringDefs_h_\n#define XTSTRINGDEFINES") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/X11/Shell.h" "#define _XtShell_h" "#define _XtShell_h\n#define XTSTRINGDEFINES") +endif() + +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() diff --git a/ports/libxt/vcpkg.json b/ports/libxt/vcpkg.json new file mode 100644 index 00000000000000..c18602dd81e747 --- /dev/null +++ b/ports/libxt/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libxt", + "version": "1.2.1", + "description": "X Toolkit Intrinsics library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxt", + "license": null, + "dependencies": [ + "bzip2", + "glib", + "libice", + "libsm", + "libx11", + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxt/windows_build.patch b/ports/libxt/windows_build.patch new file mode 100644 index 00000000000000..9ee1a73a8a9f4c --- /dev/null +++ b/ports/libxt/windows_build.patch @@ -0,0 +1,178 @@ +diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h +index cf8d3fe41..559697aa0 100644 +--- a/include/X11/Intrinsic.h ++++ b/include/X11/Intrinsic.h +@@ -50,6 +50,10 @@ in this Software without prior written authorization from The Open Group. + #ifndef _XtIntrinsic_h + #define _XtIntrinsic_h + ++#ifdef WIN32 ++#define _WILLWINSOCK_ ++#endif ++ + #include + #include + #include +diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h +index a8b7f48cf..99c5349e7 100644 +--- a/include/X11/IntrinsicI.h ++++ b/include/X11/IntrinsicI.h +@@ -48,11 +48,12 @@ SOFTWARE. + #ifndef _XtintrinsicI_h + #define _XtintrinsicI_h + +-#include "Xtos.h" +-#include "IntrinsicP.h" + #ifdef WIN32 + #define _WILLWINSOCK_ + #endif ++ ++#include "Xtos.h" ++#include "IntrinsicP.h" + #include + + #include "Object.h" +diff --git a/src/Convert.c b/src/Convert.c +index 9b2d465b3..5c89850f1 100644 +--- a/src/Convert.c ++++ b/src/Convert.c +@@ -71,6 +71,9 @@ in this Software without prior written authorization from The Open Group. + #ifdef HAVE_CONFIG_H + #include + #endif ++#ifdef _MSC_VER ++#include ++#endif + #include "IntrinsicI.h" + #include "StringDefs.h" + #include "Intrinsic.h" +diff --git a/src/Core.c b/src/Core.c +index d728a9286..5ee0d2fe8 100644 +--- a/src/Core.c ++++ b/src/Core.c +@@ -80,6 +80,9 @@ in this Software without prior written authorization from The Open Group. + #include "RectObjP.h" + #include "ThreadsI.h" + #include "StringDefs.h" ++#ifndef None ++#define None 0L ++#endif + + /****************************************************************** + * +diff --git a/src/Error.c b/src/Error.c +index 4bf4713e5..a64784a6f 100644 +--- a/src/Error.c ++++ b/src/Error.c +@@ -74,7 +74,9 @@ in this Software without prior written authorization from The Open Group. + #include "IntrinsicI.h" + #include + #include +- ++#ifndef None ++#define None 0L ++#endif + /* The error handlers in the application context aren't used since we can't + come up with a uniform way of using them. If you can, define + GLOBALERRORS to be FALSE (or 0). */ +diff --git a/src/Event.c b/src/Event.c +index dadcedeb8..1eafc0143 100644 +--- a/src/Event.c ++++ b/src/Event.c +@@ -74,7 +74,9 @@ in this Software without prior written authorization from The Open Group. + #include "IntrinsicI.h" + #include "Shell.h" + #include "StringDefs.h" +- ++#ifndef None ++#define None 0L ++#endif + typedef struct _XtEventRecExt { + int type; + XtPointer select_data[1]; /* actual dimension is [mask] */ +diff --git a/src/GCManager.c b/src/GCManager.c +index 6031248e5..205f1cbe3 100644 +--- a/src/GCManager.c ++++ b/src/GCManager.c +@@ -72,7 +72,9 @@ in this Software without prior written authorization from The Open Group. + #include + #endif + #include "IntrinsicI.h" +- ++#ifndef None ++#define None 0L ++#endif + typedef struct _GCrec { + unsigned char screen; /* Screen for GC */ + unsigned char depth; /* Depth for GC */ +diff --git a/src/Geometry.c b/src/Geometry.c +index 3704cb63d..2f00cdcca 100644 +--- a/src/Geometry.c ++++ b/src/Geometry.c +@@ -75,6 +75,10 @@ in this Software without prior written authorization from The Open Group. + #include "ShellP.h" + #include "ShellI.h" + ++#ifndef None ++#define None 0L ++#endif ++ + static void + ClearRectObjAreas(RectObj r, XWindowChanges *old) + { +diff --git a/src/Keyboard.c b/src/Keyboard.c +index da6fa11aa..7d9271f45 100644 +--- a/src/Keyboard.c ++++ b/src/Keyboard.c +@@ -80,6 +80,10 @@ in this Software without prior written authorization from The Open Group. + #include "PassivGraI.h" + #include "EventI.h" + ++#ifndef None ++#define None 0L ++#endif ++ + #define _GetWindowedAncestor(w) (XtIsWidget(w) ? w : _XtWindowedAncestor(w)) + + /* InActiveSubtree cache of the current focus source and its ancestors */ +diff --git a/util/makestrs.c b/util/makestrs.c +index 4d5c0a6b7..b64e42eea 100644 +--- a/util/makestrs.c ++++ b/util/makestrs.c +@@ -29,7 +29,9 @@ in this Software without prior written authorization from The Open Group. + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + typedef struct _TableEnt { + struct _TableEnt *next; +diff --git a/src/Initialize.c b/src/Initialize.c +index 8ae54b47c..765479603 100644 +--- a/src/Initialize.c ++++ b/src/Initialize.c +@@ -246,7 +246,7 @@ _XtInherit(void) + * cygwin-xfree: http://www.cygwin.com/ml/cygwin-xfree/2003-10/msg00000.html + */ + +-#ifdef __x86_64__ ++#if defined(__x86_64__) || defined(_M_X64) + asm(".section .trampoline, \"dwx\" \n\ + .globl _XtInherit \n\ + _XtInherit: \n\ +diff --git a/src/Shell.c b/src/Shell.c +index 07713cc25..fcf10a5e2 100644 +--- a/src/Shell.c ++++ b/src/Shell.c +@@ -87,7 +87,9 @@ in this Software without prior written authorization from The Open Group. + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + #ifdef EDITRES + #include diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index ccaea58404c57f..0f33c32a0479cf 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -6,6 +6,14 @@ "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "dependencies": [ + { + "name": "libxaw", + "platform": "linux" + }, + { + "name": "libxt", + "platform": "linux" + }, "opengl", "pugixml", { diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index ec4edcb1376a20..ff0db935ad6206 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -8,14 +8,6 @@ "supports": "!uwp & !osx", "dependencies": [ "jsoncpp", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, { "name": "libx11", "platform": "!windows" @@ -28,7 +20,15 @@ "name": "libxxf86vm", "platform": "!windows" }, - "opengl" + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "vulkan": { diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 53c52c6b3458ac..441d61bde8718e 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch + use-x11-targets.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/use-x11-targets.patch b/ports/sdl2/use-x11-targets.patch new file mode 100644 index 00000000000000..cb2a2cd12ed3f0 --- /dev/null +++ b/ports/sdl2/use-x11-targets.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake +index e062043c9..aae4d27d4 100644 +--- a/cmake/sdlchecks.cmake ++++ b/cmake/sdlchecks.cmake +@@ -409,6 +409,7 @@ endmacro() + # - HAVE_SDL_LOADSO opt + macro(CheckX11) + if(SDL_X11) ++ find_package(X11 COMPONENTS Xext Xcursor Xi Xfixes Xrandr Xrender Xss) # Xss = libxscrnsaver + foreach(_LIB X11 Xext Xcursor Xi Xfixes Xrandr Xrender Xss) + FindLibraryAndSONAME("${_LIB}") + endforeach() +@@ -492,10 +493,10 @@ macro(CheckX11) + endif() + endif() + else() +- list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB}) ++ list(APPEND EXTRA_LIBS X11::X11 X11:Xext) + endif() + +- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIB} ${X11_LIB}) ++ set(CMAKE_REQUIRED_LIBRARIES X11::X11) + + check_c_source_compiles(" + #include diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 2f8da085e12b8a..8d3c867c9f1610 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "deps on audio libs missing (alsa,pulseaudio etc.); OpenGL checks broken.", "name": "sdl2", "version": "2.24.1", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", @@ -14,17 +15,48 @@ "host": true } ], + "default-features": [ + "default-features" + ], "features": { + "default-features": { + "description": "metafeature to select the platform dependent default features", + "dependencies": [ + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "linux" + } + ] + }, "vulkan": { "description": "Vulkan functionality for SDL" }, "wayland": { + "$comment": "opt dep on libdecor", "description": "Dynamically load Wayland support", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "libxkbcommon", + "wayland", + "wayland-protocols" + ] }, "x11": { "description": "Dynamically load X11 support", - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + "libx11", + "libxcursor", + "libxext", + "libxfixes", + "libxi", + "libxrandr", + "libxrender", + "libxscrnsaver" + ] } } } diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 1e651e563a3726..a830184c9dba0c 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -12,11 +12,11 @@ "platform": "!windows" }, { - "name": "libxext", + "name": "libxcursor", "platform": "!windows" }, { - "name": "libxcursor", + "name": "libxext", "platform": "!windows" }, { diff --git a/ports/xcb/vcpkg-cmake-wrapper.cmake b/ports/xcb/vcpkg-cmake-wrapper.cmake index a541c885293b9e..8582da34354c47 100644 --- a/ports/xcb/vcpkg-cmake-wrapper.cmake +++ b/ports/xcb/vcpkg-cmake-wrapper.cmake @@ -8,3 +8,8 @@ if(TARGET XCB::XCB) target_link_libraries(XCB::XCB INTERFACE X11::Xau) endif() endif() +if(TARGET XCB::IMAGE) + if(TARGET XCB::UTIL) + target_link_libraries(XCB::IMAGE INTERFACE XCB::UTIL) + endif() +endif \ No newline at end of file From 974ac0beb2711b382f51251481cb4010947edbaa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 21:49:36 +0200 Subject: [PATCH 088/142] fix libxaw hash --- ports/libxaw/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libxaw/portfile.cmake b/ports/libxaw/portfile.cmake index 66e2f2aa1bee52..e0e00819121afe 100644 --- a/ports/libxaw/portfile.cmake +++ b/ports/libxaw/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxaw REF 9cfeba9db7f3ac4e0b351969c9ff5ab8f58ec7ef - SHA512 15b7afc706fe50c55391846892961e3286165e43513009664cfca7c443f9f9eafa32e17e8ba8089a0ae2d568aab4117f7e5ff696052ee58f6da78e3d9ad7e721 + SHA512 52c6e390aa90190ca528716eaa164ae2d79dd3345372ccc263ad1cfd2f1f49edc67df6ac34f2b9847bc099a3188d7d7161d7038565aae008cc12da373b0fc3b2 HEAD_REF master PATCHES getpagesize.patch ) From 514e90fd1d4915ece88c17f8faa4f72aeaa229e9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 22:23:57 +0200 Subject: [PATCH 089/142] fix stuff --- ports/gainput/fix-build.patch | 6 +++-- ports/gainput/vcpkg.json | 10 ++++++-- ports/gtk/vcpkg.json | 40 +++++++++++++++++++++++++++++ ports/libxaw/portfile.cmake | 3 +++ ports/nmap/portfile.cmake | 48 +++++++++++++++++------------------ 5 files changed, 78 insertions(+), 29 deletions(-) diff --git a/ports/gainput/fix-build.patch b/ports/gainput/fix-build.patch index 912828713cfc0d..c6439bb3e60e14 100644 --- a/ports/gainput/fix-build.patch +++ b/ports/gainput/fix-build.patch @@ -5,7 +5,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index a443b66..61ff7b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,11 +9,11 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON) +@@ -9,11 +9,12 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON) option(GAINPUT_BUILD_SHARED "BUILD_SHARED" ON) option(GAINPUT_BUILD_STATIC "BUILD_STATIC" ON) @@ -13,7 +13,9 @@ index a443b66..61ff7b8 100644 +if(NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra") else() - set(XINPUT "Xinput9_1_0") ++ find_package(X11 COMPONENTS Xi) ++ set(XINPUT X11::Xi) +- set(XINPUT "Xinput9_1_0") - if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 ) + if ( 0 ) set(XINPUT, "xinput") diff --git a/ports/gainput/vcpkg.json b/ports/gainput/vcpkg.json index d0a92d94043751..bd84c845af1497 100644 --- a/ports/gainput/vcpkg.json +++ b/ports/gainput/vcpkg.json @@ -7,8 +7,14 @@ "license": "MIT", "supports": "!uwp", "dependencies": [ - "libx11", - "libxi", + { + "name": "libx11", + "platform": "linux" + }, + { + "name": "libxi", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 25158cf264f845..3d47963b36105b 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -39,10 +39,50 @@ }, "graphene", "libepoxy", + { + "name": "libx11", + "platform": "linux" + }, + { + "name": "libxcursor", + "platform": "linux" + }, + { + "name": "libxcursor", + "platform": "linux" + }, + { + "name": "libxdamage", + "platform": "linux" + }, + { + "name": "libxext", + "platform": "linux" + }, + { + "name": "libxfixes", + "platform": "linux" + }, + { + "name": "libxi", + "platform": "linux" + }, + { + "name": "libxinerama", + "platform": "linux" + }, + { + "name": "libxkbcommon", + "platform": "linux" + }, { "name": "libxrandr", "platform": "linux" }, + { + "name": "libxrender", + "platform": "linux" + }, "pango", { "name": "sassc", diff --git a/ports/libxaw/portfile.cmake b/ports/libxaw/portfile.cmake index e0e00819121afe..91769b6ceb05ce 100644 --- a/ports/libxaw/portfile.cmake +++ b/ports/libxaw/portfile.cmake @@ -2,6 +2,9 @@ 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_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_FIXUP_ELF_RPATH ON) + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index 33ab71032a94d8..3c60b71d465839 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -61,32 +61,30 @@ else() set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR}) message(STATUS "Building Options: ${OPTIONS}") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release) - # Since nmap makefile has strong relationshop with codes, copy codes to obj path - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - vcpkg_extract_source_archive(source_path_release - ARCHIVE "${ARCHIVE}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - ) + # Since nmap makefile has strong relationshop with codes, copy codes to obj path + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + vcpkg_extract_source_archive(source_path_release + ARCHIVE "${ARCHIVE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) - vcpkg_execute_required_process( - COMMAND "./configure" ${OPTIONS} - WORKING_DIRECTORY "${source_path_release}" - LOGNAME config-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND make - WORKING_DIRECTORY "${source_path_release}" - LOGNAME build-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel") - file(INSTALL "${source_path_release}/nmap" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") - endif() + vcpkg_execute_required_process( + COMMAND "./configure" ${OPTIONS} + WORKING_DIRECTORY "${source_path_release}" + LOGNAME config-${TARGET_TRIPLET}-rel + ) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND make + WORKING_DIRECTORY "${source_path_release}" + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + message(STATUS "Installing ${TARGET_TRIPLET}-rel") + file(INSTALL "${source_path_release}/nmap" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + + if (NOT VCPKG_BUILD_TYPE) # Since nmap makefile has strong relationshop with codes, copy codes to obj path message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") vcpkg_extract_source_archive(source_path_debug @@ -111,7 +109,7 @@ else() file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) endif() - set(SOURCE_PATH "${source_path_release}") ## TODO: vcpkg_configure_make? + set(SOURCE_PATH "${source_path_release}") endif() vcpkg_copy_pdbs() From 0ef6b0fcdfc40a31bbbd0b4ac744fd37420dff0d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:13:03 +0200 Subject: [PATCH 090/142] more fixes --- ports/azure-kinect-sensor-sdk/fix-builds.patch | 4 ++-- ports/qt5-wayland/vcpkg.json | 4 +++- scripts/cmake/vcpkg_configure_qmake.cmake | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 750667eef279b8..4aed5a2ed88611 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -26,8 +26,8 @@ index 4f002b5..d48f3f2 100644 +add_library(libjpeg-turbo::libjpeg-turbo UNKNOWN IMPORTED) +set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TURBOJPEG_INCLUDE_DIR}) +set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_RELEASE ${TURBOJPEG_LIBRARY_RELEASE}) -+if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") -+ find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED) ++find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++if(TURBOJPEG_LIBRARY_DEBUG) + set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_DEBUG ${TURBOJPEG_LIBRARY_DEBUG}) +endif() +find_package(Matroska CONFIG REQUIRED) diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 6049b0a23933f3..d19ee9fa723ab9 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -8,6 +8,8 @@ { "name": "qt5-base", "default-features": false - } + }, + "wayland", + "wayland-protocols" ] } diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 86678d29685757..f9e7d2c54191e2 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -108,6 +108,7 @@ function(vcpkg_configure_qmake) ${build_opt_param} WORKING_DIRECTORY "${current_binary_dir}" LOGNAME "config-${TARGET_TRIPLET}-rel" + SAVE_LOG_FILES config.log ) message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") if(EXISTS "${current_binary_dir}/config.log") @@ -152,6 +153,7 @@ function(vcpkg_configure_qmake) ${build_opt_param} WORKING_DIRECTORY "${current_binary_dir}" LOGNAME "config-${TARGET_TRIPLET}-dbg" + SAVE_LOG_FILES config.log ) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") if(EXISTS "${current_binary_dir}/config.log") From 0e9d2294c2ac50725abd1b6d006e794e269eca8d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:19:13 +0200 Subject: [PATCH 091/142] fix azure kinect single config build --- ports/azure-kinect-sensor-sdk/portfile.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 414b6775f0b42f..f3ab2e473f92f5 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -38,7 +38,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Avoid deleting debug/lib/cmake when fixing the first cmake -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) @@ -79,12 +81,16 @@ endif () if (VCPKG_TARGET_IS_LINUX) file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() else() file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + endif() endif() # Handle copyright From e2a71a4df0c8b20644330163b77b7cac7d827add Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:49:58 +0200 Subject: [PATCH 092/142] hdf5 stuff is fixed --- TODO.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/TODO.txt b/TODO.txt index e1f3b1121ba2fa..9d02f114f7a63c 100644 --- a/TODO.txt +++ b/TODO.txt @@ -42,17 +42,6 @@ spdk-ipsec: single config zeroc-ice: single config zopfli: single config -hdf5 issues: -cgns: h5diff ? -h5py-lzf: h5diff ? -highfive: h5diff ? -ismrmrd: h5diff ? -kealib: h5diff ? -matio: hdf5? -minc: hdf5 -netcdf-c: hdf5 -shogun: hdf5 - TODOS: libX11.a needs fixing of hardcoding absolute paths. libinput? From 57204e6abc3367d00b5a636d992739fda49a6d97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 22 Oct 2022 23:50:04 +0200 Subject: [PATCH 093/142] fix hash ? --- ports/xcb-util-wm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xcb-util-wm/portfile.cmake b/ports/xcb-util-wm/portfile.cmake index c097f2afc20e9e..24f30ce09486b0 100644 --- a/ports/xcb-util-wm/portfile.cmake +++ b/ports/xcb-util-wm/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxcb-wm REF 0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 #v 0.4.2 - SHA512 6af514465eaa98d5417de352bd3e4f3880180f886dc1202c64496cb5a07c82c377afeb9396acf57e20caa73e858fe7e6309f3ed7a74e88eb58e1da1f31ac0bd8 + SHA512 c8be48000ad2dbe5bd430241745edb16280c2d7e602872ed8e14e6245e64391cbf8f234a4d83aad65c96ec58c3b312f2fe7f0bf01cb82f46b3e50f2358b94741 HEAD_REF master PATCHES build.patch ) From 709499fa7ca6f86e2050712991a7ad627d5958a7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:25:27 +0200 Subject: [PATCH 094/142] add missing () --- ports/xcb/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xcb/vcpkg-cmake-wrapper.cmake b/ports/xcb/vcpkg-cmake-wrapper.cmake index 8582da34354c47..57c952493d308f 100644 --- a/ports/xcb/vcpkg-cmake-wrapper.cmake +++ b/ports/xcb/vcpkg-cmake-wrapper.cmake @@ -12,4 +12,4 @@ if(TARGET XCB::IMAGE) if(TARGET XCB::UTIL) target_link_libraries(XCB::IMAGE INTERFACE XCB::UTIL) endif() -endif \ No newline at end of file +endif() \ No newline at end of file From 7066e10168f02c111b0d756b59dd292b56168ee8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 09:02:11 +0200 Subject: [PATCH 095/142] try fxes? --- ports/qtshadertools/portfile.cmake | 1 + ports/raylib/portfile.cmake | 5 ----- ports/urho3d/portfile.cmake | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ports/qtshadertools/portfile.cmake b/ports/qtshadertools/portfile.cmake index 0311a481a014ff..c0013bf84e7c14 100644 --- a/ports/qtshadertools/portfile.cmake +++ b/ports/qtshadertools/portfile.cmake @@ -8,6 +8,7 @@ set(TOOL_NAMES qsb) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index f72ad51816469b..b9e31518cc4670 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -10,17 +10,12 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li ) endif() -if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) - set(patches fix-linkGlfw.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib REF bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa #v4.2.0 SHA512 f6b1738d96fef89059062f570f67aaa8b143ccfbee78abfe5fbb25083371a4c432f3d1d0d357e4b475b4b72a6db7823c2341b70ac947759603b033c2b0acec47 HEAD_REF master - PATCHES ${patches} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index 641dc3f8c879e0..4d03658b296789 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -30,7 +30,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_INCLUDE_PATH="${CURRENT_INSTALLED_DIR}/include" + "-DCMAKE_INCLUDE_PATH=${CURRENT_INSTALLED_DIR}/include" + "-DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include" ${FEATURE_OPTIONS} -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} -DURHO3D_PCH=OFF From 029dc9e81fb4b63a421e464f3ad069538f059562 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 09:51:00 +0200 Subject: [PATCH 096/142] fixup elf path ? --- ports/qtbase/cmake/qt_install_submodule.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index d5bd93f847d7a6..ae522caeb01317 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -53,6 +53,7 @@ endfunction() function(qt_cmake_configure) + set(VCPKG_FIXUP_ELF_RPATH ON) cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA;DISABLE_PARALLEL_CONFIGURE" "" "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_MAYBE_UNUSED") @@ -110,6 +111,7 @@ function(qt_cmake_configure) ${ninja_option} ${disable_parallel} OPTIONS + #-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt is annoying. -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. #-DQT_HOST_PATH= # For crosscompiling #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc From e9b7fa895856d51c6e5463a8bde9d3371bc76e7a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 11:38:31 +0200 Subject: [PATCH 097/142] fix typo --- ports/openxr-loader/fix-x11-include.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openxr-loader/fix-x11-include.patch b/ports/openxr-loader/fix-x11-include.patch index ed4b135c12cadb..d90fc78fa54403 100644 --- a/ports/openxr-loader/fix-x11-include.patch +++ b/ports/openxr-loader/fix-x11-include.patch @@ -8,7 +8,7 @@ index b02cd4f45..c6ad5cb7c 100644 set_target_properties(openxr_loader PROPERTIES SOVERSION "${MAJOR}" VERSION "${MAJOR}.${MINOR}.${PATCH}") - + if(BUILD_WITH_XLIB_HEADERS) -+ target_link_libraries(openxr_loader PRIVATE X11:X11) ++ target_link_libraries(openxr_loader PRIVATE X11::X11) + endif() add_custom_target( libopenxr_loader.so.${MAJOR}.${MINOR} ALL From 44d4e49afa77a33b8ada44bdeb3831423edb5ed2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 11:47:40 +0200 Subject: [PATCH 098/142] fix stuff --- ports/ogre/egl.patch | 13 +++++++++++++ ports/ogre/portfile.cmake | 1 + ports/ois/x11.patch | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/ogre/egl.patch diff --git a/ports/ogre/egl.patch b/ports/ogre/egl.patch new file mode 100644 index 00000000000000..a29c10c55b40d4 --- /dev/null +++ b/ports/ogre/egl.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/Packages/FindOpenGLES2.cmake b/CMake/Packages/FindOpenGLES2.cmake +index 1ad144d41..e417f8136 100644 +--- a/CMake/Packages/FindOpenGLES2.cmake ++++ b/CMake/Packages/FindOpenGLES2.cmake +@@ -84,7 +84,7 @@ IF(OPENGLES2_gl_LIBRARY) + ENDIF(OPENGLES2_gl_LIBRARY) + + IF(OPENGL_egl_LIBRARY) +- SET( EGL_LIBRARIES ${OPENGL_egl_LIBRARY}) ++ SET( EGL_LIBRARIES OpenGL::EGL) + SET( EGL_FOUND TRUE ) + ELSEIF(EGL_egl_LIBRARY) + SET( EGL_LIBRARIES ${EGL_egl_LIBRARY}) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 40b143fbf5bf70..7a719b3f84647a 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( cfg-rel-paths.patch swig-python-polyfill.patch pkgconfig.patch + egl.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ois/x11.patch b/ports/ois/x11.patch index 04fe1666927001..53ef42f7d613d8 100644 --- a/ports/ois/x11.patch +++ b/ports/ois/x11.patch @@ -9,7 +9,7 @@ index f65b86000..fece41e9c 100644 - add_dependencies(OIS X11) - target_link_libraries(OIS X11) + find_package(X11) -+ target_link_libraries(OIS X11::X11) ++ target_link_libraries(OIS X11::X11 dl) + set(OIS_REQUIRES x11) endif() From ce56060611e1858dca544f34621cb6ee85998e44 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 11:49:49 +0200 Subject: [PATCH 099/142] add -ldl --- ports/minifb/x11.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/minifb/x11.patch b/ports/minifb/x11.patch index 9b5beabfe77b11..9c74d8db1079c6 100644 --- a/ports/minifb/x11.patch +++ b/ports/minifb/x11.patch @@ -8,16 +8,16 @@ index 03b5e5994..192720fac 100644 else() - target_link_libraries(noise -lX11) + find_package(X11 REQUIRED) -+ target_link_libraries(noise X11::X11) ++ target_link_libraries(noise X11::X11 -ldl) - target_link_libraries(input_events -lX11) - target_link_libraries(input_events_cpp -lX11) -+ target_link_libraries(input_events X11::X11) -+ target_link_libraries(input_events_cpp X11::X11) ++ target_link_libraries(input_events X11::X11 -ldl) ++ target_link_libraries(input_events_cpp X11::X11 -ldl) - target_link_libraries(multiple_windows -lX11) -+ target_link_libraries(multiple_windows X11::X11) -+ target_link_libraries(minifb X11::X11) ++ target_link_libraries(multiple_windows X11::X11 -ldl) ++ target_link_libraries(minifb X11::X11 -ldl) endif() endif() From 2c19cba35e11827f5655ccf93f40a8ae9985819b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 12:21:09 +0200 Subject: [PATCH 100/142] fix stuff. --- ports/libdrm/portfile.cmake | 2 +- ports/wayland/portfile.cmake | 2 +- ports/wayland/vcpkg.json | 2 +- triplets/x64-linux.cmake | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index 04d5023dd6e02b..e7a7e2e8136ace 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT X_VCPKG_FORCE_VCPKG_DRM_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_DRM_LIBRARIES in your triplet") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) else() diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake index effb14119101e2..b0fe942136fbae 100644 --- a/ports/wayland/portfile.cmake +++ b/ports/wayland/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO wayland/wayland - REF e60398b1755bfcdf09f040d3769131fe0d9762fc #1.19.0 + REF 8135e856ebd79872f886466e9cee39affb7d9ee8 SHA512 f2f7dd9ff71e99cf3621ab45160f59b679de763e3fdef6fcef7e14947ad43ed7a86845a213c75bb7117fdda11a51035566225a12d3eb33e8c3fe2e4456eb801d HEAD_REF master PATCHES tests.patch diff --git a/ports/wayland/vcpkg.json b/ports/wayland/vcpkg.json index 2cb6f90cac82cd..314f1cf1587a22 100644 --- 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/triplets/x64-linux.cmake b/triplets/x64-linux.cmake index 6003276973e31a..869d8db51f1961 100644 --- a/triplets/x64-linux.cmake +++ b/triplets/x64-linux.cmake @@ -5,4 +5,6 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) # save time by only building release libs -set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON) \ No newline at end of file +set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON) +set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON) +set(X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES ON) \ No newline at end of file From 9e0830bca2ccac049c25c898965ac3700074025a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 21:31:35 +0200 Subject: [PATCH 101/142] activate mesa. try to debug qsb issue. --- ports/libdrm/portfile.cmake | 6 +++--- ports/libdrm/vcpkg.json | 2 +- ports/libx11/vcpkg-cmake-wrapper.cmake | 7 +++++-- ports/mesa/portfile.cmake | 16 +++++++++++++-- ports/mesa/vcpkg.json | 28 +++++++++++++++++++++++++- ports/minifb/x11.patch | 8 ++++---- ports/qtdeclarative/portfile.cmake | 2 ++ scripts/ci.baseline.txt | 3 --- 8 files changed, 56 insertions(+), 16 deletions(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index e7a7e2e8136ace..3942f5c60a3d1f 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -7,9 +7,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/drm - REF d76c387125c7ad336f39121b9c3148361731bdad #v2.4.108 - SHA512 cefa58f0f04d96c3b9c4540ab94863c0781d46e7ef0e23a03b35d4e4033231a79f692eb601bbbba730f731a629336484df5d39c8dc0e4550e3db1634f4c2dbf2 - HEAD_REF master # branch name + REF fb5c0c301aa9b6d984ffee522775ca19ea7c7be6 + SHA512 1df9b6e965d276066bbd3a0d733b17bdc86ba47c0bbe3fe247f569fe0e81e2901fb167920d22169b91ada87d0c1c54e3261e891328fb8bc22f780024185322d1 + HEAD_REF master ) vcpkg_configure_meson( diff --git a/ports/libdrm/vcpkg.json b/ports/libdrm/vcpkg.json index c69458ede4370f..55a5b4adf42612 100644 --- a/ports/libdrm/vcpkg.json +++ b/ports/libdrm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdrm", - "version": "2.4.108", + "version": "2.4.113", "description": "Direct Rendering Manager library and headers", "homepage": "https://gitlab.freedesktop.org/mesa/drm", "license": null, diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake index e3f1998c968314..4dcbf13d7bd644 100644 --- a/ports/libx11/vcpkg-cmake-wrapper.cmake +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,9 @@ _find_package(${ARGS}) -if(TARGET X11::X11 AND TARGET X11::xcb) - target_link_libraries(X11::X11 INTERFACE X11::xcb) +if(TARGET X11::X11) + target_link_libraries(X11::X11 INTERFACE ${CMAKE_DL_LIBS}) + if(TARGET X11::xcb) + target_link_libraries(X11::X11 INTERFACE X11::xcb) + endif() endif() if(TARGET X11::xcb) if(TARGET X11::Xdmcp) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 1e29f998da8bba..ce65b1c56bff4c 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -58,8 +58,8 @@ list(APPEND MESA_OPTIONS -Dshared-llvm=auto) list(APPEND MESA_OPTIONS -Dlibunwind=disabled) list(APPEND MESA_OPTIONS -Dlmsensors=disabled) list(APPEND MESA_OPTIONS -Dvalgrind=disabled) -list(APPEND MESA_OPTIONS -Dglvnd=false) -list(APPEND MESA_OPTIONS -Dglx=disabled) + + list(APPEND MESA_OPTIONS -Dgbm=disabled) if("offscreen" IN_LIST FEATURES) @@ -94,6 +94,18 @@ if("egl" IN_LIST FEATURES) # EGL feature only works on Linux else() list(APPEND MESA_OPTIONS -Degl=disabled) endif() +if("glx" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dglx=dri) +else() + list(APPEND MESA_OPTIONS -Dglx=disabled) +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND MESA_OPTIONS -Dglvnd=true) + list(APPEND MESA_OPTIONS #-Degl-lib-suffix=_mesa + -Dgles-lib-suffix=_mesa) + +endif() list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2 diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 4fd11853b2ada0..060a3149d3c997 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -15,7 +15,15 @@ "host": true }, "zlib", - "zstd" + "zstd", + { + "name": "libxshmfence", + "platform": "!windows" + }, + { + "name": "libxrandr", + "platform": "!windows" + } ], "default-features": [ "default-features" @@ -64,6 +72,15 @@ } ] }, + "glx": { + "description": "Build support for GLX platform", + "dependencies": [ + "libx11", + "libxext", + "libxfixes", + "libxxf86vm" + ] + }, "gles1": { "description": "Build support for OpenGL ES 1.x", "dependencies": [ @@ -116,6 +133,15 @@ "target-x86" ], "platform": "x64 | x86" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "libclc", + "target-amdgpu" + ], + "platform": "!windows" } ] }, diff --git a/ports/minifb/x11.patch b/ports/minifb/x11.patch index 9c74d8db1079c6..1a157858328619 100644 --- a/ports/minifb/x11.patch +++ b/ports/minifb/x11.patch @@ -8,15 +8,15 @@ index 03b5e5994..192720fac 100644 else() - target_link_libraries(noise -lX11) + find_package(X11 REQUIRED) -+ target_link_libraries(noise X11::X11 -ldl) ++ target_link_libraries(noise X11::X11 ${CMAKE_DL_LIBS}) - target_link_libraries(input_events -lX11) - target_link_libraries(input_events_cpp -lX11) -+ target_link_libraries(input_events X11::X11 -ldl) -+ target_link_libraries(input_events_cpp X11::X11 -ldl) ++ target_link_libraries(input_events X11::X11 ${CMAKE_DL_LIBS}) ++ target_link_libraries(input_events_cpp X11::X11 ${CMAKE_DL_LIBS}) - target_link_libraries(multiple_windows -lX11) -+ target_link_libraries(multiple_windows X11::X11 -ldl) ++ target_link_libraries(multiple_windows X11::X11 ${CMAKE_DL_LIBS}) + target_link_libraries(minifb X11::X11 -ldl) endif() endif() diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 9589d6284b0e81..1e5883043cd882 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -19,6 +19,8 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") qmltc ) +set(ENV{LD_DEBUG} all) +file(INSTALL "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qsb" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME qsb.log) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a1e9c98fced949..e025106eada28f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -592,9 +592,6 @@ mecab:x64-windows-static-md=skip mecab:x86-windows = skip # Due to static crt. mesa:x64-windows-static=fail -# Missing dependent libraries. -mesa:x64-linux=fail -mesa:x64-osx=fail mfl:x64-linux=skip mfl:x64-osx=skip mfl:arm64-osx=skip From f347fbd35531fc3eb0a872b2e888a245cbc66e6a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 22:23:56 +0200 Subject: [PATCH 102/142] bump wyland fix mesa --- ports/mesa/portfile.cmake | 3 ++- ports/mesa/vcpkg.json | 12 ++++++++++++ ports/wayland-protocols/portfile.cmake | 19 ++++++------------- ports/wayland-protocols/vcpkg.json | 2 +- ports/wayland/portfile.cmake | 5 +++-- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index ce65b1c56bff4c..c78c294c834c86 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -103,7 +103,8 @@ endif() if(NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dglvnd=true) list(APPEND MESA_OPTIONS #-Degl-lib-suffix=_mesa - -Dgles-lib-suffix=_mesa) + -Dgles-lib-suffix=_mesa + -Dshared-llvm=disabled) endif() diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 060a3149d3c997..3e553cade9af9a 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -23,6 +23,18 @@ { "name": "libxrandr", "platform": "!windows" + }, + { + "name": "elfutils", + "platform": "!windows" + }, + { + "name": "wayland", + "platform": "!windows" + }, + { + "name": "wayland-protocols", + "platform": "!windows" } ], "default-features": [ diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake index 402c598562427d..c31377fd1d7396 100644 --- 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 index b85b39d12f87c2..14c085793c4eb5 100644 --- 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 index b0fe942136fbae..ef950d76094758 100644 --- a/ports/wayland/portfile.cmake +++ b/ports/wayland/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO wayland/wayland REF 8135e856ebd79872f886466e9cee39affb7d9ee8 - SHA512 f2f7dd9ff71e99cf3621ab45160f59b679de763e3fdef6fcef7e14947ad43ed7a86845a213c75bb7117fdda11a51035566225a12d3eb33e8c3fe2e4456eb801d + SHA512 c4115187826083e5f01a24dad0c4377458b7ca22973ea161ec9d4aeeb21869bdb9acd7ba7e89aba964571ce2fde319cb01808e94e502ff09061bf5fbd3a60079 HEAD_REF master - PATCHES tests.patch + PATCHES #tests.patch ) vcpkg_configure_meson( @@ -18,6 +18,7 @@ vcpkg_configure_meson( OPTIONS -Ddtd_validation=false -Ddocumentation=false -Dtests=false + -Dscanner=true ) vcpkg_install_meson() From a1df1abdc1876da059a47194b1b7633185612bf3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 22:58:33 +0200 Subject: [PATCH 103/142] fix details --- ports/libdrm/portfile.cmake | 2 +- ports/mesa/portfile.cmake | 3 ++- ports/mesa/vcpkg.json | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake index 3942f5c60a3d1f..45d192442a9e62 100644 --- a/ports/libdrm/portfile.cmake +++ b/ports/libdrm/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_gitlab( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -Dvalgrind=disabled ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index c78c294c834c86..9893a0a04ad9eb 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -104,7 +104,8 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dglvnd=true) list(APPEND MESA_OPTIONS #-Degl-lib-suffix=_mesa -Dgles-lib-suffix=_mesa - -Dshared-llvm=disabled) + -Dshared-llvm=disabled + -Dvalgrind=disabled) endif() diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 3e553cade9af9a..447ade9763d547 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -35,6 +35,10 @@ { "name": "wayland-protocols", "platform": "!windows" + }, + { + "name": "libdrm", + "platform": "!windows" } ], "default-features": [ From 5d9955775c77e54246343591db36d62724b0f9f2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 23 Oct 2022 23:33:09 +0200 Subject: [PATCH 104/142] add missing dep --- ports/mesa/vcpkg.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 447ade9763d547..cfd72d7bb219a7 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -39,6 +39,10 @@ { "name": "libdrm", "platform": "!windows" + }, + { + "name": "libglvnd", + "platform": "!windows" } ], "default-features": [ From ec011e6c91e4dc59848135709470ec12e695aabb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 00:14:41 +0200 Subject: [PATCH 105/142] rpath fixup ? --- ports/qtshadertools/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qtshadertools/portfile.cmake b/ports/qtshadertools/portfile.cmake index c0013bf84e7c14..2e59e428234891 100644 --- a/ports/qtshadertools/portfile.cmake +++ b/ports/qtshadertools/portfile.cmake @@ -4,6 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) set(TOOL_NAMES qsb) +set(VCPKG_FIXUP_ELF_RPATH ON) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} From 3404ac060971771c92992d1e276b8cf8918438a3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:00:44 +0200 Subject: [PATCH 106/142] rpath stuff --- scripts/cmake/z_vcpkg_fixup_rpath.cmake | 5 +++++ scripts/ports.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/z_vcpkg_fixup_rpath.cmake b/scripts/cmake/z_vcpkg_fixup_rpath.cmake index c61bda5a5dedbb..0924d705f411bb 100644 --- a/scripts/cmake/z_vcpkg_fixup_rpath.cmake +++ b/scripts/cmake/z_vcpkg_fixup_rpath.cmake @@ -33,6 +33,11 @@ function(z_vcpkg_fixup_rpath_in_dir) set(current_prefix "${CURRENT_PACKAGES_DIR}/debug") endif() + # TODO: Read out current rpath + # - nuke out any vcpkg related paths + # - remove just $ORIGIN paths (because we add them any way) + # - prepend our paths + # compute path relative to lib file(RELATIVE_PATH relative_to_lib "${elf_file_dir}" "${current_prefix}/lib") if(relative_to_lib STREQUAL "") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 4c3b9304b3d493..d522fceb2262b3 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -146,7 +146,7 @@ if(CMD STREQUAL "BUILD") include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) - if(VCPKG_FIXUP_ELF_RPATH) + if(NOT DEFINED VCPKG_FIXUP_ELF_RPATH OR VCPKG_FIXUP_ELF_RPATH) include("${SCRIPTS}/cmake/z_vcpkg_fixup_rpath.cmake") endif() include("${SCRIPTS}/build_info.cmake") From 696ba5aa528888f8f81601cad29aa565f8cbbc6a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:26:16 +0200 Subject: [PATCH 107/142] wayland refines --- ports/wayland/portfile.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake index ef950d76094758..3650299ffbff3c 100644 --- a/ports/wayland/portfile.cmake +++ b/ports/wayland/portfile.cmake @@ -10,15 +10,20 @@ vcpkg_from_gitlab( 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 - -Dscanner=true + ${OPTIONS} ) vcpkg_install_meson() From b38e4bccc2414460710117137423682c4d3a466f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:28:20 +0200 Subject: [PATCH 108/142] fix qt5-wayland --- ports/qt5-wayland/portfile.cmake | 5 ++++- ports/qt5-wayland/vcpkg.json | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake index 42560f179f777b..d4ee05e9253cc6 100644 --- a/ports/qt5-wayland/portfile.cmake +++ b/ports/qt5-wayland/portfile.cmake @@ -4,5 +4,8 @@ message(WARNING "This port is just a placeholder until the required wayland libr message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with sudo apt install libwayland-dev on Ubuntu systems.") -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/wayland") + +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") qt_submodule_installation() diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index d19ee9fa723ab9..1bd7f58b7561b6 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -3,13 +3,17 @@ "version": "5.15.6", "description": "Qt5 wayland Module;", "license": null, - "supports": "linux", + "supports": "!windows", "dependencies": [ { "name": "qt5-base", "default-features": false }, "wayland", + { + "name": "wayland", + "host": true + }, "wayland-protocols" ] } From c522229e941d743a281a9f8e30d882d149e49abe Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:29:32 +0200 Subject: [PATCH 109/142] get trace --- ports/qtapplicationmanager/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 2193463a91e755..54288af19eca72 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -25,6 +25,7 @@ set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS + --trace-expand -DINPUT_libarchive=system -DINPUT_libyaml=system -DFEATURE_am_system_libyaml=ON From c06475203b8b905963eef745a91b97d6f0bd7231 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:49:44 +0200 Subject: [PATCH 110/142] fix gaininput --- ports/gainput/fix_x11.patch | 19 +++++++++++++++++++ ports/gainput/portfile.cmake | 1 + 2 files changed, 20 insertions(+) create mode 100644 ports/gainput/fix_x11.patch diff --git a/ports/gainput/fix_x11.patch b/ports/gainput/fix_x11.patch new file mode 100644 index 00000000000000..8717e21c1cff26 --- /dev/null +++ b/ports/gainput/fix_x11.patch @@ -0,0 +1,19 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a6ae3d931..4c5639d28 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -71,6 +71,14 @@ elseif(APPLE) + target_link_libraries(gainput ${APPKIT}) + endif() + endif() ++elseif(UNIX) ++ find_package(X11 REQUIRED) ++ if (GAINPUT_BUILD_SHARED) ++ target_link_libraries(gainput X11::X11 ${XINPUT}) ++ endif(GAINPUT_BUILD_SHARED) ++ if(GAINPUT_BUILD_STATIC) ++ target_link_libraries(gainputstatic X11::X11 ${XINPUT}) ++ endif(GAINPUT_BUILD_STATIC) + endif() + + # Library installation directory diff --git a/ports/gainput/portfile.cmake b/ports/gainput/portfile.cmake index 33814724920d3e..398062db836af7 100644 --- a/ports/gainput/portfile.cmake +++ b/ports/gainput/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES install_as_cmake_package.patch fix-build.patch + fix_x11.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GAINPUT_BUILD_STATIC) From 9258d976f6380c2b049d3e79bc576bdb98ff0932 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:04:20 +0200 Subject: [PATCH 111/142] ogre fix --- ports/ogre/portfile.cmake | 1 + ports/ogre/x11.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 ports/ogre/x11.patch diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 7a719b3f84647a..ba14c40c929f4b 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( swig-python-polyfill.patch pkgconfig.patch egl.patch + x11.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/x11.patch b/ports/ogre/x11.patch new file mode 100644 index 00000000000000..49913bacca9913 --- /dev/null +++ b/ports/ogre/x11.patch @@ -0,0 +1,22 @@ +diff --git a/RenderSystems/GLSupport/src/X11/OgreX11.h b/RenderSystems/GLSupport/src/X11/OgreX11.h +index 2e4c7bee2..0fbc9a74d 100644 +--- a/RenderSystems/GLSupport/src/X11/OgreX11.h ++++ b/RenderSystems/GLSupport/src/X11/OgreX11.h +@@ -9,13 +9,13 @@ + #include + #include + +-#ifndef Status +-#define Status int +-#endif +- + #include + #include + ++#if !defined(Status) ++typedef int Status ++#endif ++ + namespace Ogre + { + Display* getXDisplay(Display* glDisplay, Atom& deleteWindow, Atom& fullScreen, Atom& state); From 7e3e9315af57e26e7367df7e34fb5a4be66b9b9d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:07:49 +0200 Subject: [PATCH 112/142] fix typo in patch --- ports/ogre/x11.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ogre/x11.patch b/ports/ogre/x11.patch index 49913bacca9913..8967bb4a077a02 100644 --- a/ports/ogre/x11.patch +++ b/ports/ogre/x11.patch @@ -14,7 +14,7 @@ index 2e4c7bee2..0fbc9a74d 100644 #include +#if !defined(Status) -+typedef int Status ++typedef int Status; +#endif + namespace Ogre From 093fb91286f33bc66629d76fd00695ab940b973a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:07:55 +0200 Subject: [PATCH 113/142] cleanup mesa --- ports/mesa/portfile.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 9893a0a04ad9eb..d61c3f237a57bb 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -70,6 +70,12 @@ endif() if("llvm" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dllvm=enabled) + find_library(LLVMCore_LIBRARY NAMES LLVMCore PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + if(LLVMCore_LIBRARY MATCHES ".so|.dll") + list(APPEND MESA_OPTIONS -Dshared-llvm=enabled) + else() + list(APPEND MESA_OPTIONS -Dshared-llvm=disabled) + endif() else() list(APPEND MESA_OPTIONS -Dllvm=disabled) endif() @@ -100,15 +106,12 @@ else() list(APPEND MESA_OPTIONS -Dglx=disabled) endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) +if("egl" IN_LIST FEATURES OR "glx" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dglvnd=true) - list(APPEND MESA_OPTIONS #-Degl-lib-suffix=_mesa - -Dgles-lib-suffix=_mesa - -Dshared-llvm=disabled - -Dvalgrind=disabled) - + list(APPEND MESA_OPTIONS -Dgles-lib-suffix=_mesa) endif() + list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2 if(VCPKG_TARGET_IS_WINDOWS) From 37649853f0855f922ef804293991aa1569098dd1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:07:42 +0200 Subject: [PATCH 114/142] fix allegro5 --- ports/allegro5/cmake-project-include.cmake | 2 + ports/allegro5/portfile.cmake | 1 + ports/allegro5/x11.patch | 107 +++++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 ports/allegro5/x11.patch diff --git a/ports/allegro5/cmake-project-include.cmake b/ports/allegro5/cmake-project-include.cmake index 4c1beb129bc550..4a99be849e480c 100644 --- a/ports/allegro5/cmake-project-include.cmake +++ b/ports/allegro5/cmake-project-include.cmake @@ -1,3 +1,5 @@ if(MSVC AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") add_compile_options(/Gy) endif() +set(CMAKE_REQUIRED_INCLUDES "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") +list(APPEND CMAKE_INCLUDE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") \ No newline at end of file diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index b9521f48df44c0..0b7f16388fc321 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( do-not-copy-pdbs-to-lib.patch export-targets.patch msvc-arm64-atomic.patch + x11.patch ) diff --git a/ports/allegro5/x11.patch b/ports/allegro5/x11.patch new file mode 100644 index 00000000000000..621194fee11c2c --- /dev/null +++ b/ports/allegro5/x11.patch @@ -0,0 +1,107 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8af71b169..0a1b9fbf4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -723,70 +723,79 @@ if(SUPPORT_X11) + message(FATAL_ERROR "X11 support currently requires GLX (set OPENGL_glx_LIBRARY and OpenGL_GLX_FOUND).") + endif() + +- check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR) ++ if(TARGET X11::Xcursor) ++ set(CAN_XCURSOR ON) ++ endif() + if(CAN_XCURSOR) + set(ALLEGRO_XWINDOWS_WITH_XCURSOR 1) +- find_library(XCURSOR_LIB "Xcursor") ++ set(XCURSOR_LIB "X11::Xcursor") + list(APPEND X11_LIBRARIES "${XCURSOR_LIB}") + else(CAN_XCURSOR) + message(FATAL_ERROR "X11 support requires Xcursor library.") + endif(CAN_XCURSOR) + +- check_library_exists(Xpm XpmCreatePixmapFromData "" CAN_XPM) ++ if(TARGET X11::Xpm) ++ set(CAN_XPM ON) ++ endif() + if(CAN_XPM) + set(ALLEGRO_XWINDOWS_WITH_XPM 1) +- find_library(XPM_LIB "Xpm") ++ set(XPM_LIB "X11::Xpm") + list(APPEND X11_LIBRARIES "${XPM_LIB}") + endif(CAN_XPM) + +- check_include_file("X11/extensions/XInput2.h" CAN_XINPUT2) +- run_c_compile_test(" +- #include +- int main(void) { (void)XI_TouchBegin; return 0; }" +- XINPUT2_COMPILES +- ) ++ if(TARGET X11::Xi) ++ set(CAN_XINPUT2 ON) ++ endif() + if(CAN_XINPUT2 AND XINPUT2_COMPILES) +- list(APPEND X11_LIBRARIES "Xi") ++ list(APPEND X11_LIBRARIES "X11:Xi") + set(ALLEGRO_XWINDOWS_WITH_XINPUT2 1) + else() + message("XInput2 library version 2.2 or higher not found, disabling touch support.") + endif() + + if(WANT_X11_XF86VIDMODE) +- check_include_file("X11/extensions/xf86vmode.h" HAVE_XF86VIDMODE_H) +- check_library_exists(Xxf86vm XF86VidModeQueryExtension "" CAN_XF86VIDMODE) ++ if(TARGET X11::Xxf86vm) ++ set(CAN_XF86VIDMODE ON) ++ set(HAVE_XF86VIDMODE_H ON) ++ endif() + if(CAN_XF86VIDMODE AND HAVE_XF86VIDMODE_H) + set(ALLEGRO_XWINDOWS_WITH_XF86VIDMODE 1) +- list(APPEND X11_LIBRARIES "Xxf86vm") ++ list(APPEND X11_LIBRARIES "X11::Xxf86vm") + endif() + endif(WANT_X11_XF86VIDMODE) + + if(WANT_X11_XINERAMA) +- check_include_file("X11/extensions/Xinerama.h" HAVE_XINERAMA_H) +- check_library_exists(Xinerama XineramaQueryExtension "" CAN_XINERAMA) ++ if(TARGET X11::Xinerama) ++ set(CAN_XINERAMA ON) ++ set(HAVE_XINERAMA_H ON) ++ endif() + if(CAN_XINERAMA AND HAVE_XINERAMA_H) + set(ALLEGRO_XWINDOWS_WITH_XINERAMA 1) +- find_library(XINERAMA_LIB "Xinerama") ++ set(XINERAMA_LIB "X11::Xinerama") + list(APPEND X11_LIBRARIES "${XINERAMA_LIB}") + endif() + endif(WANT_X11_XINERAMA) + + if(WANT_X11_XRANDR) +- check_include_file("X11/extensions/Xrandr.h" HAVE_XRANDR_H) +- check_library_exists(Xrandr XRRQueryExtension "" CAN_XRANDR) ++ if(TARGET X11::Xinerama) ++ set(CAN_XRANDR ON) ++ set(HAVE_XRANDR_H ON) ++ endif() + if(CAN_XRANDR AND HAVE_XRANDR_H) + set(ALLEGRO_XWINDOWS_WITH_XRANDR 1) +- find_library(XRANDR_LIB "Xrandr") ++ set(XRANDR_LIB "X11::Xrandr") + list(APPEND X11_LIBRARIES "${XRANDR_LIB}") + endif() + endif(WANT_X11_XRANDR) + + if(WANT_X11_XSCREENSAVER) +- check_include_file("X11/extensions/scrnsaver.h" HAVE_XSCREENSAVER_H) +- check_library_exists(Xss XScreenSaverQueryExtension "" CAN_XSCREENSAVER) ++ if(TARGET X11::Xss) ++ set(CAN_XSCREENSAVER ON) ++ set(HAVE_XSCREENSAVER_H ON) ++ endif() + if(CAN_XSCREENSAVER AND HAVE_XSCREENSAVER_H) + set(ALLEGRO_XWINDOWS_WITH_XSCREENSAVER 1) +- find_library(XSCREENSAVER_LIB "Xss") ++ set(XSCREENSAVER_LIB "X11::Xss") + list(APPEND X11_LIBRARIES "${XSCREENSAVER_LIB}") + endif() + endif(WANT_X11_XSCREENSAVER) From 0e2451f8aebd292cafc965192081e409fa174a0b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:27:35 +0200 Subject: [PATCH 115/142] fix skia --- ports/skia/portfile.cmake | 2 ++ ports/skia/vcpkg.json | 1 + 2 files changed, 3 insertions(+) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 6d7fa3eefcb529..26c7ccbdd58f77 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -108,6 +108,8 @@ function(replace_skia_dep NAME INCLUDES LIBS_DBG LIBS_REL DEFINITIONS) if(NOT VCPKG_BUILD_TYPE) find_libraries(_LIBS_DBG "${LIBS_DBG}" "${CURRENT_INSTALLED_DIR}/debug/lib") cmake_to_gn_list(_LIBS_DBG "${_LIBS_DBG}") + else() + set(_LIBS_DBG "[]") endif() find_libraries(_LIBS_REL "${LIBS_REL}" "${CURRENT_INSTALLED_DIR}/lib") diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index aedf114f3666ba..4bee6c324f5835 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -44,6 +44,7 @@ }, "gl": { "description": "OpenGL support for skia" + "dependencies" : [ "opengl"] }, "metal": { "description": "Metal support for skia" From 7c9dac451f41eb0cf2f50fc540973deff43af9c8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:42:37 +0200 Subject: [PATCH 116/142] fix typo and missing dep --- ports/skia/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 4bee6c324f5835..ce645937e4645c 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -43,7 +43,7 @@ "description": "Direct3D support for skia" }, "gl": { - "description": "OpenGL support for skia" + "description": "OpenGL support for skia", "dependencies" : [ "opengl"] }, "metal": { From d114d7a29132e0e579b42e5baab8d97e98de056e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:44:15 +0200 Subject: [PATCH 117/142] format manifest --- ports/mesa/vcpkg.json | 60 +++++++++++++++++++++---------------------- ports/skia/vcpkg.json | 4 ++- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index cfd72d7bb219a7..9e8e707757096d 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -7,17 +7,15 @@ "supports": "!(windows & arm)", "dependencies": [ { - "name": "vcpkg-get-python-packages", - "host": true + "name": "elfutils", + "platform": "!windows" }, { - "name": "vcpkg-tool-meson", - "host": true + "name": "libdrm", + "platform": "!windows" }, - "zlib", - "zstd", { - "name": "libxshmfence", + "name": "libglvnd", "platform": "!windows" }, { @@ -25,25 +23,27 @@ "platform": "!windows" }, { - "name": "elfutils", + "name": "libxshmfence", "platform": "!windows" }, { - "name": "wayland", - "platform": "!windows" + "name": "vcpkg-get-python-packages", + "host": true }, { - "name": "wayland-protocols", - "platform": "!windows" + "name": "vcpkg-tool-meson", + "host": true }, - { - "name": "libdrm", + { + "name": "wayland", "platform": "!windows" }, { - "name": "libglvnd", + "name": "wayland-protocols", "platform": "!windows" - } + }, + "zlib", + "zstd" ], "default-features": [ "default-features" @@ -92,15 +92,6 @@ } ] }, - "glx": { - "description": "Build support for GLX platform", - "dependencies": [ - "libx11", - "libxext", - "libxfixes", - "libxxf86vm" - ] - }, "gles1": { "description": "Build support for OpenGL ES 1.x", "dependencies": [ @@ -119,6 +110,15 @@ } ] }, + "glx": { + "description": "Build support for GLX platform", + "dependencies": [ + "libx11", + "libxext", + "libxfixes", + "libxxf86vm" + ] + }, "llvm": { "description": "Build with llvmpipe", "dependencies": [ @@ -150,18 +150,18 @@ "name": "llvm", "default-features": false, "features": [ - "target-x86" + "libclc", + "target-amdgpu" ], - "platform": "x64 | x86" + "platform": "!windows" }, { "name": "llvm", "default-features": false, "features": [ - "libclc", - "target-amdgpu" + "target-x86" ], - "platform": "!windows" + "platform": "x64 | x86" } ] }, diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index ce645937e4645c..640091c8a0a56b 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -44,7 +44,9 @@ }, "gl": { "description": "OpenGL support for skia", - "dependencies" : [ "opengl"] + "dependencies": [ + "opengl" + ] }, "metal": { "description": "Metal support for skia" From 254f819c34e90d2934fde18d0e6599e0eeba3f10 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:07:30 +0200 Subject: [PATCH 118/142] fix skia builds --- ports/skia/portfile.cmake | 46 +++++++++++++++++++-------------------- ports/skia/vcpkg.json | 4 ++++ 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 26c7ccbdd58f77..c37e893fb778d8 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -281,38 +281,38 @@ endif() if("gl" IN_LIST FEATURES) string(APPEND OPTIONS " skia_use_gl=true") list(APPEND SKIA_PUBLIC_DEFINITIONS SK_GL) + string(APPEND VCPKG_C_FLAGS " -I${CURRENT_INSTALLED_DIR}/include") + string(APPEND VCPKG_CXX_FLAGS " -I${CURRENT_INSTALLED_DIR}/include") endif() set(OPTIONS_DBG "${OPTIONS} is_debug=true") set(OPTIONS_REL "${OPTIONS} is_official_build=true") -if(CMAKE_HOST_WIN32) - # Load toolchains - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - - # turn a space delimited string into a gn list: - # "a b c" -> ["a","b","c"] - function(to_gn_list OUTPUT_ INPUT_) - string(STRIP "${INPUT_}" TEMP) - string(REPLACE " " " " TEMP "${TEMP}") - string(REPLACE " " "\",\"" TEMP "${TEMP}") - set(${OUTPUT_} "[\"${TEMP}\"]" PARENT_SCOPE) - endfunction() +# Load toolchains +vcpkg_cmake_get_vars(vars_file) +include(${vars_file}) + +# turn a space delimited string into a gn list: +# "a b c" -> ["a","b","c"] +function(to_gn_list OUTPUT_ INPUT_) + string(STRIP "${INPUT_}" TEMP) + string(REPLACE " " " " TEMP "${TEMP}") + string(REPLACE " " "\",\"" TEMP "${TEMP}") + set(${OUTPUT_} "[\"${TEMP}\"]" PARENT_SCOPE) +endfunction() - to_gn_list(SKIA_C_FLAGS_DBG "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") - to_gn_list(SKIA_C_FLAGS_REL "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") +to_gn_list(SKIA_C_FLAGS_DBG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") +to_gn_list(SKIA_C_FLAGS_REL "${VCPKG_COMBINED_C_FLAGS_RELEASE}") - to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") +to_gn_list(SKIA_CXX_FLAGS_DBG "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") +to_gn_list(SKIA_CXX_FLAGS_REL "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") - string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ - extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") - string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ - extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") +string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") +string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") +if(VCPKG_TARGET_IS_WINDOWS) set(WIN_VC "$ENV{VCINSTALLDIR}") string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}") string(APPEND OPTIONS_DBG " win_vc=\"${WIN_VC}\"") diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 640091c8a0a56b..c83644ee1d0447 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -26,6 +26,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, { "name": "vcpkg-tool-gn", "host": true From bb6dd026a58caba62085c5e04d289101e50a1e72 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:11:52 +0200 Subject: [PATCH 119/142] cleanup todo --- TODO.txt | 50 +++++++++----------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/TODO.txt b/TODO.txt index 9d02f114f7a63c..82936287a13376 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,46 +1,14 @@ -allegro5: OpenGL GLES1 GLES2; X11 (GLX); Xcursor Xpm XInput2(Xi) (XF86VIDMOD;XINERAMA;XRANDR;XSCREENSAVER) #cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm) -~coin: OpenGL; X11 (Opt on mac?) -~ffmpeg: OpenGL; -~fltk: X11; -freeglut: Opengl (+ext); x11 ;Xinput; Xxf86vm_libs xrandr (wayland-client wayland-cursor -lwayland-egl xkbcommon) -~ftgl: opengl -~gainput: x11, xinput? -~gl3w: opengl -~glew: opengl -~glfw3: X11 -hpx: MPI ? -#irrlicht: opengl; -#libepoxy: x11 -#libspnav: x11 -#llgl: x11 -~magnum: OpenGL -~mathgl: OpenGL -~minifb: x11 -~OIS: X11 -~opencascada: x11 -openexr-loader: x11: xcb xcb-glx; wayland-client;probably more? -~plib: opengl -qtbase: a lot of extra deps. -sfml: x11 -skia: single config; opengl; xcb? -~soil: opengl -~soil2: opengl -urho3d: x11 -Single Config issues: -skia: single config; opengl; xcb? -freerdp: single config -libassuan: single config -libcanbarra: single config -libmysql: single config -libobd: single config -libuvc: broken libusb wrapper; single config -nmap: single config -spdk-dpdk: single config -spdk-ipsec: single config -zeroc-ice: single config -zopfli: single config +qtapplicationmanager: +/usr/bin/ld: /mnt/vcpkg-ci/installed/x64-linux/lib/libwayland-client.a(connection.c.o): in function `wl_closure_invoke': +connection.c:(.text+0x265a): undefined reference to `ffi_type_pointer' +/usr/bin/ld: connection.c:(.text+0x2723): undefined reference to `ffi_type_sint32' +Missing libffi linkage -> check cmake module. + +urho3d: x11 +/mnt/vcpkg-ci/buildtrees/urho3d/src/3eb4f765c8-59caa317dd.clean/Source/ThirdParty/GLEW/./glxew.h:98:10: fatal error: X11/Xlib.h: No such file or directory + 98 | #include TODOS: libX11.a needs fixing of hardcoding absolute paths. From 5791355f01e6ab269774e48b6727e3f1f0e8f084 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:30:58 +0200 Subject: [PATCH 120/142] fix urho3d build --- ports/urho3d/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index 4d03658b296789..3962405ba9f55a 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -27,6 +27,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS examples URHO3D_BUILD_SAMPLES ) +if(NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND VCPKG_C_FLAGS " -I${CURRENT_INSTALLED_DIR}/include") + string(APPEND VCPKG_CXX_FLAGS " -I${CURRENT_INSTALLED_DIR}/include") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From 103a37b721b4b7ba46f69b79228d29328d8dfdde Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 24 Oct 2022 16:54:51 +0200 Subject: [PATCH 121/142] remove another point from the todo --- TODO.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TODO.txt b/TODO.txt index 82936287a13376..f36f1a0abb87e1 100644 --- a/TODO.txt +++ b/TODO.txt @@ -6,10 +6,6 @@ connection.c:(.text+0x265a): undefined reference to `ffi_type_pointer' /usr/bin/ld: connection.c:(.text+0x2723): undefined reference to `ffi_type_sint32' Missing libffi linkage -> check cmake module. -urho3d: x11 -/mnt/vcpkg-ci/buildtrees/urho3d/src/3eb4f765c8-59caa317dd.clean/Source/ThirdParty/GLEW/./glxew.h:98:10: fatal error: X11/Xlib.h: No such file or directory - 98 | #include - TODOS: libX11.a needs fixing of hardcoding absolute paths. libinput? From 339e300bab543c584f9c315503e0d3c1e359945e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:18:42 +0200 Subject: [PATCH 122/142] add mesa ci test --- .../test_ports/vcpkg-ci-mesa/portfile.cmake | 1 + scripts/test_ports/vcpkg-ci-mesa/vcpkg.json | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 scripts/test_ports/vcpkg-ci-mesa/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-mesa/vcpkg.json diff --git a/scripts/test_ports/vcpkg-ci-mesa/portfile.cmake b/scripts/test_ports/vcpkg-ci-mesa/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mesa/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-mesa/vcpkg.json b/scripts/test_ports/vcpkg-ci-mesa/vcpkg.json new file mode 100644 index 00000000000000..a5db94b031ad8c --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mesa/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "vcpkg-ci-paraview", + "version-string": "1", + "port-version": 3, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "mesa", + "default-features": false, + "features": [ + "egl", + "gles1", + "gles2", + "llvm", + "offscreen", + "opengl" + ], + "platform": "windows" + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "egl", + "gles1", + "gles2", + "glx", + "llvm", + "offscreen", + "opengl" + ], + "platform": "!windows" + } + ] +} From 6473d5ce9e4fdbce799ec5e689fbfa4152823a15 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:24:02 +0200 Subject: [PATCH 123/142] mesa fine tuning --- ports/mesa/portfile.cmake | 10 ++++------ ports/mesa/vcpkg.json | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index d61c3f237a57bb..a4ce33c4092d3e 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -54,12 +54,9 @@ endif() # For features https://github.com/pal1000/mesa-dist-win should be probably studied a bit more. list(APPEND MESA_OPTIONS -Dzstd=enabled) -list(APPEND MESA_OPTIONS -Dshared-llvm=auto) list(APPEND MESA_OPTIONS -Dlibunwind=disabled) list(APPEND MESA_OPTIONS -Dlmsensors=disabled) list(APPEND MESA_OPTIONS -Dvalgrind=disabled) - - list(APPEND MESA_OPTIONS -Dgbm=disabled) if("offscreen" IN_LIST FEATURES) @@ -70,8 +67,8 @@ endif() if("llvm" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dllvm=enabled) - find_library(LLVMCore_LIBRARY NAMES LLVMCore PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - if(LLVMCore_LIBRARY MATCHES ".so|.dll") + find_library(LLVMCore_LIBRARY NAMES LLVMCore libLLVMCore PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + if(LLVMCore_LIBRARY MATCHES "(\\\.so$|\\\.dll)") list(APPEND MESA_OPTIONS -Dshared-llvm=enabled) else() list(APPEND MESA_OPTIONS -Dshared-llvm=disabled) @@ -109,6 +106,8 @@ endif() if("egl" IN_LIST FEATURES OR "glx" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dglvnd=true) list(APPEND MESA_OPTIONS -Dgles-lib-suffix=_mesa) +else() + list(APPEND MESA_OPTIONS -Dglvnd=false) endif() @@ -127,7 +126,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/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 9e8e707757096d..4a1aeb5d2e8683 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -14,10 +14,6 @@ "name": "libdrm", "platform": "!windows" }, - { - "name": "libglvnd", - "platform": "!windows" - }, { "name": "libxrandr", "platform": "!windows" @@ -87,8 +83,8 @@ "description": "Build support for EGL platform", "dependencies": [ { - "name": "mesa", - "default-features": false + "name": "libglvnd", + "platform": "!windows" } ] }, @@ -112,7 +108,9 @@ }, "glx": { "description": "Build support for GLX platform", + "supports": "!windows", "dependencies": [ + "libglvnd", "libx11", "libxext", "libxfixes", From aeec8b50ee4f998c3ef17bbdba90b64b6206c035 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 15:42:25 +0200 Subject: [PATCH 124/142] Fix qt wayland stuff ? --- ports/qtapplicationmanager/portfile.cmake | 2 +- ports/qtapplicationmanager/vcpkg.json | 3 +++ ports/qtbase/fix-wayland-libffi.patch | 26 +++++++++++++++++++++++ ports/qtbase/portfile.cmake | 1 + ports/qtbase/vcpkg.json | 1 + ports/qtdeclarative/portfile.cmake | 2 -- ports/qtwayland/vcpkg.json | 3 ++- 7 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 ports/qtbase/fix-wayland-libffi.patch diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 54288af19eca72..aaf42428fae270 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -25,7 +25,7 @@ set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS - --trace-expand + #--trace-expand -DINPUT_libarchive=system -DINPUT_libyaml=system -DFEATURE_am_system_libyaml=ON diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 929401f5be6c74..e041d992997ffe 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -23,6 +23,9 @@ { "name": "qtwayland", "default-features": false, + "features": [ + "qml" + ], "platform": "!windows" } ] diff --git a/ports/qtbase/fix-wayland-libffi.patch b/ports/qtbase/fix-wayland-libffi.patch new file mode 100644 index 00000000000000..4ec60605825472 --- /dev/null +++ b/ports/qtbase/fix-wayland-libffi.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake +index 233cc88d0..14e02b2ef 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake +@@ -92,14 +92,19 @@ foreach(_comp ${Wayland_known_components}) + set(Wayland_${_comp}_lib "wayland-${_lc_comp}") + set(Wayland_${_comp}_header "wayland-${_lc_comp}.h") + endforeach() ++set(Wayland_libffi_component_deps ) ++set(Wayland_libffi_pkg_config "libffi") ++set(Wayland_libffi_lib "ffi") ++set(Wayland_libffi_header "ffi.h") ++set(Wayland_Client_component_deps libffi) + set(Wayland_Egl_component_deps Client) + + ecm_find_package_parse_components(Wayland + RESULT_VAR Wayland_components +- KNOWN_COMPONENTS ${Wayland_known_components} ++ KNOWN_COMPONENTS libffi ${Wayland_known_components} + ) + ecm_find_package_handle_library_components(Wayland +- COMPONENTS ${Wayland_components} ++ COMPONENTS libffi ${Wayland_components} + ) + + # If pkg-config didn't provide us with version information, diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 533b3e47c0fcd0..d9678ab23330ee 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,6 +17,7 @@ set(${PORT}_PATCHES fix_egl.patch clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. installed_dir.patch + fix-wayland-libffi.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f9544cd261b6e8..fb79a5df312f9f 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -373,6 +373,7 @@ "xkb": { "description": "XKB", "dependencies": [ + "libxkbcommon", { "name": "qtbase", "default-features": false, diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 1e5883043cd882..9589d6284b0e81 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -19,8 +19,6 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") qmltc ) -set(ENV{LD_DEBUG} all) -file(INSTALL "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qsb" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME qsb.log) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index f9ae6ee2eb8fa5..e89311c2ff5a5b 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -12,7 +12,8 @@ "features": [ "gui" ] - } + }, + "wayland" ], "features": { "qml": { From 9e619dd2da0fe01fb984e83d5bc6d377714b715a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 15:56:36 +0200 Subject: [PATCH 125/142] try fixing kf5kio --- ports/kf5kio/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake index 50ef6e4ab229d9..1330262a441151 100644 --- a/ports/kf5kio/portfile.cmake +++ b/ports/kf5kio/portfile.cmake @@ -24,6 +24,7 @@ file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: fa vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON -DBUILD_TESTING=OFF -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -DCMAKE_VERBOSE_MAKEFILE=ON From 48364f893e4defeec7f10fec705e26f5a91f6a5f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:19:45 +0200 Subject: [PATCH 126/142] todo update. --- TODO.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/TODO.txt b/TODO.txt index f36f1a0abb87e1..167fe610f73177 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,11 +1,5 @@ #cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm) -qtapplicationmanager: -/usr/bin/ld: /mnt/vcpkg-ci/installed/x64-linux/lib/libwayland-client.a(connection.c.o): in function `wl_closure_invoke': -connection.c:(.text+0x265a): undefined reference to `ffi_type_pointer' -/usr/bin/ld: connection.c:(.text+0x2723): undefined reference to `ffi_type_sint32' -Missing libffi linkage -> check cmake module. - TODOS: libX11.a needs fixing of hardcoding absolute paths. libinput? From 63211501a717c3d6fb63b3bd7451250c35ef853f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:20:14 +0200 Subject: [PATCH 127/142] add libnuma --- ports/libnuma/portfile.cmake | 19 +++++++++++++++++++ ports/libnuma/vcpkg.json | 7 +++++++ 2 files changed, 26 insertions(+) create mode 100644 ports/libnuma/portfile.cmake create mode 100644 ports/libnuma/vcpkg.json diff --git a/ports/libnuma/portfile.cmake b/ports/libnuma/portfile.cmake new file mode 100644 index 00000000000000..86dd3f2c614690 --- /dev/null +++ b/ports/libnuma/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO numactl/numactl + REF v${VERSION} + SHA512 de89bd9f4a9be0e27b21d096aa17a554c209414b5d08b6a2dbd03f8f4830fe4fc5adc88fa8cb08ae1cf75884835dacbde5b6f5d31386244a2582924d2260fcb6 + HEAD_REF master +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL2" "${SOURCE_PATH}/LICENSE.LGPL2.1") diff --git a/ports/libnuma/vcpkg.json b/ports/libnuma/vcpkg.json new file mode 100644 index 00000000000000..50f48133a232d5 --- /dev/null +++ b/ports/libnuma/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libnuma", + "version": "2.0.16", + "description": "Simple NUMA policy support. It consists of a numactl program to run other programs with a specific NUMA policy and a libnuma shared library (NUMA API) to set NUMA policy in applications.", + "homepage": "https://github.com/numactl/numactl", + "license": "GPL-2.0 AND LGPL-2.1-or-later" +} From d31a42bd4b13c59195ef3ae51bd4aded1193c611 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:20:28 +0200 Subject: [PATCH 128/142] v db --- versions/baseline.json | 4 ++++ versions/l-/libnuma.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/l-/libnuma.json diff --git a/versions/baseline.json b/versions/baseline.json index 4705c32b6a2304..c5ee2eaa738de6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4004,6 +4004,10 @@ "baseline": "2021-03-01", "port-version": 0 }, + "libnuma": { + "baseline": "2.0.16", + "port-version": 0 + }, "libodb": { "baseline": "2.4.0", "port-version": 8 diff --git a/versions/l-/libnuma.json b/versions/l-/libnuma.json new file mode 100644 index 00000000000000..3b2ddf8177ca16 --- /dev/null +++ b/versions/l-/libnuma.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c9b966de42b56476dffec9632e2c6f449a727e7c", + "version": "2.0.16", + "port-version": 0 + } + ] +} From 3f958f7f59bf7404136fe5911e3a3b9ef38a7daa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:34:42 +0200 Subject: [PATCH 129/142] break libnuma --- ports/libnuma/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/libnuma/portfile.cmake b/ports/libnuma/portfile.cmake index 86dd3f2c614690..91e050e858189a 100644 --- a/ports/libnuma/portfile.cmake +++ b/ports/libnuma/portfile.cmake @@ -17,3 +17,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL2" "${SOURCE_PATH}/LICENSE.LGPL2.1") + +message(FATAL_ERROR "break libnuma!") \ No newline at end of file From b11b7e1b302244f62fd2f132d139a220c65d52aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:48:02 +0200 Subject: [PATCH 130/142] remove numa --- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/provision-image.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 7f16832e712710..a294e612dba161 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -44,7 +44,7 @@ jobs: - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} displayName: "Build vcpkg with CMake" condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - - bash: sudo apt-get remove --yes libxt-dev libxaw7-dev libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev libxrandr-dev xutils-dev libgles2-mesa-dev libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-res0-dev libwayland-dev libxdamage-dev libdbus-1-dev libxtst-dev + - bash: sudo apt-get remove --yes libxt-dev libxaw7-dev libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev libxrandr-dev xutils-dev libgles2-mesa-dev libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-res0-dev libwayland-dev libxdamage-dev libdbus-1-dev libxtst-dev libnuma1 libnuma-dev displayName: 'Remove system x libs' - task: PowerShell@2 displayName: '*** Test Modified Ports' diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 13a6af40bdd20e..88c65b948e00b6 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -30,11 +30,16 @@ APT_PACKAGES="git curl zip unzip tar" ## common build dependencies APT_PACKAGES="$APT_PACKAGES at gperf cifs-utils \ - build-essential g++ gfortran yasm libnuma1 libnuma-dev libtool-bin \ - flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool \ + build-essential g++ gfortran yasm libtool-bin \ + flex bison libbison-dev autoconf libudev-dev libtool \ dh-autoreconf autoconf-archive ruby-full \ pkg-config meson nasm cmake ninja-build" +# Questions: +# Why/Where to get libbison-dev ? +# Where to get libudev-dev ? +# Why/Where to get libncurses5-dev ? + ## required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" From 7b90d06c5286f1110d7ece227419496b663e4a4f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:48:26 +0200 Subject: [PATCH 131/142] world rebuild to see who depends on libnuma --- triplets/x64-linux.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/triplets/x64-linux.cmake b/triplets/x64-linux.cmake index 869d8db51f1961..2fe5260ec223a9 100644 --- a/triplets/x64-linux.cmake +++ b/triplets/x64-linux.cmake @@ -7,4 +7,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) # save time by only building release libs set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON) set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON) -set(X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES ON) \ No newline at end of file +set(X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES ON) \ No newline at end of file From 16d7d8c116266583efc3709c7f95568331b5b22c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Oct 2022 00:06:49 +0200 Subject: [PATCH 132/142] numa deps. --- ports/dpdk/vcpkg.json | 2 +- ports/libnuma/portfile.cmake | 2 -- ports/numactl/portfile.cmake | 70 +----------------------------------- ports/numactl/vcpkg.json | 7 ++-- ports/spdk-dpdk/vcpkg.json | 5 ++- ports/spdk/portfile.cmake | 8 ----- ports/spdk/vcpkg.json | 1 + 7 files changed, 12 insertions(+), 83 deletions(-) diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index ff0b7586a959b6..8941f7dadf2b3e 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -13,7 +13,7 @@ "default-features": false }, { - "name": "numactl", + "name": "libnuma", "platform": "linux" }, "python3", diff --git a/ports/libnuma/portfile.cmake b/ports/libnuma/portfile.cmake index 91e050e858189a..86dd3f2c614690 100644 --- a/ports/libnuma/portfile.cmake +++ b/ports/libnuma/portfile.cmake @@ -17,5 +17,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL2" "${SOURCE_PATH}/LICENSE.LGPL2.1") - -message(FATAL_ERROR "break libnuma!") \ No newline at end of file diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake index 17a058022fe149..0015715fb66c72 100644 --- a/ports/numactl/portfile.cmake +++ b/ports/numactl/portfile.cmake @@ -1,69 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO numactl/numactl - REF v2.0.14 - SHA512 ADAF405F092FD9653F26D00F8C80CB83852C56EBD5D00E714E20D505008E74AA7105B0FB7AA55A605DEAC0D1491CEFF57DE931037D33E7944FCA105BC6510ED4 - HEAD_REF master -) - -message( -"numactl currently requires the following libraries from the system package manager: - autoconf libtool -These can be installed on Ubuntu systems via sudo apt install autoconf libtool" -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC --enable-static --disable-shared) -else() - set(SHARED_STATIC --disable-static --enable-shared) -endif() - -set(OPTIONS ${SHARED_STATIC}) -vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/autogen.sh - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME setup-${TARGET_TRIPLET} -) - -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) -message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") -set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include") -set(LDFLAGS "${VCPKG_LINKER_FLAGS}") -vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME configure-${TARGET_TRIPLET}-dbg -) -message(STATUS "Building ${TARGET_TRIPLET}-dbg") -vcpkg_execute_required_process( - COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME install-${TARGET_TRIPLET}-dbg -) - -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) -message(STATUS "Configuring ${TARGET_TRIPLET}-rel") -set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include") -set(LDFLAGS "${VCPKG_LINKER_FLAGS}") -vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME configure-${TARGET_TRIPLET}-rel -) -message(STATUS "Building ${TARGET_TRIPLET}-rel") -vcpkg_execute_required_process( - COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME install-${TARGET_TRIPLET}-rel -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/numactl/vcpkg.json b/ports/numactl/vcpkg.json index 267e8300da8d10..221caed71774c5 100644 --- a/ports/numactl/vcpkg.json +++ b/ports/numactl/vcpkg.json @@ -1,8 +1,11 @@ { "name": "numactl", "version": "2.0.14", - "port-version": 1, + "port-version": 2, "description": "NUMA support for Linux", "homepage": "https://github.com/numactl/numactl", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "libnuma" + ] } diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json index 3c3d6fd4ef725b..f21acc6bf2950c 100644 --- a/ports/spdk-dpdk/vcpkg.json +++ b/ports/spdk-dpdk/vcpkg.json @@ -3,5 +3,8 @@ "version-string": "20181124", "port-version": 2, "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "libnuma" + ] } diff --git a/ports/spdk/portfile.cmake b/ports/spdk/portfile.cmake index 38c0326fe16cf0..008aef11f9996a 100644 --- a/ports/spdk/portfile.cmake +++ b/ports/spdk/portfile.cmake @@ -10,14 +10,6 @@ VCPKG_FROM_GITHUB( HEAD_REF master ) -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - VCPKG_CONFIGURE_CMAKE( SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} PREFER_NINJA diff --git a/ports/spdk/vcpkg.json b/ports/spdk/vcpkg.json index 90a9c4940634cf..224302edb094ab 100644 --- a/ports/spdk/vcpkg.json +++ b/ports/spdk/vcpkg.json @@ -5,6 +5,7 @@ "description": "Storage Performance Development Kit", "supports": "linux", "dependencies": [ + "libnuma", "spdk-dpdk", "spdk-ipsec", "spdk-isal" From 106b3be24205eec46779f65b6438ae2959ed4bc5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Oct 2022 00:12:21 +0200 Subject: [PATCH 133/142] try fixing the wrappers. --- ports/libx11/vcpkg-cmake-wrapper.cmake | 9 +++++++-- ports/xcb/vcpkg-cmake-wrapper.cmake | 11 ++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake index 4dcbf13d7bd644..4085a39fa4087d 100644 --- a/ports/libx11/vcpkg-cmake-wrapper.cmake +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -1,11 +1,15 @@ +set(Z_VCPKG_FIRST_X11_SEARCH OFF) +if(NOT X11_FOUND) + set(Z_VCPKG_FIRST_X11_SEARCH ON) +endif() _find_package(${ARGS}) -if(TARGET X11::X11) +if(TARGET X11::X11 AND Z_VCPKG_FIRST_X11_SEARCH) target_link_libraries(X11::X11 INTERFACE ${CMAKE_DL_LIBS}) if(TARGET X11::xcb) target_link_libraries(X11::X11 INTERFACE X11::xcb) endif() endif() -if(TARGET X11::xcb) +if(TARGET X11::xcb AND Z_VCPKG_FIRST_X11_SEARCH) if(TARGET X11::Xdmcp) set_property(TARGET X11::xcb APPEND PROPERTY INTERFACE_LINK_LIBRARIES X11::Xdmcp) endif() @@ -13,3 +17,4 @@ if(TARGET X11::xcb) set_property(TARGET X11::xcb APPEND PROPERTY INTERFACE_LINK_LIBRARIES X11::Xau) endif() endif() +unset(Z_VCPKG_FIRST_X11_SEARCH) \ No newline at end of file diff --git a/ports/xcb/vcpkg-cmake-wrapper.cmake b/ports/xcb/vcpkg-cmake-wrapper.cmake index 57c952493d308f..32adbb93683186 100644 --- a/ports/xcb/vcpkg-cmake-wrapper.cmake +++ b/ports/xcb/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,10 @@ +set(Z_VCPKG_FIRST_XCB_SEARCH OFF) +if(NOT XCB_FOUND) + set(Z_VCPKG_FIRST_XCB_SEARCH ON) +endif() _find_package(X11 COMPONENTS Xau Xdmcp) _find_package(${ARGS}) -if(TARGET XCB::XCB) +if(TARGET XCB::XCB AND Z_VCPKG_FIRST_XCB_SEARCH) if(TARGET X11::Xdmcp) target_link_libraries(XCB::XCB INTERFACE X11::Xdmcp) endif() @@ -8,8 +12,9 @@ if(TARGET XCB::XCB) target_link_libraries(XCB::XCB INTERFACE X11::Xau) endif() endif() -if(TARGET XCB::IMAGE) +if(TARGET XCB::IMAGE AND Z_VCPKG_FIRST_XCB_SEARCH) if(TARGET XCB::UTIL) target_link_libraries(XCB::IMAGE INTERFACE XCB::UTIL) endif() -endif() \ No newline at end of file +endif() +unset(Z_VCPKG_FIRST_XCB_SEARCH) \ No newline at end of file From a6fbc151c20abd7cd76a5d6290a29f9b7249ccd1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Oct 2022 09:15:11 +0200 Subject: [PATCH 134/142] disable numa lookup --- ports/spdk-dpdk/portfile.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index 8c226d6624a9cb..ef58e9dc9ac24c 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -10,14 +10,6 @@ VCPKG_FROM_GITHUB( HEAD_REF master ) -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - VCPKG_CONFIGURE_CMAKE( SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} PREFER_NINJA From 3f68715fc7cb96877e79ddc58202e22a1e9f9f4a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Oct 2022 09:16:16 +0200 Subject: [PATCH 135/142] remove elf fixup --- ports/qtshadertools/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/qtshadertools/portfile.cmake b/ports/qtshadertools/portfile.cmake index 2e59e428234891..c0013bf84e7c14 100644 --- a/ports/qtshadertools/portfile.cmake +++ b/ports/qtshadertools/portfile.cmake @@ -4,7 +4,6 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) set(TOOL_NAMES qsb) -set(VCPKG_FIXUP_ELF_RPATH ON) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} From 5b29cd7f37638761b7c0a3163712cf3277d82fb9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Oct 2022 22:47:01 +0200 Subject: [PATCH 136/142] get logs --- ports/qtshadertools/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qtshadertools/portfile.cmake b/ports/qtshadertools/portfile.cmake index c0013bf84e7c14..30445c838d9942 100644 --- a/ports/qtshadertools/portfile.cmake +++ b/ports/qtshadertools/portfile.cmake @@ -5,9 +5,11 @@ set(${PORT}_PATCHES) set(TOOL_NAMES qsb) +file(COPY "${CURRENT_INSTALLED_DIR}/share/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME "Qt6QEglFSX11IntegrationPluginTargets.cmake.log") qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS + --trace-expand -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG From 25e59a6c36a97334328ce3a88bd13dc4f04f7ead Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 27 Oct 2022 00:48:13 +0200 Subject: [PATCH 137/142] WIP --- ports/qtshadertools/portfile.cmake | 2 +- ports/spdk-dpdk/CMakeLists.txt | 4 ++-- ports/spdk-dpdk/portfile.cmake | 34 +++++++++--------------------- ports/spdk-dpdk/vcpkg.json | 9 +++++--- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/ports/qtshadertools/portfile.cmake b/ports/qtshadertools/portfile.cmake index 30445c838d9942..fc3992d546fac3 100644 --- a/ports/qtshadertools/portfile.cmake +++ b/ports/qtshadertools/portfile.cmake @@ -5,7 +5,7 @@ set(${PORT}_PATCHES) set(TOOL_NAMES qsb) -file(COPY "${CURRENT_INSTALLED_DIR}/share/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME "Qt6QEglFSX11IntegrationPluginTargets.cmake.log") +file(INSTALL "${CURRENT_INSTALLED_DIR}/share/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake" DESTINATION "${CURRENT_BUILDTREES_DIR}" RENAME "Qt6QEglFSX11IntegrationPluginTargets.cmake.log") qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS diff --git a/ports/spdk-dpdk/CMakeLists.txt b/ports/spdk-dpdk/CMakeLists.txt index 1952227ae0d65e..20e2512b5b976c 100644 --- a/ports/spdk-dpdk/CMakeLists.txt +++ b/ports/spdk-dpdk/CMakeLists.txt @@ -35,9 +35,9 @@ FIND_PROGRAM(MAKE make) SET(DPDK_CFLAGS "-fPIC") IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") + STRING(APPEND ${DPDK_CFLAGS} " -O0 -g") ENDIF () - +STRING(APPEND ${DPDK_CFLAGS} " -I${NUMA_INCLUDE_DIR}") SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) #SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) SET(DPDK_CONFIG "T=${DPDK_TARGET}") diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index ef58e9dc9ac24c..91d339f0e8647b 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -5,33 +5,19 @@ ENDIF () VCPKG_FROM_GITHUB( OUT_SOURCE_PATH SOURCE_PATH REPO spdk/dpdk - REF spdk-18.11 - SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c + REF v21.02 + SHA512 f2efb5d6907a0ce7c3d2a63d37e10f2e0080a0d21c0555b46d03b800dc85b219cf0d90303035b32193c017d3b07333c91950e0b72265c1d9986e2eba39f3274e HEAD_REF master ) -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} -) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES pyelftools ) -VCPKG_INSTALL_CMAKE() +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS +) -# Headers are symbolic links here, gather all, resolve and copy real files -FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") -SET(REAL_FILES "") -FOREACH (HEADER ${HEADERS}) - GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) - LIST(APPEND REAL_FILES "${REAL_FILE}") -ENDFOREACH () +vcpkg_install_meson() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) -if(NOT VCPKG_BUILD_TYPE) - FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) -endif() -FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json index e4a16c2dbca746..b86027265462ec 100644 --- a/ports/spdk-dpdk/vcpkg.json +++ b/ports/spdk-dpdk/vcpkg.json @@ -1,10 +1,13 @@ { "name": "spdk-dpdk", - "version-date": "2018-11-24", - "port-version": 2, + "version-date": "2021-02-14", "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", "supports": "linux", "dependencies": [ - "libnuma" + "libnuma", + { + "name": "vcpkg-get-python-packages", + "host": true + } ] } From bda13012d9eb4b89164f7c2218663d3eef5febb8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:43:07 +0200 Subject: [PATCH 138/142] trigger full rebuild to find flaky ci issue --- triplets/x64-linux.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/triplets/x64-linux.cmake b/triplets/x64-linux.cmake index 2fe5260ec223a9..869d8db51f1961 100644 --- a/triplets/x64-linux.cmake +++ b/triplets/x64-linux.cmake @@ -7,4 +7,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) # save time by only building release libs set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON) set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON) -set(X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES ON) \ No newline at end of file +set(X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES ON) \ No newline at end of file From 4e9dc463c6bcc3587fc9f7742438d5f49a0ebf40 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 27 Oct 2022 15:14:12 +0200 Subject: [PATCH 139/142] fix wrapper due to vcpkg.cmake bug --- ports/xcb/vcpkg-cmake-wrapper.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/xcb/vcpkg-cmake-wrapper.cmake b/ports/xcb/vcpkg-cmake-wrapper.cmake index 32adbb93683186..ba6b07094cddf8 100644 --- a/ports/xcb/vcpkg-cmake-wrapper.cmake +++ b/ports/xcb/vcpkg-cmake-wrapper.cmake @@ -2,8 +2,9 @@ set(Z_VCPKG_FIRST_XCB_SEARCH OFF) if(NOT XCB_FOUND) set(Z_VCPKG_FIRST_XCB_SEARCH ON) endif() -_find_package(X11 COMPONENTS Xau Xdmcp) -_find_package(${ARGS}) +set(z_vcpkg_xcb_args "${ARGS}") # Works since _find_package(X11) will not call _find_package(XCB) +find_package(X11 COMPONENTS Xau Xdmcp) +_find_package(${z_vcpkg_xcb_args}) if(TARGET XCB::XCB AND Z_VCPKG_FIRST_XCB_SEARCH) if(TARGET X11::Xdmcp) target_link_libraries(XCB::XCB INTERFACE X11::Xdmcp) From a519e74f3f50742154cd1fc4ae174340ee9c3772 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 27 Oct 2022 17:48:59 +0200 Subject: [PATCH 140/142] due to symver stuff --- ports/libnuma/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/libnuma/portfile.cmake b/ports/libnuma/portfile.cmake index 86dd3f2c614690..9d79877859cf61 100644 --- a/ports/libnuma/portfile.cmake +++ b/ports/libnuma/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO numactl/numactl From 98f4ab695f643c701d88d455329c0ae39eb0d85b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 27 Oct 2022 17:54:14 +0200 Subject: [PATCH 141/142] reset spdk-dpdk --- ports/spdk-dpdk/CMakeLists.txt | 4 ++-- ports/spdk-dpdk/FindNuma.cmake | 2 +- ports/spdk-dpdk/portfile.cmake | 32 ++++++++++++++++++++++---------- ports/spdk-dpdk/vcpkg.json | 12 +++--------- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ports/spdk-dpdk/CMakeLists.txt b/ports/spdk-dpdk/CMakeLists.txt index 20e2512b5b976c..1952227ae0d65e 100644 --- a/ports/spdk-dpdk/CMakeLists.txt +++ b/ports/spdk-dpdk/CMakeLists.txt @@ -35,9 +35,9 @@ FIND_PROGRAM(MAKE make) SET(DPDK_CFLAGS "-fPIC") IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CFLAGS} " -O0 -g") + STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") ENDIF () -STRING(APPEND ${DPDK_CFLAGS} " -I${NUMA_INCLUDE_DIR}") + SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) #SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) SET(DPDK_CONFIG "T=${DPDK_TARGET}") diff --git a/ports/spdk-dpdk/FindNuma.cmake b/ports/spdk-dpdk/FindNuma.cmake index d5bb6143559541..d059b3c8353ca8 100644 --- a/ports/spdk-dpdk/FindNuma.cmake +++ b/ports/spdk-dpdk/FindNuma.cmake @@ -2,7 +2,7 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PATH(NUMA_ROOT_DIR NAMES include/numa.h - PATHS ENV NUMA_ROOT + PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" DOC "NUMA library root directory") FIND_PATH(NUMA_INCLUDE_DIR diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index 91d339f0e8647b..216af4324fb853 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -5,19 +5,31 @@ ENDIF () VCPKG_FROM_GITHUB( OUT_SOURCE_PATH SOURCE_PATH REPO spdk/dpdk - REF v21.02 - SHA512 f2efb5d6907a0ce7c3d2a63d37e10f2e0080a0d21c0555b46d03b800dc85b219cf0d90303035b32193c017d3b07333c91950e0b72265c1d9986e2eba39f3274e + REF spdk-18.11 + SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c HEAD_REF master ) -x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES pyelftools ) - -vcpkg_configure_meson( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} ) -vcpkg_install_meson() +VCPKG_INSTALL_CMAKE() + +# Headers are symbolic links here, gather all, resolve and copy real files +FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") +SET(REAL_FILES "") +FOREACH (HEADER ${HEADERS}) + GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) + LIST(APPEND REAL_FILES "${REAL_FILE}") +ENDFOREACH () -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json index b86027265462ec..3c3d6fd4ef725b 100644 --- a/ports/spdk-dpdk/vcpkg.json +++ b/ports/spdk-dpdk/vcpkg.json @@ -1,13 +1,7 @@ { "name": "spdk-dpdk", - "version-date": "2021-02-14", + "version-string": "20181124", + "port-version": 2, "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", - "supports": "linux", - "dependencies": [ - "libnuma", - { - "name": "vcpkg-get-python-packages", - "host": true - } - ] + "supports": "linux" } From f4e90d4f7cad4520f87b340c9d6233b5dae5eb86 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 10 Nov 2022 16:08:47 +0100 Subject: [PATCH 142/142] libglvnd fixes --- ports/libglvnd/portfile.cmake | 17 ++++++++++++++--- ports/libglvnd/vcpkg.json | 13 ++++++++++--- ports/libglvnd/vendor.patch | 17 +++++++++++++++++ ports/mesa/vcpkg.json | 6 +++++- 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 ports/libglvnd/vendor.patch diff --git a/ports/libglvnd/portfile.cmake b/ports/libglvnd/portfile.cmake index a6d56db4e4cdc7..23279d71de2ed5 100644 --- a/ports/libglvnd/portfile.cmake +++ b/ports/libglvnd/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(VCPKG_FIXUP_ELF_RPATH ON) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -7,20 +6,32 @@ vcpkg_from_gitlab( REPO glvnd/libglvnd REF c7cdf0cc4395b57563294d1f340b6bb1b95366a0 SHA512 3fda563239a9048c21c62005d074dafb79ec20213f8f02ffd8ac529d821a5ddb87ae44fb49159fce2a97581d9b7cff875ed7478621b6cf8191e2f5fd7f20a974 + PATCHES vendor.patch HEAD_REF master ) # TODO: Setup DEFAULT_EGL_VENDOR_CONFIG_DIRS # TODO: Fix absolute paths in libX11.a (will get integrated in the so here) +if("glx" IN_LIST FEATURES) + list(APPEND OPTIONS + -Dx11=enabled + -Dglx=enabled + ) +else() + list(APPEND OPTIONS + -Dx11=disabled + -Dglx=disabled + ) +endif() + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -Dx11=enabled + ${OPTIONS} -Degl=true -Dgles1=true -Dgles2=true - -Dglx=enabled -Dentrypoint-patching=enabled ) vcpkg_install_meson() diff --git a/ports/libglvnd/vcpkg.json b/ports/libglvnd/vcpkg.json index bfa2915714cc2e..1186acb60419a2 100644 --- a/ports/libglvnd/vcpkg.json +++ b/ports/libglvnd/vcpkg.json @@ -5,11 +5,18 @@ "homepage": "https://gitlab.freedesktop.org/glvnd/libglvnd", "license": null, "dependencies": [ - "libx11", - "libxext", { "name": "vcpkg-tool-meson", "host": true } - ] + ], + "features": { + "glx" : { + "description": "Build with GL on X", + "dependencies": [ + "libx11", + "libxext" + ] + } + } } diff --git a/ports/libglvnd/vendor.patch b/ports/libglvnd/vendor.patch new file mode 100644 index 00000000000000..6cbf2a376c486d --- /dev/null +++ b/ports/libglvnd/vendor.patch @@ -0,0 +1,17 @@ +diff --git a/src/EGL/meson.build b/src/EGL/meson.build +index 9d109b18f..a0916aa1a 100644 +--- a/src/EGL/meson.build ++++ b/src/EGL/meson.build +@@ -39,9 +39,9 @@ libEGL = shared_library( + 'libeglerror.c', + ], + c_args : [ +- '-DDEFAULT_EGL_VENDOR_CONFIG_DIRS="@0@/glvnd/egl_vendor.d:@1@/glvnd/egl_vendor.d"'.format( +- join_paths(get_option('prefix'), get_option('sysconfdir')), +- join_paths(get_option('prefix'), get_option('datadir'))), ++ '-DDEFAULT_EGL_VENDOR_CONFIG_DIRS="glvnd/egl_vendor.d:@0@/glvnd/egl_vendor.d:@1@/glvnd/egl_vendor.d"'.format( ++ '/usr/local/etc', ++ '/usr/share/'), + ], + include_directories : inc_include, + link_args : '-Wl,-Bsymbolic', diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 4a1aeb5d2e8683..6ad57494ac2ed1 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -110,7 +110,11 @@ "description": "Build support for GLX platform", "supports": "!windows", "dependencies": [ - "libglvnd", + { + "name": "libglvnd", + "default-features": false, + "features": ["glx"] + }, "libx11", "libxext", "libxfixes",