From 9c832cddf00441f0b2e44fa79868dbd7cf24b711 Mon Sep 17 00:00:00 2001
From: SunBlack <SunBlack@users.noreply.github.com>
Date: Sat, 10 Jan 2026 10:35:53 +0100
Subject: [PATCH] [libxxf86vm] Update to 1.1.6 (#48860)

---
 ports/libxxf86vm/no-undefined.patch | 13 -------------
 ports/libxxf86vm/portfile.cmake     | 27 +++++++++++++++------------
 ports/libxxf86vm/vcpkg.json         |  2 +-
 versions/baseline.json              |  2 +-
 versions/l-/libxxf86vm.json         |  5 +++++
 5 files changed, 22 insertions(+), 27 deletions(-)
 delete mode 100644 ports/libxxf86vm/no-undefined.patch

diff --git a/ports/libxxf86vm/no-undefined.patch b/ports/libxxf86vm/no-undefined.patch
deleted file mode 100644
index aacc74f226..0000000000
--- a/ports/libxxf86vm/no-undefined.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 81f896790..100ca935a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@ AM_CFLAGS = $(XXF86VM_CFLAGS) $(MALLOC_ZERO_CFLAGS)
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
- libXxf86vm_la_LIBADD = $(XXF86VM_LIBS)
--libXxf86vm_la_LDFLAGS = -version-number 1:0:0
-+libXxf86vm_la_LDFLAGS = -no-undefined -version-number 1:0:0
- 
- libXxf86vmincludedir = $(includedir)/X11/extensions
- libXxf86vminclude_HEADERS = $(top_srcdir)/include/X11/extensions/xf86vmode.h
diff --git a/ports/libxxf86vm/portfile.cmake b/ports/libxxf86vm/portfile.cmake
index 341aaf8c9a..33cce6fb24 100644
--- a/ports/libxxf86vm/portfile.cmake
+++ b/ports/libxxf86vm/portfile.cmake
@@ -1,16 +1,20 @@
 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
-    PATCHES no-undefined.patch
-) 
+    return()
+endif()
+
+vcpkg_download_distfile(
+    LIBXXF86VM_ARCHIVE
+    URLS "https://www.x.org/releases/individual/lib/libXxf86vm-${VERSION}.tar.xz"
+    FILENAME "libXxf86vm-${VERSION}.tar.xz"
+    SHA512 7fb3ac4302eea43b70d5106f6c7a113e28e2807da22d2bb7f040e0c4afd322cad4b7f258a5bd6da3940b6b6b39065e1acb218a6dc0ba06b9dd86ea3849231266
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${LIBXXF86VM_ARCHIVE}"
+)
 
 set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
 
@@ -31,5 +35,4 @@ 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()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libxxf86vm/vcpkg.json b/ports/libxxf86vm/vcpkg.json
index fc1e9a008f..cbc77db10c 100644
--- a/ports/libxxf86vm/vcpkg.json
+++ b/ports/libxxf86vm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libxxf86vm",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Xlib-based library for the XFree86-VidMode X extension",
   "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 1dd2d07482..5a49c1ee1c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5873,7 +5873,7 @@
       "port-version": 0
     },
     "libxxf86vm": {
-      "baseline": "1.1.5",
+      "baseline": "1.1.6",
       "port-version": 0
     },
     "libyaml": {
diff --git a/versions/l-/libxxf86vm.json b/versions/l-/libxxf86vm.json
index 538c4c7e10..bc2a214d87 100644
--- a/versions/l-/libxxf86vm.json
+++ b/versions/l-/libxxf86vm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bd1e90abbeb5cb9d3f5dddb22d902f3b474b6e35",
+      "version": "1.1.6",
+      "port-version": 0
+    },
     {
       "git-tree": "a4dfb11cf5012b77357e097116359740ee7ade1f",
       "version": "1.1.5",