summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPengyu Ma <pengyu.ma@windriver.com>2015-02-03 10:11:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:26 +0000
commit16a01784245ef0e9806f88f8a55d5d3a73c7ce35 (patch)
tree331cbaed85fddfd12655cbca756e24ed45f2abc2 /meta
parent09fba50cf39002fdc90e738818a418f814713e3a (diff)
downloadpoky-16a01784245ef0e9806f88f8a55d5d3a73c7ce35.tar.gz
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 <pengyu.ma@windriver.com> Tested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.4.3.bb (renamed from meta/recipes-graphics/mesa/mesa_10.3.4.bb)4
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb4
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
index 2acc21dce5..2acc21dce5 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
+++ b/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 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
59GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 59GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
60# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 60# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
61PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 61PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
62PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl"
63PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm"
64MESA_LLVM_RELEASE ?= "3.3" 62MESA_LLVM_RELEASE ?= "3.3"
65PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ 63PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
66 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 64 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
@@ -85,7 +83,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
85 libgles2-mesa libgles2-mesa-dev \ 83 libgles2-mesa libgles2-mesa-dev \
86 libgles3-mesa libgles3-mesa-dev \ 84 libgles3-mesa libgles3-mesa-dev \
87 libwayland-egl libwayland-egl-dev \ 85 libwayland-egl libwayland-egl-dev \
88 libegl-gallium libgbm-gallium \
89 libopenvg libopenvg-dev \ 86 libopenvg libopenvg-dev \
90 libxvmcsoftpipe libxvmcsoftpipe-dev \ 87 libxvmcsoftpipe libxvmcsoftpipe-dev \
91 libxatracker libxatracker-dev \ 88 libxatracker libxatracker-dev \
@@ -169,8 +166,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*"
169FILES_libglapi = "${libdir}/libglapi.so.*" 166FILES_libglapi = "${libdir}/libglapi.so.*"
170FILES_libosmesa = "${libdir}/libOSMesa.so.*" 167FILES_libosmesa = "${libdir}/libOSMesa.so.*"
171FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" 168FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
172FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*"
173FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*"
174FILES_libopenvg = "${libdir}/libOpenVG.so.*" 169FILES_libopenvg = "${libdir}/libOpenVG.so.*"
175FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" 170FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
176FILES_libxatracker = "${libdir}/libxatracker.so.*" 171FILES_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
index 50092c9a5c..9669bcb40e 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
2 2
3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
4 4
5SRC_URI[md5sum] = "fa0558a3d02c2bb8c208c030ccdc992e" 5SRC_URI[md5sum] = "be86c4ee226f8ca28b7d4c728c350b01"
6SRC_URI[sha256sum] = "e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a" 6SRC_URI[sha256sum] = "ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad"
7 7
8S = "${WORKDIR}/Mesa-${PV}" 8S = "${WORKDIR}/Mesa-${PV}"
9 9
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"
4 4
5LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" 5LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
6 6
7SRCREV = "c7b9a2e38a3e471562b50dab8be65db8ac6819f8" 7SRCREV = "f70e4d4afd16e66506ce3b055edb3b71b1464890"
8PV = "10.3.4+git${SRCPV}" 8PV = "10.4.3+git${SRCPV}"
9 9
10SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" 10SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4"
11 11