diff --git a/ports/libxrandr/fix-configure.patch b/ports/libxrandr/fix-configure.patch new file mode 100644 index 0000000000..5d5e56b801 --- /dev/null +++ b/ports/libxrandr/fix-configure.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 99e3944..d6e6159 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,6 @@ AC_INIT([libXrandr], [1.5.4], + [libXrandr]) + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) +-AC_CONFIG_MACRO_DIRS([m4]) + + # Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-xz]) diff --git a/ports/libxrandr/portfile.cmake b/ports/libxrandr/portfile.cmake index 229122bd7c..d9736998c9 100644 --- a/ports/libxrandr/portfile.cmake +++ b/ports/libxrandr/portfile.cmake @@ -4,13 +4,15 @@ if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) else() vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/xorg + GITLAB_URL "https://gitlab.freedesktop.org/xorg" OUT_SOURCE_PATH SOURCE_PATH - REPO lib/libxrandr - REF 55dcda4518eda8ae03ef25ea29d3c994ad71eb0a # 1.5.2 - SHA512 63a3a7c5db8d41c73ef2f55e86a47bdae0112ac39802efa5da4fa26a8794066d6906d4a5e4e9af5abb5838a061f2583dc2b8865e38754ee3f2a8e3918de87168 + REPO "lib/libxrandr" + REF "libXrandr-${VERSION}" + SHA512 50b92b5c62ced66418381d816f6b61d9d3eb7e7b2794f7b2c58b263875ff6001a57e1750e32b9317a0d5e3e311bf0657156dfe5b4875d863499583b25b700b68 HEAD_REF master -) + PATCHES + fix-configure.patch +) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") @@ -31,5 +33,5 @@ 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") endif() diff --git a/ports/libxrandr/vcpkg.json b/ports/libxrandr/vcpkg.json index 0d769dab84..4c4caafedf 100644 --- a/ports/libxrandr/vcpkg.json +++ b/ports/libxrandr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxrandr", - "version": "1.5.2", + "version": "1.5.4", "description": "Xlib Resize, Rotate and Reflection (RandR) extension library", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrandr", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 3dbcfbf71c..1dbb2997c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5857,7 +5857,7 @@ "port-version": 0 }, "libxrandr": { - "baseline": "1.5.2", + "baseline": "1.5.4", "port-version": 0 }, "libxrender": { diff --git a/versions/l-/libxrandr.json b/versions/l-/libxrandr.json index e621e9f4b2..f18a5475e5 100644 --- a/versions/l-/libxrandr.json +++ b/versions/l-/libxrandr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db25e01ef34386e8dd199536c1eafe7ad6118dd5", + "version": "1.5.4", + "port-version": 0 + }, { "git-tree": "a2319ebdf2506031a67829f725660eba807869cc", "version": "1.5.2",