* [PATCH 01/10] mesa: merge mesa-common.inc to mesa.inc
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:19 ` [PATCH 02/10] mesa: use PACKAGECONFIG instead of DISTRO_FEATURES to define EGL_PLATFORMS Martin Jansa
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 106 ----------------------------
meta/recipes-graphics/mesa/mesa.inc | 108 ++++++++++++++++++++++++++++-
meta/recipes-graphics/mesa/mesa_9.1.3.bb | 1 -
meta/recipes-graphics/mesa/mesa_git.bb | 1 -
4 files changed, 105 insertions(+), 111 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-common.inc
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
deleted file mode 100644
index f9d7ced..0000000
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-SUMMARY = "A free implementation of the OpenGL API"
-DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
-a system for rendering interactive 3D graphics. \
-A variety of device drivers allows Mesa to be used in many different environments \
-ranging from software emulation to complete hardware acceleration for modern GPUs. \
-Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
-environment."
-
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-
-INC_PR = "r9"
-PE = "2"
-
-DEPENDS = "expat makedepend-native flex-native bison-native"
-
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
-
-inherit autotools pkgconfig pythonnative
-
-EXTRA_OECONF = "--enable-shared-glapi"
-
-PACKAGECONFIG ??= "egl gles \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
- ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
- "
-
-X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
-PACKAGECONFIG[wayland] = ",,wayland"
-
-
-# Multiple virtual/gl providers being built breaks staging
-EXCLUDE_FROM_WORLD = "1"
-
-# Remove the mesa dependency on mesa-dev, as mesa is empty
-RDEPENDS_${PN}-dev = ""
-
-PACKAGES =+ "libegl-mesa libegl-mesa-dev \
- libosmesa libosmesa-dev \
- libgl-mesa libgl-mesa-dev \
- libdricore libdricore-dev \
- libglapi libglapi-dev \
- libgbm libgbm-dev \
- libgles1-mesa libgles1-mesa-dev \
- libgles2-mesa libgles2-mesa-dev \
- libgles3-mesa libgles3-mesa-dev \
- libwayland-egl libwayland-egl-dev \
- "
-
-do_install_append () {
- # GLU is now in libglu (this shouldn't be required in Mesa 9.x)
- rm -f ${D}${includedir}/GL/glu*
-
- # Drivers never need libtool .la files
- rm -f ${D}${libdir}/dri/*.la
-}
-
-# For the packages that make up the OpenGL interfaces, inject variables so that
-# they don't get Debian-renamed (which would remove the -mesa suffix), and
-# RPROVIDEs/RCONFLICTs on the generic libgl name.
-python __anonymous() {
- for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
- ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
- ("libgles3",)):
- fullp = p[0] + "-mesa"
- pkgs = " ".join(p)
- d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
- d.appendVar("RREPLACES_" + fullp, pkgs)
- d.appendVar("RPROVIDES_" + fullp, pkgs)
- d.appendVar("RCONFLICTS_" + fullp, pkgs)
-
- # For -dev, the first element is both the Debian and original name
- fullp += "-dev"
- pkgs = p[0] + "-dev"
- d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
- d.appendVar("RREPLACES_" + fullp, pkgs)
- d.appendVar("RPROVIDES_" + fullp, pkgs)
- d.appendVar("RCONFLICTS_" + fullp, pkgs)
-}
-
-FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
-FILES_libegl-mesa = "${libdir}/libEGL.so.*"
-FILES_libgbm = "${libdir}/libgbm.so.*"
-FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
-FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
-FILES_libgl-mesa = "${libdir}/libGL.so.*"
-FILES_libglapi = "${libdir}/libglapi.so.*"
-FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
-
-FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
-FILES_libdricore-dev = "${libdir}/libdricore*.*"
-FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
-FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
-FILES_libglapi-dev = "${libdir}/libglapi.*"
-FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
-FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
-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_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a692bb7..3f00237 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -1,5 +1,35 @@
-DEPENDS += "libdrm expat udev"
-X11_DEPS += "dri2proto"
+SUMMARY = "A free implementation of the OpenGL API"
+DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
+a system for rendering interactive 3D graphics. \
+A variety of device drivers allows Mesa to be used in many different environments \
+ranging from software emulation to complete hardware acceleration for modern GPUs. \
+Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
+environment."
+
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "MIT"
+
+INC_PR = "r9"
+PE = "2"
+
+DEPENDS = "expat makedepend-native flex-native bison-native libdrm expat udev"
+
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
+
+inherit autotools pkgconfig pythonnative
+
+EXTRA_OECONF = "--enable-shared-glapi"
+
+PACKAGECONFIG ??= "egl gles \
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
+ ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
+ "
+
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes dri2proto"
+PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
+PACKAGECONFIG[wayland] = ",,wayland"
DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
@@ -16,9 +46,58 @@ EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
+# Multiple virtual/gl providers being built breaks staging
+EXCLUDE_FROM_WORLD = "1"
+
+# Remove the mesa dependency on mesa-dev, as mesa is empty
+RDEPENDS_${PN}-dev = ""
+
+PACKAGES =+ "libegl-mesa libegl-mesa-dev \
+ libosmesa libosmesa-dev \
+ libgl-mesa libgl-mesa-dev \
+ libdricore libdricore-dev \
+ libglapi libglapi-dev \
+ libgbm libgbm-dev \
+ libgles1-mesa libgles1-mesa-dev \
+ libgles2-mesa libgles2-mesa-dev \
+ libgles3-mesa libgles3-mesa-dev \
+ libwayland-egl libwayland-egl-dev \
+ "
+
+do_install_append () {
+ # GLU is now in libglu (this shouldn't be required in Mesa 9.x)
+ rm -f ${D}${includedir}/GL/glu*
+
+ # Drivers never need libtool .la files
+ rm -f ${D}${libdir}/dri/*.la
+}
+
+# For the packages that make up the OpenGL interfaces, inject variables so that
+# they don't get Debian-renamed (which would remove the -mesa suffix), and
+# RPROVIDEs/RCONFLICTs on the generic libgl name.
+python __anonymous() {
+ for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
+ ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
+ ("libgles3",)):
+ fullp = p[0] + "-mesa"
+ pkgs = " ".join(p)
+ d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+ d.appendVar("RREPLACES_" + fullp, pkgs)
+ d.appendVar("RPROVIDES_" + fullp, pkgs)
+ d.appendVar("RCONFLICTS_" + fullp, pkgs)
+
+ # For -dev, the first element is both the Debian and original name
+ fullp += "-dev"
+ pkgs = p[0] + "-dev"
+ d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+ d.appendVar("RREPLACES_" + fullp, pkgs)
+ d.appendVar("RPROVIDES_" + fullp, pkgs)
+ d.appendVar("RCONFLICTS_" + fullp, pkgs)
+}
+
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
-
+
pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
for pkg in pkgs:
@@ -31,3 +110,26 @@ PACKAGES_DYNAMIC += "^mesa-driver-.*"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
+FILES_libegl-mesa = "${libdir}/libEGL.so.*"
+FILES_libgbm = "${libdir}/libgbm.so.*"
+FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
+FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
+FILES_libgl-mesa = "${libdir}/libGL.so.*"
+FILES_libglapi = "${libdir}/libglapi.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
+
+FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
+FILES_libdricore-dev = "${libdir}/libdricore*.*"
+FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
+FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
+FILES_libglapi-dev = "${libdir}/libglapi.*"
+FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
+FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
+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_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.3.bb b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
index 60a90a3..74d467a 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
@@ -10,5 +10,4 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555
S = "${WORKDIR}/Mesa-${PV}"
-require mesa-common.inc
require mesa.inc
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 6a4bc38..241261c 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -1,4 +1,3 @@
-require mesa-common.inc
require mesa-git.inc
require mesa.inc
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 02/10] mesa: use PACKAGECONFIG instead of DISTRO_FEATURES to define EGL_PLATFORMS
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
2013-06-12 23:19 ` [PATCH 01/10] mesa: merge mesa-common.inc to mesa.inc Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:19 ` [PATCH 03/10] mesa: move LIC_FILES_CHKSUM to .inc Martin Jansa
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
* it makes it easier to change PACKAGECONFIG in .bbappend and get
consistent EGL_PLATFORMS
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 3f00237..74fddc2 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -42,8 +42,8 @@ EXTRA_OECONF += "--enable-gbm"
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
EGL_PLATFORMS = "drm"
-EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
-EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
+EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
+EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
# Multiple virtual/gl providers being built breaks staging
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/10] mesa: move LIC_FILES_CHKSUM to .inc
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
2013-06-12 23:19 ` [PATCH 01/10] mesa: merge mesa-common.inc to mesa.inc Martin Jansa
2013-06-12 23:19 ` [PATCH 02/10] mesa: use PACKAGECONFIG instead of DISTRO_FEATURES to define EGL_PLATFORMS Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:19 ` [PATCH 04/10] mesa: merge mesa-git.inc to mesa_git.bb Martin Jansa
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
* we can also include .inc as first statement in recipe like most recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-git.inc | 2 --
meta/recipes-graphics/mesa/mesa.inc | 1 +
meta/recipes-graphics/mesa/mesa_9.1.3.bb | 6 ++----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index c5507ce..cf07155 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -2,8 +2,6 @@
SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
PV = "9.1.3+git${SRCPV}"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
-
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
file://fix-glsl-cross.patch \
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 74fddc2..dd91981 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,6 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
INC_PR = "r9"
PE = "2"
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.3.bb b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
index 74d467a..fc193f5 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
@@ -1,3 +1,5 @@
+require ${BPN}.inc
+
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
file://fix-glsl-cross.patch \
@@ -6,8 +8,4 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada"
SRC_URI[sha256sum] = "8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
-
S = "${WORKDIR}/Mesa-${PV}"
-
-require mesa.inc
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/10] mesa: merge mesa-git.inc to mesa_git.bb
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (2 preceding siblings ...)
2013-06-12 23:19 ` [PATCH 03/10] mesa: move LIC_FILES_CHKSUM to .inc Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:19 ` [PATCH 05/10] mesa: introduce PACKAGECONFIG for dri Martin Jansa
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
---
meta/recipes-graphics/mesa/mesa-git.inc | 10 ----------
meta/recipes-graphics/mesa/mesa_git.bb | 13 +++++++++++--
2 files changed, 11 insertions(+), 12 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-git.inc
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
deleted file mode 100644
index cf07155..0000000
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 9.1.3 commit
-SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
-PV = "9.1.3+git${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
- file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
- file://fix-glsl-cross.patch \
- "
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 241261c..ef0bec4 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -1,6 +1,15 @@
-require mesa-git.inc
-require mesa.inc
+require ${BPN}.inc
DEFAULT_PREFERENCE = "-1"
PR = "${INC_PR}.0"
+# 9.1.3 commit
+SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
+PV = "9.1.3+git${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
+ file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
+ file://fix-glsl-cross.patch \
+ "
+
+S = "${WORKDIR}/git"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/10] mesa: introduce PACKAGECONFIG for dri
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (3 preceding siblings ...)
2013-06-12 23:19 ` [PATCH 04/10] mesa: merge mesa-git.inc to mesa_git.bb Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:19 ` [PATCH 06/10] mesa: remove more .la files Martin Jansa
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
* move DEPENDS which were originally applied only for mesa-dri to
dri PACKAGECONFIG
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index dd91981..9d59166 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555
INC_PR = "r9"
PE = "2"
-DEPENDS = "expat makedepend-native flex-native bison-native libdrm expat udev"
+DEPENDS = "expat makedepend-native flex-native bison-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
@@ -23,21 +23,21 @@ inherit autotools pkgconfig pythonnative
EXTRA_OECONF = "--enable-shared-glapi"
-PACKAGECONFIG ??= "egl gles \
+PACKAGECONFIG ??= "egl gles dri \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
"
-X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes dri2proto"
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
PACKAGECONFIG[wayland] = ",,wayland"
DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
+PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev"
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
-EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--enable-gbm"
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/10] mesa: remove more .la files
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (4 preceding siblings ...)
2013-06-12 23:19 ` [PATCH 05/10] mesa: introduce PACKAGECONFIG for dri Martin Jansa
@ 2013-06-12 23:19 ` Martin Jansa
2013-06-12 23:20 ` [PATCH 07/10] mesa: introduce gallium PACKAGECONFIG Martin Jansa
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 9d59166..a210415 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -71,6 +71,9 @@ do_install_append () {
# Drivers never need libtool .la files
rm -f ${D}${libdir}/dri/*.la
+ rm -f ${D}${libdir}/egl/*.la
+ rm -f ${D}${libdir}/gallium-pipe/*.la
+ rm -f ${D}${libdir}/gbm/*.la
}
# For the packages that make up the OpenGL interfaces, inject variables so that
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/10] mesa: introduce gallium PACKAGECONFIG
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (5 preceding siblings ...)
2013-06-12 23:19 ` [PATCH 06/10] mesa: remove more .la files Martin Jansa
@ 2013-06-12 23:20 ` Martin Jansa
2013-06-12 23:20 ` [PATCH 08/10] mesa: introduce openvg PACKAGECONFIG Martin Jansa
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a210415..6207bb6 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -37,7 +37,6 @@ DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev"
-EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-gbm"
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
@@ -47,6 +46,9 @@ EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
+GALLIUMDRIVERS = "swrast"
+PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers"
+
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
@@ -63,6 +65,7 @@ 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 \
"
do_install_append () {
@@ -108,6 +111,9 @@ python populate_packages_prepend() {
d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
+
+ pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
+ do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
}
PACKAGES_DYNAMIC += "^mesa-driver-.*"
@@ -123,6 +129,8 @@ 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_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
FILES_libdricore-dev = "${libdir}/libdricore*.*"
@@ -136,4 +144,4 @@ 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_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/10] mesa: introduce openvg PACKAGECONFIG
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (6 preceding siblings ...)
2013-06-12 23:20 ` [PATCH 07/10] mesa: introduce gallium PACKAGECONFIG Martin Jansa
@ 2013-06-12 23:20 ` Martin Jansa
2013-06-12 23:20 ` [PATCH 09/10] mesa: use PACKAGESPLITFUNCS Martin Jansa
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6207bb6..2caa238 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -46,6 +46,8 @@ EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
+PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
+
GALLIUMDRIVERS = "swrast"
PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers"
@@ -66,6 +68,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libgles3-mesa libgles3-mesa-dev \
libwayland-egl libwayland-egl-dev \
libegl-gallium libgbm-gallium \
+ libopenvg libopenvg-dev \
"
do_install_append () {
@@ -131,6 +134,7 @@ 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_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
FILES_libdricore-dev = "${libdir}/libdricore*.*"
@@ -143,5 +147,7 @@ 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_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/10] mesa: use PACKAGESPLITFUNCS
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (7 preceding siblings ...)
2013-06-12 23:20 ` [PATCH 08/10] mesa: introduce openvg PACKAGECONFIG Martin Jansa
@ 2013-06-12 23:20 ` Martin Jansa
2013-06-12 23:20 ` [PATCH 10/10] mesa: introduce gallium-llvmpipe PACKAGECONFIG Martin Jansa
2013-06-14 9:36 ` [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Burton, Ross
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 2caa238..b4e9b84 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -105,7 +105,7 @@ python __anonymous() {
d.appendVar("RCONFLICTS_" + fullp, pkgs)
}
-python populate_packages_prepend() {
+python mesa_populate_packages() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
@@ -119,6 +119,8 @@ python populate_packages_prepend() {
do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
}
+PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
+
PACKAGES_DYNAMIC += "^mesa-driver-.*"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/10] mesa: introduce gallium-llvmpipe PACKAGECONFIG
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (8 preceding siblings ...)
2013-06-12 23:20 ` [PATCH 09/10] mesa: use PACKAGESPLITFUNCS Martin Jansa
@ 2013-06-12 23:20 ` Martin Jansa
2013-06-14 9:36 ` [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Burton, Ross
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2013-06-12 23:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 6 ++
...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ++++++++++++++++++++++
...move-the-power-of-two-sizeof-struct-cmd_b.patch | 42 ++++++++++++++
meta/recipes-graphics/mesa/mesa_9.1.3.bb | 2 +
meta/recipes-graphics/mesa/mesa_git.bb | 2 +
5 files changed, 117 insertions(+)
create mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
create mode 100644 meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index b4e9b84..6aba0cb 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -51,6 +51,12 @@ PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
GALLIUMDRIVERS = "swrast"
PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers"
+export WANT_LLVM_RELEASE = "3.2"
+PACKAGECONFIG[gallium-llvmpipe] = "--enable-gallium-llvm --enable-gallium-egl --enable-gallium-gbm --with-llvm-shared-libs --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers, llvm3.2"
+
+# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
+FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
+
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
new file mode 100644
index 0000000..9f7002a
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
@@ -0,0 +1,65 @@
+From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Tue, 4 Jun 2013 06:04:44 -0700
+Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling
+
+The AC_CHECK_FILE macro can't be used for cross compiling as it will
+result in "error: cannot check for file existence when cross compiling".
+Replace it with the AS_IF macro.
+
+Upstream-Status: Submitted
+http://lists.freedesktop.org/archives/mesa-dev/2013-June/040168.html
+
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36065f1..2b4a374 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then
+ CLANG_LIBDIR=${LLVM_LIBDIR}
+ fi
+ CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
+- AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",,
+- AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.]))
++ AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
++ [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
+ fi
+ else
+ MESA_LLVM=0
+@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then
+ if test "x$with_llvm_shared_libs" = xyes; then
+ dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+- AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,)
++ AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes])
+
+ if test "x$llvm_have_one_so" = xyes; then
+ dnl LLVM was built using auto*, so there is only one shared object.
+@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then
+ else
+ dnl If LLVM was built with CMake, there will be one shared object per
+ dnl component.
+- AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",,
+- AC_MSG_ERROR([Could not find llvm shared libraries:
++ AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"],
++ [AC_MSG_ERROR([Could not find llvm shared libraries:
+ Please make sure you have built llvm with the --enable-shared option
+ and that your llvm libraries are installed in $LLVM_LIBDIR
+ If you have installed your llvm libraries to a different directory you
+@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then
+ --enable-opencl
+ If you do not want to build with llvm shared libraries and instead want to
+ use llvm static libraries then remove these options from your configure
+- invocation and reconfigure.]))
++ invocation and reconfigure.])])
+
+ dnl We don't need to update LLVM_LIBS in this case because the LLVM
+ dnl install uses a shared object for each compoenent and we have
+--
+1.8.2.1
+
diff --git a/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
new file mode 100644
index 0000000..b74fddc
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
@@ -0,0 +1,42 @@
+From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Wed, 6 Mar 2013 16:57:20 -0700
+Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block)
+ assertion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It fails on 32-bit systems (I only tested on 64-bit). Power of two
+size isn't required, so just remove the assertion.
+
+Reviewed-by: José Fonseca <jfonseca@vmware.com>
+
+Upstream-Status: Backport
+http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb
+
+---
+ src/gallium/drivers/llvmpipe/lp_scene.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c
+index dd0943e..a0912eb 100644
+--- a/src/gallium/drivers/llvmpipe/lp_scene.c
++++ b/src/gallium/drivers/llvmpipe/lp_scene.c
+@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe )
+ assert(maxCommandBytes < LP_SCENE_MAX_SIZE);
+ /* We'll also need space for at least one other data block */
+ assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE);
+-
+- /* Ideally, the size of a cmd_block object will be a power of two
+- * in order to avoid wasting space when we allocation them from
+- * data blocks (which are power of two also).
+- */
+- assert(sizeof(struct cmd_block) ==
+- util_next_power_of_two(sizeof(struct cmd_block)));
+ }
+ #endif
+
+--
+1.8.3
+
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.3.bb b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
index fc193f5..ec95c10 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
@@ -3,6 +3,8 @@ require ${BPN}.inc
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
file://fix-glsl-cross.patch \
+ file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
+ file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
"
SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index ef0bec4..5e252af 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -10,6 +10,8 @@ PV = "9.1.3+git${SRCPV}"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
file://fix-glsl-cross.patch \
+ file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
+ file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
"
S = "${WORKDIR}/git"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options
2013-06-12 23:19 [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options Martin Jansa
` (9 preceding siblings ...)
2013-06-12 23:20 ` [PATCH 10/10] mesa: introduce gallium-llvmpipe PACKAGECONFIG Martin Jansa
@ 2013-06-14 9:36 ` Burton, Ross
10 siblings, 0 replies; 12+ messages in thread
From: Burton, Ross @ 2013-06-14 9:36 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 13 June 2013 00:19, Martin Jansa <martin.jansa@gmail.com> wrote:
> Martin Jansa (10):
> mesa: merge mesa-common.inc to mesa.inc
> mesa: use PACKAGECONFIG instead of DISTRO_FEATURES to define
> EGL_PLATFORMS
> mesa: move LIC_FILES_CHKSUM to .inc
> mesa: merge mesa-git.inc to mesa_git.bb
> mesa: introduce PACKAGECONFIG for dri
> mesa: remove more .la files
> mesa: introduce gallium PACKAGECONFIG
> mesa: introduce openvg PACKAGECONFIG
> mesa: use PACKAGESPLITFUNCS
> mesa: introduce gallium-llvmpipe PACKAGECONFIG
Signed-off-by: Ross Burton <ross.burton@intel.com>
Great stuff :)
Ross
^ permalink raw reply [flat|nested] 12+ messages in thread