From 1f825db83b129a8a9504b141cadb2ce29f32e01f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 1 Nov 2022 22:00:11 +0100 Subject: [PATCH] Add X windows part 12/N (#27512) * [libdmx] add new port * [libxcvt] add port * [xbitmaps] add port * format manifest * use version * v db * add cross fixes and fix issue due to missing xorg macros on osx * v db * license * v db * Use the conventional copyright install. * Correct the SHA512. Co-authored-by: Billy Robert O'Neal III --- ports/libdmx/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/libdmx/vcpkg.json | 12 ++++++++++++ ports/libxcvt/portfile.cmake | 18 ++++++++++++++++++ ports/libxcvt/vcpkg.json | 8 ++++++++ ports/xbitmaps/portfile.cmake | 24 ++++++++++++++++++++++++ ports/xbitmaps/vcpkg.json | 10 ++++++++++ scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 12 ++++++++++++ versions/l-/libdmx.json | 9 +++++++++ versions/l-/libxcvt.json | 9 +++++++++ versions/x-/xbitmaps.json | 9 +++++++++ 11 files changed, 142 insertions(+) create mode 100644 ports/libdmx/portfile.cmake create mode 100644 ports/libdmx/vcpkg.json create mode 100644 ports/libxcvt/portfile.cmake create mode 100644 ports/libxcvt/vcpkg.json create mode 100644 ports/xbitmaps/portfile.cmake create mode 100644 ports/xbitmaps/vcpkg.json create mode 100644 versions/l-/libdmx.json create mode 100644 versions/l-/libxcvt.json create mode 100644 versions/x-/xbitmaps.json diff --git a/ports/libdmx/portfile.cmake b/ports/libdmx/portfile.cmake new file mode 100644 index 0000000000..82801b1d30 --- /dev/null +++ b/ports/libdmx/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/libdmx + REF 6056db9a2fa8ad1ea55f8b8e2cbf5972408d612f + SHA512 f7b0a3fb26bc68e5dd27a0afa98ed29fed31956fd07f89b57171d7f9d9a0a87185876551dbf312b8d90a66fa50de06992cf9eb386fa98dd8133946de3c37e274 + HEAD_REF master +) +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS --enable-malloc0returnsnull=yes +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +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/libdmx/vcpkg.json b/ports/libdmx/vcpkg.json new file mode 100644 index 0000000000..c54eeb4c6c --- /dev/null +++ b/ports/libdmx/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libdmx", + "version": "1.1.4", + "description": "X Window System DMX (Distributed Multihead X) extension library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libdmx", + "license": "MIT", + "dependencies": [ + "libxext", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxcvt/portfile.cmake b/ports/libxcvt/portfile.cmake new file mode 100644 index 0000000000..b8c7273161 --- /dev/null +++ b/ports/libxcvt/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcvt + REF db5ff12110994dc9010d44f981399e796917a845 + SHA512 a69c4d163ab7a5f71dd4940e9b1f7ac2c5b5f282cbe9e1af26dcb677d061ff5187aa17f9acf9f913d3b05afac44f44b962ca4290ad2f5ae7f104ec870d8b515f + HEAD_REF master +) +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES cvt AUTO_CLEAN) +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) diff --git a/ports/libxcvt/vcpkg.json b/ports/libxcvt/vcpkg.json new file mode 100644 index 0000000000..0037a0ff88 --- /dev/null +++ b/ports/libxcvt/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libxcvt", + "version": "0.1.2", + "description": "A library providing a standalone version of the X server implementation of the VESA CVT standard timing modelines generator.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcvt", + "license": null, + "supports": "!windows" +} diff --git a/ports/xbitmaps/portfile.cmake b/ports/xbitmaps/portfile.cmake new file mode 100644 index 0000000000..a2617b12b6 --- /dev/null +++ b/ports/xbitmaps/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO data/bitmaps + REF 61eebdfde170841ae933cf65ba27346fbf2f8018 + SHA512 dd8acefc6f96d65e4b5d4807221aa3b87faca7b8b50e9de76081351503c9abb127a3063f3bb23ca71a0e3521640e7fdf7686e33cca5c7b7ad8d67a7ac26e65b5 + 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() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/pkgconfig/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/xbitmaps.pc" "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xbitmaps.pc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") diff --git a/ports/xbitmaps/vcpkg.json b/ports/xbitmaps/vcpkg.json new file mode 100644 index 0000000000..d93fdddf62 --- /dev/null +++ b/ports/xbitmaps/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xbitmaps", + "version": "1.1.2", + "description": "X BitMap (XBM) format bitmaps commonly used in X.Org applications", + "homepage": "https://gitlab.freedesktop.org/xorg/data/bitmaps", + "license": null, + "dependencies": [ + "xorg-macros" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e9cc0b1310..e197d20672 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1155,6 +1155,8 @@ x265:arm-uwp=fail x265:x64-uwp=fail xalan-c:x64-windows-static=fail xalan-c:arm64-windows=fail +# No xorg-macros available on osx +xbitmaps:x64-osx=skip xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index d7c424ff33..9a1ca1b246 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3668,6 +3668,10 @@ "baseline": "0.16.0", "port-version": 0 }, + "libdmx": { + "baseline": "1.1.4", + "port-version": 0 + }, "libdshowcapture": { "baseline": "0.6.0", "port-version": 3 @@ -4380,6 +4384,10 @@ "baseline": "0.4.5", "port-version": 0 }, + "libxcvt": { + "baseline": "0.1.2", + "port-version": 0 + }, "libxdamage": { "baseline": "1.1.5", "port-version": 0 @@ -8016,6 +8024,10 @@ "baseline": "1.2.9", "port-version": 0 }, + "xbitmaps": { + "baseline": "1.1.2", + "port-version": 0 + }, "xbyak": { "baseline": "6.60", "port-version": 0 diff --git a/versions/l-/libdmx.json b/versions/l-/libdmx.json new file mode 100644 index 0000000000..11dd6a8a46 --- /dev/null +++ b/versions/l-/libdmx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "732f7de5885d8a8897e9f8ad0c36c9f44479332c", + "version": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxcvt.json b/versions/l-/libxcvt.json new file mode 100644 index 0000000000..a64f62e11c --- /dev/null +++ b/versions/l-/libxcvt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b0c69bbf0c5c3c7ccecaac73ae1f8e828133c72b", + "version": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xbitmaps.json b/versions/x-/xbitmaps.json new file mode 100644 index 0000000000..fb72c03765 --- /dev/null +++ b/versions/x-/xbitmaps.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8559532a1b6db036c16c36bb7f46207a8280b976", + "version": "1.1.2", + "port-version": 0 + } + ] +}