* [PATCH 1/8] base.bbclass: fix PACKAGECONFIG handling code
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-13 18:58 ` [PATCH 2/8] clutter: DOLT isn't used anymore Ross Burton
` (8 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
From: Yao Zhao <yao.zhao@windriver.com>
PACKAGECONFIG flag code only handles that when it has 3 or 4 items in flag,
it may have a stale data if some flags doesn't need DEPENDS and RDEPENDS.
Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/base.bbclass | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e15fa26..3e6a7de 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -364,20 +364,19 @@ python () {
if flag == "defaultval":
continue
items = flagval.split(",")
- if len(items) == 3:
- enable, disable, depend = items
- rdepend = ""
- elif len(items) == 4:
- enable, disable, depend, rdepend = items
+ num = len(items)
+ if num > 4:
+ bb.error("Only enable,disable,depend,rdepend can be specified!")
+
if flag in pkgconfig:
- if depend:
- extradeps.append(depend)
- if rdepend:
- extrardeps.append(rdepend)
- if enable:
- extraconf.append(enable)
- elif disable:
- extraconf.append(disable)
+ if num >= 3 and items[2]:
+ extradeps.append(items[2])
+ if num >= 4 and items[3]:
+ extrardeps.append(items[3])
+ if num >= 1 and items[0]:
+ extraconf.append(items[0])
+ elif num >= 2 and items[1]:
+ extraconf.append(items[1])
appendVar('DEPENDS', extradeps)
appendVar('RDEPENDS_${PN}', extrardeps)
appendVar('EXTRA_OECONF', extraconf)
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/8] clutter: DOLT isn't used anymore
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
2012-08-13 18:58 ` [PATCH 1/8] base.bbclass: fix PACKAGECONFIG handling code Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-17 21:04 ` Saul Wold
2012-08-13 18:58 ` [PATCH 3/8] mesa: Add a mesa-dri-glsl-native_git recipe Ross Burton
` (7 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +------
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +------
meta/recipes-graphics/clutter/cogl_git.bb | 7 +------
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
index a370568..aceef96 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
@@ -1,7 +1,7 @@
require recipes-graphics/clutter/clutter.inc
require recipes-graphics/clutter/clutter-package.inc
-PR = "r1"
+PR = "r2"
# We're API/ABI compatible and this may make things easier for layers
PROVIDES += "clutter-1.6"
@@ -19,10 +19,5 @@ S = "${WORKDIR}/clutter-${PV}"
BASE_CONF += "--disable-introspection"
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-
SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
index 7d8bcb3..89d8026 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.4 tag
SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
PV = "1.8.4+git${SRCPV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -18,8 +18,3 @@ S = "${WORKDIR}/git"
BASE_CONF += "--disable-introspection"
AUTOTOOLS_AUXDIR = "${S}/build"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 682f931..a3e1903 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.2 tag
SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
PV = "1.8.2+git${SRCPV}"
-PR = "r2"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
@@ -14,8 +14,3 @@ SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
S = "${WORKDIR}/git"
AUTOTOOLS_AUXDIR = "${S}/build"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/8] clutter: DOLT isn't used anymore
2012-08-13 18:58 ` [PATCH 2/8] clutter: DOLT isn't used anymore Ross Burton
@ 2012-08-17 21:04 ` Saul Wold
0 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2012-08-17 21:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/13/2012 11:58 AM, Ross Burton wrote:
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +------
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +------
> meta/recipes-graphics/clutter/cogl_git.bb | 7 +------
> 3 files changed, 3 insertions(+), 18 deletions(-)
>
> diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
> index a370568..aceef96 100644
> --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
> +++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
> @@ -1,7 +1,7 @@
> require recipes-graphics/clutter/clutter.inc
> require recipes-graphics/clutter/clutter-package.inc
>
> -PR = "r1"
> +PR = "r2"
>
> # We're API/ABI compatible and this may make things easier for layers
> PROVIDES += "clutter-1.6"
> @@ -19,10 +19,5 @@ S = "${WORKDIR}/clutter-${PV}"
>
> BASE_CONF += "--disable-introspection"
>
> -do_configure_prepend () {
> - # Disable DOLT
> - sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
> -
> SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
> SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
> diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
> index 7d8bcb3..89d8026 100644
> --- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
> +++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> # the 1.8.4 tag
> SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
> PV = "1.8.4+git${SRCPV}"
> -PR = "r1"
> +PR = "r2"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -18,8 +18,3 @@ S = "${WORKDIR}/git"
> BASE_CONF += "--disable-introspection"
>
> AUTOTOOLS_AUXDIR = "${S}/build"
> -
> -do_configure_prepend () {
> - # Disable DOLT
> - sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
> diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
> index 682f931..a3e1903 100644
> --- a/meta/recipes-graphics/clutter/cogl_git.bb
> +++ b/meta/recipes-graphics/clutter/cogl_git.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> # the 1.8.2 tag
> SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
> PV = "1.8.2+git${SRCPV}"
> -PR = "r2"
> +PR = "r3"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -14,8 +14,3 @@ SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
> S = "${WORKDIR}/git"
>
> AUTOTOOLS_AUXDIR = "${S}/build"
> -
> -do_configure_prepend () {
> - # Disable DOLT
> - sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
>
Merged this into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/8] mesa: Add a mesa-dri-glsl-native_git recipe
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
2012-08-13 18:58 ` [PATCH 1/8] base.bbclass: fix PACKAGECONFIG handling code Ross Burton
2012-08-13 18:58 ` [PATCH 2/8] clutter: DOLT isn't used anymore Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-13 18:58 ` [PATCH 4/8] mesa: enable GLES v1 and v2 Ross Burton
` (6 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
If you have both a fixed version of mesa and a git version of mesa, you
also need the mesa-dri-glsl-native recipe for each versions. The code
generation that happens natively has to be done with the tool extracted
from the version you are compiling.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../recipes-graphics/mesa/mesa-dri-glsl-native.inc | 7 ++++++
.../mesa/mesa-dri-glsl-native_8.0.4.bb | 9 ++------
.../mesa/mesa-dri-glsl-native_git.bb | 23 ++++++++++++++++++++
3 files changed, 32 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc b/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
new file mode 100644
index 0000000..c8b80e8
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "GPLv3+"
+
+DEPENDS = "makedepend-native"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
index a81fb6d..d551598 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
@@ -1,11 +1,6 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+require mesa-dri-glsl-native.inc
-DEPENDS = "makedepend-native"
+LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
new file mode 100644
index 0000000..4611f80
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
@@ -0,0 +1,23 @@
+require mesa-dri-glsl-native.inc
+
+LIC_FILES_CHKSUM = "file://../../docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
+
+SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
+PV = "8.0.4+git${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
+S = "${WORKDIR}/git/src/glsl"
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -sf ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/8] mesa: enable GLES v1 and v2
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (2 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 3/8] mesa: Add a mesa-dri-glsl-native_git recipe Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-19 9:51 ` Richard Purdie
2012-08-13 18:58 ` [PATCH 5/8] core: Prefer mesa-dri as virtual/libopengles1/2 provider Ross Burton
` (5 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 12 ++++++++++--
meta/recipes-graphics/mesa/mesa-dri.inc | 2 ++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index aac3bbe..24cc3d0 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r0"
+INC_PR = "r1"
PE = "2"
@@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
-PROVIDES = "virtual/libgl"
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
# for mesa-dri and mesa-xlib
FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -34,6 +34,8 @@ EXTRA_OECONF = "--enable-glu \
--enable-glx-tls \
--enable-shared-glapi"
+PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
+
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
@@ -46,10 +48,14 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
libgl libgl-dev \
libglapi libglapi-dev \
libgbm libgbm-dev \
+ libgles1 libgles1-dev \
+ libgles2 libgles2-dev \
"
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
FILES_libgbm = "${libdir}/libgbm.so.*"
+FILES_libgles1 = "${libdir}/libGLESv1*.so.*"
+FILES_libgles2 = "${libdir}/libGLESv2.so.*"
FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
@@ -59,6 +65,8 @@ FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
+FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
+FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index f8f1fff..32ca4b2 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -12,6 +12,8 @@ EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--disable-egl --enable-gbm"
+PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
+
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 4/8] mesa: enable GLES v1 and v2
2012-08-13 18:58 ` [PATCH 4/8] mesa: enable GLES v1 and v2 Ross Burton
@ 2012-08-19 9:51 ` Richard Purdie
0 siblings, 0 replies; 18+ messages in thread
From: Richard Purdie @ 2012-08-19 9:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2012-08-13 at 19:58 +0100, Ross Burton wrote:
> Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-graphics/mesa/mesa-common.inc | 12 ++++++++++--
> meta/recipes-graphics/mesa/mesa-dri.inc | 2 ++
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index aac3bbe..24cc3d0 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -12,7 +12,7 @@ SECTION = "x11"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
>
> -INC_PR = "r0"
> +INC_PR = "r1"
> PE = "2"
>
>
> @@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
>
> DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
>
> -PROVIDES = "virtual/libgl"
> +PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
>
> # for mesa-dri and mesa-xlib
> FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
> @@ -34,6 +34,8 @@ EXTRA_OECONF = "--enable-glu \
> --enable-glx-tls \
> --enable-shared-glapi"
>
> +PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
I've taken this but could we change this to:
PACKAGECONFIG ??= ""
PACKAGECONFIG_x86 ?= "gles"
since I'd prefer to rely on the architecture override than the
MACHINE_FEATURES. This recipe shouldn't be machine specific if we can
help it.
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/8] core: Prefer mesa-dri as virtual/libopengles1/2 provider
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (3 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 4/8] mesa: enable GLES v1 and v2 Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-13 18:58 ` [PATCH 6/8] mesa-demos: fix GLES2 build Ross Burton
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's
prefer the accelerated version.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/conf/distro/include/default-providers.inc | 2 ++
meta/conf/machine/qemux86-64.conf | 2 ++
meta/conf/machine/qemux86.conf | 2 ++
.../bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 2 ++
4 files changed, 8 insertions(+)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 54c90d3..28d2f8e 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -6,6 +6,8 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 998ef60..285054a 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,6 +4,8 @@
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
require conf/machine/include/tune-x86_64.inc
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 57e480c..c81afe5 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,6 +4,8 @@
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
require conf/machine/include/tune-i586.inc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 1ab6e58..d1f50c1 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -11,6 +11,8 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }}
{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }}
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/8] mesa-demos: fix GLES2 build
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (4 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 5/8] core: Prefer mesa-dri as virtual/libopengles1/2 provider Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-13 18:58 ` [PATCH 7/8] mesa: respect x11 DISTRO_FEATURE Ross Burton
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch | 15 +++++++++++++++
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
new file mode 100644
index 0000000..84a6fd6
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
@@ -0,0 +1,15 @@
+Index: mesa-demos-8.0.1/src/egl/opengles2/es2_info.c
+===================================================================
+--- mesa-demos-8.0.1.orig/src/egl/opengles2/es2_info.c 2010-07-07 18:57:15.000000000 +0100
++++ mesa-demos-8.0.1/src/egl/opengles2/es2_info.c 2012-08-01 13:14:59.000104115 +0100
+@@ -18,8 +18,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+-#include <GLES/gl.h>
+-#include <GLES/glext.h>
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
+ #include <EGL/egl.h>
+
+
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index bfc62c5..1d16bfc 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -11,10 +11,11 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
DEPENDS = "virtual/libx11 virtual/libgl glew"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
- file://dso_linking_change_build_fix.patch"
+ file://dso_linking_change_build_fix.patch \
+ file://gles2-info.patch"
inherit autotools pkgconfig
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 7/8] mesa: respect x11 DISTRO_FEATURE
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (5 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 6/8] mesa-demos: fix GLES2 build Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-13 18:58 ` [PATCH 8/8] mesa: enable EGL, with DRM and X11 platforms Ross Burton
` (2 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-8.0.4.inc | 1 +
meta/recipes-graphics/mesa/mesa-common.inc | 15 +++++-----
meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
4 files changed, 39 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
index d9d17bb..9afb35d 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -5,6 +5,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://0002-cross-compile.patch \
file://0003-fix-for-x32.patch \
"
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
S = "${WORKDIR}/Mesa-${PV}"
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 24cc3d0..feb152b 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,14 +12,10 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r1"
+INC_PR = "r2"
PE = "2"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
-
-DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
+DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
@@ -31,10 +27,13 @@ inherit autotools pkgconfig pythonnative
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
- --enable-glx-tls \
--enable-shared-glapi"
-PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 32b1d96..7910eb6 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -11,6 +11,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
file://0002-cross-compile.patch \
file://0003-fix-for-x32.patch \
"
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
+
S = "${WORKDIR}/git"
do_configure_prepend() {
diff --git a/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
new file mode 100644
index 0000000..cf9dee2
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
@@ -0,0 +1,29 @@
+gross hack to prevent from install libgl
+
+This patch is not suitable for upstream. This is only needed for the 8.0.x
+branch, master (8.1.x) has a largely different build system (using automake)
+and does not need it. It is fully expected to drop the patch with the next bump
+to a stable version based on 8.1.x.
+
+Upstream-Status: Inappropriate
+
+---
+ src/mesa/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/Makefile b/src/mesa/Makefile
+index 0e15d61..a0a2cb5 100644
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -166,7 +166,7 @@ install: default $(DRICORE_INSTALL_TARGET)
+ else \
+ $(MAKE) install-osmesa || exit 1 ; \
+ fi ;; \
+- dri) $(MAKE) install-libgl install-dri || exit 1 ;; \
++ dri) $(MAKE) install-dri || exit 1 ;; \
+ *) $(MAKE) install-libgl || exit 1 ;; \
+ esac ; \
+ done
+--
+1.7.10.4
+
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 8/8] mesa: enable EGL, with DRM and X11 platforms
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (6 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 7/8] mesa: respect x11 DISTRO_FEATURE Ross Burton
@ 2012-08-13 18:58 ` Ross Burton
2012-08-15 1:22 ` [PATCH 0/8] Enable EGL and GLES in x86 Mesa Saul Wold
2012-08-20 16:05 ` Saul Wold
9 siblings, 0 replies; 18+ messages in thread
From: Ross Burton @ 2012-08-13 18:58 UTC (permalink / raw)
To: openembedded-core
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 5 +++--
meta/recipes-graphics/mesa/mesa-dri.inc | 6 +++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index feb152b..de171f0 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -17,7 +17,7 @@ PE = "2"
DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
# for mesa-dri and mesa-xlib
FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -30,6 +30,7 @@ EXTRA_OECONF = "--enable-glu \
--enable-shared-glapi"
PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
@@ -60,7 +61,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libegl-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-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 32ca4b2..8b04e5b 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -10,10 +10,14 @@ DRIDRIVERS_append_x86-64 = ",i915,i965"
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
-EXTRA_OECONF += "--disable-egl --enable-gbm"
+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)}"
+PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
+
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (7 preceding siblings ...)
2012-08-13 18:58 ` [PATCH 8/8] mesa: enable EGL, with DRM and X11 platforms Ross Burton
@ 2012-08-15 1:22 ` Saul Wold
2012-08-15 1:30 ` Khem Raj
` (2 more replies)
2012-08-20 16:05 ` Saul Wold
9 siblings, 3 replies; 18+ messages in thread
From: Saul Wold @ 2012-08-15 1:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/13/2012 09:58 PM, Ross Burton wrote:
> Hopefully the final Mesa patch set. First pulls in an essential fix to
> PACKAGECONFIG, and then enables GLES and EGL using PACKAGECONFIG, based on
> whether the MACHINE_FEATURES contains x86.
>
Ross,
Sorry not quite yet, there seems to be an issue with this patch set:
(found with and arm and world builds)
> | arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork -mtune=arm926ej-s --sysroot=/srv/ssd/sgw_ab/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/sysroots/qemuarm -c -I../../../../include -I../../../../src/gbm/main -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wmissing-prototypes -std=c99 -fno-strict-aliasing -fno-builtin-memcmp -O2 -pipe -g -feliminate-unused-debug-types -fPIC -D_GNU_SOURCE -DPTHREADS -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_XSHM -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -fvisibility=hidden -DDEFAULT_DRIVER_DIR=\"/usr/lib/dri\" driver_name.c -o driver_name.o
> | In file included from gbm_driint.h:37:0,
> | from driver_name.c:34:
> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error: drm.h: No such file or directory
> | compilation terminated.
> | In file included from gbm_dri.c:40:0:
> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error: drm.h: No such file or directory
> | compilation terminated.
Sau!
> Ross
>
> The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18:
>
> foomatic: fix perl path for target (2012-08-08 10:06:00 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/mesa
>
> for you to fetch changes up to 938675e4208fd34908653e1a7565c58f53067d77:
>
> mesa: enable EGL, with DRM and X11 platforms (2012-08-13 12:53:45 +0100)
>
> ----------------------------------------------------------------
> Damien Lespiau (2):
> mesa: Add a mesa-dri-glsl-native_git recipe
> core: Prefer mesa-dri as virtual/libopengles1/2 provider
>
> Ross Burton (5):
> clutter: DOLT isn't used anymore
> mesa: enable GLES v1 and v2
> mesa-demos: fix GLES2 build
> mesa: respect x11 DISTRO_FEATURE
> mesa: enable EGL, with DRM and X11 platforms
>
> Yao Zhao (1):
> base.bbclass: fix PACKAGECONFIG handling code
>
> meta/classes/base.bbclass | 25 ++++++++---------
> meta/conf/distro/include/default-providers.inc | 2 ++
> meta/conf/machine/qemux86-64.conf | 2 ++
> meta/conf/machine/qemux86.conf | 2 ++
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +----
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +----
> meta/recipes-graphics/clutter/cogl_git.bb | 7 +----
> meta/recipes-graphics/mesa/mesa-8.0.4.inc | 1 +
> meta/recipes-graphics/mesa/mesa-common.inc | 26 ++++++++++++------
> .../mesa/mesa-demos/gles2-info.patch | 15 ++++++++++
> meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 ++--
> .../recipes-graphics/mesa/mesa-dri-glsl-native.inc | 7 +++++
> .../mesa/mesa-dri-glsl-native_8.0.4.bb | 9 ++----
> .../mesa/mesa-dri-glsl-native_git.bb | 23 ++++++++++++++++
> meta/recipes-graphics/mesa/mesa-dri.inc | 8 +++++-
> meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
> ...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
> .../arch/qemu/conf/machine/{{=machine}}.conf | 2 ++
> 18 files changed, 129 insertions(+), 50 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
>
> Damien Lespiau (2):
> mesa: Add a mesa-dri-glsl-native_git recipe
> core: Prefer mesa-dri as virtual/libopengles1/2 provider
>
> Ross Burton (5):
> clutter: DOLT isn't used anymore
> mesa: enable GLES v1 and v2
> mesa-demos: fix GLES2 build
> mesa: respect x11 DISTRO_FEATURE
> mesa: enable EGL, with DRM and X11 platforms
>
> Yao Zhao (1):
> base.bbclass: fix PACKAGECONFIG handling code
>
> meta/classes/base.bbclass | 25 ++++++++---------
> meta/conf/distro/include/default-providers.inc | 2 ++
> meta/conf/machine/qemux86-64.conf | 2 ++
> meta/conf/machine/qemux86.conf | 2 ++
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +----
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +----
> meta/recipes-graphics/clutter/cogl_git.bb | 7 +----
> meta/recipes-graphics/mesa/mesa-8.0.4.inc | 1 +
> meta/recipes-graphics/mesa/mesa-common.inc | 26 ++++++++++++------
> .../mesa/mesa-demos/gles2-info.patch | 15 ++++++++++
> meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 ++--
> .../recipes-graphics/mesa/mesa-dri-glsl-native.inc | 7 +++++
> .../mesa/mesa-dri-glsl-native_8.0.4.bb | 9 ++----
> .../mesa/mesa-dri-glsl-native_git.bb | 23 ++++++++++++++++
> meta/recipes-graphics/mesa/mesa-dri.inc | 8 +++++-
> meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
> ...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
> .../arch/qemu/conf/machine/{{=machine}}.conf | 2 ++
> 18 files changed, 129 insertions(+), 50 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-15 1:22 ` [PATCH 0/8] Enable EGL and GLES in x86 Mesa Saul Wold
@ 2012-08-15 1:30 ` Khem Raj
2012-08-15 6:56 ` Burton, Ross
2012-08-15 10:44 ` Burton, Ross
2 siblings, 0 replies; 18+ messages in thread
From: Khem Raj @ 2012-08-15 1:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Aug 14, 2012 at 6:22 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 08/13/2012 09:58 PM, Ross Burton wrote:
>>
>> Hopefully the final Mesa patch set. First pulls in an essential fix to
>> PACKAGECONFIG, and then enables GLES and EGL using PACKAGECONFIG, based on
>> whether the MACHINE_FEATURES contains x86.
>>
> Ross,
>
> Sorry not quite yet, there seems to be an issue with this patch set:
> (found with and arm and world builds)
>
>> | arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
>> -mtune=arm926ej-s
>> --sysroot=/srv/ssd/sgw_ab/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/sysroots/qemuarm
>> -c -I../../../../include -I../../../../src/gbm/main -O2 -pipe -g
>> -feliminate-unused-debug-types -Wall -Wmissing-prototypes -std=c99
>> -fno-strict-aliasing -fno-builtin-memcmp -O2 -pipe -g
>> -feliminate-unused-debug-types -fPIC -D_GNU_SOURCE -DPTHREADS
>> -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_XSHM -DGLX_USE_TLS -DPTHREADS
>> -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -fvisibility=hidden
>> -DDEFAULT_DRIVER_DIR=\"/usr/lib/dri\" driver_name.c -o driver_name.o
>> | In file included from gbm_driint.h:37:0,
>> | from driver_name.c:34:
>> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error:
>> drm.h: No such file or directory
>> | compilation terminated.
>> | In file included from gbm_dri.c:40:0:
>> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error:
>> drm.h: No such file or directory
>> | compilation terminated.
drm/drm.h should come from kernel-headers I wonder if its included
correctly or not.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-15 1:22 ` [PATCH 0/8] Enable EGL and GLES in x86 Mesa Saul Wold
2012-08-15 1:30 ` Khem Raj
@ 2012-08-15 6:56 ` Burton, Ross
2012-08-15 7:36 ` Burton, Ross
2012-08-15 10:44 ` Burton, Ross
2 siblings, 1 reply; 18+ messages in thread
From: Burton, Ross @ 2012-08-15 6:56 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On 15 August 2012 02:22, Saul Wold <sgw@linux.intel.com> wrote:
>> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error:
>> drm.h: No such file or directory
Not what I was expecting. I've kicked off a local qemuarm build to investigate.
Ross
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-15 6:56 ` Burton, Ross
@ 2012-08-15 7:36 ` Burton, Ross
2012-08-15 9:52 ` Burton, Ross
0 siblings, 1 reply; 18+ messages in thread
From: Burton, Ross @ 2012-08-15 7:36 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On 15 August 2012 07:56, Burton, Ross <ross.burton@intel.com> wrote:
> On 15 August 2012 02:22, Saul Wold <sgw@linux.intel.com> wrote:
>>> | ../../../../include/GL/internal/dri_interface.h:51:17: fatal error:
>>> drm.h: No such file or directory
>
> Not what I was expecting. I've kicked off a local qemuarm build to investigate.
Hm, worked on qemuarm for me, and from what I can tell in the failed
autobuilder log linux-libc-headers was correctly built
(understandably) before mesa-dri.
Ross
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-15 1:22 ` [PATCH 0/8] Enable EGL and GLES in x86 Mesa Saul Wold
2012-08-15 1:30 ` Khem Raj
2012-08-15 6:56 ` Burton, Ross
@ 2012-08-15 10:44 ` Burton, Ross
2 siblings, 0 replies; 18+ messages in thread
From: Burton, Ross @ 2012-08-15 10:44 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On 15 August 2012 02:22, Saul Wold <sgw@linux.intel.com> wrote:
> Sorry not quite yet, there seems to be an issue with this patch set:
> (found with and arm and world builds)
I think I found the problem although I couldn't ever replicate the
failure. mesa-dri was failing to declare a dependency on libdrm (it
was setting variable but never using it in DEPENDS).
I've pushed a new branch which fixes up the dependencies.
Ross
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/8] Enable EGL and GLES in x86 Mesa
2012-08-13 18:58 [PATCH 0/8] Enable EGL and GLES in x86 Mesa Ross Burton
` (8 preceding siblings ...)
2012-08-15 1:22 ` [PATCH 0/8] Enable EGL and GLES in x86 Mesa Saul Wold
@ 2012-08-20 16:05 ` Saul Wold
9 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2012-08-20 16:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/13/2012 11:58 AM, Ross Burton wrote:
> Hopefully the final Mesa patch set. First pulls in an essential fix to
> PACKAGECONFIG, and then enables GLES and EGL using PACKAGECONFIG, based on
> whether the MACHINE_FEATURES contains x86.
>
> Ross
>
> The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18:
>
> foomatic: fix perl path for target (2012-08-08 10:06:00 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/mesa
>
> for you to fetch changes up to 938675e4208fd34908653e1a7565c58f53067d77:
>
> mesa: enable EGL, with DRM and X11 platforms (2012-08-13 12:53:45 +0100)
>
> ----------------------------------------------------------------
> Damien Lespiau (2):
> mesa: Add a mesa-dri-glsl-native_git recipe
> core: Prefer mesa-dri as virtual/libopengles1/2 provider
>
> Ross Burton (5):
> clutter: DOLT isn't used anymore
> mesa: enable GLES v1 and v2
> mesa-demos: fix GLES2 build
> mesa: respect x11 DISTRO_FEATURE
> mesa: enable EGL, with DRM and X11 platforms
>
> Yao Zhao (1):
> base.bbclass: fix PACKAGECONFIG handling code
>
Merged this lot into OE-Core
Thanks
Sau!
> meta/classes/base.bbclass | 25 ++++++++---------
> meta/conf/distro/include/default-providers.inc | 2 ++
> meta/conf/machine/qemux86-64.conf | 2 ++
> meta/conf/machine/qemux86.conf | 2 ++
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +----
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +----
> meta/recipes-graphics/clutter/cogl_git.bb | 7 +----
> meta/recipes-graphics/mesa/mesa-8.0.4.inc | 1 +
> meta/recipes-graphics/mesa/mesa-common.inc | 26 ++++++++++++------
> .../mesa/mesa-demos/gles2-info.patch | 15 ++++++++++
> meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 ++--
> .../recipes-graphics/mesa/mesa-dri-glsl-native.inc | 7 +++++
> .../mesa/mesa-dri-glsl-native_8.0.4.bb | 9 ++----
> .../mesa/mesa-dri-glsl-native_git.bb | 23 ++++++++++++++++
> meta/recipes-graphics/mesa/mesa-dri.inc | 8 +++++-
> meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
> ...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
> .../arch/qemu/conf/machine/{{=machine}}.conf | 2 ++
> 18 files changed, 129 insertions(+), 50 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
>
> Damien Lespiau (2):
> mesa: Add a mesa-dri-glsl-native_git recipe
> core: Prefer mesa-dri as virtual/libopengles1/2 provider
>
> Ross Burton (5):
> clutter: DOLT isn't used anymore
> mesa: enable GLES v1 and v2
> mesa-demos: fix GLES2 build
> mesa: respect x11 DISTRO_FEATURE
> mesa: enable EGL, with DRM and X11 platforms
>
> Yao Zhao (1):
> base.bbclass: fix PACKAGECONFIG handling code
>
> meta/classes/base.bbclass | 25 ++++++++---------
> meta/conf/distro/include/default-providers.inc | 2 ++
> meta/conf/machine/qemux86-64.conf | 2 ++
> meta/conf/machine/qemux86.conf | 2 ++
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 +----
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 +----
> meta/recipes-graphics/clutter/cogl_git.bb | 7 +----
> meta/recipes-graphics/mesa/mesa-8.0.4.inc | 1 +
> meta/recipes-graphics/mesa/mesa-common.inc | 26 ++++++++++++------
> .../mesa/mesa-demos/gles2-info.patch | 15 ++++++++++
> meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 ++--
> .../recipes-graphics/mesa/mesa-dri-glsl-native.inc | 7 +++++
> .../mesa/mesa-dri-glsl-native_8.0.4.bb | 9 ++----
> .../mesa/mesa-dri-glsl-native_git.bb | 23 ++++++++++++++++
> meta/recipes-graphics/mesa/mesa-dri.inc | 8 +++++-
> meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
> ...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
> .../arch/qemu/conf/machine/{{=machine}}.conf | 2 ++
> 18 files changed, 129 insertions(+), 50 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
> create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
> create mode 100644 meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
>
^ permalink raw reply [flat|nested] 18+ messages in thread