[Midnightbsd-cvs] mports [18335] trunk/x11: update libxcb
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Mar 26 20:22:16 EDT 2015
Revision: 18335
http://svnweb.midnightbsd.org/mports/?rev=18335
Author: laffer1
Date: 2015-03-26 20:22:16 -0400 (Thu, 26 Mar 2015)
Log Message:
-----------
update libxcb
Modified Paths:
--------------
trunk/x11/libxcb/Makefile
trunk/x11/libxcb/distinfo
trunk/x11/libxcb/pkg-plist
trunk/x11/xcb-proto/Makefile
trunk/x11/xcb-proto/distinfo
Removed Paths:
-------------
trunk/x11/libxcb/files/patch-64bit-packed
trunk/x11/xcb-proto/files/
Modified: trunk/x11/libxcb/Makefile
===================================================================
--- trunk/x11/libxcb/Makefile 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/libxcb/Makefile 2015-03-27 00:22:16 UTC (rev 18335)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libxcb
-PORTVERSION= 1.10
+PORTVERSION= 1.11
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -19,10 +19,11 @@
CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput
XORG_CAT= lib
-USES= gmake
+USES= gmake python:2,build
USE_GNOME= libxslt:build
USE_XORG= xau xdmcp
USE_PYTHON_BUILD=2
+INSTALL_TARGET= install-strip
OPTIONS_DEFINE= DOCS
@@ -42,7 +43,4 @@
.include <bsd.mport.options.mk>
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxcb*.so.*
-
.include <bsd.port.mk>
Modified: trunk/x11/libxcb/distinfo
===================================================================
--- trunk/x11/libxcb/distinfo 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/libxcb/distinfo 2015-03-27 00:22:16 UTC (rev 18335)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxcb-1.10.tar.bz2) = 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5
-SIZE (xorg/lib/libxcb-1.10.tar.bz2) = 475211
+SHA256 (xorg/lib/libxcb-1.11.tar.bz2) = 03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7
+SIZE (xorg/lib/libxcb-1.11.tar.bz2) = 517700
Deleted: trunk/x11/libxcb/files/patch-64bit-packed
===================================================================
--- trunk/x11/libxcb/files/patch-64bit-packed 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/libxcb/files/patch-64bit-packed 2015-03-27 00:22:16 UTC (rev 18335)
@@ -1,102 +0,0 @@
-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
---- src/c_client.py
-+++ 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
---- src/xcb.h
-+++ 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: trunk/x11/libxcb/pkg-plist
===================================================================
--- trunk/x11/libxcb/pkg-plist 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/libxcb/pkg-plist 2015-03-27 00:22:16 UTC (rev 18335)
@@ -33,106 +33,132 @@
lib/libxcb-composite.la
lib/libxcb-composite.so
lib/libxcb-composite.so.0
+lib/libxcb-composite.so.0.0.0
lib/libxcb-damage.a
lib/libxcb-damage.la
lib/libxcb-damage.so
lib/libxcb-damage.so.0
+lib/libxcb-damage.so.0.0.0
lib/libxcb-dpms.a
lib/libxcb-dpms.la
lib/libxcb-dpms.so
lib/libxcb-dpms.so.0
+lib/libxcb-dpms.so.0.0.0
lib/libxcb-dri2.a
lib/libxcb-dri2.la
lib/libxcb-dri2.so
lib/libxcb-dri2.so.0
+lib/libxcb-dri2.so.0.0.0
lib/libxcb-dri3.a
lib/libxcb-dri3.la
lib/libxcb-dri3.so
lib/libxcb-dri3.so.0
+lib/libxcb-dri3.so.0.0.0
lib/libxcb-glx.a
lib/libxcb-glx.la
lib/libxcb-glx.so
lib/libxcb-glx.so.0
+lib/libxcb-glx.so.0.0.0
lib/libxcb-present.a
lib/libxcb-present.la
lib/libxcb-present.so
lib/libxcb-present.so.0
+lib/libxcb-present.so.0.0.0
lib/libxcb-randr.a
lib/libxcb-randr.la
lib/libxcb-randr.so
-lib/libxcb-randr.so.1
+lib/libxcb-randr.so.0
+lib/libxcb-randr.so.0.1.0
lib/libxcb-record.a
lib/libxcb-record.la
lib/libxcb-record.so
lib/libxcb-record.so.0
+lib/libxcb-record.so.0.0.0
lib/libxcb-render.a
lib/libxcb-render.la
lib/libxcb-render.so
lib/libxcb-render.so.0
+lib/libxcb-render.so.0.0.0
lib/libxcb-res.a
lib/libxcb-res.la
lib/libxcb-res.so
lib/libxcb-res.so.0
+lib/libxcb-res.so.0.0.0
lib/libxcb-screensaver.a
lib/libxcb-screensaver.la
lib/libxcb-screensaver.so
lib/libxcb-screensaver.so.0
+lib/libxcb-screensaver.so.0.0.0
lib/libxcb-shape.a
lib/libxcb-shape.la
lib/libxcb-shape.so
lib/libxcb-shape.so.0
+lib/libxcb-shape.so.0.0.0
lib/libxcb-shm.a
lib/libxcb-shm.la
lib/libxcb-shm.so
lib/libxcb-shm.so.0
+lib/libxcb-shm.so.0.0.0
lib/libxcb-sync.a
lib/libxcb-sync.la
lib/libxcb-sync.so
lib/libxcb-sync.so.1
+lib/libxcb-sync.so.1.0.0
lib/libxcb-xevie.a
lib/libxcb-xevie.la
lib/libxcb-xevie.so
lib/libxcb-xevie.so.0
+lib/libxcb-xevie.so.0.0.0
lib/libxcb-xf86dri.a
lib/libxcb-xf86dri.la
lib/libxcb-xf86dri.so
lib/libxcb-xf86dri.so.0
+lib/libxcb-xf86dri.so.0.0.0
lib/libxcb-xfixes.a
lib/libxcb-xfixes.la
lib/libxcb-xfixes.so
lib/libxcb-xfixes.so.0
+lib/libxcb-xfixes.so.0.0.0
lib/libxcb-xinerama.a
lib/libxcb-xinerama.la
lib/libxcb-xinerama.so
lib/libxcb-xinerama.so.0
+lib/libxcb-xinerama.so.0.0.0
lib/libxcb-xinput.a
lib/libxcb-xinput.la
lib/libxcb-xinput.so
-lib/libxcb-xinput.so.1
+lib/libxcb-xinput.so.0
+lib/libxcb-xinput.so.0.1.0
lib/libxcb-xkb.a
lib/libxcb-xkb.la
lib/libxcb-xkb.so
lib/libxcb-xkb.so.1
+lib/libxcb-xkb.so.1.0.0
lib/libxcb-xprint.a
lib/libxcb-xprint.la
lib/libxcb-xprint.so
lib/libxcb-xprint.so.0
+lib/libxcb-xprint.so.0.0.0
lib/libxcb-xtest.a
lib/libxcb-xtest.la
lib/libxcb-xtest.so
lib/libxcb-xtest.so.0
+lib/libxcb-xtest.so.0.0.0
lib/libxcb-xv.a
lib/libxcb-xv.la
lib/libxcb-xv.so
lib/libxcb-xv.so.0
+lib/libxcb-xv.so.0.0.0
lib/libxcb-xvmc.a
lib/libxcb-xvmc.la
lib/libxcb-xvmc.so
lib/libxcb-xvmc.so.0
+lib/libxcb-xvmc.so.0.0.0
lib/libxcb.a
lib/libxcb.la
lib/libxcb.so
-lib/libxcb.so.2
+lib/libxcb.so.1
+lib/libxcb.so.1.1.0
libdata/pkgconfig/xcb-composite.pc
libdata/pkgconfig/xcb-damage.pc
libdata/pkgconfig/xcb-dpms.pc
@@ -1942,6 +1968,9 @@
man/man3/xcb_x_print_print_end_page.3.gz
man/man3/xcb_x_print_print_end_page_checked.3.gz
man/man3/xcb_x_print_print_get_attributes.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes_end.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes_length.3.gz
man/man3/xcb_x_print_print_get_attributes_reply.3.gz
man/man3/xcb_x_print_print_get_attributes_unchecked.3.gz
man/man3/xcb_x_print_print_get_context.3.gz
@@ -2407,6 +2436,3 @@
man/man3/xcb_xvmc_query_version_unchecked.3.gz
%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial/xcb.css
- at dirrmtry include/xcb
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: trunk/x11/xcb-proto/Makefile
===================================================================
--- trunk/x11/xcb-proto/Makefile 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/xcb-proto/Makefile 2015-03-27 00:22:16 UTC (rev 18335)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= xcb-proto
-PORTVERSION= 1.10
+PORTVERSION= 1.11
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -12,7 +12,7 @@
BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2
-USES= pathfix tar:bzip2
+USES= python:2 pathfix tar:bzip2
XORG_CAT= proto
USE_PYTHON= yes
GNU_CONFIGURE= yes
Modified: trunk/x11/xcb-proto/distinfo
===================================================================
--- trunk/x11/xcb-proto/distinfo 2015-03-26 23:30:22 UTC (rev 18334)
+++ trunk/x11/xcb-proto/distinfo 2015-03-27 00:22:16 UTC (rev 18335)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xcb-proto-1.10.tar.bz2) = 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05
-SIZE (xorg/proto/xcb-proto-1.10.tar.bz2) = 138834
+SHA256 (xorg/proto/xcb-proto-1.11.tar.bz2) = b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e
+SIZE (xorg/proto/xcb-proto-1.11.tar.bz2) = 139213
More information about the Midnightbsd-cvs
mailing list