xorgproto, bump version (#8741)

x11-base/xorg-proto/patches/xorgproto-2022.2.patchset

@@ -1,47 +1,4 @@
-From b66daa576885031c18437e407300128785a1cc8c Mon Sep 17 00:00:00 2001
+From ba87604b1758eb57a8eda178c40ffcbcb532036f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Fri, 7 Jan 2022 15:15:24 -0500
-Subject: configure: add proper check for fd_set.bits
-
-
-diff --git a/configure.ac b/configure.ac
-index a6008fa..02a7a3a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,28 @@ case $host_os in
- 	*)		fds_bits_found=false;;
- esac
- 
-+if test "x$fds_bits_found" = xfalse ; then
-+   AC_CHECK_MEMBER(fd_set.bits,
-+			   [
-+			       fds_bits_found=plain_simple
-+			       USE_FDS_BITS="bits"
-+			   ],,
-+			   [
-+                               #ifdef HAVE_SYS_PARAM_H
-+                               #include <sys/param.h>
-+                               #endif
-+                               #ifdef HAVE_SYS_TYPES_H
-+                               #include <sys/types.h>
-+                               #endif
-+                               #ifdef HAVE_SYS_TIME_H
-+                               #include <sys/time.h>
-+                               #endif
-+                               #ifdef HAVE_SYS_SELECT_H
-+			       #include <sys/select.h>
-+                               #endif
-+			   ])
-+fi
-+
- if test "x$fds_bits_found" = xfalse ; then
-    AC_CHECK_MEMBER(fd_set.fds_bits,
- 			   [
--- 
-2.30.2
-
-
-From ae10146adf2902f7fbb66381fb518a61f3b80bdf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sat, 14 Jul 2018 15:26:34 +0200
 Subject: Assume Haiku uses POSIX thread safe functions
@@ -63,10 +20,10 @@ index f963b64..f8b727b 100644
  
  #ifdef __cplusplus
 -- 
-2.30.2
+2.37.3
 
 
-From e3cfb189dd01d1541611c533340c46d957febe1f Mon Sep 17 00:00:00 2001
+From cebe50e5c825d64395c4de7a137821e6056cfc58 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sat, 14 Jul 2018 15:29:54 +0200
 Subject: Haiku only has POSIX-mandated passwd fields
@@ -86,5 +43,33 @@ index f8b727b..970f37d 100644
  {
     memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
 -- 
-2.30.2
+2.37.3
+
+
+From da7e74bfb732ef94d8404ce5d08d5dd85afee088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Fri, 7 Jan 2022 15:15:24 -0500
+Subject: configure: fix check for fd_set.bits
+
+
+diff --git a/configure.ac b/configure.ac
+index 87334ad..0f2dc22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,10 +59,10 @@ case $host_os in
+ esac
+ 
+ if test "x$fds_bits_found" = xfalse ; then
+-   AC_CHECK_MEMBER(fd_set.fds_bits,
++   AC_CHECK_MEMBER(fd_set.bits,
+ 			   [
+-			       fds_bits_found=plain
+-			       USE_FDS_BITS="fds_bits"
++			       fds_bits_found=plain_simple
++			       USE_FDS_BITS="bits"
+ 			   ],,
+ 			   [
+                                #ifdef HAVE_SYS_PARAM_H
+-- 
+2.37.3
 

x11-base/xorg-proto/xorgproto-2022.2.recipe

@@ -9,8 +9,8 @@ COPYRIGHT="1991 Oracle and/or its affiliates. All rights reserved.
 	1999 The XFree86 Project Inc."
 LICENSE="MIT (no promotion)"
 REVISION="1"
-SOURCE_URI="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$portVersion.tar.bz2"
+SOURCE_URI="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$portVersion.tar.xz"
-CHECKSUM_SHA256="aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015"
+CHECKSUM_SHA256="5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e"
 PATCHES="xorgproto-$portVersion.patchset"
 
 ARCHITECTURES="any"
@@ -24,7 +24,7 @@ PROVIDES="
 	devel:dmxproto = 2.3.1
 	devel:dpmsproto = 1.2
 	devel:dri2proto = 2.8
-	devel:dri3proto = 1.2
+	devel:dri3proto = 1.3
 	devel:evieproto = 1.1.1
 	devel:fixesproto = 6.0
 	devel:fontcacheproto = 0.1.3
@@ -55,6 +55,7 @@ PROVIDES="
 	devel:xineramaproto = 1.2.1
 	devel:xproto = 7.0.33
 	devel:xproxymngproto = 1.0.3
+	devel:xwaylandproto = 1.0
 	"
 REQUIRES="
 	haiku
@@ -120,4 +121,8 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	# licenses
+	mkdir -p $dataDir/licenses/xorgproto
+	cp COPYING-* $dataDir/licenses/xorgproto
 }