jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Remove MESA3D_REMOVE_OPENGL_PC, not needed anymore after
https://cgit.freedesktop.org/mesa/mesa/commit/?h=12.0&id=5193fe9f4fe9c2d537afb051323724a399abc4e1

Tested using defconfig from
https://git.buildroot.net/buildroot/commit/package/mesa3d/mesa3d.mk?id=e07a98239969794c2257345b17a604e309a5dbb1

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:
Bernd Kuhls 2016-07-08 17:43:36 +02:00 committed by Thomas Petazzoni
parent c26132c95f
commit ff3e522e74
3 changed files with 4 additions and 18 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 = 11.2.2 MESA3D_HEADERS_VERSION = 12.0.0
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos

4
package/mesa3d/mesa3d.hash
View File

@ -1,2 +1,2 @@
# From https://lists.freedesktop.org/archives/mesa-announce/2016-April/000209.html # From https://lists.freedesktop.org/archives/mesa-announce/2016-July/000226.html
sha256 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 mesa-11.2.2.tar.xz sha256 0090c025219318935124292b482e3439bc43e8c074ad01086449fcad88547dc6 mesa-12.0.0.tar.xz

16
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 = 11.2.2 MESA3D_VERSION = 12.0.0
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE = MIT, SGI, Khronos
@ -93,12 +93,6 @@ MESA3D_CONF_OPTS += \
--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
endif 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),) ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \ MESA3D_CONF_OPTS += \
--without-dri-drivers --disable-dri3 --without-dri-drivers --disable-dri3
@ -115,8 +109,6 @@ endif
# libGL is only provided for a full xorg stack # libGL is only provided for a full xorg stack
ifeq ($(BR2_PACKAGE_XORG7),y) ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_PROVIDES += libgl MESA3D_PROVIDES += libgl
else
MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
endif endif
MESA3D_CONF_OPTS += \ MESA3D_CONF_OPTS += \
--enable-shared-glapi \ --enable-shared-glapi \
@ -124,10 +116,6 @@ MESA3D_CONF_OPTS += \
--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
endif endif
ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
endif
# APIs # APIs
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
@ -138,8 +126,6 @@ endif
# Always enable OpenGL: # Always enable OpenGL:
# - it is needed for GLES (mesa3d's ./configure is a bit weird) # - 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 MESA3D_CONF_OPTS += --enable-opengl --enable-dri
# libva and mesa3d have a circular dependency # libva and mesa3d have a circular dependency