Package updates for Master

similarity index 90%
rename from meta/recipes-support/libpcre/libpcre2_10.30.bb
rename to meta/recipes-support/libpcre/libpcre2_10.31.bb
index 46c2d63..a10c312 100644
@@ -8,14 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2"
 HOMEPAGE = "http://www.pcre.org"
 SECTION = "devel"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=12d55e15a0c6da5c645ba40382bd3293"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=f5e4bde9fd0493d0967b4dba9899590f"
 
 SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \
            file://pcre-cross.patch \
 "
 
-SRC_URI[md5sum] = "d3adf4b130eed854a530390f00020a65"
-SRC_URI[sha256sum] = "90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db"
+SRC_URI[md5sum] = "e0b91c891a3c49050f7fd15de33d0ba4"
+SRC_URI[sha256sum] = "e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac"
 
 CVE_PRODUCT = "pcre2"
 

similarity index 78%
rename from meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
rename to meta/recipes-graphics/xorg-app/xprop_1.2.3.bb
index d78bf04..ca58d47 100644
@@ -14,5 +14,5 @@ DEPENDS += "libxmu"
 
 PE = "1"
 
-SRC_URI[md5sum] = "fae3d2fda07684027a643ca783d595cc"
-SRC_URI[sha256sum] = "9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6"
+SRC_URI[md5sum] = "4becb3ddc4674d741487189e4ce3d0b6"
+SRC_URI[sha256sum] = "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b"

similarity index 87%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.23.1.bb
index 4fd894f..fb9f5d1 100644
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "eb61fb3fd419e817df572b0c8d94a883"
-SRC_URI[sha256sum] = "deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd"
+SRC_URI[md5sum] = "875cbd09ab8394277fd16070326abbae"
+SRC_URI[sha256sum] = "2a4bbc05fea22151b7a7c8ac2655d549aa9b0486bedc7f5a68c72716343b02f3"
 
 SECTION = "x11/libs"
 DEPENDS = "intltool-native util-macros libxslt-native"

similarity index 75%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.4.1.bb
index c9dc327..c35d5d7 100644
@@ -9,11 +9,9 @@ be read directly by XKB-capable X servers or utilities."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
 
-PR = "${INC_PR}.0"
-
 DEPENDS += "libxkbfile"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "cc22b232bc78a303371983e1b48794ab"
-SRC_URI[sha256sum] = "bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b"
+SRC_URI[md5sum] = "07df9790d30f9a369d20a418af784de0"
+SRC_URI[sha256sum] = "748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736"

similarity index 79%
rename from meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
rename to meta/recipes-graphics/xorg-app/xinit_1.4.0.bb
index 9318518..dc2a06b 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68"
 
 PE = "1"
 
-SRC_URI[md5sum] = "4e928452dfaf73851413a2d8b8c76388"
-SRC_URI[sha256sum] = "75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3"
+SRC_URI[md5sum] = "2da154b2f80ca9637b1a17b13af0880c"
+SRC_URI[sha256sum] = "230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef"
 
 EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
 

similarity index 72%
rename from meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
rename to meta/recipes-graphics/xorg-app/xwininfo_1.1.4.bb
index 0c23d19..1fb90dd 100644
@@ -11,5 +11,5 @@ DEPENDS += "libxext libxmu gettext-native"
 
 PE = "0"
 
-SRC_URI[md5sum] = "b777bafb674555e48fd8437618270931"
-SRC_URI[sha256sum] = "218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8"
+SRC_URI[md5sum] = "9a505b91ae7160bbdec360968d060c83"
+SRC_URI[sha256sum] = "839498aa46b496492a5c65cd42cd2e86e0da88149b0672e90cb91648f8cd5b01"

similarity index 54%
rename from meta/recipes-support/gnutls/gnutls_3.6.1.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.2.bb
index 7624a20..e540528 100644
@@ -3,7 +3,7 @@ require gnutls.inc
 SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
             file://arm_eabi.patch \
            "
-SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3"
-SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed"
+SRC_URI[md5sum] = "8b4912c6c0e5ffefd3dbb4888eaf8a58"
+SRC_URI[sha256sum] = "bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f"
 
 BBCLASSEXTEND = "native nativesdk"

similarity index 72%
rename from meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
rename to meta/recipes-graphics/xorg-app/xeyes_1.1.2.bb
index 84d0cb8..06885f8 100644
@@ -8,7 +8,7 @@ PE = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6"
 
-SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981"
-SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521"
+SRC_URI[md5sum] = "6f0543ec84283df5743eeafc173bea4a"
+SRC_URI[sha256sum] = "57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553"
 
 DEPENDS += "libxau libxt libxext libxmu libxrender"

index 4cc9e05..461fe83 100644
@@ -4,14 +4,16 @@ AC_USE_SYSTEM_EXTENSIONS to get that defined.
 Upstream-Status: Submitted
 Signed-off-by: Ross Burton <[email protected]>
 
-diff --git a/configure.ac b/configure.ac
-index 0c98875..ebf4dee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,4 +29,6 @@ AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
+Index: libxshmfence-1.3/configure.ac
+===================================================================
+--- libxshmfence-1.3.orig/configure.ac
++++ libxshmfence-1.3/configure.ac
+@@ -30,6 +30,8 @@ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_USE_SYSTEM_EXTENSIONS
  
 +AC_USE_SYSTEM_EXTENSIONS
 +
  # Initialize Automake
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 

similarity index 77%
rename from meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
rename to meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb
index 1df068d..f6f5fb2 100644
@@ -15,5 +15,5 @@ BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI += "file://extensions.patch"
 
-SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e"
-SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c"
+SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937"
+SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7"

similarity index 77%
rename from meta/recipes-graphics/xorg-app/xset_1.2.3.bb
rename to meta/recipes-graphics/xorg-app/xset_1.2.4.bb
index f683b76..5748837 100644
@@ -12,8 +12,8 @@ PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
-SRC_URI[md5sum] = "dcd227388b57487d543cab2fd7a602d7"
-SRC_URI[sha256sum] = "4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063"
+SRC_URI[md5sum] = "70ea7bc7bacf1a124b1692605883f620"
+SRC_URI[sha256sum] = "e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb --without-fontcache"

deleted file mode 100644
index 89ec666..0000000
@@ -1,215 +0,0 @@
-From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <[email protected]>
-Date: Thu, 19 May 2016 17:30:04 +0200
-Subject: [PATCH 1/2] Make whitespace use consistent.
-
-At least python-3.5.x complains about this forcefully.
-
-Signed-off-by: Thomas Klausner <[email protected]>
-Signed-off-by: Uli Schlachter <[email protected]>
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <[email protected]>
----
- xcbgen/align.py | 96 ++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 48 insertions(+), 48 deletions(-)
-
-diff --git a/xcbgen/align.py b/xcbgen/align.py
-index 5e31838..d4c12ee 100644
---- a/xcbgen/align.py
-+++ b/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)
- 
- 
- 
--- 
-2.9.0
-

75 lines not on this page · raw message

similarity index 83%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb
index 25a8373..d503786 100644
@@ -11,12 +11,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2 \
-           file://0001-Make-whitespace-use-consistent.patch \
-           file://0002-print-is-a-function-and-needs-parentheses.patch \
-           "
-SRC_URI[md5sum] = "14e60919f859560f28426a685a555962"
-SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906"
+SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2"
+
+SRC_URI[md5sum] = "abe9aa4886138150bbc04ae4f29b90e3"
+SRC_URI[sha256sum] = "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1"
 
 inherit autotools pkgconfig
 

similarity index 95%
rename from meta/recipes-support/curl/curl_7.58.0.bb
rename to meta/recipes-support/curl/curl_7.59.0.bb
index 5535a56..e356fdc 100644
@@ -15,8 +15,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 #
 SRC_URI += " file://configure_ac.patch"
 
