Merge branch '3.6' into 3.7

12 files changed, 50 insertions, 222 deletions

diff --git a/libglvnd/.signature b/libglvnd/.signature
index 3f2fba5a..082ca2d3 100644
--- a/libglvnd/.signature
+++ b/libglvnd/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndKyULHVkU90mxKiif/ISvlTESKO8wqZXDEcWzHJ8UBKydxvvUuHHLZPndLiLG+5UizLyRhfAyhu+5aPJMVnHMAE=
-SHA256 (Pkgfile) = 6d5ffd009b93efb70f47d1ef5aef650c1b5863aff70c2c28203846c1bf707393
+RWTSGWF5Q7TndDP5tsZMphaF20XYRN+vL2jamyBk9h90wcueW5Gyr8hhfMdJ34kEPv9lBm4ot+euWmJ94JcuvQPPgQA1cx3Xdgg=
+SHA256 (Pkgfile) = c02c2651424148b4093492220c04938be13c140eb7e5848f502aa39abaed6439
 SHA256 (.footprint) = 07003e941903a50550a5a235ec32d6e1aff2dbe44d9406660a15b4fec7b70680
 SHA256 (libglvnd-1.5.0.tar.gz) = abdf8229c86358f651e35bdc7cfced0fdf67d0a2acdf9197d08a9732ef7b53bc
-SHA256 (eglplatform.h) = fb6f2775ee3f3536de579b232b6bc48261a6678f91ab39bf8a1c1e05dde68d04
+SHA256 (fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch) = feea791d9ff07926c2160808223eab676295142616b947607309ca5e9b450a6e
 SHA256 (0001-glx-Add-another-fallback-library-name.patch) = 87565356c31b20e60ded9f17ab76d442dd2cd36bfa4214a0de9699c49106ce43
diff --git a/libglvnd/Pkgfile b/libglvnd/Pkgfile
index ffe734ee..bf74b2b6 100644
--- a/libglvnd/Pkgfile
+++ b/libglvnd/Pkgfile
@@ -5,18 +5,24 @@
 
 name=libglvnd
 version=1.5.0
