From 16a01784245ef0e9806f88f8a55d5d3a73c7ce35 Mon Sep 17 00:00:00 2001 From: Pengyu Ma Date: Tue, 3 Feb 2015 10:11:08 +0800 Subject: mesa: Upgrade to 10.4.3 flags for EGL and GBM Gallium had been removed in 10.4, so remove these flags, files or packages. (From OE-Core rev: ba079975fa984f53fde5b4e8131d0f3877323e6c) Signed-off-by: Pengyu Ma Tested-by: Nicolas Dechesne Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb | 11 ----------- meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb | 11 +++++++++++ meta/recipes-graphics/mesa/mesa.inc | 5 ----- meta/recipes-graphics/mesa/mesa_10.3.4.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa_10.4.3.bb | 16 ++++++++++++++++ meta/recipes-graphics/mesa/mesa_git.bb | 4 ++-- 6 files changed, 29 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_10.3.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa_10.4.3.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb deleted file mode 100644 index 2acc21dce5..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb new file mode 100644 index 0000000000..2acc21dce5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb @@ -0,0 +1,11 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index cb1837ac51..c9748e234f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -59,8 +59,6 @@ GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" -PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" MESA_LLVM_RELEASE ?= "3.3" PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" @@ -85,7 +83,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ - libegl-gallium libgbm-gallium \ libopenvg libopenvg-dev \ libxvmcsoftpipe libxvmcsoftpipe-dev \ libxatracker libxatracker-dev \ @@ -169,8 +166,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" -FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" FILES_libopenvg = "${libdir}/libOpenVG.so.*" FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" FILES_libxatracker = "${libdir}/libxatracker.so.*" diff --git a/meta/recipes-graphics/mesa/mesa_10.3.4.bb b/meta/recipes-graphics/mesa/mesa_10.3.4.bb deleted file mode 100644 index 50092c9a5c..0000000000 --- a/meta/recipes-graphics/mesa/mesa_10.3.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" - -SRC_URI[md5sum] = "fa0558a3d02c2bb8c208c030ccdc992e" -SRC_URI[sha256sum] = "e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a" - -S = "${WORKDIR}/Mesa-${PV}" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_10.4.3.bb b/meta/recipes-graphics/mesa/mesa_10.4.3.bb new file mode 100644 index 0000000000..9669bcb40e --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_10.4.3.bb @@ -0,0 +1,16 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" + +SRC_URI[md5sum] = "be86c4ee226f8ca28b7d4c728c350b01" +SRC_URI[sha256sum] = "ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad" + +S = "${WORKDIR}/Mesa-${PV}" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index b046ae2e65..e554ff4faa 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -4,8 +4,8 @@ DEFAULT_PREFERENCE = "-1" LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" -SRCREV = "c7b9a2e38a3e471562b50dab8be65db8ac6819f8" -PV = "10.3.4+git${SRCPV}" +SRCREV = "f70e4d4afd16e66506ce3b055edb3b71b1464890" +PV = "10.4.3+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" -- cgit v1.2.3-54-g00ecf