-SRC_URI[md5sum] = "fa049f9f90c1ae473a2a7bcfa14de976"
-SRC_URI[sha256sum] = "1cb081f97807c01e3ed747b6e1c9fee7a01cb10048f1cd0b5f56cfe0209de731"
+SRC_URI[md5sum] = "a2192804f7c2636a09320416afcf888e"
+SRC_URI[sha256sum] = "b5920ffd6a8c95585fb95070e0ced38322790cb335c39d0dab852d12e157b5a0"
 
 CVE_PRODUCT = "libcurl"
 inherit autotools pkgconfig binconfig multilib_header

similarity index 80%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
index 31cf186..88c88f1 100644
@@ -14,5 +14,5 @@ BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
 
-SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8"
-SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20"
+SRC_URI[md5sum] = "987c438e79f5ddb84a9c5726a1610819"
+SRC_URI[sha256sum] = "1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a"

similarity index 75%
rename from meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb
rename to meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb
index b39d787..2680599 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
 
 PE = "1"
 
-SRC_URI[md5sum] = "3f8a8e6100556f7f28e469809805dee8"
-SRC_URI[sha256sum] = "472ad0e41d1e0abf5ecafd29460bf1b8d47e53d4b7d3abf1f66d02dc576547b8"
+SRC_URI[md5sum] = "5059b328fac086b733ffac6607164c41"
+SRC_URI[sha256sum] = "9225c45c3de60faf971979a55a5536f3562baa4b6f02246c23e98ac0c09a75b7"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""

deleted file mode 100644
index 8992386..0000000
@@ -1,62 +0,0 @@
-From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <[email protected]>
-Date: Thu, 19 May 2016 17:31:18 +0200
-Subject: [PATCH] Fix inconsistent use of tabs vs. space.
-
-Needed for at least python-3.5.x.
-
-Signed-off-by: Thomas Klausner <[email protected]>
-Signed-off-by: Uli Schlachter <[email protected]>
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <[email protected]>
----
- src/c_client.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/c_client.py b/src/c_client.py
-index 57de3fb..043338d 100644
---- a/src/c_client.py
-+++ b/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'"
--- 
-2.9.0
-

similarity index 85%
rename from meta/recipes-graphics/xorg-lib/libxcb_1.12.bb
rename to meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
index a38bdea..04b58ea 100644
@@ -13,10 +13,10 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
            file://xcbincludedir.patch \
            file://disable-check.patch \
            file://gcc-mips-pr68302-mips-workaround.patch \
-           file://Fix-inconsistent-use-of-tabs-vs.-space.patch \
           "
-SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6"
-SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b"
+
+SRC_URI[md5sum] = "c2b6cf928afa16b0047c974e7aaa783f"
+SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa"
 
 BBCLASSEXTEND = "native nativesdk"
 

similarity index 77%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
index fa251b5..5c1356d 100644
@@ -9,13 +9,11 @@ can drive most VESA-compatible video cards, but only makes use of the \
 basic standard VESA core that is common to these cards. The driver \
 supports depths 8, 15 16 and 24."
 
-PR = "${INC_PR}.0"
-
 DEPENDS += "virtual/libx11 randrproto libpciaccess"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
 
-SRC_URI[md5sum] = "a893c37c589f7a31cea929a5d896a0e2"
-SRC_URI[sha256sum] = "7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1"
+SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6"
+SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c"

new file mode 100644
index 0000000..f48a22b
@@ -0,0 +1,14 @@
+require xorg-proto-common.inc
+
+SUMMARY = "XCalibrate: Touchscreen calibration headers"
+
+DESCRIPTION = "This package provides the headers and specification documents defining \
+the core protocol and (many) extensions for the X Window System"
+
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676"
+
+SRC_URI[md5sum] = "81557ca47ee66a4e54590fcdadd28114"
+SRC_URI[sha256sum] = "fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0"
+
+BBCLASSEXTEND = "native nativesdk"

deleted file mode 100644
index f798a43..0000000
@@ -1,16 +0,0 @@
-require xorg-proto-common.inc
-
-PE = "1"
-
-SUMMARY = "BigReqs: X Big Requests extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the \
-BIG-REQUESTS extension, used to send larger requests that usual in order \
-to avoid fragmentation."
-
-BBCLASSEXTEND = "native nativesdk"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b12715630da6f268d0d3712ee1a504f4"
-
-SRC_URI[md5sum] = "1a05fb01fa1d5198894c931cf925c025"
-SRC_URI[sha256sum] = "462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e"

42 lines not on this page · raw message

deleted file mode 100644
index eb4b422..0000000
@@ -1,21 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XCalibrate: Touchscreen calibration headers"
-
-DESCRIPTION = "This package provides the wire protocol for the \
-Touchscreen calibration extension."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \
-                    file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db"
-
-SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-
-PV = "0.0+git${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \
-           file://fix.patch;apply=yes"
-S = "${WORKDIR}/git"
-UPSTREAM_CHECK_COMMITS = "1"
-

deleted file mode 100644
index adfee26..0000000
@@ -1,21 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xcomposite: X composite extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X \
-composite extension.  The X composite extension provides three related \
-mechanisms for compositing and off-screen storage."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \
-                    file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926"
-
-RCONFLICTS_${PN} = "compositeext"
-BBCLASSEXTEND = "native"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0"
-SRC_URI[sha256sum] = "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc"
-

deleted file mode 100644
index 75d0268..0000000
@@ -1,20 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xdamage: X Damage extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the DAMAGE \
-extension.  The DAMAGE extension allows applications to receive \
-information about changes made to pixel contents of windows and \
-pixmaps."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \
-                    file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296"
-
-RCONFLICTS_${PN} = "damageext"
-BBCLASSEXTEND = "native"
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95"
-SRC_URI[sha256sum] = "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b"

deleted file mode 100644
index d960e5d..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "DMX: Distributed Multihead extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the DMX \
-extension.  The DMX extension provides support for communication with \
-and control of Xdmx server.  Attributes of the Xdmx server and of the \
-back-end screens attached to the server can be queried and modified via \
-this protocol."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \
-                    file://dmxproto.h;endline=32;md5=ab8509955c3dd4c65fac728e1b367bc4"
-
-PE = "1"
-
-SRC_URI[md5sum] = "4ee175bbd44d05c34d43bb129be5098a"
-SRC_URI[sha256sum] = "e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509"

deleted file mode 100644
index f4c40c5..0000000
@@ -1,15 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
-
-DESCRIPTION = "This package provides the wire protocol for the Direct \
-Rendering Ifnrastructure 2.  DIR is required for may hardware \
-accelerated OpenGL drivers."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
-                    file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca"
-
-
-SRC_URI[md5sum] = "b2721d5d24c04d9980a0c6540cb5396a"
-SRC_URI[sha256sum] = "f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04"

deleted file mode 100644
index bed97b3..0000000
@@ -1,14 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Direct Rendering Infrastructure 3 Extension"
-
-DESCRIPTION = "The DRI3 extension provides mechanisms to translate between direct \
-rendered buffers and X pixmaps. When combined with the Present extension, \
-a complete direct rendering solution for OpenGL is provided."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://dri3proto.h;endline=21;md5=ac90d1d416be3cb13e1d3c88cd5166bf"
-
-
-SRC_URI[md5sum] = "a3d2cbe60a9ca1bf3aea6c93c817fee3"
-SRC_URI[sha256sum] = "01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074"

deleted file mode 100644
index 39fb88d..0000000
@@ -1,22 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFixes: X Fixes extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Fixes \
-extension.  This extension is designed to provide server-side support \
-for application work arounds to shortcomings in the core X window \
-system."
-
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \
-                    file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4"
-
-RCONFLICTS_${PN} = "fixesext"
-PR = "r1"
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "e7431ab84d37b2678af71e29355e101d"
-SRC_URI[sha256sum] = "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce"

