Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -25,8 +25,8 @@ patch: http://lists.busybox.net/pipermail/buildroot/2015-March/123410.html
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
diff -uNr mesa-10.5.3.org/src/glsl/nir/nir_constant_expressions.c mesa-10.5.3/src/glsl/nir/nir_constant_expressions.c
|
||||
--- mesa-10.5.3.org/src/glsl/nir/nir_constant_expressions.c 2015-04-12 23:31:29.000000000 +0200
|
||||
+++ mesa-10.5.3/src/glsl/nir/nir_constant_expressions.c 2015-04-13 19:59:37.819786541 +0200
|
||||
--- mesa-10.5.3.org/src/compiler/nir/nir_constant_expressions.c 2015-04-12 23:31:29.000000000 +0200
|
||||
+++ mesa-10.5.3/src/compiler/nir/nir_constant_expressions.c 2015-04-13 19:59:37.819786541 +0200
|
||||
@@ -48,6 +48,18 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -2,9 +2,8 @@ menuconfig BR2_PACKAGE_MESA3D
|
||||
bool "mesa3d"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_1
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
# Triggers the _gp link issue in nios2
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
select BR2_PACKAGE_LIBDRM
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
|
||||
@@ -29,13 +28,14 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
select BR2_PACKAGE_MESA3D_DRIVER
|
||||
select BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER && \
|
||||
BR2_PACKAGE_XORG7
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRIVER
|
||||
bool
|
||||
@@ -79,6 +79,16 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
|
||||
This is a software opengl implementation using the Gallium3D
|
||||
infrastructure.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4
|
||||
bool "Gallium vc4 driver"
|
||||
depends on BR2_arm
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_VC4
|
||||
select BR2_PACKAGE_MESA3D_NEEDS_XA
|
||||
help
|
||||
Driver for Broadcom VC4 (rpi2/3) GPUs.
|
||||
It requires a vanilla 4.5+ kernel with drm vc4 (open) support.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL
|
||||
bool "Gallium virgl driver"
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
@@ -87,11 +97,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL
|
||||
virgl is the 3D acceleration backend for the virtio-gpu
|
||||
shipping with qemu.
|
||||
|
||||
comment "DRI drivers need X.Org"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
if BR2_PACKAGE_XORG7
|
||||
|
||||
comment "DRI drivers"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
|
||||
@@ -131,8 +136,6 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
|
||||
help
|
||||
Legacy Radeon driver for R100 series GPUs.
|
||||
|
||||
endif # BR2_PACKAGE_XORG7
|
||||
|
||||
comment "Off-screen Rendering"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_OSMESA
|
||||
@@ -169,6 +172,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
endif # BR2_PACKAGE_MESA3D
|
||||
|
||||
comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_1
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://lists.freedesktop.org/archives/mesa-announce/2016-January/000196.html
|
||||
sha256 64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20 mesa-11.1.1.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/mesa-announce/2016-July/000227.html
|
||||
sha256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 mesa-12.0.1.tar.xz
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# When updating the version, please also update mesa3d-headers
|
||||
MESA3D_VERSION = 11.1.1
|
||||
MESA3D_VERSION = 12.0.1
|
||||
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
|
||||
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
@@ -17,18 +17,31 @@ MESA3D_INSTALL_STAGING = YES
|
||||
MESA3D_PROVIDES =
|
||||
|
||||
MESA3D_DEPENDENCIES = \
|
||||
host-bison \
|
||||
host-flex \
|
||||
expat \
|
||||
libdrm
|
||||
|
||||
# The Sourcery MIPS toolchain has a special (non-upstream) feature to
|
||||
# have "compact exception handling", which unfortunately breaks with
|
||||
# mesa3d, so we disable it here by passing -mno-compact-eh.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y)
|
||||
MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
|
||||
MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
MESA3D_DEPENDENCIES += openssl
|
||||
MESA3D_CONF_OPTS += --with-sha1=libcrypto
|
||||
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
MESA3D_DEPENDENCIES += libgcrypt
|
||||
MESA3D_CONF_OPTS += --with-sha1=libgcrypt
|
||||
else ifeq ($(BR2_PACKAGE_LIBSHA1),y)
|
||||
MESA3D_DEPENDENCIES += libsha1
|
||||
MESA3D_CONF_OPTS += --with-sha1=libsha1
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBUDEV),y)
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
MESA3D_DEPENDENCIES += udev
|
||||
MESA3D_CONF_OPTS += --disable-sysfs
|
||||
else
|
||||
@@ -65,6 +78,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
|
||||
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600
|
||||
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
|
||||
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
|
||||
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4
|
||||
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl
|
||||
# DRI Drivers
|
||||
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
|
||||
@@ -82,16 +96,9 @@ MESA3D_CONF_OPTS += \
|
||||
--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
|
||||
endif
|
||||
|
||||
define MESA3D_REMOVE_OPENGL_PC
|
||||
rm -f $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc
|
||||
rm -f $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
|
||||
rm -rf $(STAGING_DIR)/usr/include/GL/
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
|
||||
MESA3D_CONF_OPTS += \
|
||||
--without-dri-drivers --disable-dri3
|
||||
MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
|
||||
MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
|
||||
@@ -102,7 +109,10 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
|
||||
MESA3D_DEPENDENCIES += xlib_libXxf86vm
|
||||
endif
|
||||
# libGL is only provided for a full xorg stack
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
MESA3D_PROVIDES += libgl
|
||||
endif
|
||||
MESA3D_CONF_OPTS += \
|
||||
--enable-shared-glapi \
|
||||
--enable-driglx-direct \
|
||||
@@ -119,8 +129,6 @@ endif
|
||||
|
||||
# Always enable OpenGL:
|
||||
# - it is needed for GLES (mesa3d's ./configure is a bit weird)
|
||||
# - but if no DRI driver is enabled, then libgl is not built,
|
||||
# remove dri.pc and gl.pc in this case (MESA3D_REMOVE_OPENGL_PC)
|
||||
MESA3D_CONF_OPTS += --enable-opengl --enable-dri
|
||||
|
||||
# libva and mesa3d have a circular dependency
|
||||
@@ -131,6 +139,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
|
||||
MESA3D_PROVIDES += libegl
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
|
||||
MESA3D_EGL_PLATFORMS = drm
|
||||
else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y)
|
||||
MESA3D_EGL_PLATFORMS = drm
|
||||
else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y)
|
||||
MESA3D_EGL_PLATFORMS = drm
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user