Update x11/libxcb and x11/xcb-proto to 1.13

Remove patches from upstream included in the releases.

Tested by: Pete Wright

8 files changed, 40 insertions, 307 deletions

diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 2c0c0ad427a..303d1acd4ff 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxcb
-PORTVERSION=	1.12
-PORTREVISION=	2
+PORTVERSION=	1.13
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index c50a0496177..12c915bc546 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478371055
-SHA256 (xorg/lib/libxcb-1.12.tar.bz2) = 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b
-SIZE (xorg/lib/libxcb-1.12.tar.bz2) = 613822
+TIMESTAMP = 1525895942
+SHA256 (xorg/lib/libxcb-1.13.tar.bz2) = 188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa
+SIZE (xorg/lib/libxcb-1.13.tar.bz2) = 510453
diff --git a/x11/libxcb/files/patch-src_c__client.py b/x11/libxcb/files/patch-src_c__client.py
deleted file mode 100644
index dec29105192..00000000000
--- a/x11/libxcb/files/patch-src_c__client.py
+++ /dev/null
@@ -1,44 +0,0 @@
-Obtained from:
-
-https://cgit.freedesktop.org/xcb/libxcb/commit/src/c_client.py?id=8740a288ca468433141341347aa115b9544891d3
-
---- src/c_client.py.orig	2016-05-09 16:10:55 UTC
-+++ src/c_client.py
-@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
-             _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--	       self.get_align_offset() )
-+               self.get_align_offset() )
-         prefix = [('_aux', '->', self)]
-         aux_ptr = 'xcb_out'
- 
-@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
-         _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--	       self.get_align_offset() )
-+               self.get_align_offset() )
- 
-     elif 'sizeof' == context:
-         param_names = [p[2] for p in params]
-@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
-                     # from the request size and divide that by the member size
-                     return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
-                 else:
--		    # use the accessor to get the start of the list, then
--		    # compute the length of it by subtracting it from
-+                    # use the accessor to get the start of the list, then
-+                    # compute the length of it by subtracting it from
-                     # the adress of the first byte after the end of the
-                     # request
--		    after_end_of_request = '(((char*)R) + R->length * 4)'
--		    start_of_list = '%s(R)' % (field.c_accessor_name)
-+                    after_end_of_request = '(((char*)R) + R->length * 4)'
-+                    start_of_list = '%s(R)' % (field.c_accessor_name)
-                     bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
--		    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
-+                    return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
-             else:
-                 raise Exception(
-                     "lengthless lists with varsized members are not supported. Fieldname '%s'"
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index 7e66ff7e876..58ab21d92ef 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -4,6 +4,7 @@ include/xcb/damage.h
 include/xcb/dpms.h
 include/xcb/dri2.h
 include/xcb/dri3.h
+include/xcb/ge.h
 include/xcb/glx.h
 include/xcb/present.h
 include/xcb/randr.h
@@ -352,16 +353,39 @@ man/man3/xcb_dri2_wait_sbc_unchecked.3.gz
 man/man3/xcb_dri3_buffer_from_pixmap.3.gz
 man/man3/xcb_dri3_buffer_from_pixmap_reply.3.gz
 man/man3/xcb_dri3_buffer_from_pixmap_unchecked.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_buffers.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_buffers_end.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_buffers_length.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_offsets.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_offsets_end.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_offsets_length.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_reply.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_strides.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_strides_end.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_strides_length.3.gz
+man/man3/xcb_dri3_buffers_from_pixmap_unchecked.3.gz
 man/man3/xcb_dri3_fd_from_fence.3.gz
 man/man3/xcb_dri3_fd_from_fence_reply.3.gz
 man/man3/xcb_dri3_fd_from_fence_unchecked.3.gz
 man/man3/xcb_dri3_fence_from_fd.3.gz
 man/man3/xcb_dri3_fence_from_fd_checked.3.gz
+man/man3/xcb_dri3_get_supported_modifiers.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_reply.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_screen_modifiers.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_screen_modifiers_end.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_screen_modifiers_length.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_unchecked.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_window_modifiers.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_window_modifiers_end.3.gz
+man/man3/xcb_dri3_get_supported_modifiers_window_modifiers_length.3.gz
 man/man3/xcb_dri3_open.3.gz
 man/man3/xcb_dri3_open_reply.3.gz
 man/man3/xcb_dri3_open_unchecked.3.gz
 man/man3/xcb_dri3_pixmap_from_buffer.3.gz
 man/man3/xcb_dri3_pixmap_from_buffer_checked.3.gz
+man/man3/xcb_dri3_pixmap_from_buffers.3.gz
+man/man3/xcb_dri3_pixmap_from_buffers_checked.3.gz
 man/man3/xcb_dri3_query_version.3.gz
 man/man3/xcb_dri3_query_version_reply.3.gz
 man/man3/xcb_dri3_query_version_unchecked.3.gz
@@ -383,6 +407,9 @@ man/man3/xcb_free_gc_checked.3.gz
 man/man3/xcb_free_pixmap.3.gz
 man/man3/xcb_free_pixmap_checked.3.gz
 man/man3/xcb_ge_generic_event_t.3.gz
+man/man3/xcb_genericevent_query_version.3.gz
+man/man3/xcb_genericevent_query_version_reply.3.gz
+man/man3/xcb_genericevent_query_version_unchecked.3.gz
 man/man3/xcb_get_atom_name.3.gz
 man/man3/xcb_get_atom_name_name.3.gz
 man/man3/xcb_get_atom_name_name_end.3.gz
@@ -1283,6 +1310,9 @@ man/man3/xcb_randr_configure_output_property.3.gz
 man/man3/xcb_randr_configure_output_property_checked.3.gz
 man/man3/xcb_randr_configure_provider_property.3.gz
 man/man3/xcb_randr_configure_provider_property_checked.3.gz
+man/man3/xcb_randr_create_lease.3.gz
+man/man3/xcb_randr_create_lease_reply.3.gz
+man/man3/xcb_randr_create_lease_unchecked.3.gz
 man/man3/xcb_randr_create_mode.3.gz
 man/man3/xcb_randr_create_mode_reply.3.gz
 man/man3/xcb_randr_create_mode_unchecked.3.gz
@@ -1296,6 +1326,8 @@ man/man3/xcb_randr_delete_provider_property.3.gz
 man/man3/xcb_randr_delete_provider_property_checked.3.gz
 man/man3/xcb_randr_destroy_mode.3.gz
 man/man3/xcb_randr_destroy_mode_checked.3.gz
+man/man3/xcb_randr_free_lease.3.gz
+man/man3/xcb_randr_free_lease_checked.3.gz
 man/man3/xcb_randr_get_crtc_gamma.3.gz
 man/man3/xcb_randr_get_crtc_gamma_blue.3.gz
 man/man3/xcb_randr_get_crtc_gamma_blue_end.3.gz
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 71a82edcf6b..25d97a2756e 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.12
+PORTVERSION=	1.13
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index d8931bfc127..0ad955ff4b6 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478371121
-SHA256 (xorg/proto/xcb-proto-1.12.tar.bz2) = 5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906
-SIZE (xorg/proto/xcb-proto-1.12.tar.bz2) = 153890
+TIMESTAMP = 1525896108
+SHA256 (xorg/proto/xcb-proto-1.13.tar.bz2) = 7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1
+SIZE (xorg/proto/xcb-proto-1.13.tar.bz2) = 151981
diff --git a/x11/xcb-proto/files/patch-xcbgen_align.py b/x11/xcb-proto/files/patch-xcbgen_align.py
deleted file mode 100644
index 8556f04ca58..00000000000
--- a/x11/xcb-proto/files/patch-xcbgen_align.py
+++ /dev/null
@@ -1,197 +0,0 @@
-Obtained from:
-
-https://cgit.freedesktop.org/xcb/proto/commit/xcbgen/align.py?id=ea7a3ac6c658164690e0febb55f4467cb9e0bcac
-
---- xcbgen/align.py.orig	2016-05-01 07:44:48 UTC
-+++ xcbgen/align.py
-@@ -16,12 +16,12 @@ class Alignment(object):
-         return self.align == other.align and self.offset == other.offset
- 
-     def __str__(self):
--	return "(align=%d, offset=%d)" % (self.align, self.offset)
-+        return "(align=%d, offset=%d)" % (self.align, self.offset)
- 
-     @staticmethod
-     def for_primitive_type(size):
--	# compute the required start_alignment based on the size of the type
--	if size % 8 == 0:
-+        # compute the required start_alignment based on the size of the type
-+        if size % 8 == 0:
-             # do 8-byte primitives require 8-byte alignment in X11?
-             return Alignment(8,0)
-         elif size % 4 == 0:
-@@ -33,7 +33,7 @@ class Alignment(object):
- 
- 
-     def align_after_fixed_size(self, size):
--	new_offset = (self.offset + size) % self.align
-+        new_offset = (self.offset + size) % self.align
-         return Alignment(self.align, new_offset)
- 
- 
-@@ -41,7 +41,7 @@ class Alignment(object):
-         '''
-         Assuming the given external_align, checks whether
-         self is fulfilled for all cases.
--	Returns True if yes, False otherwise.
-+        Returns True if yes, False otherwise.
-         '''
-         if self.align == 1 and self.offset == 0:
-             # alignment 1 with offset 0 is always fulfilled
-@@ -55,9 +55,9 @@ class Alignment(object):
-             # the external align guarantees less alignment -> not guaranteed
-             return False
- 
--	if external_align.align % self.align != 0:
-+        if external_align.align % self.align != 0:
-             # the external align cannot be divided by our align
--	    # -> not guaranteed
-+            # -> not guaranteed
-             # (this can only happen if there are alignments that are not
-             # a power of 2, which is highly discouraged. But better be
-             # safe and check for it)
-@@ -72,7 +72,7 @@ class Alignment(object):
- 
-     def combine_with(self, other):
-         # returns the alignment that is guaranteed when
--	# both, self or other, can happen
-+        # both, self or other, can happen
-         new_align = gcd(self.align, other.align)
-         new_offset_candidate1 = self.offset % new_align
-         new_offset_candidate2 = other.offset % new_align
-@@ -83,8 +83,8 @@ class Alignment(object):
-             new_align = gcd(new_align, offset_diff)
-             new_offset_candidate1 = self.offset % new_align
-             new_offset_candidate2 = other.offset % new_align
--	    assert new_offset_candidate1 == new_offset_candidate2
--	    new_offset = new_offset_candidate1
-+            assert new_offset_candidate1 == new_offset_candidate2
-+            new_offset = new_offset_candidate1
-         # return the result
-         return Alignment(new_align, new_offset)
- 
-@@ -92,44 +92,44 @@ class Alignment(object):
- class AlignmentLog(object):
- 
-     def __init__(self):
--	self.ok_list = []
--	self.fail_list = []
--	self.verbosity = 1
-+        self.ok_list = []
-+        self.fail_list = []
-+        self.verbosity = 1
- 
-     def __str__(self):
--	result = ""
-+        result = ""
- 
--	# output the OK-list
--	for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
--	    stacksize = len(callstack)
-+        # output the OK-list
-+        for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
-+            stacksize = len(callstack)
-             indent = '  ' * stacksize
--	    if self.ok_callstack_is_relevant(callstack):
-+            if self.ok_callstack_is_relevant(callstack):
-                 if field_name is None or field_name == "":
--	            result += ("    %sok: %s:\n\t%sbefore: %s, after: %s\n"
--		        % (indent, str(type_obj), indent, str(align_before), str(align_after)))
--	        else:
--		    result += ("    %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
--		        % (indent, str(field_name), str(type_obj),
--		           indent, str(align_before), str(align_after)))
-+                    result += ("    %sok: %s:\n\t%sbefore: %s, after: %s\n"
-+                        % (indent, str(type_obj), indent, str(align_before), str(align_after)))
-+                else:
-+                    result += ("    %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
-+                        % (indent, str(field_name), str(type_obj),
-+                           indent, str(align_before), str(align_after)))
-                 if self.verbosity >= 1:
--		    result += self.callstack_to_str(indent, callstack)
-+                    result += self.callstack_to_str(indent, callstack)
- 
--	# output the fail-list
--	for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
--	    stacksize = len(callstack)
-+        # output the fail-list
-+        for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
-+            stacksize = len(callstack)
-             indent = '  ' * stacksize
--	    if field_name is None or field_name == "":
--	        result += ("    %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
--		    % (indent, str(align_before), indent, str(type_obj), indent, reason))
--	    else:
--		result += ("    %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
--		    % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
-+            if field_name is None or field_name == "":
-+                result += ("    %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
-+                    % (indent, str(align_before), indent, str(type_obj), indent, reason))
-+            else:
-+                result += ("    %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
-+                    % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
- 
-             if self.verbosity >= 1:
--	        result += self.callstack_to_str(indent, callstack)
-+                result += self.callstack_to_str(indent, callstack)
- 
- 
--	return result
-+        return result
- 
- 
-     def callstack_to_str(self, indent, callstack):
-@@ -137,41 +137,41 @@ class AlignmentLog(object):
-         for stack_elem in callstack:
-             result += "\t  %s%s\n" % (indent, str(stack_elem))
-         result += "\t%s]\n" % indent
--	return result
-+        return result
- 
- 
-     def ok_callstack_is_relevant(self, ok_callstack):
-         # determine whether an ok callstack is relevant for logging
--	if self.verbosity >= 2:
--	    return True
-+        if self.verbosity >= 2:
-+            return True
- 
-         # empty callstacks are always relevant
--	if len(ok_callstack) == 0:
-+        if len(ok_callstack) == 0:
-             return True
- 
--	# check whether the ok_callstack is a subset or equal to a fail_callstack
-+        # check whether the ok_callstack is a subset or equal to a fail_callstack
-         for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list:
-             if len(ok_callstack) <= len(fail_callstack):
-                 zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)])
--		is_subset = all([i == j for i, j in zipped])
--		if is_subset:
-+                is_subset = all([i == j for i, j in zipped])
-+                if is_subset:
-                     return True
- 
-         return False
- 
- 
-     def ok(self, align_before, field_name, type_obj, callstack, align_after):
--	self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
-+        self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
- 
-     def fail(self, align_before, field_name, type_obj, callstack, reason):
--	self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
-+        self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
- 
-     def append(self, other):
--	self.ok_list.extend(other.ok_list)
--	self.fail_list.extend(other.fail_list)
-+        self.ok_list.extend(other.ok_list)
-+        self.fail_list.extend(other.fail_list)
- 
-     def ok_count(self):
--	return len(self.ok_list)
-+        return len(self.ok_list)
- 
- 
- 
diff --git a/x11/xcb-proto/files/patch-xcbgen_xtypes.py b/x11/xcb-proto/files/patch-xcbgen_xtypes.py
deleted file mode 100644
index 859ce126b1f..00000000000
--- a/x11/xcb-proto/files/patch-xcbgen_xtypes.py
+++ /dev/null
@@ -1,57 +0,0 @@
-Obtained from:
-
-https://cgit.freedesktop.org/xcb/proto/commit/xcbgen/xtypes.py?id=bea5e1c85bdc0950913790364e18228f20395a3d
-
---- xcbgen/xtypes.py.orig	2016-05-01 07:44:48 UTC
-+++ xcbgen/xtypes.py
-@@ -501,7 +501,7 @@ class ComplexType(Type):
-                 int(required_start_align_element.get('align', "4"), 0),
-                 int(required_start_align_element.get('offset', "0"), 0))
-             if verbose_align_log:
--                print "Explicit start-align for %s: %s\n" % (self, self.required_start_align)
-+                print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align))
- 
-     def resolve(self, module):
-         if self.resolved:
-@@ -592,7 +592,7 @@ class ComplexType(Type):
-                 if verbose_align_log:
-                     print ("calc_required_start_align: %s has start-align %s"
-                         % (str(self), str(self.required_start_align)))
--                    print "Details:\n" + str(log)
-+                    print ("Details:\n" + str(log))
-                 if self.required_start_align.offset != 0:
-                     print (("WARNING: %s\n\thas start-align with non-zero offset: %s"
-                         + "\n\tsuggest to add explicit definition with:"
-@@ -619,12 +619,12 @@ class ComplexType(Type):
-             for offset in range(0,align):
-                 align_candidate = Alignment(align, offset)
-                 if verbose_align_log:
--                    print "trying %s for %s" % (str(align_candidate), str(self))
-+                    print ("trying %s for %s" % (str(align_candidate), str(self)))
-                 my_log = AlignmentLog()
-                 if self.is_possible_start_align(align_candidate, callstack, my_log):
-                     log.append(my_log)
-                     if verbose_align_log:
--                        print "found start-align %s for %s" % (str(align_candidate), str(self))
-+                        print ("found start-align %s for %s" % (str(align_candidate), str(self)))
-                     return align_candidate
-                 else:
-                     my_ok_count = my_log.ok_count()
-@@ -641,7 +641,7 @@ class ComplexType(Type):
-         # none of the candidates applies
-         # this type has illegal internal aligns for all possible start_aligns
-         if verbose_align_log:
--            print "didn't find start-align for %s" % str(self)
-+            print ("didn't find start-align for %s" % str(self))
-         log.append(best_log)
-         return None
- 
-@@ -900,7 +900,7 @@ class SwitchType(ComplexType):
-     # aux function for unchecked_get_alignment_after
-     def get_align_for_selected_case_field(self, case_field, start_align, callstack, log):
-         if verbose_align_log:
--            print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))
-+            print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)))
-         total_align = start_align
-         for field in self.bitcases:
-             my_callstack = callstack[:]