NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/{mesa3d, mesa3d-headers}: bump version to 17.1.2

Browse Source 
Patch 0005 tweaked to apply on this release.

Patch 0006 already included in this release:
  https://cgit.freedesktop.org/mesa/mesa/commit/?id=e75001811e3b66986b4ede165a0fdde703d4f05b

zlib is now a mandatory dependency.
https://cgit.freedesktop.org/mesa/mesa/commit/?h=17.1&id=85a9b1b562b6a73b9494b3fad25172da3dc90fc2

[Bernd: added in v2]
- bump to mesa3d version 17.1.2
- squashed mesa3d-headers bump for bisectability
- renumbered patch 0007
- added zlib link in patch message
- Vulkan Intel driver does not depend on the i965 dri driver anymore
  https://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=17.1&id=9aebdb5d082ec640fe8a14704201952bddb50a88
- Gallium vc4 driver depends on NEON support
  https://cgit.freedesktop.org/mesa/mesa/commit/?h=17.1&id=4d30024238efa829cabc72c1601beeee18c3dbf2

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Vicente Olivert Riera 2017-06-10 13:53:46 +02:00 committed by Thomas Petazzoni
parent 734414453e
commit 3e5926555b
7 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/mesa3d-headers/mesa3d-headers.mk
View File

@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of # Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery... # first/second expansion trickery...
MESA3D_HEADERS_VERSION = 17.0.7 MESA3D_HEADERS_VERSION = 17.1.2
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos

17
package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch
View File

@ -9,17 +9,20 @@ non-executable and wrong scanner.
Try searching the PATH first, and if that fails fall back into Try searching the PATH first, and if that fails fall back into
pkg-config. pkg-config.
[Vincent: tweak patch for 17.1.1 version]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
--- ---
configure.ac | 8 ++++---- configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 5f30ae8..461792e 100644 index 2c7e636..0198d52 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then @@ -2174,11 +2174,11 @@ if test "x$with_platforms" != xauto; then
AC_MSG_ERROR([cannot build egl state tracker without EGL library]) with_egl_platforms=$with_platforms
fi fi
-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
@ -27,10 +30,10 @@ index 5f30ae8..461792e 100644
- WAYLAND_SCANNER='') - WAYLAND_SCANNER='')
+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
if test "x$WAYLAND_SCANNER" = x; then if test "x$WAYLAND_SCANNER" = x; then
- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], + PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+ WAYLAND_SCANNER='') + WAYLAND_SCANNER='')
fi fi
# Do per-EGL platform setups and checks # Do per-EGL platform setups and checks

0
package/mesa3d/0007-Revert-Subject-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch → package/mesa3d/0006-Revert-Subject-PATCH-etnaviv-add-RGBX-RGBA-pixel-for.patch
View File

35
package/mesa3d/0006-Revert-etnaviv-Cannot-render-to-rb-swapped-formats.patch
View File

@ -1,35 +0,0 @@
From 309d4f0f11bac24a0b487404c51564735ac2c9ed Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 14 Mar 2017 09:51:23 -0300
Subject: [PATCH 1/2] Revert "etnaviv: Cannot render to rb-swapped formats"
Organization: O.S. Systems Software LTDA.
This reverts commit 6c89a728d9e5d072cb504453e73077564c6523d3.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
src/gallium/drivers/etnaviv/etnaviv_screen.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 28db9b95bf..2298936f51 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -469,11 +469,8 @@ etna_screen_is_format_supported(struct pipe_screen *pscreen,
return FALSE;
if (usage & PIPE_BIND_RENDER_TARGET) {
- /* If render target, must be RS-supported format that is not rb swapped.
- * Exposing rb swapped (or other swizzled) formats for rendering would
- * involve swizzing in the pixel shader.
- */
- if (translate_rs_format(format) != ETNA_NO_MATCH && !translate_rs_format_rb_swap(format)) {
+ /* if render target, must be RS-supported format */
+ if (translate_rs_format(format) != ETNA_NO_MATCH) {
/* Validate MSAA; number of samples must be allowed, and render target
* must have MSAA'able format. */
if (sample_count > 1) {
--
2.12.0

4
package/mesa3d/Config.in
View File

@ -15,6 +15,7 @@ menuconfig BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
select BR2_PACKAGE_ZLIB
help help
Mesa 3D, an open-source implementation of the OpenGL specification. Mesa 3D, an open-source implementation of the OpenGL specification.
@ -90,7 +91,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4
bool "Gallium vc4 driver" bool "Gallium vc4 driver"
depends on BR2_arm depends on BR2_ARM_CPU_HAS_NEON
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_LIBDRM_VC4
select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_MESA3D_NEEDS_XA
@ -153,7 +154,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h
depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
depends on BR2_PACKAGE_XORG7 # xproto_dri3proto depends on BR2_PACKAGE_XORG7 # xproto_dri3proto
select BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
select BR2_PACKAGE_MESA3D_VULKAN_DRIVER select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
select BR2_PACKAGE_XPROTO_DRI3PROTO select BR2_PACKAGE_XPROTO_DRI3PROTO
help help

10
package/mesa3d/mesa3d.hash
View File

@ -1,5 +1,5 @@
# From https://lists.freedesktop.org/archives/mesa-announce/2017-June/000332.html # From https://lists.freedesktop.org/archives/mesa-announce/2017-May/000335.html
md5 8d088c8f7a099084ac745646ed1ad62b mesa-17.0.7.tar.xz md5 4d2eaf5955740b044afd95ed167c906c mesa-17.1.2.tar.xz
sha1 33eecf0d137ad31bc91d2863447766aa42d2df43 mesa-17.0.7.tar.xz sha1 9433bd12ac1509d22100c9cd68e15c406daccf2e mesa-17.1.2.tar.xz
sha256 f6d75304a229c8d10443e219d6b6c0c342567dbab5a879ebe7cfa3c9139c4492 mesa-17.0.7.tar.xz sha256 0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239 mesa-17.1.2.tar.xz
sha512 378d643cf63ec3ed5fd093c00079fb03375f6a87875d3583a5d4707d3d6b21934194b0f624f4ed261c9a05a2fe3e9f292dcd8466e82cfb95d919459e3eb635ea mesa-17.0.7.tar.xz sha512 9df5e1a0336948a6ba338a9a8499b286543bc079f61f1cf85f6ecf98e05fab9a237777cde0d1e3f2153df9b07515cb8c1a08531d43f053783991ecdd32380d3b mesa-17.1.2.tar.xz

5
package/mesa3d/mesa3d.mk
View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
# When updating the version, please also update mesa3d-headers # When updating the version, please also update mesa3d-headers
MESA3D_VERSION = 17.0.7 MESA3D_VERSION = 17.1.2
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE = MIT, SGI, Khronos
@ -20,7 +20,8 @@ MESA3D_DEPENDENCIES = \
host-bison \ host-bison \
host-flex \ host-flex \
expat \ expat \
libdrm libdrm \
zlib
# Disable assembly usage. # Disable assembly usage.
MESA3D_CONF_OPTS = --disable-asm MESA3D_CONF_OPTS = --disable-asm