From a38fe95df4a95b39afb41ccbbec6cc15d9a57008 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:42:58 +0000 Subject: import xorg-x11-proto-devel-7.7-12.el7 --- diff --git a/.gitignore b/.gitignore index d646180..974b0cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ SOURCES/dri2proto-2.8.tar.bz2 SOURCES/dri3proto-1.0.tar.bz2 SOURCES/evieext-1.1.1.tar.bz2 SOURCES/fixesproto-5.0.tar.bz2 -SOURCES/fontsproto-2.1.2.tar.bz2 +SOURCES/fontsproto-2.1.3.tar.bz2 SOURCES/glproto-1.4.17.tar.bz2 -SOURCES/inputproto-2.3.tar.bz2 +SOURCES/inputproto-2.3.1.tar.bz2 SOURCES/kbproto-1.0.6.tar.bz2 SOURCES/presentproto-1.0.tar.bz2 SOURCES/randrproto-1.4.0.tar.bz2 @@ -16,14 +16,14 @@ 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.1.tar.bz2 +SOURCES/videoproto-2.3.2.tar.bz2 SOURCES/xcmiscproto-1.2.2.tar.bz2 -SOURCES/xextproto-7.2.99.901.tar.bz2 +SOURCES/xextproto-7.3.0.tar.bz2 SOURCES/xf86bigfontproto-1.2.0.tar.bz2 SOURCES/xf86dgaproto-2.1.tar.bz2 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.24.tar.bz2 +SOURCES/xproto-7.0.26.tar.bz2 SOURCES/xproxymanagementprotocol-1.0.3.tar.bz2 diff --git a/.xorg-x11-proto-devel.metadata b/.xorg-x11-proto-devel.metadata index 8023795..50f9c0c 100644 --- a/.xorg-x11-proto-devel.metadata +++ b/.xorg-x11-proto-devel.metadata @@ -6,9 +6,9 @@ bd0f0f4dc8f37eaabd9279d10fe2889710507358 SOURCES/damageproto-1.2.1.tar.bz2 1007eaa2f83022653a224f7d2e676ea51cba2f2b SOURCES/dri3proto-1.0.tar.bz2 86d9545273b07961f0d5ba65c6c408371e10c0d2 SOURCES/evieext-1.1.1.tar.bz2 ab605af5da8c98c0c2f8b2c578fed7c864ee996a SOURCES/fixesproto-5.0.tar.bz2 -538f0880faa6981cb1a348ced93dc715c42840f7 SOURCES/fontsproto-2.1.2.tar.bz2 +28c108bd6438c332122c10871c1fc6415591755f SOURCES/fontsproto-2.1.3.tar.bz2 20e061c463bed415051f0f89e968e331a2078551 SOURCES/glproto-1.4.17.tar.bz2 -4eacc1883593d3f0040e410be3afc8483c7d2409 SOURCES/inputproto-2.3.tar.bz2 +126b6ad57b5432e154485f900920765eae8fda45 SOURCES/inputproto-2.3.1.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 @@ -16,14 +16,14 @@ a2cc82357c22a1f4d6243017982c32703c95575c SOURCES/kbproto-1.0.6.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 -bb8b366687a7f345e3a8697bac516cb436cbf4b2 SOURCES/videoproto-2.3.1.tar.bz2 +aa60e3b93c6a78ad03f1c502b910e7c45faaedbc SOURCES/videoproto-2.3.2.tar.bz2 59ae9ec6414964440bf654b207618e5dd66a32fb SOURCES/xcmiscproto-1.2.2.tar.bz2 -59677ac36e562cc0af66a3a74708ed7bb3b21dea SOURCES/xextproto-7.2.99.901.tar.bz2 +b8d736342dcb73b71584d99a1cb9806d93c25ff8 SOURCES/xextproto-7.3.0.tar.bz2 312a2ea708b257520c1af4393b69d73a393a478f SOURCES/xf86bigfontproto-1.2.0.tar.bz2 97a06120e7195c968875e8ba42e82c90ab54948b SOURCES/xf86dgaproto-2.1.tar.bz2 23e861f40ba0f0cbbfd7db7ba2ef623762ffca17 SOURCES/xf86driproto-2.1.1.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 -c05b5757174839644f2fd98c1b062150494b6b15 SOURCES/xproto-7.0.24.tar.bz2 +81101b78052fa0f652982081f9328f912b71a948 SOURCES/xproto-7.0.26.tar.bz2 4abb036371670ecc25d32e48b3277fe203ae5203 SOURCES/xproxymanagementprotocol-1.0.3.tar.bz2 diff --git a/SOURCES/presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch b/SOURCES/presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch new file mode 100644 index 0000000..4fe42c3 --- /dev/null +++ b/SOURCES/presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch @@ -0,0 +1,41 @@ +From 8405ee4552565825d776e6a8963d33d9cd9cddf0 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 11 Dec 2013 13:25:06 -0500 +Subject: [PATCH presentproto 1/4] Force Window and Pixmap to be CARD32 on the + wire + +If you don't do this then the client libs on 64-bit machines see them as +XIDs, which are 64-bit wide (sigh), which ruins the wire encoding and +nothing works. + +Reviewed-by: Jasper St. Pierre +Signed-off-by: Adam Jackson +--- + presentproto.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/presentproto.h b/presentproto.h +index 8303a94..ee65fa4 100644 +--- a/presentproto.h ++++ b/presentproto.h +@@ -25,6 +25,8 @@ + + #include + ++#define Window CARD32 ++#define Pixmap CARD32 + #define Region CARD32 + #define XSyncFence CARD32 + #define EventID CARD32 +@@ -235,6 +237,8 @@ typedef struct { + + #define sz_xPresentRedirectNotify 104 + ++#undef Window ++#undef Pixmap + #undef Region + #undef XSyncFence + #undef EventID +-- +1.9.0 + diff --git a/SOURCES/randrproto-0001-Add-a-GUID-property.patch b/SOURCES/randrproto-0001-Add-a-GUID-property.patch new file mode 100644 index 0000000..f333da5 --- /dev/null +++ b/SOURCES/randrproto-0001-Add-a-GUID-property.patch @@ -0,0 +1,60 @@ +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/SPECS/xorg-x11-proto-devel.spec b/SPECS/xorg-x11-proto-devel.spec index ee253a5..fff7a29 100644 --- a/SPECS/xorg-x11-proto-devel.spec +++ b/SPECS/xorg-x11-proto-devel.spec @@ -7,7 +7,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.7 -Release: 8%{?dist}.1 +Release: 12%{?dist} License: MIT Group: Development/System URL: http://www.x.org @@ -21,9 +21,9 @@ Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-2.8.tar Source33: http://xorg.freedesktop.org/pub/individual/proto/dri3proto-1.0.tar.bz2 Source4: http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar.bz2 Source5: http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2 -Source7: http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.2.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.tar.bz2 +Source9: http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.3.1.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 @@ -31,20 +31,23 @@ Source14: http://xorg.freedesktop.org/archive/individual/proto/recordproto-1.14. 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.1.tar.bz2 +Source19: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.2.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.2.99.901.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 Source23: http://xorg.freedesktop.org/archive/individual/proto/xf86dgaproto-2.1.tar.bz2 Source24: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1.1.tar.bz2 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.24.tar.bz2 +Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.26.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 + BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.2-1 BuildRequires: autoconf automake libtool @@ -58,17 +61,28 @@ Requires: pkgconfig %description X.Org X11 Protocol headers + %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31 -a32 -a33 +pushd presentproto-* +%patch1 -p1 +popd + +pushd randrproto-* +%patch2 -p1 +popd + + %build # Proceed through each proto package directory, building them all for dir in $(ls -1) ; do pushd $dir [ -e configure ] || ./autogen.sh - # yes, this looks horrible, but it's to get the .pc files in datadir + # HdG: AFAIK this is not necessary, remove ? autoreconf -vif + # yes, this looks horrible, but it's to get the .pc files in datadir %configure --libdir=%{_datadir} --without-xmlto make %{?_smp_mflags} # XXX presentproto, dri3proto missing this initially @@ -79,10 +93,9 @@ done %install -rm -rf $RPM_BUILD_ROOT for dir in $(ls -1) ; do pushd $dir - make install DESTDIR=$RPM_BUILD_ROOT + %make_install install -m 444 COPYING-${dir%%-*} $OLDPWD popd done @@ -97,11 +110,8 @@ mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec . # keep things building even if you have the html doc tools for xmlto installed rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg} -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc COPYING-* %doc *.txt %doc PM_spec @@ -277,7 +287,23 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pkgconfig/xproxymngproto.pc %changelog -* Tue Dec 10 2013 Adam Jackson 7.7-8.1 +* Thu Jun 12 2014 Hans de Goede - 7.7-12 +- inputproto-2.3.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 7.7-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Apr 16 2014 Hans de Goede - 7.7-10 +- fontsproto-2.1.3 +- videoproto-2.3.2 +- xextproto-7.3.0 +- xproto-7.0.26 +- Cherry pick some unreleased fixes from upstream git + +* Thu Jan 23 2014 Adam Jackson 7.7-9 +- Backport pointer-to-void* changes + +* Tue Dec 10 2013 Adam Jackson 7.7-8 - glproto 1.4.17 * Wed Nov 06 2013 Adam Jackson 7.7-7