[arch-commits] Commit in libxcb/trunk (2 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Sat Jul 12 17:34:53 UTC 2014
Date: Saturday, July 12, 2014 @ 19:34:52
Author: lcarlier
Revision: 216838
upgpkg: libxcb 1.10-3
Fix Present support (FS#41172)
Added:
libxcb/trunk/Force-XCB-event-structures-with-64-bit-extended-fiel.patch
Modified:
libxcb/trunk/PKGBUILD
------------------------------------------------------------+
Force-XCB-event-structures-with-64-bit-extended-fiel.patch | 102 +++++++++++
PKGBUILD | 12 -
2 files changed, 110 insertions(+), 4 deletions(-)
Added: Force-XCB-event-structures-with-64-bit-extended-fiel.patch
===================================================================
--- Force-XCB-event-structures-with-64-bit-extended-fiel.patch (rev 0)
+++ Force-XCB-event-structures-with-64-bit-extended-fiel.patch 2014-07-12 17:34:52 UTC (rev 216838)
@@ -0,0 +1,102 @@
+From 3b72a2c9d1d656c74c691a45689e1d637f669e3a Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth at whitecape.org>
+Date: Fri, 03 Jan 2014 23:08:33 +0000
+Subject: Force XCB event structures with 64-bit extended fields to be packed.
+
+With the advent of the Present extension, some events (such as
+PresentCompleteNotify) now use native 64-bit types on the wire.
+
+For XGE events, we insert an extra "uint32_t full_sequence" field
+immediately after the first 32 bytes of data. Normally, this causes
+the subsequent fields to be shifted over by 4 bytes, and the structure
+to grow in size by 4 bytes. Everything works fine.
+
+However, if event contains 64-bit extended fields, this may result in
+the compiler adding an extra 4 bytes of padding so that those fields
+remain aligned on 64-bit boundaries. This causes the structure to grow
+by 8 bytes, not 4. Unfortunately, XCB doesn't realize this, and
+always believes that the length only increased by 4. read_packet()
+then fails to malloc enough memory to hold the event, and the event
+processing code uses the wrong offsets.
+
+To fix this, mark any event structures containing 64-bit extended
+fields with __attribute__((__packed__)).
+
+v2: Use any(...) instead of True in (...), as suggested by
+ Daniel Martin.
+
+v3 (Alan Coopersmith): Fix build with Solaris Studio 12.3 by moving the
+attribute to after the structure definition.
+
+Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
+Reviewed-by: Keith Packard <keithp at keithp.com> [v1]
+Reviewed-by: Josh Triplett <josh at joshtriplett.org> [v1]
+Reviewed-by: Daniel Martin <consume.noise at gmail.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+---
+diff --git a/src/c_client.py b/src/c_client.py
+index 99fd307..45de544 100644
+--- a/src/c_client.py
++++ b/src/c_client.py
+@@ -1762,7 +1762,7 @@ def c_simple(self, name):
+ # Iterator
+ _c_iterator(self, name)
+
+-def _c_complex(self):
++def _c_complex(self, force_packed = False):
+ '''
+ Helper function for handling all structure types.
+ Called for all structs, requests, replies, events, errors.
+@@ -1817,7 +1817,7 @@ def _c_complex(self):
+ if b.type.has_name:
+ _h(' } %s;', b.c_field_name)
+
+- _h('} %s;', self.c_type)
++ _h('} %s%s;', 'XCB_PACKED ' if force_packed else '', self.c_type)
+
+ def c_struct(self, name):
+ '''
+@@ -2902,6 +2902,7 @@ def c_event(self, name):
+ # events while generating the structure for them. Otherwise we would read
+ # garbage (the internal full_sequence) when accessing normal event fields
+ # there.
++ force_packed = False
+ if hasattr(self, 'is_ge_event') and self.is_ge_event and self.name == name:
+ event_size = 0
+ for field in self.fields:
+@@ -2911,6 +2912,11 @@ def c_event(self, name):
+ full_sequence = Field(tcard32, tcard32.name, 'full_sequence', False, True, True)
+ idx = self.fields.index(field)
+ self.fields.insert(idx + 1, full_sequence)
++
++ # If the event contains any 64-bit extended fields, they need
++ # to remain aligned on a 64-bit boundary. Adding full_sequence
++ # would normally break that; force the struct to be packed.
++ force_packed = any(f.type.size == 8 and f.type.is_simple for f in self.fields[(idx+1):])
+ break
+
+ _c_type_setup(self, name, ('event',))
+@@ -2920,7 +2926,7 @@ def c_event(self, name):
+
+ if self.name == name:
+ # Structure definition
+- _c_complex(self)
++ _c_complex(self, force_packed)
+ else:
+ # Typedef
+ _h('')
+diff --git a/src/xcb.h b/src/xcb.h
+index e62c985..73c77a3 100644
+--- a/src/xcb.h
++++ b/src/xcb.h
+@@ -51,6 +51,8 @@ extern "C" {
+ * @file xcb.h
+ */
+
++#define XCB_PACKED __attribute__((__packed__))
++
+ /**
+ * @defgroup XCB_Core_API XCB Core API
+ * @brief Core API of the XCB library.
+--
+cgit v0.9.0.2-2-gbebe
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-12 14:49:30 UTC (rev 216837)
+++ PKGBUILD 2014-07-12 17:34:52 UTC (rev 216838)
@@ -5,7 +5,7 @@
pkgname=libxcb
pkgver=1.10
-pkgrel=2
+pkgrel=3
pkgdesc="X11 client-side library"
arch=('i686' 'x86_64')
url="http://xcb.freedesktop.org/"
@@ -14,10 +14,12 @@
license=('custom')
source=($url/dist/$pkgname-$pkgver.tar.bz2
libxcb-1.1-no-pthread-stubs.patch
- Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch)
+ Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
+ Force-XCB-event-structures-with-64-bit-extended-fiel.patch)
sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5'
'748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356'
- '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb')
+ '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb'
+ '7dd84c631da541e2dc708323071c3306ceaf79ee807aa457c1cdc7e069b7ccb9')
prepare() {
cd "$pkgname-$pkgver"
@@ -25,7 +27,9 @@
autoreconf -vfi
# fix FS#40289 merged upstream
- patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
+ patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
+ # fix FS#41172 merged upstream
+ patch -Np1 -i ../Force-XCB-event-structures-with-64-bit-extended-fiel.patch
}
build() {
More information about the arch-commits
mailing list