diff --git a/packages/addons/service/multimedia/boblightd/package.mk b/packages/addons/service/multimedia/boblightd/package.mk index ac35eefe9b..2f0e909ea1 100644 --- a/packages/addons/service/multimedia/boblightd/package.mk +++ b/packages/addons/service/multimedia/boblightd/package.mk @@ -39,7 +39,7 @@ if [ "$DISPLAYSERVER" = "x11" ] ; then fi if [ "$OPENGL_SUPPORT" = "yes" ] ; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa glu" fi if [ "$OPENGL" = "no" ]; then diff --git a/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch b/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch deleted file mode 100644 index d0747e9a50..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= -Date: Wed, 3 Dec 2014 07:48:26 +0000 -Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr. - -Trivial. - -Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958 - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe3c754..5210acc 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - MM = new ShaderMemoryManager(JMM); - *OutCode = MM->getGeneratedCode(); - -+#if HAVE_LLVM >= 0x0306 -+ builder.setMCJITMemoryManager(std::unique_ptr(MM)); -+#else - builder.setMCJITMemoryManager(MM); - #endif -+#endif - } else { - #if HAVE_LLVM < 0x0306 - BaseMemoryManager* JMM = reinterpret_cast(CMM); --- -cgit v0.10.2 - diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/mesa/package.mk similarity index 90% rename from packages/graphics/Mesa/package.mk rename to packages/graphics/mesa/package.mk index c9c65690ae..5f31bdc4df 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -16,14 +16,14 @@ # along with OpenELEC. If not, see . ################################################################################ -PKG_NAME="Mesa" -PKG_VERSION="10.4.6" +PKG_NAME="mesa" +PKG_VERSION="10.5.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence" +PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS_TARGET="toolchain Python:host Mako:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API" @@ -59,11 +59,11 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ DRI_DRIVER_INSTALL_DIR=$XORG_PATH_DRI \ DRI_DRIVER_SEARCH_DIR=$XORG_PATH_DRI \ --disable-debug \ + --disable-mangling \ --enable-texture-float \ --enable-asm \ --disable-selinux \ --enable-opengl \ - --enable-driglx-direct \ --disable-gles1 \ --disable-gles2 \ --disable-openvg \ @@ -71,6 +71,7 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ --disable-dri3 \ --enable-glx \ --disable-osmesa \ + --disable-gallium-osmesa \ --enable-egl --with-egl-platforms=x11,drm \ --disable-xa \ --enable-gbm \ @@ -79,13 +80,15 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ $MESA_VDPAU \ --disable-omx \ --disable-va \ - --disable-opencl --enable-opencl-icd \ + --disable-opencl \ + --enable-opencl-icd \ --disable-xlib-glx \ --disable-r600-llvm-compiler \ --disable-gallium-tests \ - --disable-gallium-osmesa \ --enable-shared-glapi \ + --enable-shader-cache \ --enable-sysfs \ + --enable-driglx-direct \ --enable-glx-tls \ $MESA_GALLIUM_LLVM \ --disable-silent-rules \ diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 69c31c00e9..33de230c55 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/vaapi" PKG_URL="http://cgit.freedesktop.org/vaapi/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm Mesa glu" +PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm mesa glu" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libva: The main motivation for VAAPI (Video Acceleration API) is to enable hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3)." diff --git a/projects/Generic/options b/projects/Generic/options index 50e51619e0..998faa7896 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -79,8 +79,8 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / Mesa) - OPENGL="Mesa" + # OpenGL(X) implementation to use (no / mesa) + OPENGL="mesa" # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) OPENGLES="no" diff --git a/projects/RPi/options b/projects/RPi/options index c54e7c6aa9..f7ead012ef 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -89,7 +89,7 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / Mesa) + # OpenGL(X) implementation to use (no / mesa) OPENGL="no" # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) diff --git a/projects/RPi2/options b/projects/RPi2/options index d1d2965fc4..fa39e1834f 100644 --- a/projects/RPi2/options +++ b/projects/RPi2/options @@ -89,7 +89,7 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / Mesa) + # OpenGL(X) implementation to use (no / mesa) OPENGL="no" # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index d932ea979d..387f7a2fea 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -87,7 +87,7 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / Mesa) + # OpenGL(X) implementation to use (no / mesa) OPENGL="no" # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6) diff --git a/projects/imx6/options b/projects/imx6/options index 8f90e3e158..b841297c2a 100644 --- a/projects/imx6/options +++ b/projects/imx6/options @@ -88,7 +88,7 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / Mesa) + # OpenGL(X) implementation to use (no / mesa) OPENGL="no" # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)