From 8c7803683bee780f0bc8913cc32653ff173329b7 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Tue, 4 Aug 2015 08:37:49 +0100 Subject: mesa: upgrade 10.5.8 -> 10.6.3 * Removed openvg references in PACKAGECONFIG, FILES and PACKAGES since OpenVG support was removed in mesa 10.6 * Tested with X11 : * xf86-video-freedreno on IFC6410 and DragonBoard 410c * softpipe on DragonBoard 410c * using meta-qualcomm BSP Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 6 ------ meta/recipes-graphics/mesa/mesa_10.5.8.bb | 14 -------------- meta/recipes-graphics/mesa/mesa_10.6.3.bb | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_10.5.8.bb create mode 100644 meta/recipes-graphics/mesa/mesa_10.6.3.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb b/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb deleted file mode 100644 index fc2bca9982..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb new file mode 100644 index 0000000000..fc2bca9982 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb @@ -0,0 +1,13 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +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 09e80e8f04..af7a2c47fc 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,6 @@ EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" -PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" - GALLIUMDRIVERS = "swrast" GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" PACKAGECONFIG[r600] = "" @@ -84,7 +82,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ - libopenvg libopenvg-dev \ libxvmcsoftpipe libxvmcsoftpipe-dev \ libxatracker libxatracker-dev \ mesa-megadriver \ @@ -167,7 +164,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_libopenvg = "${libdir}/libOpenVG.so.*" FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" FILES_libxatracker = "${libdir}/libxatracker.so.*" @@ -181,8 +177,6 @@ FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/p FILES_libgles3-mesa-dev = "${includedir}/GLES3" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" -FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ - ${includedir}/VG ${libdir}/pkgconfig/vg.pc" FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ diff --git a/meta/recipes-graphics/mesa/mesa_10.5.8.bb b/meta/recipes-graphics/mesa/mesa_10.5.8.bb deleted file mode 100644 index 072cde9395..0000000000 --- a/meta/recipes-graphics/mesa/mesa_10.5.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" - -SRC_URI[md5sum] = "5332a3576c5e3a0c3947ee6668dd4157" -SRC_URI[sha256sum] = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54" - -#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/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/meta/recipes-graphics/mesa/mesa_10.6.3.bb new file mode 100644 index 0000000000..8c55064fd9 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_10.6.3.bb @@ -0,0 +1,14 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" + +SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" +SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" + +#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/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit 1.2.3-korg