deleted file mode 100644
index 27fc281..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFont: X Font rasterisation headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Font \
-rasterisation extensions.  These extensions are used to control \
-server-side font configurations."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c3e48aa9ce868c8e90f0401db41c11a2 \
-                    file://FSproto.h;endline=44;md5=d2e58e27095e5ea7d4ad456ccb91986c"
-
-PE = "1"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "36934d00b00555eaacde9f091f392f97"
-SRC_URI[sha256sum] = "259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8"

deleted file mode 100644
index eb03d33..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "OpenGL: X OpenGL extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the \
-OpenGL-related extensions, used to enable the rendering of applications \
-using OpenGL."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \
-                    file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9"
-
-PE = "1"
-
-BBCLASSEXTEND = "nativesdk"
-
-SRC_URI[md5sum] = "5565f1b0facf4a59c2778229c1f70d10"
-SRC_URI[sha256sum] = "adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40"

deleted file mode 100644
index eb5e66b..0000000
@@ -1,22 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XI: X Input extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Input \
-extension.  The extension supports input devices other then the core X \
-keyboard and pointer."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e562cc0f6587b961f032211d8160f31e \
-                    file://XI2proto.h;endline=48;md5=1ac1581e61188da2885cc14ff49b20be"
-
-PE = "1"
-
-inherit gettext
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "b290a463af7def483e6e190de460f31a"
-SRC_URI[sha256sum] = "893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d"
-
-EXTRA_OECONF += "--without-asciidoc"

deleted file mode 100644
index 46f5c92..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XKB: X Keyboard extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X \
-Keyboard extension.  This extension is used to control options related \
-to keyboard handling and layout."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \
-                    file://XKBproto.h;beginline=1;endline=25;md5=5744eeff407aeb6e7a1346eebab486a2"
-
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "94afc90c1f7bef4a27fdd59ece39c878"
-SRC_URI[sha256sum] = "f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857"

deleted file mode 100644
index e6d32f9..0000000
@@ -1,22 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "This package provides the basic headers for the X Window System"
-DESCRIPTION = "The Present extension provides a way for applications to update their \
-               window contents from a pixmap in a well defined fashion, synchronizing \
-               with the display refresh and potentially using a more efficient \
-               mechanism than copying the contents of the source pixmap.\
-              "
-
-LICENSE = "GPLv2"
-
-SRCREV = "bfdc7e052302c79c5803ad95a73c9b63b350c40c"
-PV = "1.1+git${SRCPV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto"
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-BBCLASSEXTEND = "native"

deleted file mode 100644
index b59e525..0000000
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XRandR: X Resize, Rotate and Reflect extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Resize, \
-Rotate and Reflect extension.  This extension provides the ability to \
-resize, rotate and reflect the root window of a screen."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=00426d41bd3d9267cf9bbb2df9323a5e \
-                    file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f"
-
-RCONFLICTS_${PN} = "randrext"
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "a46765c8dcacb7114c821baf0df1e797"
-SRC_URI[sha256sum] = "4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468"

deleted file mode 100644
index ad2317c..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XRecord: X Record extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Record \
-extension.  This extension is used to record and play back event \
-sequences."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \
-                    file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738"
-
-RCONFLICTS_${PN} = "recordext"
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216"
-SRC_URI[sha256sum] = "a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370"

deleted file mode 100644
index ff800ec..0000000
@@ -1,21 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XRender: X rendering Extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X \
-Rendering extension.  This is the basis the image composition within the \
-X window system."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \
-                    file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f"
-
-RCONFLICTS_${PN} = "renderext"
-PR = "r1"
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274"
-SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537"
-

deleted file mode 100644
index 08b610a..0000000
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XRes: X Resource extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X \
-Resource extension.  XRes provides an interface that allows X clients to \
-see and monitor X resource usage of various clients."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
-
-RCONFLICTS_${PN} = "resourceext"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"
-SRC_URI[sha256sum] = "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818"
-

deleted file mode 100644
index ab07f51..0000000
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xscrnsaver: X Screen Saver extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Screen \
-Saver extension.  This extension allows an external \"screen saver\" \
-client to detect when the alternative image is to be displayed and to \
-provide the graphics."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eed49b78b15b436c933b6b8b054e3901 \
-                    file://saverproto.h;endline=26;md5=a84c0637305159f3c0ab173aaeede48d"
-
-PE = "1"
-
-EXTRA_OECONF_append = " --enable-specs=no"
-
-SRC_URI[md5sum] = "edd8a73775e8ece1d69515dd17767bfb"
-SRC_URI[sha256sum] = "8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65"

deleted file mode 100644
index 6f97a26..0000000
@@ -1,14 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xv: X Video extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Video \
-extension.  This extension alows for accerlated drawing of videos."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b"
-
-PE = "1"
-
-SRC_URI[md5sum] = "fe86de8ea3eb53b5a8f52956c5cd3174"
-SRC_URI[sha256sum] = "c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702"

deleted file mode 100644
index 0751b94..0000000
@@ -1,17 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XC-MISC: X XC-Miscellaneous extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XC-MISC \
-extension, which is used to get details of XID allocations within the \
-server."
-
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=09d83047c15994e05db29b423ed6662e"
-
-PE = "1"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "5f4847c78e41b801982c8a5e06365b24"
-SRC_URI[sha256sum] = "b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df"

deleted file mode 100644
index dd0bd95..0000000
@@ -1,24 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XExt: X Extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for several X \
-extensions.  These protocol extensions include DOUBLE-BUFFER, DPMS, \
-Extended-Visual-Information, LBX, MIT_SHM, MIT_SUNDRY-NONSTANDARD, \
-Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, \
-XTEST.  In addition a small set of utility functions are also \
-available."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=86f273291759d0ba2a22585cd1c06c53"
-
-PE = "1"
-
-inherit gettext
-
-EXTRA_OECONF_append = " --enable-specs=no"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "70c90f313b4b0851758ef77b95019584"
-SRC_URI[sha256sum] = "f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0"

deleted file mode 100644
index 86f3ce3..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XFree86 \
-Direct Graphics Access extension. This extension allows direct graphics \
-access to a framebuffer-like region, as well as relative mouse \
-reporting."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
-
-RCONFLICTS_${PN} = "xxf86dgaext"
-PR = "r2"
-PE = "1"
-
-SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
-SRC_URI[sha256sum] = "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050"

deleted file mode 100644
index b3f9210..0000000
@@ -1,17 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFree86-DRI: XFree86 Direct Rendering Infrastructure extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XFree86 \
-Direct Rendering Infrastructure extension.  The XFree86-DRI extension is \
-used to organize direct rendering support or 3D clients and help \
-arbitrate requests."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ef103b9d951e39ff7e23d386e2011fa3 \
-                    file://xf86driproto.h;endline=35;md5=42be3d8e6d429ab79172572bb0cff544"
-
-PE = "1"
-
-SRC_URI[md5sum] = "1d716d0dac3b664e5ee20c69d34bc10e"
-SRC_URI[sha256sum] = "9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f"

deleted file mode 100644
index d4663ea..0000000
@@ -1,17 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XFree \
-miscellaneous extension.  The XFree86-Misc extension provides a means to \
-access input device configuration settings specific to the XFree86/Xorg \
-DDX."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "ca63bbb31cf5b7f37b2237e923ff257a"
-SRC_URI[sha256sum] = "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095"

deleted file mode 100644
index 0f31900..0000000
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFree86-VM: XFree86 video mode extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the XFree86 \
-video mode extension.  This extension allows client applications to get \
-and set video mode timings."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502"
-
-RCONFLICTS_${PN} = "xxf86vmext"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e"
-SRC_URI[sha256sum] = "45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770"

