[OE-core] [PATCH 1/3] xf86-video-intel: patch cleanup

[akuster808]

On 06/18/2018 03:10 AM, Ross Burton wrote:
> always_include_xorg_server.h.patch is merged upstream, so drop it.
>
> disable-x11-dri3.patch was purely to solve determinism issues with the shared sysroot, which
> we don't have anymore.
>
> Also remove redundant tarball checksums as this recipe fetches from git.
cool, I will drop the changes I have queue fro this package.

thanks,
Armin
>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  .../always_include_xorg_server.h.patch             | 24 ----------------------
>  .../xf86-video-intel/disable-x11-dri3.patch        | 17 ---------------
>  .../xorg-driver/xf86-video-intel_git.bb            |  4 ----
>  3 files changed, 45 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
>  delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
> deleted file mode 100644
> index 8a5dd39ae1e..00000000000
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Include xorg-server.h to fix build errors seen with glibc 2.20
> -
> -In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
> -                 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39:
> -/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
> - strndup(const char *str, size_t n);
> - ^
> -
> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> -
> -Upstream-Status: Pending
> -
> -Index: xf86-video-intel-2.99.912/src/backlight.c
> -===================================================================
> ---- xf86-video-intel-2.99.912.orig/src/backlight.c	2014-04-09 10:41:18.000000000 -0700
> -+++ xf86-video-intel-2.99.912/src/backlight.c	2014-08-28 18:52:25.524070587 -0700
> -@@ -29,6 +29,7 @@
> - #include "config.h"
> - #endif
> - 
> -+#include <xorg-server.h>
> - #include <sys/types.h>
> - #include <sys/wait.h>
> - #include <sys/stat.h>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
> deleted file mode 100644
> index 3dddd334bf4..00000000000
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -These modules are only used for tests that don't get installed, and the
> -automatic detection without explicit dependencies means that a build can find
> -e.g. xshmfence at configure time but then it's been removed from the sysroot by
> -the time compile happens.
> -
> -As the tests don't get installed, just disable the checks.
> -
> -Upstream-Status: Inappropriate [OE-specific]
> -Signed-off-by: Ross Burton <ross.burton at intel.com>
> -
> -diff --git a/configure.ac b/configure.ac
> -index bd654f3..78a0e0d 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -279 +279 @@ fi
> --PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
> -+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> index 893f5ce3f64..a60da70840d 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> @@ -14,13 +14,9 @@ PV = "2.99.917+git${SRCPV}"
>  S = "${WORKDIR}/git"
>  
>  SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
> -           file://disable-x11-dri3.patch \
> -           file://always_include_xorg_server.h.patch \
>             file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \
>             "
>  
> -SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b"
> -SRC_URI[sha256sum] = "00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9"
>  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
>  
>  DEPENDS += "virtual/libx11 drm libpciaccess pixman"