-release=1
-source=(https://github.com/NVIDIA/$name/archive/v$version/$name-$version.tar.gz \
-	eglplatform.h
-    0001-glx-Add-another-fallback-library-name.patch)
+release=2
+source=(https://github.com/NVIDIA/$name/archive/v$version/$name-$version.tar.gz
+	https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch
+	0001-glx-Add-another-fallback-library-name.patch)
 
 build() {
-	#prt-get isinst xorg-libx11 xorg-libxext xorg-xorgproto && PKGMK_GLVND+=' --enable-x11 --enable-glx'; patch -Np1 -d $name-$version -i $SRC/EGL_NO_X11.patch
+	## for future references
+	#prt-get isinst xorg-libx11 xorg-libxext xorg-xorgproto && PKGMK_GLVND+=' -D x11=enabled -D glx=enabled'
 	PKGMK_GLVND+=' -D x11=enabled -D glx=enabled'
 
-	# https://src.fedoraproject.org/rpms/libglvnd/tree/rawhide
+	# https://src.fedoraproject.org/rpms/libglvnd
 	patch -Np1 -d $name-$version -i $SRC/0001-glx-Add-another-fallback-library-name.patch
 
+	# [PATCH] Update GL headers and XML files.
+	# Update the GL headers and XML files to the Khronos repository, from
+	# commit 11d7b7baebfc2b58116670cd17266f9c6a0d760b.
+	patch -p1 -d $name-$version -i $SRC/fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch
+
 	meson setup $name-$version build $PKGMK_GLVND \
 		--prefix=/usr \
 		--buildtype=plain \
@@ -28,7 +34,4 @@ build() {
 		-D tls=false
 	meson compile -C build
 	DESTDIR=$PKG meson install -C build
-
-	# replace EGL/eglplatform.h with the newer mesa version
-	install -m 0644 $SRC/eglplatform.h $PKG/usr/include/EGL/
 }
diff --git a/libglvnd/eglplatform.h b/libglvnd/eglplatform.h
deleted file mode 100644
index 939539e6..00000000
--- a/libglvnd/eglplatform.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef __eglplatform_h_
-#define __eglplatform_h_
-
-/*
-** Copyright (c) 2007-2016 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Platform-specific types and definitions for egl.h
- * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "EGL" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-/* Macros used in EGL function prototype declarations.
- *
- * EGL functions should be prototyped as:
- *
- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
- *
- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
- */
-
-#ifndef EGLAPI
-#define EGLAPI KHRONOS_APICALL
-#endif
-
-#ifndef EGLAPIENTRY
-#define EGLAPIENTRY  KHRONOS_APIENTRY
-#endif
-#define EGLAPIENTRYP EGLAPIENTRY*
-
-#if defined(MESA_EGL_NO_X11_HEADERS) && !defined(EGL_NO_X11)
-#warning "`MESA_EGL_NO_X11_HEADERS` is deprecated, and doesn't work with the unmodified Khronos header"
-#warning "Please use `EGL_NO_X11` instead, as `MESA_EGL_NO_X11_HEADERS` will be removed soon"
-#define EGL_NO_X11
-#endif
-
-/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
- * are aliases of window-system-dependent types, such as X Display * or
- * Windows Device Context. They must be defined in platform-specific
- * code below. The EGL-prefixed versions of Native*Type are the same
- * types, renamed in EGL 1.3 so all types in the API start with "EGL".
- *
- * Khronos STRONGLY RECOMMENDS that you use the default definitions
- * provided below, since these changes affect both binary and source
- * portability of applications using EGL running on different EGL
- * implementations.
- */
-
-#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-#include <windows.h>
-
-typedef HDC     EGLNativeDisplayType;
-typedef HBITMAP EGLNativePixmapType;
-typedef HWND    EGLNativeWindowType;
-
-#elif defined(__EMSCRIPTEN__)
-
-typedef int EGLNativeDisplayType;
-typedef int EGLNativePixmapType;
-typedef int EGLNativeWindowType;
-
-#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
-
-typedef int   EGLNativeDisplayType;
-typedef void *EGLNativePixmapType;
-typedef void *EGLNativeWindowType;
-
-#elif defined(WL_EGL_PLATFORM)
-
-typedef struct wl_display     *EGLNativeDisplayType;
-typedef struct wl_egl_pixmap  *EGLNativePixmapType;
-typedef struct wl_egl_window  *EGLNativeWindowType;
-
-#elif defined(__GBM__)
-
-typedef struct gbm_device  *EGLNativeDisplayType;
-typedef struct gbm_bo      *EGLNativePixmapType;
-typedef void               *EGLNativeWindowType;
-
-#elif defined(__ANDROID__) || defined(ANDROID)
-
-struct ANativeWindow;
-struct egl_native_pixmap_t;
-
-typedef void*                           EGLNativeDisplayType;
-typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
-typedef struct ANativeWindow*           EGLNativeWindowType;
-
-#elif defined(USE_OZONE)
-
-typedef intptr_t EGLNativeDisplayType;
-typedef intptr_t EGLNativePixmapType;
-typedef intptr_t EGLNativeWindowType;
-
-#elif defined(__unix__) && defined(EGL_NO_X11)
-
-typedef void             *EGLNativeDisplayType;
-typedef khronos_uintptr_t EGLNativePixmapType;
-typedef khronos_uintptr_t EGLNativeWindowType;
-
-#elif defined(__unix__) || defined(USE_X11)
-
-/* X11 (tentative)  */
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-typedef Display *EGLNativeDisplayType;
-typedef Pixmap   EGLNativePixmapType;
-typedef Window   EGLNativeWindowType;
-
-#elif defined(__APPLE__)
-
-typedef int   EGLNativeDisplayType;
-typedef void *EGLNativePixmapType;
-typedef void *EGLNativeWindowType;
-
-#elif defined(__HAIKU__)
-
-#include <kernel/image.h>
-
-typedef void              *EGLNativeDisplayType;
-typedef khronos_uintptr_t  EGLNativePixmapType;
-typedef khronos_uintptr_t  EGLNativeWindowType;
-
-#else
-#error "Platform not recognized"
-#endif
-
-/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
-typedef EGLNativeDisplayType NativeDisplayType;
-typedef EGLNativePixmapType  NativePixmapType;
-typedef EGLNativeWindowType  NativeWindowType;
-
-
-/* Define EGLint. This must be a signed integral type large enough to contain
- * all legal attribute names and values passed into and out of EGL, whether
- * their type is boolean, bitmask, enumerant (symbolic constant), integer,
- * handle, or other.  While in general a 32-bit integer will suffice, if
- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
- * integer type.
- */
-typedef khronos_int32_t EGLint;
-
-
-/* C++ / C typecast macros for special EGL handle values */
-#if defined(__cplusplus)
-#define EGL_CAST(type, value) (static_cast<type>(value))
-#else
-#define EGL_CAST(type, value) ((type) (value))
-#endif
-
-#endif /* __eglplatform_h */
diff --git a/xorg-libx11/.footprint b/xorg-libx11/.footprint
index d53efac5..9e52fc6b 100644
--- a/xorg-libx11/.footprint
+++ b/xorg-libx11/.footprint
@@ -14,6 +14,7 @@ drwxr-xr-x	root/root	usr/include/X11/
 -rw-r--r--	root/root	usr/include/X11/Xutil.h
 -rw-r--r--	root/root	usr/include/X11/cursorfont.h
 drwxr-xr-x	root/root	usr/include/X11/extensions/
+-rw-r--r--	root/root	usr/include/X11/extensions/XKBgeom.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libX11-xcb.a
 -rwxr-xr-x	root/root	usr/lib/libX11-xcb.la
diff --git a/xorg-libx11/.signature b/xorg-libx11/.signature
index 68cb1637..fd49903a 100644
--- a/xorg-libx11/.signature
+++ b/xorg-libx11/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndDlXO640r+ZA9H+GQrOuSLVJ0TpvUK9uRZ4RB0EBGDAOy6zh8bUGguZLSmMLc3jX7fW7Ga/LaGNNUc4oCB4kMAM=
-SHA256 (Pkgfile) = 4f64a327dccb91092a3b30ad2444506087750c8fcdf69eab91c37928f5ef323d
-SHA256 (.footprint) = 63ced358e03505394f076a68be0e08a228628a70fac192e3a162ee09be4bbab0
+RWTSGWF5Q7TndFTpJz/jgHK44uYVWNW8osDx0IW6+T59MWLYp3Zgdiso98PuIqjeRyUxujdAoFdFOGvD9L5w6CaKNuULfbhV2Q0=
+SHA256 (Pkgfile) = a3f6eea4bd6b4bbfade9ff11778f4ddc13615f0542be430e65963c55b0efb9d0
+SHA256 (.footprint) = 4c27b51e09695066f98ad89cfc3f1e4becc59ccaa39387c56ee010bb8700295f
 SHA256 (libX11-1.8.1.tar.xz) = 1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7
diff --git a/xorg-libx11/Pkgfile b/xorg-libx11/Pkgfile
index 03b2e880..a97cbf92 100644
--- a/xorg-libx11/Pkgfile
+++ b/xorg-libx11/Pkgfile
@@ -5,19 +5,24 @@
 
 name=xorg-libx11
 version=1.8.1
-release=1
+release=2
 source=(https://www.x.org/releases/individual/lib/libX11-$version.tar.xz)
 
 build() {
 	cd libX11-$version
 
-	./configure --prefix=/usr
+	# https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/157
+	# https://bugs.gentoo.org/862115
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016363
+	# https://www.mail-archive.com/tech@openbsd.org/msg71386.html
+	# https://gitlab.freedesktop.org/mesa/demos/-/issues/27
+	# --disable-thread-safety-constructor as per LFS Debian Alpine OpenBSD
 
-	make
-	make DESTDIR=$PKG install
-
-	# Conflict with xorg-xorgproto
-	rm $PKG/usr/include/X11/extensions/XKBgeom.h
+	./configure \
+		--prefix=/usr \
+		--disable-specs \
+		--disable-thread-safety-constructor
 
-	rm -r $PKG/usr/share/doc
+	make
+	make DESTDIR="$PKG" install
 }
diff --git a/xorg-libxvmc/.footprint b/xorg-libxvmc/.footprint
index 7b2288e3..1ade7fb4 100644
--- a/xorg-libxvmc/.footprint
+++ b/xorg-libxvmc/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/X11/
 drwxr-xr-x	root/root	usr/include/X11/extensions/
 -rw-r--r--	root/root	usr/include/X11/extensions/XvMClib.h
+-rw-r--r--	root/root	usr/include/X11/extensions/vldXvMC.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libXvMC.a
 lrwxrwxrwx	root/root	usr/lib/libXvMC.so -> libXvMC.so.1
diff --git a/xorg-libxvmc/.signature b/xorg-libxvmc/.signature
index 9c825760..1af2044e 100644
--- a/xorg-libxvmc/.signature
+++ b/xorg-libxvmc/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndIMg52Qo0XG9Z0ByRbxmqYrQWFqVp10WUJh9VccgM23R3aj3a15rwJc5xikXBpijwVmjDACRTwNNfATrKWj6+wQ=
-SHA256 (Pkgfile) = 1a58bf5b1c29980eca04a8a6e152dffa918fe4fe1c808010cadc58c2f8fb6241
-SHA256 (.footprint) = 1d7b7a67f9beb4ca7dea4864eb89341f684ddd3ec3c41563dd1cefcc33e110d6
+RWTSGWF5Q7TndKbBRYx1sgbM1wrIGFBoKOJhx0xvQQ090OIuMDqnKi3z+t5Q20a7GCOnrg2+i2zlNJH2LRHO+Oa6hjoGG8b4KAE=
+SHA256 (Pkgfile) = bc86c91421506c336bf19ac0425601ac322dbe401080412dceb229ca541a6c40
+SHA256 (.footprint) = 79223968225eb145500793faed2c1e9b7b3862c47ad9934ef30b34f607b68d06
 SHA256 (libXvMC-1.0.13.tar.xz) = 0a9ebe6dea7888a747e5aca1b891d53cd7d3a5f141a9645f77d9b6a12cee657c
diff --git a/xorg-libxvmc/Pkgfile b/xorg-libxvmc/Pkgfile
index a3d7459c..d28f8ef8 100644
--- a/xorg-libxvmc/Pkgfile
+++ b/xorg-libxvmc/Pkgfile
@@ -5,7 +5,7 @@
 
 name=xorg-libxvmc
 version=1.0.13
-release=1
+release=2
 source=(https://www.x.org/releases/individual/lib/libXvMC-$version.tar.xz)
 
 build() {
@@ -19,8 +19,5 @@ build() {
 	meson compile -C build -j ${JOBS:-1}
 	DESTDIR=$PKG meson install -C build
 
-	# Conflict with xorg-xorgproto
-	rm $PKG/usr/include/X11/extensions/vldXvMC.h
-
 	rm -r $PKG/usr/share
 }
diff --git a/xorg-xorgproto/.footprint b/xorg-xorgproto/.footprint
index d2005ff8..3b4a4929 100644
--- a/xorg-xorgproto/.footprint
+++ b/xorg-xorgproto/.footprint
@@ -49,7 +49,6 @@ drwxr-xr-x	root/root	usr/include/X11/extensions/
 -rw-r--r--	root/root	usr/include/X11/extensions/XI2proto.h
 -rw-r--r--	root/root	usr/include/X11/extensions/XIproto.h
 -rw-r--r--	root/root	usr/include/X11/extensions/XKB.h
--rw-r--r--	root/root	usr/include/X11/extensions/XKBgeom.h
 -rw-r--r--	root/root	usr/include/X11/extensions/XKBproto.h
 -rw-r--r--	root/root	usr/include/X11/extensions/XKBsrv.h
 -rw-r--r--	root/root	usr/include/X11/extensions/XKBstr.h
@@ -114,7 +113,6 @@ drwxr-xr-x	root/root	usr/include/X11/extensions/
 -rw-r--r--	root/root	usr/include/X11/extensions/syncconst.h
 -rw-r--r--	root/root	usr/include/X11/extensions/syncproto.h
 -rw-r--r--	root/root	usr/include/X11/extensions/syncstr.h
--rw-r--r--	root/root	usr/include/X11/extensions/vldXvMC.h
 -rw-r--r--	root/root	usr/include/X11/extensions/xcalibrateproto.h
 -rw-r--r--	root/root	usr/include/X11/extensions/xcalibratewire.h
 -rw-r--r--	root/root	usr/include/X11/extensions/xcmiscproto.h
diff --git a/xorg-xorgproto/.signature b/xorg-xorgproto/.signature
index 0ad12341..d660b8df 100644
--- a/xorg-xorgproto/.signature
+++ b/xorg-xorgproto/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndGyD4F+ZNxlUt00VTjeplWaOCsY+SC4Wb8YrKUfBHISbERU7eJBNKP4ZicGlL+js/Il9icIKhQ0KPEvnUUaIAQ8=
-SHA256 (Pkgfile) = 62e8fdf36640d2db7511c34444225d7153953d0e1865172b7278bd5d278aed84
-SHA256 (.footprint) = 48545e86d789569fab329cf1640e78ea622bd394d52d2b9e30e3d79d2d4d088a
+RWTSGWF5Q7TndFENRki6gYwNCTviImY1tLYYQUUpEF8uBy6UmQmBEKOUJef5AzcfWvBuMDGhllsIxcoaxF7r0z88bSYKQlM+zw4=
+SHA256 (Pkgfile) = 762e690fd66eb0b5b9e54fb4ab71ebd831c3799f6666659f2537cdae7d5b929d
+SHA256 (.footprint) = 82871a1c5a447bd86a5fa118352e4cb026d9dbba1c1c3dd6f045e90c593bc50a
 SHA256 (xorgproto-2022.2.tar.xz) = 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e
diff --git a/xorg-xorgproto/Pkgfile b/xorg-xorgproto/Pkgfile
index 37f5d0fd..6d858e1b 100644
--- a/xorg-xorgproto/Pkgfile
+++ b/xorg-xorgproto/Pkgfile
@@ -5,7 +5,7 @@
 
 name=xorg-xorgproto
 version=2022.2
-release=1
+release=2
 source=(https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$version.tar.xz)
 
 build() {
@@ -17,9 +17,14 @@ build() {
 		-D b_pie=true \
 		-D legacy=true
 	meson compile -C build
-	DESTDIR=$PKG meson install -C build
+	DESTDIR="$PKG" meson install -C build
 
-	rm $PKG/usr/include/X11/extensions/{apple,windows}*
-	rm $PKG/usr/share/pkgconfig/{apple,windows}wmproto.pc
-	rm -r $PKG/usr/share/doc
+	# cleanup
+	rm "$PKG"/usr/include/X11/extensions/apple*
+	rm "$PKG"/usr/include/X11/extensions/windows*
+	rm "$PKG"/usr/share/pkgconfig/apple*
+	rm "$PKG"/usr/share/pkgconfig/windows*
+	rm "$PKG"/usr/include/X11/extensions/vldXvMC.h # xorg-libxvmc >= 1.0.13-2
+	rm "$PKG"/usr/include/X11/extensions/XKBgeom.h # xorg-libx11 >= 1.8.1-2
+	rm -r "$PKG"/usr/share/doc
 }