deleted file mode 100644
index dde7e9d..0000000
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xinerama: Xinerama extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the Xinerama \
-extension.  This extension is used for retrieving information about \
-physical output devices which may be combined into a single logical X \
-screen."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e397a5326c83d5d0ebf5b3f87163ac6 \
-                    file://panoramiXproto.h;endline=24;md5=098e0bc089368a988092b3cbda617a57"
-
-PE = "1"
-
-SRC_URI[md5sum] = "9959fe0bfb22a0e7260433b8d199590a"
-SRC_URI[sha256sum] = "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b"
-
-BBCLASSEXTEND = "native nativesdk"

deleted file mode 100644
index 4f9ed99..0000000
@@ -1,24 +0,0 @@
-Upstream-Status: Pending
-
-Don't always define LONG64 for AMD64
-    
-X32 defines __amd64__/amd64 with 32bit long.  We should simply check
-__LP64__ before defining LONG64 without checking __amd64__/amd64.
-
-This fixes compilation with x32 toolchain.
-
-Received this patch from H.J. Lu <[email protected]>
-Signed-off-by: Nitin A Kamble <[email protected]> 2011/12/1
-
-Index: xproto-7.0.31/Xmd.h
-===================================================================
---- xproto-7.0.31.orig/Xmd.h
-+++ xproto-7.0.31/Xmd.h
-@@ -62,7 +62,6 @@ SOFTWARE.
-      defined(__ia64__) || defined(ia64) || \
-      defined(__sparc64__) || \
-      defined(__s390x__) || \
--     defined(__amd64__) || defined(amd64) || \
-      defined(__powerpc64__)
- #  if !defined(__ILP32__) /* amd64-x32 is 32bit */
- #   define LONG64				/* 32/64-bit architecture */

deleted file mode 100644
index febcc67..0000000
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "Xlib: C Language X interface headers"
-
-DESCRIPTION = "This package provides the basic headers for the X Window \
-System."
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676"
-
-PE = "1"
-
-SRC_URI += "file://xproto_fix_for_x32.patch"
-
-EXTRA_OECONF_append = " --enable-specs=no"
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "16791f7ca8c51a20608af11702e51083"
-SRC_URI[sha256sum] = "c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747"

index 8ec623b..1f4ff11 100644
@@ -15,7 +15,6 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core"
 DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk"
 DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover"
 DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT"
-DISTRO_PN_ALIAS_pn-bigreqsproto = "Meego=xorg-x11-proto-bigreqsproto"
 DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam"
 DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool"
 DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez  Opensuse=bluez"

@@ -25,7 +24,6 @@ DISTRO_PN_ALIAS_pn-build-appliance-image = "OSPDT"
 DISTRO_PN_ALIAS_pn-build-compare = "Opensuse=build-compare Fedora=build-compare"
 DISTRO_PN_ALIAS_pn-builder = "OE-Core"
 DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core"
-DISTRO_PN_ALIAS_pn-calibrateproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/calibrateproto"
 DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT"
 DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig"
 DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"

@@ -37,7 +35,6 @@ DISTRO_PN_ALIAS_pn-clutter-gtk-1.0 = "Debian=clutter-gtk Ubuntu=clutter-gtk Fedo
 DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
 DISTRO_PN_ALIAS_pn-cogl-1.0 = "Debian=cogl Ubuntu=cogl Fedora=cogl"
 DISTRO_PN_ALIAS_pn-cogl = "Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl"
-DISTRO_PN_ALIAS_pn-compositeproto = "Meego=xorg-x11-proto-compositeproto"
 DISTRO_PN_ALIAS_pn-connman = "Meego=connman"
 DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core"
 DISTRO_PN_ALIAS_pn-connman-gnome = "Intel"

@@ -68,14 +65,12 @@ DISTRO_PN_ALIAS_pn-cryptodev-linux = "OE-Core"
 DISTRO_PN_ALIAS_pn-cryptodev-module = "OE-Core"
 DISTRO_PN_ALIAS_pn-cryptodev-tests = "OE-Core"
 DISTRO_PN_ALIAS_pn-cwautomacros = "OSPDT upstream=http://cwautomacros.berlios.de/"
-DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto"
 DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1"
 DISTRO_PN_ALIAS_pn-dbus-test = "Fedora=dbus Ubuntu=dbus"
 DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand"
 DISTRO_PN_ALIAS_pn-depmodwrapper-cross = "OE-Core"
 DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc"
 DISTRO_PN_ALIAS_pn-distcc-config = "OpenedHand"
-DISTRO_PN_ALIAS_pn-dmxproto = "Meego=xorg-x11-proto-dmxproto Ubuntu=x11proto-dmx Debian=x11proto-dmx"
 DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheets = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl"
 DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml"
 DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml"

@@ -83,18 +78,13 @@ DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = "Fedora=docbook-dtds Mandriva=docbook-
 DISTRO_PN_ALIAS_pn-docbook-xml-dtd4 = "Ubuntu=docbook-xml Fedora=docbook-dtds"
 DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook-dtds"
 DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets"
-DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto"
-DISTRO_PN_ALIAS_pn-dri3proto = "Fedora=dri3proto Opensuse=dri3proto-devel"
 DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear"
 DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
 DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts"
 DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core"
 DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core"
 DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings"
-DISTRO_PN_ALIAS_pn-fixesproto = "Meego=xorg-x11-proto-fixesproto"
 DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts"
-DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto"
-DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto"
 DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils"
 DISTRO_PN_ALIAS_pn-formfactor = "OE-Core"
 DISTRO_PN_ALIAS_pn-fstests = "OpenedHand"

@@ -114,7 +104,6 @@ DISTRO_PN_ALIAS_pn-glib-2.0 = "Meego=glib2 Fedora=glib2 OpenSuSE=glib2 Ubuntu=gl
 DISTRO_PN_ALIAS_pn-glibc-locale = "OpenSuSE=glibc-locale Fedora=glibc-devel"
 DISTRO_PN_ALIAS_pn-glibc-mtrace = "Fedora=glibc-utils Ubuntu=libc-dev-bin"
 DISTRO_PN_ALIAS_pn-glibc-scripts = "Fedora=glibc Ubuntu=libc-bin"
-DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto"
 DISTRO_PN_ALIAS_pn-gnome-desktop-testing = "Debian=gnome-desktop-testing Fedora=gnome-desktop-testing"
 DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand"
 DISTRO_PN_ALIAS_pn-gptfdisk = "Fedora=gdisk Ubuntu=gdisk"

@@ -149,10 +138,8 @@ DISTRO_PN_ALIAS_pn-initramfs-live-install-efi = "OE-Core"
 DISTRO_PN_ALIAS_pn-initramfs-live-install-efi-testfs = "OE-Core"
 DISTRO_PN_ALIAS_pn-initramfs-live-install-testfs = "OE-Core"
 DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts"
-DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto"
 DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT"
 DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62"
-DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev"
 DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux"
 DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark"
 DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver"

@@ -316,7 +303,6 @@ DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind"
 DISTRO_PN_ALIAS_pn-postinst-intercept = "OE-Core"
 DISTRO_PN_ALIAS_pn-powertop = "Meego=powertop Fedora=powertop Debian=powertop OpenSuSE=powertop Mandriva=powertop"
 DISTRO_PN_ALIAS_pn-ppp-dialin = "OE-Core"
-DISTRO_PN_ALIAS_pn-presentproto = "Debian=x11proto-present-dev Fedora=xorg-x11-proto-devel"
 DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
 DISTRO_PN_ALIAS_pn-psplash = "OpenedHand"
 DISTRO_PN_ALIAS_pn-ptest-runner = "OE-Core"

@@ -342,12 +328,8 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand"
 DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand"
 DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand"
 DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core"
-DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto"
 DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common"
-DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto"
 DISTRO_PN_ALIAS_pn-remake = "Mandriva=remake Debian=remake"
