mesa: Update 18.1.9 -> 18.3.4

- Refresh all patches.

  - Remove "Use Python 3 to execute the scripts" patch
      Commit 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a add support
      for both python 2 and 3.

  - Remove "dri: i965: Add missing time.h include" patch
      Commit 3c288da5eec81ee58b85927df18d9194ead8f5c2 add time.h
      header file.

  - Remove --enable-texture-float.
      Commit 66673bef941af344314fe9c91cad8cd330b245eb remove option to
      unconditionally enable floating-point textures.

  - Commit 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd moved
    ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf
    Add 00-mesa-defaults.conf to mesa-megadriver package

  - Stop removing ${sysconfdir}/drirc on do_install_append

  - Fix upgrade path from mesa to mesa-megadriver

  - Add patch to fix mesa-native build

  - Add xrandr to X11_DEPS

(From OE-Core rev: 9ddd6add68f07fb7b3f264cee7c853ffe4a1b43e)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fabio Berton
2019-02-22 11:09:29 -03:00
committed by Richard Purdie
parent 060f27602a
commit c21c581d61
10 changed files with 99 additions and 115 deletions

View File

@@ -55,7 +55,7 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl"
# "gbm" requires "dri", "opengl"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
# "x11" requires "opengl"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
@@ -104,7 +104,7 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600',
GALLIUMDRIVERS_append = ",virgl"
# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
MESA_LLVM_RELEASE ?= "8.0"
PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
@@ -152,7 +152,6 @@ do_install_append () {
rm -f ${D}${libdir}/gbm/*.la
# it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
rm -f ${D}${sysconfdir}/drirc
chrpath --delete ${D}${libdir}/dri/*_dri.so || true
# libwayland-egl has been moved to wayland 1.15+
@@ -219,8 +218,7 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
PACKAGES_DYNAMIC += "^mesa-driver-.*"
FILES_${PN} += "${sysconfdir}/drirc"
FILES_mesa-megadriver = "${libdir}/dri/*"
FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf"
FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
FILES_libegl-mesa = "${libdir}/libEGL.so.*"
FILES_libgbm = "${libdir}/libgbm.so.*"
@@ -243,3 +241,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}
FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
${libdir}/pkgconfig/xatracker.pc"
# Fix upgrade path from mesa to mesa-megadriver
RREPLACES_mesa-megadriver = "mesa"
RCONFLICTS_mesa-megadriver = "mesa"
RPROVIDES_mesa-megadriver = "mesa"