From patchwork Sat Aug 24 19:41:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 269661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 6CB952C0079 for ; Sun, 25 Aug 2013 05:48:16 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7EA698D267; Sat, 24 Aug 2013 19:48:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OQxtrtdmCAMt; Sat, 24 Aug 2013 19:48:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 089108D0BD; Sat, 24 Aug 2013 19:48:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1FC301BF968 for ; Sat, 24 Aug 2013 19:48:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 13A6E8D0BD for ; Sat, 24 Aug 2013 19:48:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id udC6AAU7d2Oh for ; Sat, 24 Aug 2013 19:48:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2AD688D0B2 for ; Sat, 24 Aug 2013 19:48:09 +0000 (UTC) Received: by mail-ie0-f176.google.com with SMTP id s9so2671860iec.7 for ; Sat, 24 Aug 2013 12:48:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Oyj0jbcNSnpGz6yXQt6hOFpMfc/PZIjO2dKtXdQPQCI=; b=Q/cjkxZMUL2DFaWNxO/PtJMvts+FskpQs+eByCI7fgNqkUEkpaRSYWZvqclaKsLR0U JhJVpYkzj7PT/qf6LHeko4cS4xCjr+WmQlecn+wdMAL1/J6uL9ftQgMFYWiRRhVsNuVe J+3qKiY5nLDm2bo43WtL8O6tFn2rzjp+iD68HnE4k+aeYwHXeLinx/1DiqpoN8ESM+rU YLKZbMawSKJ4yT6sbr//+8y6yaljPDH5niT+wqEV0hE9cMowOmPR1+aIGCqbW4u3vWWZ sUp+oKDoSto3tA6+HEK/yJM+QnQ/eAnFuUqdhuxMx0mT9nrZ1nU/oRyTvzErovHSyzO+ IPiA== X-Gm-Message-State: ALoCoQnsVEkKLMpaGeZAcTxETkLo4MJbmQrzYMjnmM3BETVEpwSZCsW3Y8VVNGzQtMxAyxLSsZBW X-Received: by 10.50.106.102 with SMTP id gt6mr2065683igb.46.1377373333845; Sat, 24 Aug 2013 12:42:13 -0700 (PDT) Received: from bourban.iit.edu (dhcp33.westwn1.iit.edu. [64.131.102.33]) by mx.google.com with ESMTPSA id ft2sm6280674igb.5.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 24 Aug 2013 12:42:13 -0700 (PDT) From: Spenser Gilliland To: buildroot@busybox.net Date: Sat, 24 Aug 2013 14:41:59 -0500 Message-Id: <1377373321-29732-5-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377373321-29732-1-git-send-email-spenser@gillilanding.com> References: <1377373321-29732-1-git-send-email-spenser@gillilanding.com> Subject: [Buildroot] [PATCH 4/6] mesa3d: reorganize, modularize, and bump to version 9.1.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net move mesa3d out of xorg as it is not really an Xorg component. Signed-off-by: Spenser Gilliland --- package/Config.in | 1 + package/mesa3d/Config.in | 172 +++++++++++++++++++++ package/mesa3d/mesa3d-cross-glsl-compiler.patch | 41 +++++ package/mesa3d/mesa3d-gbm-without-dri.patch | 30 ++++ package/mesa3d/mesa3d.mk | 149 ++++++++++++++++++ package/opengl/Config.in | 3 + package/opengl/libegl/libegl.mk | 4 + package/opengl/libgl/libgl.mk | 20 +++ package/opengl/libgles/libgles.mk | 4 + package/opengl/libopenvg/libopenvg.mk | 4 + package/x11r7/Config.in | 1 - package/x11r7/mesa3d/Config.in | 15 -- package/x11r7/mesa3d/mesa3d-uclibc-locale.patch | 56 ------- package/x11r7/mesa3d/mesa3d.mk | 40 ----- .../xserver_xorg-server/xserver_xorg-server.mk | 4 +- 15 files changed, 430 insertions(+), 114 deletions(-) create mode 100644 package/mesa3d/Config.in create mode 100644 package/mesa3d/mesa3d-cross-glsl-compiler.patch create mode 100644 package/mesa3d/mesa3d-gbm-without-dri.patch create mode 100644 package/mesa3d/mesa3d.mk create mode 100644 package/opengl/libgl/libgl.mk delete mode 100644 package/x11r7/mesa3d/Config.in delete mode 100644 package/x11r7/mesa3d/mesa3d-uclibc-locale.patch delete mode 100644 package/x11r7/mesa3d/mesa3d.mk diff --git a/package/Config.in b/package/Config.in index 7069d77..0278885 100644 --- a/package/Config.in +++ b/package/Config.in @@ -273,6 +273,7 @@ source "package/lvm2/Config.in" source "package/mdadm/Config.in" source "package/media-ctl/Config.in" source "package/memtester/Config.in" +source "package/mesa3d/Config.in" source "package/minicom/Config.in" source "package/nanocom/Config.in" source "package/neard/Config.in" diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in new file mode 100644 index 0000000..65d269a --- /dev/null +++ b/package/mesa3d/Config.in @@ -0,0 +1,172 @@ +config BR2_PACKAGE_MESA3D + bool "Mesa 3D Graphics Library" + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_HOST_LIBXML2_PYTHON + select BR2_PACKAGE_XPROTO_DRI2_PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_LARGEFILE + depends on BR2_PACKAGE_XORG7 # libdrm + help + Mesa 3D, an open-source implementation of the OpenGL specification. + + http://mesa3d.org + +if BR2_PACKAGE_MESA3D + +menu "libraries" + +config BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_UDEV + bool "gbm support" + help + Add support for Graphics Buffer Manager. + +config BR2_PACKAGE_MESA3D_XVMC + bool "xvmc support" + help + Add support for X Video Motion Compensation. + +config BR2_PACKAGE_MESA3D_VDPAU + bool "vdpau support" + help + Add support for Video Decode and Presentation API for Unix. + +endmenu + +menu "Drivers" + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Supports intel chips with Gallium. In most cases, the DRI i965 driver + should be used as it is better maintined by Intel. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + bool "Gallium nouveau driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Supports all Nvidia GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 + bool "Gallium r300 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Supports the R300, R400, and R500 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + bool "Gallium r600 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Supports the R600, R700, and R800 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + bool "Gallium radeonsi driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Supports the Radeon HD7000/HD8000/HD9000 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA + bool "Gallium vmware svga driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + This is a virtual GPU driver for VMWare virtual machines. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + bool "Gallium swrast driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + This is a software opengl implementation using the Gallium3D + infrastructure. + +config BR2_PACKAGE_MESA3D_DRI_DRIVERS_SWRAST + bool "DRI swrast driver" + select BR2_PACKAGE_MESA3D_DRI_DRIVER + help + This is a software opengl implementation using the DRI infrastrucutre. + +config BR2_PACKAGE_MESA3D_DRI_DRIVERS_I965 + bool "DRI i965 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + help + Supports all Intel GPUs. This version is most supported by Intel. + +config BR2_PACKAGE_MESA3D_DRI_DRIVERS_RADEON + bool "DRI radeon driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + help + Legacy Radeon driver for R100 series GPUs. + +endmenu + +# The following hidden options inform gallium or dri driver selection. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRIVER + bool + +menu "API Support" +depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || BR2_PACKAGE_MESA3D_DRI_DRIVER + +config BR2_PACKAGE_MESA3D_OPENGL + bool "OpenGL" + select BR2_PACKAGE_HAS_OPENGL + help + Use the Khronos OpenGL API. This is a desktop computer API and is not + normally implemented by embedded systems. + +config BR2_PACKAGE_MESA3D_EGL + bool "EGL" + select BR2_PACKAGE_MESA3D_GBM + select BR2_PACKAGE_HAS_OPENGL_EGL + help + Use the Khronos EGL APIs. EGL is a window manger for OpenGL applications + similar to GLX, for X, and WGL, for Windows. + + config BR2_PACKAGE_MESA3D_OPENGL_ES + bool "OpenGL ES" + select BR2_PACKAGE_HAS_OPENGL_ES + help + Use the Khronos OpenGL ES APIs. This is commonly used on embedded + systems and represents a subset of the OpenGL API. + +config BR2_PACKAGE_MESA3D_OPENVG + bool "OpenVG" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Use the Khronos OpenVG APIs. This is a 2D API commonly used on + embedded systems. + +config BR2_PACKAGE_MESA3D_OPENCL + bool "OpenCL" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENCL + help + Use the Khronos OpenCL APIs. This is a GPU computation language + commonly used in GPGPU computing applications. + +endmenu + +endif diff --git a/package/mesa3d/mesa3d-cross-glsl-compiler.patch b/package/mesa3d/mesa3d-cross-glsl-compiler.patch new file mode 100644 index 0000000..1028ea1 --- /dev/null +++ b/package/mesa3d/mesa3d-cross-glsl-compiler.patch @@ -0,0 +1,41 @@ +This patch fixes a cross compile issue as described here +https://bugs.freedesktop.org/show_bug.cgi?id=44618 + +Signed-off-by: Spenser Gilliland +--- +diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am +index e11a17f..8ebe0a2 100644 +--- a/src/glsl/builtin_compiler/Makefile.am ++++ b/src/glsl/builtin_compiler/Makefile.am +@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS) + include ../Makefile.sources + + noinst_PROGRAMS = builtin_compiler ++ ++if !CROSS_COMPILING + noinst_LTLIBRARIES = libglslcore.la libglcpp.la + + libglcpp_la_SOURCES = \ +@@ -73,6 +75,7 @@ libglcpp_la_SOURCES = \ + libglslcore_la_SOURCES = \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_FILES) ++endif + + builtin_compiler_SOURCES = \ + $(top_srcdir)/src/mesa/main/hash_table.c \ +@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + $(BUILTIN_COMPILER_CXX_FILES) \ + $(GLSL_COMPILER_CXX_FILES) ++ ++if CROSS_COMPILING ++builtin_compiler_SOURCES += \ ++ $(LIBGLCPP_GENERATED_FILES) \ ++ $(LIBGLCPP_FILES) \ ++ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ ++ $(LIBGLSL_FILES) ++builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS) ++else + builtin_compiler_LDADD = libglslcore.la libglcpp.la ++endif diff --git a/package/mesa3d/mesa3d-gbm-without-dri.patch b/package/mesa3d/mesa3d-gbm-without-dri.patch new file mode 100644 index 0000000..2c417f4 --- /dev/null +++ b/package/mesa3d/mesa3d-gbm-without-dri.patch @@ -0,0 +1,30 @@ +Fix build issue when gbm backend is built without dri support. + +Signed-off-by: Spenser Gilliland + +--- +Index: mesa3d-9.1.6/src/gbm/main/backend.c +=================================================================== +--- mesa3d-9.1.6.orig/src/gbm/main/backend.c 2012-11-24 11:57:41.000000000 -0600 ++++ mesa3d-9.1.6/src/gbm/main/backend.c 2013-08-16 10:59:58.844753588 -0500 +@@ -36,7 +36,9 @@ + + #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + ++#ifdef HAVE_DRI + extern const struct gbm_backend gbm_dri_backend; ++#endif + + struct backend_desc { + const char *name; +@@ -44,7 +46,9 @@ + }; + + static const struct backend_desc backends[] = { +- { "gbm_dri.so", &gbm_dri_backend }, ++#ifdef HAVE_DRI ++ { "gbm_dri.so", &gbm_dri_backend }, ++#endif + { "gbm_gallium_drm.so", NULL }, + }; + diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk new file mode 100644 index 0000000..31ebe96 --- /dev/null +++ b/package/mesa3d/mesa3d.mk @@ -0,0 +1,149 @@ +################################################################################ +# +# mesa3d +# +################################################################################ + +MESA3D_VERSION = 9.1.6 +MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz +MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) +MESA3D_LICENSE = MIT, SGI, Khronos +MESA3D_LICENSE_FILES = docs/license.html + +MESA3D_AUTORECONF = YES +MESA3D_INSTALL_STAGING = YES + +MESA3D_DEPENDENCIES = \ + libdrm \ + expat \ + host-xutil_makedepend \ + host-libxml2 \ + host-python \ + host-bison \ + host-flex + +MESA3D_CONF_OPT = \ + --disable-static + +# Used by subst in some options +null := +space := $(null) # +comma := , + +# Libraries + +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +MESA3D_DEPENDENCIES += udev +MESA3D_CONF_OPT += --enable-gbm +else +MESA3D_CONF_OPT += --disable-gbm +endif + +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +MESA3D_DEPENDENCIES += \ + xproto_xf86driproto xproto_dri2proto xproto_glproto \ + xlib_libX11 xlib_libXext xlib_libXdamage xlib_libXfixes libxcb +MESA3D_CONF_OPT += \ + --enable-dri \ + --enable-xa \ + --enable-glx +else +MESA3D_CONF_OPT += \ + --disable-dri \ + --disable-xa \ + --disable-glx +endif + +# Drivers + +# Gallium Drivers +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915),y) +MESA3D_GALLIUM_DRIVERS += i915 +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU),y) +MESA3D_GALLIUM_DRIVERS += nouveau +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300),y) +MESA3D_GALLIUM_DRIVERS += r300 +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600),y) +MESA3D_GALLIUM_DRIVERS += r600 +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) +MESA3D_GALLIUM_DRIVERS += radeonsi +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA),y) +MESA3D_GALLIUM_DRIVERS += svga +endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST),y) +MESA3D_GALLIUM_DRIVERS += swrast +endif + +# DRI Drivers +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST),y) +MESA3D_DRI_DRIVERS += swrast +endif +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965),y) +MESA3D_DRI_DRIVERS += i965 +endif +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON),y) +MESA3D_DRI_DRIVERS += radeon +endif + +ifneq ($(MESA3D_GALLIUM_DRIVERS),) +MESA3D_CONF_OPT += \ + --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS)) +else +MESA3D_CONF_OPT += --without-gallium-drivers +endif + +ifneq ($(MESA3D_DRI_DRIVERS),) +MESA3D_CONF_OPT += \ + --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS)) +else +MESA3D_CONF_OPT += --without-dri-drivers +endif + +# APIs + +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +MESA3D_EGL_PLATFORMS = drm +ifeq ($(BR2_PACKAGE_WAYLAND),y) +MESA3D_DEPENDENCIES += wayland +MESA3D_EGL_PLATFORMS += wayland +endif +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +MESA3D_EGL_PLATFORMS += x11 +endif +MESA3D_CONF_OPT += \ + --enable-egl \ + --with-egl-platforms=$(foreach subst $(space),$(comma),$(MESA3D_EGL_PLATFORMS)) +else +MESA3D_CONF_OPT += --disable-egl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL),y) +MESA3D_CONF_OPT += --enable-opengl +else +MESA3D_CONF_OPT += --disable-opengl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +MESA3D_CONF_OPT += --enable-gles1 --enable-gles2 +else +MESA3D_CONF_OPT += --disable-gles1 --disable-gles2 +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +MESA3D_CONF_OPT += --enable-openvg --enable-gallium-egl +else +MESA3D_CONF_OPT += --disable-openvg --disable-gallium-egl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) +MESA3D_CONF_OPT += --enable-opencl +else +MESA3D_CONF_OPT += --disable-opencl +endif + +$(eval $(autotools-package)) diff --git a/package/opengl/Config.in b/package/opengl/Config.in index 1636807..c705446 100644 --- a/package/opengl/Config.in +++ b/package/opengl/Config.in @@ -1,3 +1,6 @@ +config BR2_PACKAGE_HAS_OPENGL + bool + config BR2_PACKAGE_HAS_OPENGL_EGL bool diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk index c194b02..2d52fe3 100644 --- a/package/opengl/libegl/libegl.mk +++ b/package/opengl/libegl/libegl.mk @@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y) LIBEGL_DEPENDENCIES += gpu-viv-bin-mx6q endif +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +LIBEGL_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBEGL_DEPENDENCIES),) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error." diff --git a/package/opengl/libgl/libgl.mk b/package/opengl/libgl/libgl.mk new file mode 100644 index 0000000..4b0d7f2 --- /dev/null +++ b/package/opengl/libgl/libgl.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# libgl +# +################################################################################ + +LIBGL_SOURCE = + +ifeq ($(BR2_PACKAGE_MESA_OPENGL),y) +LIBGL_DEPENDENCIES += mesa3d +endif + +ifeq ($(LIBGL_DEPENDENCIES),) +define LIBOPENGL_CONFIGURE_CMDS + echo "No libOpenGL implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package)) diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk index ec157ac..8e5cef1 100644 --- a/package/opengl/libgles/libgles.mk +++ b/package/opengl/libgles/libgles.mk @@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y) LIBGLES_DEPENDENCIES += gpu-viv-bin-mx6q endif +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +LIBGLES_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBGLES_DEPENDENCIES),) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error." diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk index 3296f63..e897423 100644 --- a/package/opengl/libopenvg/libopenvg.mk +++ b/package/opengl/libopenvg/libopenvg.mk @@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) LIBOPENVG_DEPENDENCIES += rpi-userland endif +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +LIBOPENVG_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBOPENVG_DEPENDENCIES),) define LIBOPENVG_CONFIGURE_CMDS echo "No libOpenVG implementation selected. Configuration error." diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 205079c..d5d6e60 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -13,7 +13,6 @@ if BR2_PACKAGE_XORG7 endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in - source package/x11r7/mesa3d/Config.in source package/x11r7/xcb-util/Config.in source package/x11r7/xcb-util-image/Config.in source package/x11r7/xcb-util-keysyms/Config.in diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in deleted file mode 100644 index 080f56a..0000000 --- a/package/x11r7/mesa3d/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MESA3D - bool "Mesa 3D Graphics Library" - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_DRI2PROTO - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_HOST_LIBXML2_PYTHON - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - depends on BR2_INSTALL_LIBSTDCPP - help - Mesa 3D, an open-source implementation of the OpenGL specification. - diff --git a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch b/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch deleted file mode 100644 index 99afe8d..0000000 --- a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] Fix compilation on uClibc without locale support - -Based on similar patch from OE: - -http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 3 +++ - src/glsl/strtod.c | 2 +- - src/mesa/main/imports.c | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fbaa376..454dad2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS]) - dnl See if posix_memalign is available - AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) - -+dnl See if newlocale is available -+AC_CHECK_FUNCS_ONCE(newlocale) -+ - dnl SELinux awareness. - AC_ARG_ENABLE([selinux], - [AS_HELP_STRING([--enable-selinux], -diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c -index a876e13..9fce7e9 100644 ---- a/src/glsl/strtod.c -+++ b/src/glsl/strtod.c -@@ -44,7 +44,7 @@ double - double - glsl_strtod(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) -+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); -diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c -index d3727ef..363bf32 100644 ---- a/src/mesa/main/imports.c -+++ b/src/mesa/main/imports.c -@@ -757,7 +757,7 @@ float - float - _mesa_strtof( const char *s, char **end ) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) -+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); --- -1.7.10.4 - diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk deleted file mode 100644 index f9d35a9..0000000 --- a/package/x11r7/mesa3d/mesa3d.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# mesa3d -# -################################################################################ - -MESA3D_VERSION = 7.10.3 -MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz -MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) -MESA3D_LICENSE = MIT, SGI, Khronos -MESA3D_LICENSE_FILES = docs/license.html - -MESA3D_AUTORECONF = YES -MESA3D_INSTALL_STAGING = YES - -MESA3D_CONF_OPT = \ - --disable-egl \ - --disable-glu \ - --disable-glw \ - --disable-glut \ - --disable-gallium \ - --with-driver=dri \ - --with-dri-drivers=swrast \ - --disable-static - -MESA3D_DEPENDENCIES = \ - xproto_glproto \ - xlib_libXxf86vm \ - xlib_libXdamage \ - xlib_libXfixes \ - xproto_dri2proto \ - libdrm \ - expat \ - host-xutil_makedepend \ - host-libxml2 \ - host-python \ - host-bison \ - host-flex - -$(eval $(autotools-package)) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4089aab..f5a4db6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -99,7 +99,7 @@ else # modular XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto else XSERVER_XORG_SERVER_CONF_OPT += --disable-dri @@ -172,7 +172,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-glx else XSERVER_XORG_SERVER_CONF_OPT += --disable-glx