-DISTRO_PN_ALIAS_pn-renderproto = "Meego=xorg-x11-proto-renderproto"
-DISTRO_PN_ALIAS_pn-resourceproto = "Meego=xorg-x11-proto-resourceproto"
 DISTRO_PN_ALIAS_pn-rgb = "Fedora=xorg-X11-server-utils Debian=x11-xserver-utils"
 DISTRO_PN_ALIAS_pn-rpmresolve = "OSPDT"
 DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"

@@ -356,7 +338,6 @@ DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand"
 DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand"
 DISTRO_PN_ALIAS_pn-sbc = "Fedora=sbc Debian=libsbc1"
 DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand"
-DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev"
 DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand"
 DISTRO_PN_ALIAS_pn-sgml-common = "OpenSuSE=sgml-common Fedora=sgml-common"
 DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl"

@@ -393,7 +374,6 @@ DISTRO_PN_ALIAS_pn-update-rc.d = "OE-Core"
 DISTRO_PN_ALIAS_pn-usbinit = "OE-Core"
 DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros"
 DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d"
-DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto"
 DISTRO_PN_ALIAS_pn-waffle = "OE-Core"
 DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog"
 DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit"

@@ -405,21 +385,15 @@ DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps"
 DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util"
 DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util"
 DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util"
-DISTRO_PN_ALIAS_pn-xcmiscproto = "Meego=xorg-x11-proto-xcmiscproto"
 DISTRO_PN_ALIAS_pn-xcursor-transparent-theme = "OpenedHand"
 DISTRO_PN_ALIAS_pn-xdpyinfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils"
 DISTRO_PN_ALIAS_pn-xev = "Fedora=xorg-x11-utils Ubuntu=x11-utils"
-DISTRO_PN_ALIAS_pn-xextproto = "Meego=xorg-x11-proto-xextproto"
 DISTRO_PN_ALIAS_pn-xeyes = "Ubuntu=x11-apps Fedora=xorg-x11-apps"
-DISTRO_PN_ALIAS_pn-xf86bigfontproto = "Meego=xorg-x11-proto-xf86bigfontproto"
-DISTRO_PN_ALIAS_pn-xf86dgaproto = "Meego=xorg-x11-proto-xf86dgaproto"
-DISTRO_PN_ALIAS_pn-xf86driproto = "Meego=xorg-x11-proto-xf86driproto"
 DISTRO_PN_ALIAS_pn-xf86-input-evdev = "Ubuntu=xserver-xorg-input-evdev Mandriva=x11-driver-input-evdev Debian=xserver-xorg-input-evdev Fedora=xorg-x11-drv-evdev Meego=xorg-x11-drv-evdev"
 DISTRO_PN_ALIAS_pn-xf86-input-keyboard = "Meego=xorg-x11-drv-keyboard Fedora=xorg-x11-drv-keyboard Mandriva=x11-driver-input-keyboard Debian=xserver-xorg-input-keyboard"
 DISTRO_PN_ALIAS_pn-xf86-input-mouse = "Ubuntu=xserver-xorg-input-mouse Mandriva=x11-driver-input-mouse Debian=xserver-xorg-input-mouse"
 DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
 DISTRO_PN_ALIAS_pn-xf86-input-vmmouse = "Fedora=xorg-x11-drv-vmmouse Ubuntu=xserver-xorg-input-vmmouse Mandriva=x11-driver-input-vmmouse Debian=xserver-xorg-input-vmmouse"
-DISTRO_PN_ALIAS_pn-xf86miscproto = "Meego=xorg-x11-proto-xf86miscproto"
 DISTRO_PN_ALIAS_pn-xf86-video-cirrus = "Opensuse=xf86-video-cirrus Debian=xserver-xorg-video-cirrus"
 DISTRO_PN_ALIAS_pn-xf86-video-fbdev = "Ubuntu=xserver-xorg-video-fbdev Debian=xserver-xorg-video-fbdev"
 DISTRO_PN_ALIAS_pn-xf86-video-intel = "Debian=xserver-xorg-video-intel Fedora=xorg-x11-drv-intel Mandriva=x11-driver-video-intel Meego=xorg-x11-drv-intel Ubuntu=xserver-xorg-video-intel"

@@ -428,15 +402,13 @@ DISTRO_PN_ALIAS_pn-xf86-video-omap = "Ubuntu=xf86-video-omap Debian=xf86-video-o
 DISTRO_PN_ALIAS_pn-xf86-video-omapfb = "OSPDT"
 DISTRO_PN_ALIAS_pn-xf86-video-vesa = "Debian=xserver-xorg-video-vesa Fedora=xorg-x11-drv-vesa Mandriva=x11-driver-video-vesa Ubuntu=xserver-xorg-video-vesa"
 DISTRO_PN_ALIAS_pn-xf86-video-vmware = "Debian=xserver-xorg-video-vmware Fedora=xorg-x11-drv-vmware Mandriva=x11-driver-video-vmware Ubuntu=xserver-xorg-video-vmware"
-DISTRO_PN_ALIAS_pn-xf86vidmodeproto = "Meego=xorg-x11-proto-xf86vidmodeproto Ubuntu=x11proto-xf86vidmode Debian=x11proto-xf86vidmode"
 DISTRO_PN_ALIAS_pn-xhost = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils"
-DISTRO_PN_ALIAS_pn-xineramaproto = "Meego=xorg-x11-proto-xineramaproto Ubuntu=x11proto-xinerama Debian=x11proto-xinerama"
 DISTRO_PN_ALIAS_pn-xinput-calibrator = "Fedora=xinput-calibrator Mandravia=xinput-calibrator Ubuntu=xinput-calibrator"
 DISTRO_PN_ALIAS_pn-xkbcomp = "Ubuntu=x11-xkb-utils Fedora=xorg-x11-xkb-utils"
 DISTRO_PN_ALIAS_pn-xmodmap = "Meego=xorg-x11-utils-xmodmap Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils"
 DISTRO_PN_ALIAS_pn-xorg-minimal-fonts = "Ubuntu=xfonts-base Fedora=xorg-x11-fonts-base"
+DISTRO_PN_ALIAS_pn-xorgproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/xorgproto"
 DISTRO_PN_ALIAS_pn-xprop = "Meego=xorg-x11-utils-xprop Fedora=xorg-x11-utils Ubuntu=x11-utils"
-DISTRO_PN_ALIAS_pn-xproto = "Meego=xorg-x11-proto-xproto Fedora=xorg-x11-proto-devel Ubuntu=x11proto-core-dev Debian=x11proto-core-dev Opensuse=xorg-x11-proto-devel Mandriva=x11-proto-devel"
 DISTRO_PN_ALIAS_pn-xproxymanagementprotocol = "Meego=xorg-x11-proto-xproxymanagementprotocol"
 DISTRO_PN_ALIAS_pn-xrandr = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils"
 DISTRO_PN_ALIAS_pn-xrdb = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils"

index e471891..5b142c0 100644
@@ -66,7 +66,6 @@ RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin <alexander.kanavin@int
 RECIPE_MAINTAINER_pn-bc = "Jose Lamego <[email protected]>"
 RECIPE_MAINTAINER_pn-bdwgc = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-beecrypt = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-bigreqsproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-bind = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-binutils = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj <[email protected]>"

@@ -92,7 +91,6 @@ RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-cairo = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-calibrateproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ccache = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <[email protected]>"

@@ -105,7 +103,6 @@ RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-cmake = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-cmake-native = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-cogl-1.0 = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-compositeproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-connman-conf = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-connman-gnome = "Maxin B. John <[email protected]>"

@@ -124,7 +121,6 @@ RECIPE_MAINTAINER_pn-cups = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-curl = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-cve-check-tool = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-damageproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-db = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-dbus = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-dbus-glib = "Chen Qi <[email protected]>"

