airlied pushed to xorg-x11-proto-devel (f22). "randrproto-1.4.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 00:57:14 UTC 2015


>From 2735510413aafed5b84c0685cb49b2d00d61e570 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 1 Apr 2015 10:53:33 +1000
Subject: randrproto-1.4.1


diff --git a/.gitignore b/.gitignore
index a52495d..209bf2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,4 @@ inputproto-2.0.1.tar.bz2
 /xextproto-7.3.0.tar.bz2
 /xproto-7.0.26.tar.bz2
 /inputproto-2.3.1.tar.bz2
+/randrproto-1.4.1.tar.bz2
diff --git a/randrproto-0001-Add-a-GUID-property.patch b/randrproto-0001-Add-a-GUID-property.patch
deleted file mode 100644
index f333da5..0000000
--- a/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 <aplattner at nvidia.com>
-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 <aplattner at nvidia.com>
-Reviewed-by: Andy Ritger <aritger at nvidia.com>
----
- 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 b/sources
index bbe65f5..1064e76 100644
--- a/sources
+++ b/sources
@@ -11,7 +11,7 @@ e7431ab84d37b2678af71e29355e101d  fixesproto-5.0.tar.bz2
 6caebead4b779ba031727f66a7ffa358  inputproto-2.3.1.tar.bz2
 677ea8523eec6caca86121ad2dca0b71  kbproto-1.0.6.tar.bz2
 2d569c75884455c7148d133d341e8fd6  presentproto-1.0.tar.bz2
-ce4d0b05675968e4c83e003cc809660d  randrproto-1.4.0.tar.bz2
+51ff4d45dbe8e1098740d384971805ee  randrproto-1.4.1.tar.bz2
 1b4e5dede5ea51906f1530ca1e21d216  recordproto-1.14.2.tar.bz2
 a914ccc1de66ddeb4b611c6b0686e274  renderproto-0.11.1.tar.bz2
 cfdb57dae221b71b2703f8e2980eaaf4  resourceproto-1.2.0.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index fff7a29..69e79b6 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.7
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -26,7 +26,7 @@ Source8:  http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.17.ta
 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
+Source13: http://xorg.freedesktop.org/archive/individual/proto/randrproto-1.4.1.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
@@ -46,7 +46,6 @@ Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementp
 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
@@ -69,11 +68,6 @@ pushd presentproto-*
 %patch1 -p1
 popd
 
-pushd randrproto-*
-%patch2 -p1
-popd
-
-
 %build
 
 # Proceed through each proto package directory, building them all
@@ -287,6 +281,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Apr 01 2015 Dave Airlie <airlied at redhat.com> 7.7-13
+- randrproto-1.4.1
+
 * Thu Jun 12 2014 Hans de Goede <hdegoede at redhat.com> - 7.7-12
 - inputproto-2.3.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-proto-devel.git/commit/?h=f22&id=2735510413aafed5b84c0685cb49b2d00d61e570


More information about the scm-commits mailing list