Fixing implicit deps on X

TODO.txt

@@ -0,0 +1,6 @@
+#cairo: GL;GLES;(EGL;GLX);x11;xext;xrender;(xcb;xcb-render;x11-xcb;xcb-shm)
+
+TODOS:
+libX11.a needs fixing of hardcoding absolute paths. 
+libinput?
+libudev?

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")

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
 )
 
 

ports/allegro5/vcpkg.json

@@ -13,6 +13,10 @@
     "libpng",
     "libtheora",
     "libvorbis",
+    {
+      "name": "libxcursor",
+      "platform": "!windows"
+    },
     "openal-soft",
     "opengl",
     "opus",

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 <X11/extensions/XInput2.h>
+-        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)

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'
 )

ports/at-spi2-core/vcpkg.json

@@ -1,16 +1,21 @@
 {
   "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",
       "host": true
     },
+    "libx11",
+    "libxi",
+    "libxtst",
     {
       "name": "vcpkg-tool-meson",
       "host": true

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)

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

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()

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"
+      ]
     }
   }
 }

ports/coin/vcpkg.json

@@ -12,7 +12,7 @@
     "boost-math",
     "boost-smart-ptr",
     "boost-static-assert",
-    "opengl-registry"
+    "opengl"
   ],
   "default-features": [
     "simage",

ports/dpdk/vcpkg.json

@@ -13,7 +13,7 @@
       "default-features": false
     },
     {
-      "name": "numactl",
+      "name": "libnuma",
       "platform": "linux"
     },
     "python3",

ports/egl-registry/portfile.cmake

@@ -1,3 +1,4 @@
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/EGL-Registry
@@ -6,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"
@@ -26,3 +28,5 @@ file(
 )
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY)
+
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

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")

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,13 @@
     },
     "libjpeg-turbo",
     "libpng",
+    "libx11",
+    "libxcursor",
+    "libxext",
+    "libxfixes",
+    "libxft",
+    "libxinerama",
+    "libxrender",
     {
       "name": "vcpkg-cmake",
       "host": true