@@ -141,14 +137,11 @@ RECIPE_MAINTAINER_pn-directfb-examples = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-distcc-config = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dmidecode = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-dmxproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-dnf = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-docbook-xml-dtd4 = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-docbook-xsl-stylesheets = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dosfstools = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dpkg = "Aníbal Limón <[email protected]>"
-RECIPE_MAINTAINER_pn-dri2proto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-dri3proto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-dropbear = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin <[email protected]>"

@@ -170,13 +163,11 @@ RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-file = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-findutils = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-fixesproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-flex = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-fontconfig = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-fontsproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-freetype = "Maxin B. John <[email protected]>"

@@ -213,7 +204,6 @@ RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <[email protected]>"
-RECIPE_MAINTAINER_pn-glproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-gmp = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Maxin B. John <[email protected]>"

@@ -281,7 +271,6 @@ RECIPE_MAINTAINER_pn-initramfs-live-install-efi = "Chang Rebecca Swee Fun <rebec
 RECIPE_MAINTAINER_pn-initramfs-live-install-efi-testfs = "Chang Rebecca Swee Fun <[email protected]>"
 RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Chang Rebecca Swee Fun <[email protected]>"
 RECIPE_MAINTAINER_pn-initscripts = "Chang Rebecca Swee Fun <[email protected]>"
-RECIPE_MAINTAINER_pn-inputproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <[email protected]>"

@@ -293,7 +282,6 @@ RECIPE_MAINTAINER_pn-libjpeg-turbo = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-kbproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kernelshark = "Alexander Kanavin <[email protected]>"

@@ -584,7 +572,6 @@ RECIPE_MAINTAINER_pn-powertop = "Alexander Kanavin <[email protected]>
 RECIPE_MAINTAINER_pn-ppp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-ppp-dialin = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-prelink = "Mark Hatle <[email protected]>"
-RECIPE_MAINTAINER_pn-presentproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-procps = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-psmisc = "Alexander Kanavin <[email protected]>"

@@ -623,14 +610,10 @@ RECIPE_MAINTAINER_pn-qemuwrapper-cross = "Juro Bystricky <[email protected]
 RECIPE_MAINTAINER_pn-quilt = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-quilt-native = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-quota = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-randrproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-re2c = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-readline = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-recordproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-remake = "Robert Yang <[email protected]>"
-RECIPE_MAINTAINER_pn-renderproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-resolvconf = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-resourceproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-rgb = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-rpcbind = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-rng-tools = "Maxin B. John <[email protected]>"

@@ -644,7 +627,6 @@ RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-sato-screenshot = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-screen = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-scrnsaverproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-sed = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-serf = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-setserial = "Yi Zhao <[email protected]>"

@@ -718,7 +700,6 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-videoproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-vte = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-vulkan = "Maxin B. John <[email protected]>"

@@ -746,12 +727,10 @@ RECIPE_MAINTAINER_pn-xcb-util-image = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xcb-util-wm = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcmiscproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xdg-utils = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-xdpyinfo = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xev = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xextproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xeyes = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-input-evdev = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-input-keyboard = "Armin Kuster <[email protected]>"

@@ -766,12 +745,7 @@ RECIPE_MAINTAINER_pn-xf86-video-omap = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-video-omapfb = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-video-vesa = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-video-vmware = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86dgaproto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86driproto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86miscproto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86vidmodeproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xhost = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xineramaproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xinetd = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-xinit = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xinput = "Armin Kuster <[email protected]>"

@@ -781,8 +755,8 @@ RECIPE_MAINTAINER_pn-xkeyboard-config = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xmlto = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-xmodmap = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xorg-minimal-fonts = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xorgproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xprop = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xproto = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xrandr = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xrestop = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xserver-nodm-init = "Armin Kuster <[email protected]>"

index 9e4da81..45335e9 100644
@@ -47,7 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
 # "gbm" requires "dri", "opengl"
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
 
-X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 # "x11" requires "opengl"
 PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
 PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"

@@ -57,8 +57,8 @@ DRIDRIVERS = "swrast"
 DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
 DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
 # "dri" requires "opengl"
-PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
-PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
+PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm"
+PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence"
 
 # Vulkan drivers need dri3 enabled
 # radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9

index 88c88f1..2a6bec1 100644
@@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \
 name to a file fonts.scale in the directory.  The resulting fonts.scale \
 is used by the mkfontdir program."
 
-DEPENDS = "util-macros-native zlib libfontenc freetype xproto"
+DEPENDS = "util-macros-native zlib libfontenc freetype xorgproto"
 
 BBCLASSEXTEND = "native"
 

index 8726804..c3e8536 100644
@@ -6,7 +6,7 @@ to RGB values (rgb.txt) and, if configured to use a database for color \
 lookup, the rgb program to convert the text file into the binary database \
 format."
 
-DEPENDS += " xproto util-macros"
+DEPENDS += " xorgproto util-macros"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
 PE = "1"
 

index f151b57..0705b7f 100644
@@ -10,7 +10,7 @@ LICENSE = "MIT"
 
 PE = "1"
 
-DEPENDS += "libxrandr xproto"
+DEPENDS += "libxrandr xorgproto"
 
 SRC_URI += "file://diet-x11.patch"
 

index 2623cb2..893f5ce 100644
@@ -28,9 +28,9 @@ DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 PACKAGECONFIG ??= "xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}"
 
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri"
-PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto"
-PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
-PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
+PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xorgproto"
+PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto"
+PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto"
 PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
 PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
 PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"

index bef3636..0430f67 100644
@@ -22,7 +22,7 @@ omapdrm kernel driver w/ GEM support. \
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
-DEPENDS += "virtual/libx11 libdrm xf86driproto"
+DEPENDS += "virtual/libx11 libdrm xorgproto"
 
 SRC_URI[md5sum] = "3b8ea5e8fba63355c0dc6681c49d5fe5"
 SRC_URI[sha256sum] = "93e7d42107521e61f61980eaea64fb452e87b7b94272e48938ac8d904ccfab5a"

index 5c1356d..9a11014 100644
@@ -9,7 +9,7 @@ can drive most VESA-compatible video cards, but only makes use of the \
 basic standard VESA core that is common to these cards. The driver \
 supports depths 8, 15 16 and 24."
 
-DEPENDS += "virtual/libx11 randrproto libpciaccess"
+DEPENDS += "virtual/libx11 xorgproto libpciaccess"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 

index 706d35d..0b63bbc 100644
@@ -6,7 +6,7 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
 
-DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
+DEPENDS += "virtual/libx11 xorgproto libpciaccess"
 
 SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
 

index bca0aad..e657c65 100644
@@ -7,7 +7,7 @@ LICENSE = "MIT-X"
 PE = "2"
 INC_PR = "r21"
 
-DEPENDS = "virtual/xserver xproto randrproto util-macros"
+DEPENDS = "virtual/xserver xorgproto util-macros"
 
 SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
 

index 342067d..57912e7 100644
@@ -1,6 +1,6 @@
 require xorg-driver-common.inc
 
