From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../xorg-proto/bigreqsproto_1.1.2.bb | 16 - .../xorg-proto/calibrateproto/fix.patch | 42 -- .../xorg-proto/calibrateproto_git.bb | 21 - .../xorg-proto/compositeproto_0.4.2.bb | 21 - .../xorg-proto/damageproto_1.2.1.bb | 20 - .../recipes-graphics/xorg-proto/dmxproto_2.3.1.bb | 18 - .../recipes-graphics/xorg-proto/dri2proto_2.8.bb | 15 - .../recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 - .../recipes-graphics/xorg-proto/fixesproto_5.0.bb | 22 - .../xorg-proto/fontsproto_2.1.3.bb | 18 - .../recipes-graphics/xorg-proto/glproto_1.4.17.bb | 18 - .../xorg-proto/inputproto_2.3.2.bb | 22 - .../recipes-graphics/xorg-proto/kbproto_1.0.7.bb | 18 - .../xorg-proto/presentproto_git.bb | 22 - .../xorg-proto/randrproto_1.5.0.bb | 19 - .../xorg-proto/recordproto_1.14.2.bb | 18 - .../xorg-proto/renderproto_0.11.1.bb | 21 - .../xorg-proto/resourceproto_1.2.0.bb | 19 - .../xorg-proto/scrnsaverproto_1.2.2.bb | 19 - .../xorg-proto/videoproto_2.3.3.bb | 14 - .../0001-Make-whitespace-use-consistent.patch | 215 ---------- ...print-is-a-function-and-needs-parentheses.patch | 75 ---- .../recipes-graphics/xorg-proto/xcb-proto_1.12.bb | 53 --- .../recipes-graphics/xorg-proto/xcb-proto_1.13.bb | 51 +++ .../xorg-proto/xcmiscproto_1.2.2.bb | 17 - .../recipes-graphics/xorg-proto/xextproto_7.3.0.bb | 24 -- .../xorg-proto/xf86dgaproto_2.1.bb | 18 - .../xorg-proto/xf86driproto_2.1.1.bb | 17 - .../xorg-proto/xf86miscproto_0.9.3.bb | 17 - .../xorg-proto/xf86vidmodeproto_2.3.1.bb | 18 - .../xorg-proto/xineramaproto_1.2.1.bb | 19 - .../0001-Remove-libdir-specification.patch | 468 +++++++++++++++++++++ .../xorg-proto/xorgproto_2018.4.bb | 16 + .../xorg-proto/xproto/xproto_fix_for_x32.patch | 24 -- .../recipes-graphics/xorg-proto/xproto_7.0.31.bb | 19 - 35 files changed, 535 insertions(+), 913 deletions(-) delete mode 100644 poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch delete mode 100644 poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb create mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb create mode 100644 poky/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch create mode 100644 poky/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb (limited to 'poky/meta/recipes-graphics/xorg-proto') diff --git a/poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb b/poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb deleted file mode 100644 index f798a43538..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch deleted file mode 100644 index ff8cb25cd5..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Add missing length fields to the replies. Without these, sanity checking in recent X -breaks things. - -RP 11/2/10 - - -Index: git/xcalibrateproto.h -=================================================================== ---- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000 -+++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000 -@@ -67,13 +67,13 @@ - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; -+ CARD32 length; - CARD32 status; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -- CARD32 pad7 B32; - } xXCalibrateRawModeReply; - - #define sz_xXCalibrateRawModeReply 32 -@@ -92,13 +92,13 @@ - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; -+ CARD32 length; - CARD32 x; - CARD32 y; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -- CARD32 pad6 B32; - } xXCalibrateScreenToCoordReply; - - #define sz_xXCalibrateScreenToCoordReply 32 diff --git a/poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb deleted file mode 100644 index eb4b4224ca..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb +++ /dev/null @@ -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" - diff --git a/poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb deleted file mode 100644 index adfee26306..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb +++ /dev/null @@ -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" - diff --git a/poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb deleted file mode 100644 index 75d0268108..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb b/poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb deleted file mode 100644 index d960e5d4cf..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb b/poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb deleted file mode 100644 index f4c40c5719..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb deleted file mode 100644 index bed97b3f49..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb deleted file mode 100644 index 39fb88d84c..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb b/poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb deleted file mode 100644 index 27fc281748..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb b/poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb deleted file mode 100644 index eb03d33c2b..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb b/poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb deleted file mode 100644 index eb5e66bd66..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb b/poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb deleted file mode 100644 index 46f5c92b61..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb deleted file mode 100644 index e6d32f95af..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb b/poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb deleted file mode 100644 index b59e52513f..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb deleted file mode 100644 index ad2317c26e..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb deleted file mode 100644 index ff800ec831..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb +++ /dev/null @@ -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" - diff --git a/poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb deleted file mode 100644 index 08b610aea5..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb +++ /dev/null @@ -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" - diff --git a/poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb b/poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb deleted file mode 100644 index ab07f518cf..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb b/poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb deleted file mode 100644 index 6f97a2653b..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch b/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch deleted file mode 100644 index 89ec66618e..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch +++ /dev/null @@ -1,215 +0,0 @@ -From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -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 -Signed-off-by: Uli Schlachter - -Upstream-Status: Backport - -Signed-off-by: Robert Yang ---- - 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 - diff --git a/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch b/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch deleted file mode 100644 index 542acb82b8..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch +++ /dev/null @@ -1,75 +0,0 @@ -From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 19 May 2016 17:30:05 +0200 -Subject: [PATCH 2/2] print() is a function and needs parentheses. - -Fixes build with python-3.x. - -Signed-off-by: Thomas Klausner -Signed-off-by: Uli Schlachter - -Upstream-Status: Backport - -Signed-off-by: Robert Yang ---- - xcbgen/xtypes.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py -index c3b5758..b83b119 100644 ---- a/xcbgen/xtypes.py -+++ b/xcbgen/xtypes.py -@@ -501,7 +501,7 @@ class ComplexType(Type): - int(required_start_align_element.get('align', "4"), 0), - int(required_start_align_element.get('offset', "0"), 0)) - if verbose_align_log: -- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align) -+ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align)) - - def resolve(self, module): - if self.resolved: -@@ -592,7 +592,7 @@ class ComplexType(Type): - if verbose_align_log: - print ("calc_required_start_align: %s has start-align %s" - % (str(self), str(self.required_start_align))) -- print "Details:\n" + str(log) -+ print ("Details:\n" + str(log)) - if self.required_start_align.offset != 0: - print (("WARNING: %s\n\thas start-align with non-zero offset: %s" - + "\n\tsuggest to add explicit definition with:" -@@ -619,12 +619,12 @@ class ComplexType(Type): - for offset in range(0,align): - align_candidate = Alignment(align, offset) - if verbose_align_log: -- print "trying %s for %s" % (str(align_candidate), str(self)) -+ print ("trying %s for %s" % (str(align_candidate), str(self))) - my_log = AlignmentLog() - if self.is_possible_start_align(align_candidate, callstack, my_log): - log.append(my_log) - if verbose_align_log: -- print "found start-align %s for %s" % (str(align_candidate), str(self)) -+ print ("found start-align %s for %s" % (str(align_candidate), str(self))) - return align_candidate - else: - my_ok_count = my_log.ok_count() -@@ -641,7 +641,7 @@ class ComplexType(Type): - # none of the candidates applies - # this type has illegal internal aligns for all possible start_aligns - if verbose_align_log: -- print "didn't find start-align for %s" % str(self) -+ print ("didn't find start-align for %s" % str(self)) - log.append(best_log) - return None - -@@ -900,7 +900,7 @@ class SwitchType(ComplexType): - # aux function for unchecked_get_alignment_after - def get_align_for_selected_case_field(self, case_field, start_align, callstack, log): - if verbose_align_log: -- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)) -+ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))) - total_align = start_align - for field in self.bitcases: - my_callstack = callstack[:] --- -2.9.0 - diff --git a/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb deleted file mode 100644 index 25a8373e0b..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding headers" -DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ -(XCB). XCB is a replacement for Xlib featuring a small footprint, \ -latency hiding, direct access to the protocol, improved threading \ -support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -SECTION = "x11/libs" -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" - -inherit autotools pkgconfig - -# Force the use of Python 3 and a specific library path so we don't need to -# depend on python3-native -CACHED_CONFIGUREVARS += "PYTHON=python3 am_cv_python_pythondir=${libdir}/xcb-proto" - -PACKAGES += "python-xcbgen" - -FILES_${PN} = "" -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${libdir}/xcb-proto" - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" - -# Need to do this dance because we're forcing the use of host Python above and -# if xcb-proto is built with Py3.5 and then re-used from sstate on a host with -# Py3.6 the second build will write new cache files into the sysroot which won't -# be listed in the manifest so won't be deleted, resulting in an error on -# rebuilds. Solve this by deleting the entire cache directory when this package -# is removed from the sysroot. -SSTATEPOSTINSTFUNCS += "xcb_sstate_postinst" -xcb_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - cat <${SSTATE_INST_POSTRM} -#!/bin/sh -rm -rf ${libdir}/xcb-proto/xcbgen/__pycache__ -EOF - fi -} diff --git a/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb new file mode 100644 index 0000000000..d5037868d5 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb @@ -0,0 +1,51 @@ +SUMMARY = "XCB: The X protocol C binding headers" +DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ +(XCB). XCB is a replacement for Xlib featuring a small footprint, \ +latency hiding, direct access to the protocol, improved threading \ +support, and extensibility." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" + +SECTION = "x11/libs" +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" + +SRC_URI[md5sum] = "abe9aa4886138150bbc04ae4f29b90e3" +SRC_URI[sha256sum] = "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1" + +inherit autotools pkgconfig + +# Force the use of Python 3 and a specific library path so we don't need to +# depend on python3-native +CACHED_CONFIGUREVARS += "PYTHON=python3 am_cv_python_pythondir=${libdir}/xcb-proto" + +PACKAGES += "python-xcbgen" + +FILES_${PN} = "" +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" +FILES_python-xcbgen = "${libdir}/xcb-proto" + +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" + +# Need to do this dance because we're forcing the use of host Python above and +# if xcb-proto is built with Py3.5 and then re-used from sstate on a host with +# Py3.6 the second build will write new cache files into the sysroot which won't +# be listed in the manifest so won't be deleted, resulting in an error on +# rebuilds. Solve this by deleting the entire cache directory when this package +# is removed from the sysroot. +SSTATEPOSTINSTFUNCS += "xcb_sstate_postinst" +xcb_sstate_postinst() { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + cat <${SSTATE_INST_POSTRM} +#!/bin/sh +rm -rf ${libdir}/xcb-proto/xcbgen/__pycache__ +EOF + fi +} diff --git a/poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb b/poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb deleted file mode 100644 index 0751b94c9d..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb b/poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb deleted file mode 100644 index dd0bd951b2..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb deleted file mode 100644 index 86f3ce328f..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb deleted file mode 100644 index b3f9210ccb..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb b/poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb deleted file mode 100644 index d4663ea880..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb deleted file mode 100644 index 0f31900a9e..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb deleted file mode 100644 index dde7e9db7a..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb +++ /dev/null @@ -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" diff --git a/poky/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch b/poky/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch new file mode 100644 index 0000000000..48296f7844 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch @@ -0,0 +1,468 @@ +Upstream-Status: Submitted + +https://cgit.freedesktop.org/xorg/proto/xorgproto/commit/?id=91c1c8e1490c970379efb16784003426faec806e + +From 6feb974e0deb3355908c30e07293d82a3f6996ed Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 11 Jun 2018 16:42:43 +0000 +Subject: [PATCH] Remove libdir specification. + +Currently the pc files define libdir, however they are installed into +/usr/share, which means they should be architecture agnostic. In a +multilib system, xorg-proto built for each multilib abi, the value of +libdir is going to be different. These should either be installed in +/pkgconfig or they shouldn't define libdir, espeically since +they don't actually use the definition. This specifically causes an +issue when trying to install both abis at the same time, since they are +not binary identical, something like rpm will complain that they + +--- + applewmproto.pc.in | 1 - + bigreqsproto.pc.in | 1 - + compositeproto.pc.in | 1 - + damageproto.pc.in | 1 - + dmxproto.pc.in | 1 - + dri2proto.pc.in | 1 - + dri3proto.pc.in | 1 - + evieproto.pc.in | 1 - + fixesproto.pc.in | 1 - + fontcacheproto.pc.in | 1 - + fontsproto.pc.in | 1 - + glproto.pc.in | 1 - + inputproto.pc.in | 1 - + kbproto.pc.in | 1 - + lg3dproto.pc.in | 1 - + presentproto.pc.in | 1 - + printproto.pc.in | 1 - + randrproto.pc.in | 1 - + recordproto.pc.in | 1 - + renderproto.pc.in | 1 - + resourceproto.pc.in | 1 - + scrnsaverproto.pc.in | 1 - + trapproto.pc.in | 1 - + videoproto.pc.in | 1 - + windowswmproto.pc.in | 1 - + xcalibrateproto.pc.in | 1 - + xcmiscproto.pc.in | 1 - + xextproto.pc.in | 1 - + xf86bigfontproto.pc.in | 1 - + xf86dgaproto.pc.in | 1 - + xf86driproto.pc.in | 1 - + xf86miscproto.pc.in | 1 - + xf86rushproto.pc.in | 1 - + xf86vidmodeproto.pc.in | 1 - + xineramaproto.pc.in | 1 - + xproto.pc.in | 1 - + xproxymngproto.pc.in | 1 - + 37 files changed, 37 deletions(-) + +diff --git a/applewmproto.pc.in b/applewmproto.pc.in +index 17841ac..3227b21 100644 +--- a/applewmproto.pc.in ++++ b/applewmproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: AppleWMProto +diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in +index 94577ed..e21bb59 100644 +--- a/bigreqsproto.pc.in ++++ b/bigreqsproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: BigReqsProto +diff --git a/compositeproto.pc.in b/compositeproto.pc.in +index da429c7..b0dada1 100644 +--- a/compositeproto.pc.in ++++ b/compositeproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: CompositeExt +diff --git a/damageproto.pc.in b/damageproto.pc.in +index 6fd9ef1..bfd5244 100644 +--- a/damageproto.pc.in ++++ b/damageproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: DamageProto +diff --git a/dmxproto.pc.in b/dmxproto.pc.in +index e82ee7d..d140e1c 100644 +--- a/dmxproto.pc.in ++++ b/dmxproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: DMXProto +diff --git a/dri2proto.pc.in b/dri2proto.pc.in +index cb5b171..fa9d24d 100644 +--- a/dri2proto.pc.in ++++ b/dri2proto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: DRI2Proto +diff --git a/dri3proto.pc.in b/dri3proto.pc.in +index e42d60e..20da358 100644 +--- a/dri3proto.pc.in ++++ b/dri3proto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: DRI3Proto +diff --git a/evieproto.pc.in b/evieproto.pc.in +index 64e0ec4..fd5442b 100644 +--- a/evieproto.pc.in ++++ b/evieproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: EvIEExt +diff --git a/fixesproto.pc.in b/fixesproto.pc.in +index f8258e2..c7fcb81 100644 +--- a/fixesproto.pc.in ++++ b/fixesproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: FixesProto +diff --git a/fontcacheproto.pc.in b/fontcacheproto.pc.in +index eb4238b..8ffffe9 100644 +--- a/fontcacheproto.pc.in ++++ b/fontcacheproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: FontcacheProto +diff --git a/fontsproto.pc.in b/fontsproto.pc.in +index 9d22354..ebb61a4 100644 +--- a/fontsproto.pc.in ++++ b/fontsproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: FontsProto +diff --git a/glproto.pc.in b/glproto.pc.in +index b951db5..e97bfc9 100644 +--- a/glproto.pc.in ++++ b/glproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: GLProto +diff --git a/inputproto.pc.in b/inputproto.pc.in +index 1eb6619..270b95c 100644 +--- a/inputproto.pc.in ++++ b/inputproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: InputProto +diff --git a/kbproto.pc.in b/kbproto.pc.in +index bdd39f1..32a172d 100644 +--- a/kbproto.pc.in ++++ b/kbproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: KBProto +diff --git a/lg3dproto.pc.in b/lg3dproto.pc.in +index 3930ad7..43fba29 100644 +--- a/lg3dproto.pc.in ++++ b/lg3dproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: Lg3dProto +diff --git a/presentproto.pc.in b/presentproto.pc.in +index 6ec4b7d..55b84dc 100644 +--- a/presentproto.pc.in ++++ b/presentproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: PresentProto +diff --git a/printproto.pc.in b/printproto.pc.in +index 8a2e2d6..a2da66d 100644 +--- a/printproto.pc.in ++++ b/printproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: PrintProto +diff --git a/randrproto.pc.in b/randrproto.pc.in +index 5a5edb2..6d60cbb 100644 +--- a/randrproto.pc.in ++++ b/randrproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: RandrProto +diff --git a/recordproto.pc.in b/recordproto.pc.in +index 0ff4c0b..a87aa82 100644 +--- a/recordproto.pc.in ++++ b/recordproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: RecordProto +diff --git a/renderproto.pc.in b/renderproto.pc.in +index e6028ac..34b15e0 100644 +--- a/renderproto.pc.in ++++ b/renderproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: RenderProto +diff --git a/resourceproto.pc.in b/resourceproto.pc.in +index a409db9..f927cbb 100644 +--- a/resourceproto.pc.in ++++ b/resourceproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: ResourceProto +diff --git a/scrnsaverproto.pc.in b/scrnsaverproto.pc.in +index 6556a2c..fd9d368 100644 +--- a/scrnsaverproto.pc.in ++++ b/scrnsaverproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: ScrnSaverProto +diff --git a/trapproto.pc.in b/trapproto.pc.in +index 8cb0aa8..8a220b9 100644 +--- a/trapproto.pc.in ++++ b/trapproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: TrapProto +diff --git a/videoproto.pc.in b/videoproto.pc.in +index 14b907a..5c22f7a 100644 +--- a/videoproto.pc.in ++++ b/videoproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: VideoProto +diff --git a/windowswmproto.pc.in b/windowswmproto.pc.in +index 0a2ec0b..ec56e82 100644 +--- a/windowswmproto.pc.in ++++ b/windowswmproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: WindowsWMProto +diff --git a/xcalibrateproto.pc.in b/xcalibrateproto.pc.in +index 40b6fd0..f1ea5de 100644 +--- a/xcalibrateproto.pc.in ++++ b/xcalibrateproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XCalibrate +diff --git a/xcmiscproto.pc.in b/xcmiscproto.pc.in +index 0dfbf21..b72bbc6 100644 +--- a/xcmiscproto.pc.in ++++ b/xcmiscproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XCMiscProto +diff --git a/xextproto.pc.in b/xextproto.pc.in +index f66eeae..9419c91 100644 +--- a/xextproto.pc.in ++++ b/xextproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XExtProto +diff --git a/xf86bigfontproto.pc.in b/xf86bigfontproto.pc.in +index 18c5647..4a67be6 100644 +--- a/xf86bigfontproto.pc.in ++++ b/xf86bigfontproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86BigFontProto +diff --git a/xf86dgaproto.pc.in b/xf86dgaproto.pc.in +index 5c5f8b1..e029cd4 100644 +--- a/xf86dgaproto.pc.in ++++ b/xf86dgaproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86DGAProto +diff --git a/xf86driproto.pc.in b/xf86driproto.pc.in +index 93df292..c8faf14 100644 +--- a/xf86driproto.pc.in ++++ b/xf86driproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86DRIProto +diff --git a/xf86miscproto.pc.in b/xf86miscproto.pc.in +index af73fa3..05d5d9e 100644 +--- a/xf86miscproto.pc.in ++++ b/xf86miscproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86MiscProto +diff --git a/xf86rushproto.pc.in b/xf86rushproto.pc.in +index fc5f63b..1c7ff1b 100644 +--- a/xf86rushproto.pc.in ++++ b/xf86rushproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86RushProto +diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in +index fcb74f2..ef062b3 100644 +--- a/xf86vidmodeproto.pc.in ++++ b/xf86vidmodeproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XF86VidModeProto +diff --git a/xineramaproto.pc.in b/xineramaproto.pc.in +index 1ffd37d..9172f1e 100644 +--- a/xineramaproto.pc.in ++++ b/xineramaproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XineramaProto +diff --git a/xproto.pc.in b/xproto.pc.in +index 8ff2d3d..899316a 100644 +--- a/xproto.pc.in ++++ b/xproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + includex11dir=@includedir@/X11 + +diff --git a/xproxymngproto.pc.in b/xproxymngproto.pc.in +index 5c6fad6..1a81e28 100644 +--- a/xproxymngproto.pc.in ++++ b/xproxymngproto.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XProxyManagementProtocol +-- +2.11.1 + diff --git a/poky/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb b/poky/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb new file mode 100644 index 0000000000..cec6e87559 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb @@ -0,0 +1,16 @@ +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 += "file://0001-Remove-libdir-specification.patch" + +SRC_URI[md5sum] = "81557ca47ee66a4e54590fcdadd28114" +SRC_URI[sha256sum] = "fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch deleted file mode 100644 index 4f9ed99c9c..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +++ /dev/null @@ -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 -Signed-off-by: Nitin A Kamble 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 */ diff --git a/poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb b/poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb deleted file mode 100644 index febcc67921..0000000000 --- a/poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb +++ /dev/null @@ -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" -- cgit v1.2.3