microsoft · Neumann-A · May 29, 2020 · May 29, 2020 · May 29, 2020 · May 29, 2020
diff --git a/TODO_xwindow.txt b/TODO_xwindow.txt
@@ -0,0 +1,9 @@
+Windows:
+ice -> unistd
+fs -> winsock2.h(180): error C2011: 'timeval': 'struct' type redefinition
+xcb-error -> OSError: [Errno 22] Invalid argument: 'D:/installed/x64-windows/debug/../share/xcb-proto/xcb/*.xml'
+xcwm -> src/libxcwm/event_loop.c(48): error C2074: '_event_thread': 'struct' initialization requires a brace-enclosed initializer list
+xpm -> D:\buildtrees\xpm\src\d5575c554d-7758f31930.clean\src\XpmI.h(328): fatal error C1083: Cannot open include file: 'strings.h': No such file or directory
+xrandrutils -> D:\buildtrees\xrandrutils\src\5de815dc7c-c34f2cdac4.clean\examples\xrandr.c(35): fatal error C1083: Cannot open include file: 'strings.h': No such file or directory
+xres -> .././../src/f4fe226948-60b8ee4612.clean/src/XRes.c(348): error C2061: syntax error: identifier 'XResGetClientPid'
+xxf86vm -> libtool:   error: can't build x86_64-pc-mingw32 shared library unless -no-undefined is specified
diff --git a/ports/applewm/CONTROL b/ports/applewm/CONTROL
@@ -0,0 +1,6 @@
+Source: applewm
+Version: 1.4.1
+Homepage: https://gitlab.freedesktop.org/xorg/lib/libapplewm
+Description: Xlib-based library for the Apple-WM extension
+Build-Depends: xorg-macros, bzip2, xproto, x11, xext
+Supports: osx
diff --git a/ports/applewm/portfile.cmake b/ports/applewm/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libapplewm
+    REF 78e9081bd1dc88e4a86fc6e401647bdb5265fef7 # 1.4.1
+    SHA512  a4afb77458e980f61b0d51d8d89f89c2b47eaca6674b7ff2473745d04b9dd59921401db74f53fe24e5b5e4221f311f69fcbfcaa0d5e0b37c53e68a6844e655bc
+    HEAD_REF master # branch name
+) 
+
+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)
+
diff --git a/ports/dbus/CONTROL b/ports/dbus/CONTROL
@@ -0,0 +1,5 @@
+Source: dbus
+Version: 1.13.10-1
+Homepage: https://gitlab.freedesktop.org/dbus/dbus
+Description: D-Bus specification and reference implementation, including libdbus and dbus-daemon
+Build-Depends: x11, expat, glib
diff --git a/ports/dbus/cmake.dep.patch b/ports/dbus/cmake.dep.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index 8cde1ffe0..d4d09f223 100644
+--- a/tools/CMakeLists.txt	
++++ b/tools/CMakeLists.txt
+@@ -91,7 +91,9 @@ endif()
+ add_executable(dbus-launch ${dbus_launch_SOURCES})
+ target_link_libraries(dbus-launch ${DBUS_LIBRARIES})
+ if(DBUS_BUILD_X11)
+-    target_link_libraries(dbus-launch ${X11_LIBRARIES} )
++    find_package(Threads REQUIRED)
++    target_link_libraries(dbus-launch ${X11_LIBRARIES} xcb ${X11_Xau_LIB} ${X11_Xdmcp_LIB} Threads::Threads)
++    target_include_directories(dbus-launch PRIVATE ${X11_INCLUDE_DIR})
+ endif()
+ install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS})
+
diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake
@@ -0,0 +1,51 @@
+set(PORT_DEBUG ON)
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO dbus/dbus
+    REF 99f0821bfbff1f23d19b8f316f2c559744b28e51 #1.13.10
+    SHA512  abbe1290eb93a23f113a8e878d077a5b2d1b4b89750e53b71ce389cee9931155d6bb858d3757f74505b6f6b3f2cea6654c3bb2dd0ebe3415277d05eaa296d4a8
+    HEAD_REF master # branch name
+    PATCHES cmake.dep.patch #patch name
+) 
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DDBUS_BUILD_TESTS=OFF
+        -DDBUS_ENABLE_XML_DOCS=OFF
+        -DDBUS_INSTALL_SYSTEM_LIBS=ON
+        -DXSLTPROC_EXECUTABLE=FALSE
+)
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/DBus1")
+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)
+
+file(REMOVE_RECURSE     "${CURRENT_PACKAGES_DIR}/debug/var/"
+                        "${CURRENT_PACKAGES_DIR}/var"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/services"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/session.d"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system-services"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+set(TOOLS cleanup-sockets daemon launch monitor run-session send test-tool update-activation-environment uuidgen)
+foreach(_tool ${TOOLS})
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/dbus-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/dbus-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/dbus-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+    endif()
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/dbus-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/dbus-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+    endif()
+endforeach()
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/ports/dmx/CONTROL b/ports/dmx/CONTROL
@@ -0,0 +1,6 @@
+Source: dmx
+Version: 1.1.4
+Homepage: https://gitlab.freedesktop.org/xorg/lib/libdmx
+Description: X Window System DMX (Distributed Multihead X) extension library
+Build-Depends: xorg-macros, xproto, xext
+
diff --git a/ports/dmx/portfile.cmake b/ports/dmx/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libdmx
+    REF  6056db9a2fa8ad1ea55f8b8e2cbf5972408d612f #1.1.4
+    SHA512 f7b0a3fb26bc68e5dd27a0afa98ed29fed31956fd07f89b57171d7f9d9a0a87185876551dbf312b8d90a66fa50de06992cf9eb386fa98dd8133946de3c37e274
+    HEAD_REF master # branch name
+) 
+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(SYSTEM_LIBRARIES pthread)
+
+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)
+
diff --git a/ports/drm/CONTROL b/ports/drm/CONTROL
@@ -0,0 +1,5 @@
+Source: drm
+Version: 2.4.101
+Homepage: https://gitlab.freedesktop.org/mesa/drm
+Description: Direct Rendering Manager library and headers
+Build-Depends: pciaccess, tool-meson
diff --git a/ports/drm/portfile.cmake b/ports/drm/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mesa/drm
+    REF  27fa47a738b15464528a1c44d8cb0b2ab31d3cf7 #v2.4.101
+    SHA512  897b40c5b3752a1bf4a1c82eb820698821d780eec22fff10d3267009aab527ff6ac4db019e99e67d4a474d18bd241fd5e8bdff2dfe0a59f666a4c2896a7cb7c4
+    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(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) No license in source?
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto
diff --git a/ports/font-util/CONTROL b/ports/font-util/CONTROL
@@ -0,0 +1,6 @@
+Source: font-util
+Version: 1.3.2
+Homepage: https://gitlab.freedesktop.org/xorg/font/util
+Description: X.Org font package creation/installation utilities
+Build-Depends: xorg-macros
+
diff --git a/ports/font-util/build.patch b/ports/font-util/build.patch
@@ -0,0 +1,33 @@
+diff --git a/bdftruncate.c b/bdftruncate.c
+index 2b317c0b0..3ab84978f 100644
+--- a/bdftruncate.c	
++++ b/bdftruncate.c
+@@ -40,7 +40,13 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++#if defined(_MSC_VER)
++# if defined(_M_X64)
++#  define SSIZE_MAX 9223372036854775807
++# else
++#  define SSIZE_MAX 2147483647
++# endif
++#endif
+ #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205))	\
+         || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+ # define ATTR_NORETURN __attribute((noreturn))
+diff --git a/ucs2any.c b/ucs2any.c
+index 1f575d14f..75b662b3d 100644
+--- a/ucs2any.c	
++++ b/ucs2any.c
+@@ -49,7 +49,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+
+ /* global variable for argv[0] */
+ static const char *my_name = NULL;
diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake
@@ -0,0 +1,68 @@
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO font/util
+    REF  d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2
+    SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04
+    HEAD_REF master # branch name
+    PATCHES build.patch #patch name
+) 
+#file(TOUCH ${SOURCE_PATH}/m4/dummy)
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND VCPKG_C_FLAGS /DNEED_BASENAME)
+    list(APPEND VCPKG_CXX_FLAGS /DNEED_BASENAME)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH ${SOURCE_PATH}
+    AUTOCONFIG
+    #SKIP_CONFIGURE
+    #NO_DEBUG
+    #AUTO_HOST
+    #AUTO_DST
+    #PRERUN_SHELL ${SHELL_PATH}
+    #OPTIONS 
+    #OPTIONS_DEBUG
+    #OPTIONS_RELEASE
+)
+
+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/xorg/")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts")
+#file(RENAME "${CURRENT_PACKAGES_DIR}/share/font-util/" "${CURRENT_PACKAGES_DIR}/share/xorg/font-util")
+#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/man")
+#file(RENAME "${CURRENT_PACKAGES_DIR}/share/man/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man")
+
+#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/")
+#file(RENAME "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
+#file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/debug")
+
+set(_file "${CURRENT_PACKAGES_DIR}/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}")
+
+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}")
+
+# # 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")
+#file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/font-util)
+#file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/fontenc/CONTROL b/ports/fontenc/CONTROL
@@ -0,0 +1,6 @@
+Source: fontenc
+Version: 1.1.4
+Homepage: https://gitlab.freedesktop.org/xorg/lib/libfontenc
+Description: X font encoding library
+Build-Depends: xorg-macros, zlib, xproto, font-util
+
diff --git a/ports/fontenc/build.patch b/ports/fontenc/build.patch
@@ -0,0 +1,38 @@
+diff --git a/src/encparse.c b/src/encparse.c
+index 548110ede..61952b9ce 100644
+--- a/src/encparse.c	
++++ b/src/encparse.c
+@@ -28,12 +28,16 @@ THE SOFTWARE.
+    to be pure ASCII.  Bloody ``Code Set Independence''. */
+
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <strings.h>
++#else
++#define strcasecmp _stricmp
++#endif
+ #include <stdio.h>
+
+ #include <stdlib.h>
+
+-#include "zlib.h"
++#include <zlib.h>
+ typedef gzFile FontFilePtr;
+
+ #define FontFileGetc(f) gzgetc(f)
+diff --git a/src/fontenc.c b/src/fontenc.c
+index c4ccd5eb0..e87d1089d 100644
+--- a/src/fontenc.c	
++++ b/src/fontenc.c
+@@ -23,7 +23,11 @@ THE SOFTWARE.
+ /* Backend-independent encoding code */
+
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <strings.h>
++#else
++#define strcasecmp _stricmp
++#endif
+ #include <stdlib.h>
+
+ #define FALSE 0
diff --git a/ports/fontenc/configure.ac.patch b/ports/fontenc/configure.ac.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index cadc653a0..aa645af81 100644
+--- a/configure.ac	
++++ b/configure.ac
+@@ -47,7 +47,7 @@ XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
+ # zlib
+ AC_CHECK_HEADER([zlib.h], [],
+                 AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))
+-AC_CHECK_LIB(z, gzclose, [],
++AC_SEARCH_LIBS(gzclose, [z zlib zlibd], [],
+              AC_MSG_FAILURE([zlib is required to compile libfontenc]))
+
+ # Obtain compiler/linker options for depedencies
diff --git a/ports/fontenc/portfile.cmake b/ports/fontenc/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libfontenc
+    REF  2baea13978759d1a011fc6d739465893b554d30a #1.1.4
+    SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e
+    HEAD_REF master # branch name
+    PATCHES configure.ac.patch
+            build.patch #patch name
+) 
+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
+
diff --git a/ports/fs/CONTROL b/ports/fs/CONTROL
@@ -0,0 +1,6 @@
+Source: fs
+Version: 1.0.8
+Homepage: https://gitlab.freedesktop.org/xorg/lib/libfs
+Description: X Font Service client library
+Build-Depends: xorg-macros, bzip2, xproto, xtrans
+Supports: !windows