-DEPENDS += "inputproto kbproto "
+DEPENDS += "xorgproto"
 
 python add_xorg_abi_depends() {
     _add_xorg_abi_depends(d, "input")

index b5862da..2938ef1 100644
@@ -1,6 +1,6 @@
 require xorg-driver-common.inc
 
-DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+DEPENDS =+ "xorgproto"
 
 python add_xorg_abi_depends() {
     _add_xorg_abi_depends(d, "video")

index e623cee..c74b706 100644
@@ -11,7 +11,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \
                     file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1"
 
-DEPENDS += "libxext dmxproto"
+DEPENDS += "libxext xorgproto"
 
 PE = "1"
 

index a181f05..34d5fc4 100644
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
 
-DEPENDS += "zlib xproto font-util"
+DEPENDS += "zlib xorgproto font-util"
 PE = "1"
 
 BBCLASSEXTEND = "native"

index f069749..0337d21 100644
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93"
 
-DEPENDS += "xproto xtrans"
+DEPENDS += "xorgproto xtrans"
 PROVIDES = "ice"
 
 PE = "1"

index 48922cb..fdc693b 100644
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d"
 
-DEPENDS += "libice xproto xtrans"
+DEPENDS += "libice xorgproto xtrans"
 
 # libSM can work without libuuid, we explicitly disable it to break the following circular dependency
 # when DISTRO_FEATURES contains 'systemd' and 'x11'.

index 4af40ab..d9a2b52 100644
@@ -18,8 +18,8 @@ XORG_PN = "libX11"
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
-DEPENDS += "xproto-native"
+DEPENDS += "xorgproto xtrans libxcb"
+DEPENDS += "xorgproto-native"
 
 EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
 EXTRA_OEMAKE += 'CWARNFLAGS=""'

index 2ef8bfa..8c52475 100644
@@ -11,7 +11,7 @@ inherit gettext
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
 
-DEPENDS += " xproto"
+DEPENDS += " xorgproto"
 PROVIDES = "xau"
 
 PE = "1"

index 0fe6531..0ed8fda 100644
@@ -9,7 +9,7 @@ LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \
                     file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7"
 
-DEPENDS = "virtual/libx11 calibrateproto libxext"
+DEPENDS = "virtual/libx11 xorgproto libxext"
 
 SRCREV = "209d83af61ed38a002c8096377deac292b3e396c"
 PV = "0.0+git${SRCPV}"

index 04b58ea..a8e0307 100644
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b
 
 BBCLASSEXTEND = "native nativesdk"
 
-DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp"
+DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp"
 
 PACKAGES_DYNAMIC = "^libxcb-.*"
 

index 7025719..73e2948 100644
@@ -14,7 +14,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1"
 
-DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+DEPENDS += " xorgproto virtual/libx11 libxfixes libxext"
 PROVIDES = "xcomposite"
 BBCLASSEXTEND = "native"
 

index c3d7004..6d6ffad 100644
@@ -16,7 +16,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868"
 
-DEPENDS += "virtual/libx11 damageproto libxfixes"
+DEPENDS += "virtual/libx11 xorgproto libxfixes"
 PROVIDES = "xdamage"
 BBCLASSEXTEND = "native"
 

index f4e30d9..466f349 100644
@@ -13,7 +13,7 @@ inherit gettext
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123"
 
-DEPENDS += "xproto"
+DEPENDS += "xorgproto"
 PROVIDES = "xdmcp"
 
 PE = "1"

index 063e531..aae8f2a 100644
@@ -13,7 +13,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8"
 
-DEPENDS += "xproto virtual/libx11 xextproto"
+DEPENDS += "xorgproto virtual/libx11"
 PROVIDES = "xext"
 
 PE = "1"

index c80042d..f0e2f60 100644
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0"
 
-DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+DEPENDS += "virtual/libx11 xorgproto"
 
 PE = "1"
 

index 5f27a55..2b72d67 100644
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
 
-DEPENDS += "freetype xtrans fontsproto libfontenc zlib"
+DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
 
 XORG_PN = "libXfont2"
 

index 79f77fc..94c6c66 100644
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
 
-DEPENDS += "freetype xtrans fontsproto libfontenc zlib"
+DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
 PROVIDES = "xfont"
 
 PE = "1"

index 74f0527..08381d9 100644
@@ -11,7 +11,7 @@ LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \
                     file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f"
 
-DEPENDS += "libxext inputproto libxfixes"
+DEPENDS += "libxext xorgproto libxfixes"
 
 PE = "1"
 

index bb03f44..367ad26 100644
@@ -10,7 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \
                     file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02"
 
-DEPENDS += "libxext xineramaproto"
+DEPENDS += "libxext xorgproto"
 PROVIDES = "xinerama"
 PE = "1"
 

index 39a344c..f5c1860 100644
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f"
 
-DEPENDS += "virtual/libx11 kbproto"
+DEPENDS += "virtual/libx11 xorgproto"
 
 PE = "1"
 

index 48e88d2..b90ebc6 100644
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69"
 
-DEPENDS += "virtual/libx11 randrproto libxrender libxext"
+DEPENDS += "virtual/libx11 xorgproto libxrender libxext"
 
 PE = "1"
 

index 92b3102..9b18366 100644
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196"
 
-DEPENDS += "virtual/libx11 renderproto xproto"
+DEPENDS += "virtual/libx11 xorgproto"
 
 PE = "1"
 

index 8c34e47..af6bb19 100644
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa"
 
-DEPENDS += "libxext resourceproto"
+DEPENDS += "libxext xorgproto"
 
 PE = "1"
 

index 354e5de..ddf09af 100644
@@ -12,7 +12,7 @@ image is to be displayed and to provide the graphics."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb"
 
-DEPENDS += "libxext scrnsaverproto"
+DEPENDS += "libxext xorgproto"
 PROVIDES = "libxss"
 RREPLACES_${PN} = "libxss"
 PE = "1"

index 180d00d..f8d94a2 100644
@@ -16,7 +16,7 @@ LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343"
 
 
-DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp"
+DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp"
 PROVIDES = "xt"
 
 PE = "1"

index 5717fa5..266bd1c 100644
@@ -10,7 +10,7 @@ LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \
                     file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99"
 
-DEPENDS += "libxext recordproto inputproto libxi"
+DEPENDS += "libxext xorgproto libxi"
 PROVIDES = "xtst"
 PE = "1"
 

index a226c27..c602723 100644
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c"
 
-DEPENDS += "libxext videoproto"
+DEPENDS += "libxext xorgproto"
 
 XORG_PN = "libXv"
 

index 6ed49b1..7e49a98 100644
@@ -9,7 +9,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \
                     file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de"
 
-DEPENDS += "libxext libxv videoproto"
+DEPENDS += "libxext libxv xorgproto"
 
 PE = "1"
 

index 695a396..626199e 100644
@@ -9,7 +9,7 @@ emulators for games."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f"
 
-DEPENDS += "libxext xf86dgaproto"
+DEPENDS += "libxext"
 
 PE = "1"
 

index af6f1f7..04fe962 100644
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45"
 
-DEPENDS += "libxext xf86miscproto"
+DEPENDS += "libxext"
 PROVIDES = "xxf86misc"
 
 PE = "1"

index 35f87d2..95fc0b6 100644
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d"
 
-DEPENDS += "libxext xf86vidmodeproto"
+DEPENDS += "libxext xorgproto"
 
 PE = "1"
 

index 84a967a..727ab54 100644
@@ -10,7 +10,7 @@ directives would be used in a compilation. Any #include, directives \
 can reference files having other #include directives, and parsing will \
 occur in these files as well."
 
-DEPENDS = "xproto util-macros"
+DEPENDS = "xorgproto util-macros"
 PE = "1"
 
 BBCLASSEXTEND = "native"

index cf2286c..882897b 100644
@@ -26,7 +26,7 @@ inherit autotools pkgconfig
 inherit distro_features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto  xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
+PROTO_DEPS = "xorgproto"
 LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
 

@@ -127,18 +127,18 @@ PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
 "
 
 PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
-PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
+PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa"
+PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto"
 # DRI3 requires xshmfence to also be enabled
-PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
-PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
+PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,xorgproto virtual/libgl virtual/libx11"
 PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
 PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
 PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
 PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
 PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
-PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
+PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xorgproto"
 PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
 
 # Xorg requires a SHA1 implementation, pick one

index 5b142c0..d7a7a1a 100644
@@ -65,8 +65,8 @@ RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-bc = "Jose Lamego <[email protected]>"
 RECIPE_MAINTAINER_pn-bdwgc = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-beecrypt = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-bind = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-beecrypt = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-bind = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-binutils = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-binutils-cross-canadian = "Khem Raj <[email protected]>"

@@ -110,7 +110,7 @@ RECIPE_MAINTAINER_pn-console-tools = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-consolekit = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <[email protected]>"
-RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-cronie = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-cross-localedef-native = "Khem Raj <[email protected]>"

@@ -118,7 +118,7 @@ RECIPE_MAINTAINER_pn-cryptodev-linux = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cups = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-curl = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-curl = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-cve-check-tool = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-db = "Mark Hatle <[email protected]>"

@@ -154,7 +154,7 @@ RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin <[email protected]
 RECIPE_MAINTAINER_pn-efilinux = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-enchant = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-encodings = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-encodings = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ethtool = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-eudev = "Chang Rebecca Swee Fun <[email protected]>"

@@ -165,8 +165,8 @@ RECIPE_MAINTAINER_pn-file = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-findutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-flex = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-fontconfig = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <[email protected]>"

@@ -213,7 +213,7 @@ RECIPE_MAINTAINER_pn-gnome-themes-standard = "Maxin B. John <[email protected]
 RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-gnu-efi = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-go = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-cross = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-go-dep = "Otavio Salvador <[email protected]>"

@@ -286,7 +286,7 @@ RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin <alexander.kanavin@i
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-kernelshark = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <[email protected]>"
-RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-kmod = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <[email protected]>"

@@ -300,7 +300,7 @@ RECIPE_MAINTAINER_pn-libacpi = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-libart-lgpl = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-libassuan = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libassuan = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libatomic-ops = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libbsd = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-libcap = "Yi Zhao <[email protected]>"

@@ -311,7 +311,7 @@ RECIPE_MAINTAINER_pn-libcomps = "Alexander Kanavin <[email protected]>
 RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libcroco = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libdaemon = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-libepoxy = "Maxin B. John <[email protected]>"

@@ -324,7 +324,7 @@ RECIPE_MAINTAINER_pn-libfakekey = "Alexander Kanavin <[email protected]
 RECIPE_MAINTAINER_pn-libffi = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libfm-extra = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libfontenc = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libfontenc = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libgcc = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libgcc-initial = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libgcrypt = "Hongxu Jia <[email protected]>"

@@ -333,7 +333,7 @@ RECIPE_MAINTAINER_pn-libglu = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libgpg-error = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libgudev = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libical = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-libice = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libice = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libiconv = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin <[email protected]>"

@@ -357,7 +357,7 @@ RECIPE_MAINTAINER_pn-libpam = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libpcap = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libpciaccess = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libpcre = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libpfm4 = "Matthew McClintock <[email protected]>"
 RECIPE_MAINTAINER_pn-libpipeline = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libpng = "Maxin B. John <[email protected]>"

@@ -370,7 +370,7 @@ RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-libsdl = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-libsdl2 = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-libsecret = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libsndfile1 = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-libsolv = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-libsoup-2.4 = "Maxin B. John <[email protected]>"

@@ -393,24 +393,24 @@ RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libx11-diet = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxau = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxcalibrate = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxcursor = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxdamage = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxdmcp = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxext = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxfixes = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxfont = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxfont2 = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxft = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxi = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxinerama = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxkbcommon = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxkbfile = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libx11-diet = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxau = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxcalibrate = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxcursor = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxdamage = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxdmcp = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxext = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxfixes = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxfont = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxfont2 = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxft = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxi = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxinerama = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxkbcommon = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxkbfile = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libxml-namespacesupport-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libxml-parser-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libxml-perl = "Tim Orling <[email protected]>"

@@ -418,22 +418,22 @@ RECIPE_MAINTAINER_pn-libxml-sax-base-perl = "Tim Orling <timothy.t.orling@linux.
 RECIPE_MAINTAINER_pn-libxml-sax-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libxml-simple-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-libxml2 = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-libxmu = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxpm = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxrandr = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxrender = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxres = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxscrnsaver = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxmu = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxpm = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxrandr = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxrender = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxres = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxscrnsaver = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libxsettings-client = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-libxshmfence = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxshmfence = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libxslt = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libxt = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxt = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-linux-dummy = "Alexander Kanavin <[email protected]>"

@@ -490,11 +490,11 @@ RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <[email protected]
 RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <[email protected]>"
 RECIPE_MAINTAINER_pn-meta-world-pkgdata = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-mkelfimage = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-mkfontdir = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-mkfontdir = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-mktemp = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-mmc-utils = "Maxin B. John <[email protected]>"

@@ -519,19 +519,19 @@ RECIPE_MAINTAINER_pn-nativesdk-postinst-intercept = "Alexander Kanavin <alexande
 RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-neard = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-neon = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-net-tools = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-netbase = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-net-tools = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-netbase = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-nettle = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-ninja = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-nspr = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-nss = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-nspr = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-nss = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-nss-myhostname = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-ofono = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-oh-puzzles = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <[email protected]>"
 RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <[email protected]>"

@@ -614,7 +614,7 @@ RECIPE_MAINTAINER_pn-re2c = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-readline = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-remake = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-resolvconf = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-rgb = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-rgb = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-rpcbind = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-rng-tools = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-rpm = "Mark Hatle <[email protected]>"

@@ -623,7 +623,7 @@ RECIPE_MAINTAINER_pn-rsync = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-rt-tests = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ruby = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-run-postinsts = "Cristian Iorga <[email protected]>"
-RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-sato-screenshot = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-screen = "Maxin B. John <[email protected]>"

@@ -681,8 +681,8 @@ RECIPE_MAINTAINER_pn-time = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-tiny-init = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-trace-cmd = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <[email protected]>"
 RECIPE_MAINTAINER_pn-u-boot-fw-utils = "Marek Vasut <[email protected]>"
 RECIPE_MAINTAINER_pn-u-boot-mkimage = "Marek Vasut <[email protected]>"

@@ -696,7 +696,7 @@ RECIPE_MAINTAINER_pn-update-rc.d = "Chang Rebecca Swee Fun <rebecca.swee.fun.cha
 RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-util-linux = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <[email protected]>"

@@ -717,57 +717,57 @@ RECIPE_MAINTAINER_pn-which = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-wic-tools = "Chang Rebecca Swee Fun <[email protected]>"
 RECIPE_MAINTAINER_pn-wireless-tools = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae <[email protected]>"
-RECIPE_MAINTAINER_pn-x11-common = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-x11-common = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-xauth = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-proto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-util = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-util-image = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcb-util-wm = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xauth = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-proto = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-util = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-util-image = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcb-util-wm = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xdg-utils = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-xdpyinfo = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xev = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xeyes = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-evdev = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-keyboard = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-libinput = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-mouse = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-synaptics = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-input-vmmouse = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-cirrus = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-fbdev = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-intel = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-omap = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-omapfb = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-vesa = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-vmware = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xhost = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xdpyinfo = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xev = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xeyes = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-evdev = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-keyboard = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-libinput = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-mouse = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-synaptics = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-input-vmmouse = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-cirrus = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-fbdev = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-intel = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-omap = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-omapfb = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-vesa = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xf86-video-vmware = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xhost = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xinetd = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-xinit = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xinput = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xinput-calibrator = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xkbcomp = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xkeyboard-config = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xinit = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xinput = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xinput-calibrator = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xkbcomp = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xkeyboard-config = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xmlto = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-xmodmap = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xorg-minimal-fonts = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xorgproto = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xprop = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xrandr = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xrestop = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xserver-nodm-init = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xserver-xf86-config = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xserver-xorg = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xset = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xmodmap = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xorg-minimal-fonts = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xorgproto = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xprop = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xrandr = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xrestop = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xserver-nodm-init = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xserver-xf86-config = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xserver-xorg = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xset = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xvideo-tests = "Maxin B. John <[email protected]>"
-RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-yasm = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <[email protected]>"