From 6e43626d816a6b809b59b6bea508fa9d9ca84b73 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:22:43 +0000 Subject: import xorg-x11-proto-devel-7.7-20.el7 --- diff --git a/.gitignore b/.gitignore index 974b0cc..741ce42 100644 --- a/.gitignore +++ b/.gitignore @@ -8,15 +8,15 @@ SOURCES/evieext-1.1.1.tar.bz2 SOURCES/fixesproto-5.0.tar.bz2 SOURCES/fontsproto-2.1.3.tar.bz2 SOURCES/glproto-1.4.17.tar.bz2 -SOURCES/inputproto-2.3.1.tar.bz2 +SOURCES/inputproto-2.3.2.tar.bz2 SOURCES/kbproto-1.0.6.tar.bz2 SOURCES/presentproto-1.0.tar.bz2 -SOURCES/randrproto-1.4.0.tar.bz2 +SOURCES/randrproto-1.5.0.tar.bz2 SOURCES/recordproto-1.14.2.tar.bz2 SOURCES/renderproto-0.11.1.tar.bz2 SOURCES/resourceproto-1.2.0.tar.bz2 SOURCES/scrnsaverproto-1.2.2.tar.bz2 -SOURCES/videoproto-2.3.2.tar.bz2 +SOURCES/videoproto-2.3.3.tar.bz2 SOURCES/xcmiscproto-1.2.2.tar.bz2 SOURCES/xextproto-7.3.0.tar.bz2 SOURCES/xf86bigfontproto-1.2.0.tar.bz2 @@ -25,5 +25,5 @@ SOURCES/xf86driproto-2.1.1.tar.bz2 SOURCES/xf86miscproto-0.9.3.tar.bz2 SOURCES/xf86vidmodeproto-2.3.1.tar.bz2 SOURCES/xineramaproto-1.2.1.tar.bz2 -SOURCES/xproto-7.0.26.tar.bz2 +SOURCES/xproto-7.0.31.tar.bz2 SOURCES/xproxymanagementprotocol-1.0.3.tar.bz2 diff --git a/.xorg-x11-proto-devel.metadata b/.xorg-x11-proto-devel.metadata index 50f9c0c..62951cb 100644 --- a/.xorg-x11-proto-devel.metadata +++ b/.xorg-x11-proto-devel.metadata @@ -8,15 +8,15 @@ bd0f0f4dc8f37eaabd9279d10fe2889710507358 SOURCES/damageproto-1.2.1.tar.bz2 ab605af5da8c98c0c2f8b2c578fed7c864ee996a SOURCES/fixesproto-5.0.tar.bz2 28c108bd6438c332122c10871c1fc6415591755f SOURCES/fontsproto-2.1.3.tar.bz2 20e061c463bed415051f0f89e968e331a2078551 SOURCES/glproto-1.4.17.tar.bz2 -126b6ad57b5432e154485f900920765eae8fda45 SOURCES/inputproto-2.3.1.tar.bz2 +62b29a0c3b4ede9d129a0598cc6becf628a2158a SOURCES/inputproto-2.3.2.tar.bz2 a2cc82357c22a1f4d6243017982c32703c95575c SOURCES/kbproto-1.0.6.tar.bz2 432371cdc464881029c3f39f9bf81cc80a484e54 SOURCES/presentproto-1.0.tar.bz2 -65d2fc4440adf1557cde2b36901a3de21ab189c1 SOURCES/randrproto-1.4.0.tar.bz2 +bc420745dc4af011988e9dcabdadf8829cbc2374 SOURCES/randrproto-1.5.0.tar.bz2 1f48c4b0004d8b133efd0498e8d88d68d3b9199c SOURCES/recordproto-1.14.2.tar.bz2 7ae9868a358859fe539482b02414aa15c2d8b1e4 SOURCES/renderproto-0.11.1.tar.bz2 9ff9bb9243b0474330959dc3853973523c9dd9ce SOURCES/resourceproto-1.2.0.tar.bz2 640a2cbef5893aacda74799e6fa4d973e629b753 SOURCES/scrnsaverproto-1.2.2.tar.bz2 -aa60e3b93c6a78ad03f1c502b910e7c45faaedbc SOURCES/videoproto-2.3.2.tar.bz2 +4556b5c2243a2ca290ea2140dc1a427c4bac8ba2 SOURCES/videoproto-2.3.3.tar.bz2 59ae9ec6414964440bf654b207618e5dd66a32fb SOURCES/xcmiscproto-1.2.2.tar.bz2 b8d736342dcb73b71584d99a1cb9806d93c25ff8 SOURCES/xextproto-7.3.0.tar.bz2 312a2ea708b257520c1af4393b69d73a393a478f SOURCES/xf86bigfontproto-1.2.0.tar.bz2 @@ -25,5 +25,5 @@ b8d736342dcb73b71584d99a1cb9806d93c25ff8 SOURCES/xextproto-7.3.0.tar.bz2 52c54ed17e55f26b26654ff16d61da97f9fd36bc SOURCES/xf86miscproto-0.9.3.tar.bz2 11d54c3210887631ea71e8f8030a77692e964fc4 SOURCES/xf86vidmodeproto-2.3.1.tar.bz2 818bffc16139d6e3de4344c83f00c495d3536753 SOURCES/xineramaproto-1.2.1.tar.bz2 -81101b78052fa0f652982081f9328f912b71a948 SOURCES/xproto-7.0.26.tar.bz2 +779fa333c5522cca40ca810c25a8fa60b6ccedfb SOURCES/xproto-7.0.31.tar.bz2 4abb036371670ecc25d32e48b3277fe203ae5203 SOURCES/xproxymanagementprotocol-1.0.3.tar.bz2 diff --git a/SOURCES/randrproto-0001-Add-a-GUID-property.patch b/SOURCES/randrproto-0001-Add-a-GUID-property.patch deleted file mode 100644 index f333da5..0000000 --- a/SOURCES/randrproto-0001-Add-a-GUID-property.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 19fc4c5a72eb9919d720ad66734029d9f8e313b1 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Tue, 12 Jun 2012 12:32:19 -0700 -Subject: [PATCH 1/4] Add a "GUID" property - -This property represents the globally-unique identifier of the connected -display, if one is available. - -Signed-off-by: Aaron Plattner -Reviewed-by: Andy Ritger ---- - randr.h | 1 + - randrproto.txt | 12 ++++++++++++ - 2 files changed, 13 insertions(+) - -diff --git a/randr.h b/randr.h -index 33d22fb..3c6721b 100644 ---- a/randr.h -+++ b/randr.h -@@ -180,6 +180,7 @@ typedef unsigned long XRandrModeFlags; - #define RR_PROPERTY_CLONE_LIST "CloneList" - #define RR_PROPERTY_BORDER "Border" - #define RR_PROPERTY_BORDER_DIMENSIONS "BorderDimensions" -+#define RR_PROPERTY_GUID "GUID" - - /* roles this device can carry out */ - #define RR_Capability_None 0 -diff --git a/randrproto.txt b/randrproto.txt -index 2bf065f..f82407c 100644 ---- a/randrproto.txt -+++ b/randrproto.txt -@@ -1957,6 +1957,17 @@ doesn't handle a mandatory property correctly. - 2 = left/right and top/bottom borders can be specified independently - 4 = all four borders can be specified independently - -+ "GUID" aka RR_PROPERTY_GUID -+ Type: INTEGER -+ Format: 8 -+ Num items: 16 -+ Flags: Immutable -+ Range/List: - -+ -+ Some display devices, such as DisplayPort 1.2 devices, have globally -+ unique identifiers. When such an identifier is available, this property -+ contains its raw bytes. -+ - - 9.2 Properties introduced with version 1.2 of the RandR extension - -@@ -1990,6 +2001,7 @@ Property Immutable Mandatory since - ──────── ───────── ─────────────── - Border yes not mandatory - BorderDimensions yes: static not mandatory -+GUID yes not mandatory - - ❧❧❧❧❧❧❧❧❧❧❧ - --- -1.9.0 - diff --git a/SOURCES/xproto-increase-number-of-file-descriptors.patch b/SOURCES/xproto-increase-number-of-file-descriptors.patch deleted file mode 100644 index 03de7a5..0000000 --- a/SOURCES/xproto-increase-number-of-file-descriptors.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 2c94cdb453bc641246cc8b9a876da9799bee1ce7 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Fri, 29 May 2015 18:16:34 +0200 -Subject: [PATCH 1/2] Increase the number of file descriptors - -To allow up to 512 clients, the number of file descriptors being -monitored need to be increased accordingly. - -Signed-off-by: Adam Jackson -Signed-off-by: Olivier Fourdan -Reviewed-by: Alan Coopersmith ---- - Xpoll.h.in | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/Xpoll.h.in b/Xpoll.h.in -index 0a05424..01be164 100644 ---- a/Xpoll.h.in -+++ b/Xpoll.h.in -@@ -67,7 +67,7 @@ typedef long fd_mask; - # endif - #endif - --#define XFD_SETSIZE 256 -+#define XFD_SETSIZE 512 - - #ifndef FD_SETSIZE - #define FD_SETSIZE XFD_SETSIZE -@@ -127,7 +127,16 @@ typedef struct fd_set { - (howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \ - (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \ - (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \ -- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7)))) -+ (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 8 && (__XFDS_BITS(p, 8))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 9 && (__XFDS_BITS(p, 9))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 10 && (__XFDS_BITS(p, 10))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 11 && (__XFDS_BITS(p, 11))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 12 && (__XFDS_BITS(p, 12))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 13 && (__XFDS_BITS(p, 13))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 14 && (__XFDS_BITS(p, 14))) || \ -+ (howmany(FD_SETSIZE, NFDBITS) > 15 && (__XFDS_BITS(p, 15)))) -+ - - #define XFD_COPYSET(src,dst) { \ - int __i__; \ --- -2.5.0 - -From edc04f87c74abacb57782dc947f81a2810a72537 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Wed, 26 Aug 2015 10:11:11 +0200 -Subject: [PATCH 2/2] Raise the number of FD on WIN32 as well - -Commit 2c94cdb raised the number of file descriptors from 256 to 512 -but only for non-WIN32 platforms. - -The definition of XFD_SETSIZE being duplicated, we need to do the same -for WIN32 builds as well otherwise a newer X server trying to -use more than 256 clients would fail on that platform. - -Signed-off-by: Olivier Fourdan -Reviewed-by: Jon TURNEY ---- - Xpoll.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Xpoll.h.in b/Xpoll.h.in -index 01be164..2878591 100644 ---- a/Xpoll.h.in -+++ b/Xpoll.h.in -@@ -165,7 +165,7 @@ typedef struct fd_set { - - #else /* WIN32 */ - --#define XFD_SETSIZE 256 -+#define XFD_SETSIZE 512 - #ifndef FD_SETSIZE - #define FD_SETSIZE XFD_SETSIZE - #endif --- -2.5.0 - diff --git a/SPECS/xorg-x11-proto-devel.spec b/SPECS/xorg-x11-proto-devel.spec index c57ee35..63cca32 100644 --- a/SPECS/xorg-x11-proto-devel.spec +++ b/SPECS/xorg-x11-proto-devel.spec @@ -1,13 +1,13 @@ # INFO: When doing a bootstrap build on a new architecture, set this to 1 to # avoid build loops. -%define build_bootstrap 1 +%global build_bootstrap 1 -%define debug_package %{nil} +%global debug_package %{nil} Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.7 -Release: 13%{?dist} +Release: 20%{?dist} License: MIT Group: Development/System URL: http://www.x.org @@ -23,15 +23,15 @@ Source4: http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar Source5: http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2 Source7: http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.3.tar.bz2 Source8: http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.17.tar.bz2 -Source9: http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.3.1.tar.bz2 +Source9: http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.3.2.tar.bz2 Source10: http://xorg.freedesktop.org/archive/individual/proto/kbproto-1.0.6.tar.bz2 Source32: http://xorg.freedesktop.org/archive/individual/proto/presentproto-1.0.tar.bz2 -Source13: http://xorg.freedesktop.org/archive/individual/proto/randrproto-1.4.0.tar.bz2 +Source13: http://xorg.freedesktop.org/archive/individual/proto/randrproto-1.5.0.tar.bz2 Source14: http://xorg.freedesktop.org/archive/individual/proto/recordproto-1.14.2.tar.bz2 Source15: http://xorg.freedesktop.org/archive/individual/proto/renderproto-0.11.1.tar.bz2 Source16: http://xorg.freedesktop.org/archive/individual/proto/resourceproto-1.2.0.tar.bz2 Source17: http://xorg.freedesktop.org/archive/individual/proto/scrnsaverproto-1.2.2.tar.bz2 -Source19: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.2.tar.bz2 +Source19: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.3.tar.bz2 Source20: http://xorg.freedesktop.org/archive/individual/proto/xcmiscproto-1.2.2.tar.bz2 Source21: http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.3.0.tar.bz2 Source22: http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2 @@ -40,14 +40,12 @@ Source24: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1. Source25: http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2 Source27: http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 Source28: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2 -Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.26.tar.bz2 +Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.31.tar.bz2 Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2 Source40: make-git-snapshot.sh Patch1: presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch -Patch2: randrproto-0001-Add-a-GUID-property.patch -Patch3: xproto-increase-number-of-file-descriptors.patch BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.2-1 @@ -70,14 +68,6 @@ pushd presentproto-* %patch1 -p1 popd -pushd randrproto-* -%patch2 -p1 -popd - -pushd xproto-* -%patch3 -p1 -popd - %build # Proceed through each proto package directory, building them all @@ -291,8 +281,32 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg} %{_datadir}/pkgconfig/xproxymngproto.pc %changelog -* Tue Mar 22 2016 Olivier Fourdan - 7.7-13 -- xproto: Increase number of file descriptors to 512 +* Mon Sep 26 2016 Adam Jackson - 7.7-20 +- xproto 7.0.31 + +* Mon Apr 04 2016 Peter Hutterer 7.7-19 +- inputproto 2.3.2 + +* Fri Mar 11 2016 Adam Jackson 7.7-18 +- videoproto 2.3.3 + +* Fri Feb 05 2016 Fedora Release Engineering - 7.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 20 2016 Peter Hutterer +- s/define/global/ + +* Wed Jul 01 2015 Adam Jackson 7.7-16 +- xproto 7.0.28 + +* Fri Jun 19 2015 Fedora Release Engineering - 7.7-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 17 2015 Dave Airlie 7.7-14 +- randrproto-1.5.0 + +* Wed Apr 01 2015 Dave Airlie 7.7-13 +- randrproto-1.4.1 * Thu Jun 12 2014 Hans de Goede - 7.7-12 - inputproto-2.3.1