[gnome-continuous-yocto/gnomeostree-3.28-rocko: 162/8267] xserver-xorg: update 1.18.3 and add PACKAGECONFIG for glamor

[Emmanuele Bassi <ebassi src gnome org>]

commit 1e88c74650a2c860180e780527672385e217d933
Author: Andreas Müller <schnitzeltony googlemail com>
Date:   Fri Apr 29 22:59:46 2016 +0200

    xserver-xorg: update 1.18.3 and add PACKAGECONFIG for glamor
    
    * drm-version patch was applied mainline
    * libsystemd was solved similar to patch upstream
    * glamor was enhanced twice by Eric Anholt and makes vc4 work on Raspberry Pi
    * glamor does not link against libegl but won't work without libegl
    
    (From OE-Core rev: 7fc6e5e816434fb6e35c137d5440b92a1cc4d9c2)
    
    Signed-off-by: Andreas Müller <schnitzeltony googlemail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 ....ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch |   50 --------------------
 .../modesetting_libdrm_requirements.patch          |   30 ------------
 ...erver-xorg_1.18.0.bb => xserver-xorg_1.18.3.bb} |    9 +--
 4 files changed, 4 insertions(+), 86 deletions(-)
---
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index f4c5469..30307bc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -131,6 +131,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
 # 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[glamor] = "--enable-glamor,--disable-glamor,libepoxy,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"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb
similarity index 71%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb
index eb79b40..27098f1 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.3.bb
@@ -1,11 +1,8 @@
 require xserver-xorg.inc
 
-SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \
-            file://musl-arm-inb-outb.patch \
-            file://modesetting_libdrm_requirements.patch \
-           "
-SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
-SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
+SRC_URI += "file://musl-arm-inb-outb.patch"
+SRC_URI[md5sum] = "043d720bf2472a65bb8f0daa97f83dfa"
+SRC_URI[sha256sum] = "ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.