Re: [oe-commits] Pengyu Ma : mesa: Upgrade to 10.4.3

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 5453 bytes --]

On Sun, Feb 08, 2015 at 08:00:49AM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: ba079975fa984f53fde5b4e8131d0f3877323e6c
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ba079975fa984f53fde5b4e8131d0f3877323e6c
> 
> Author: Pengyu Ma <pengyu.ma@windriver.com>
> Date:   Tue Feb  3 10:11:08 2015 +0800
> 
> 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.

This seems to break openvg as well

| checking for mincore... yes
| configure: error: Cannot enable OpenVG, because egl_gallium has been removed and
|                   OpenVG hasn't been integrated into standard libEGL yet
| Configure failed. The contents of all config.log files follows to aid debugging
| ERROR: oe_runconf failed

> Signed-off-by: Pengyu Ma <pengyu.ma@windriver.com>
> Tested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> 
> ---
> 
>  meta/recipes-graphics/mesa/{mesa-gl_10.3.4.bb => mesa-gl_10.4.3.bb} | 0
>  meta/recipes-graphics/mesa/mesa.inc                                 | 5 -----
>  meta/recipes-graphics/mesa/{mesa_10.3.4.bb => mesa_10.4.3.bb}       | 4 ++--
>  meta/recipes-graphics/mesa/mesa_git.bb                              | 4 ++--
>  4 files changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
> rename to meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index cb1837a..c9748e2 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.4.3.bb
> similarity index 78%
> rename from meta/recipes-graphics/mesa/mesa_10.3.4.bb
> rename to meta/recipes-graphics/mesa/mesa_10.4.3.bb
> index 50092c9..9669bcb 100644
> --- a/meta/recipes-graphics/mesa/mesa_10.3.4.bb
> +++ b/meta/recipes-graphics/mesa/mesa_10.4.3.bb
> @@ -2,8 +2,8 @@ require ${BPN}.inc
>  
>  SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
>  
> -SRC_URI[md5sum] = "fa0558a3d02c2bb8c208c030ccdc992e"
> -SRC_URI[sha256sum] = "e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a"
> +SRC_URI[md5sum] = "be86c4ee226f8ca28b7d4c728c350b01"
> +SRC_URI[sha256sum] = "ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad"
>  
>  S = "${WORKDIR}/Mesa-${PV}"
>  
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index b046ae2..e554ff4 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"
>  
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]