* [PATCH 01/11] mesa: format the packages list nicely
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 02/11] mesa: move glu.pc to libglu-dev Ross Burton
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 120a256..2385f9d 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -39,7 +39,12 @@ EXCLUDE_FROM_WORLD = "1"
# ie mesa-dri could be empty and mesa-dri-dev RDEPENDS on it
ALLOW_EMPTY_${PN} = "1"
-PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+PACKAGES =+ "libegl libegl-dev libegl-dbg \
+ libglu libglu-dev \
+ libosmesa libosmesa-dev \
+ libgl libgl-dev \
+ "
+
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 02/11] mesa: move glu.pc to libglu-dev
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
2012-08-01 15:36 ` [PATCH 01/11] mesa: format the packages list nicely Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 03/11] mesa: add --enable-shared-glapi, and package it in libglapi Ross Burton
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 2385f9d..4aa7f5f 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=7a3373c039b6b925c427755a4f779c1d"
-INC_PR = "r15"
+INC_PR = "r16"
PE = "2"
@@ -52,7 +52,7 @@ FILES_libosmesa = "${libdir}/libOSMesa.so.*"
FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
-FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 03/11] mesa: add --enable-shared-glapi, and package it in libglapi
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
2012-08-01 15:36 ` [PATCH 01/11] mesa: format the packages list nicely Ross Burton
2012-08-01 15:36 ` [PATCH 02/11] mesa: move glu.pc to libglu-dev Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 04/11] mesa: enable the Graphic Buffer Manager library Ross Burton
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 4aa7f5f..509b021 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=7a3373c039b6b925c427755a4f779c1d"
-INC_PR = "r16"
+INC_PR = "r17"
PE = "2"
@@ -31,7 +31,8 @@ inherit autotools pkgconfig pythonnative
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
- --enable-glx-tls"
+ --enable-glx-tls \
+ --enable-shared-glapi"
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
@@ -43,17 +44,21 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
libglu libglu-dev \
libosmesa libosmesa-dev \
libgl libgl-dev \
+ libglapi libglapi-dev libglapi-dbg\
"
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
+FILES_libglapi-dev = "${libdir}/libglapi.*"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+FILES_libglapi-dbg += "${libdir}/.debug/libglapi*"
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 04/11] mesa: enable the Graphic Buffer Manager library
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (2 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 03/11] mesa: add --enable-shared-glapi, and package it in libglapi Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 05/11] mesa: Update to 8.0.4 (latest stable version) Ross Burton
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 6 +++++-
meta/recipes-graphics/mesa/mesa-dri.inc | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 509b021..0987478 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=7a3373c039b6b925c427755a4f779c1d"
-INC_PR = "r17"
+INC_PR = "r18"
PE = "2"
@@ -45,15 +45,18 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
libosmesa libosmesa-dev \
libgl libgl-dev \
libglapi libglapi-dev libglapi-dbg\
+ libgbm libgbm-dev libgbm-dbg \
"
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgbm = "${libdir}/libgbm.so.*"
FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
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_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
@@ -62,3 +65,4 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
FILES_libegl-dbg += "${libdir}/egl/.debug/*"
FILES_libglapi-dbg += "${libdir}/.debug/libglapi*"
+FILES_libgbm-dbg += "${libdir}/.debug/libgbm*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 6bf2503..f8f1fff 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -1,5 +1,5 @@
PROTO_DEPS += "dri2proto"
-LIB_DEPS += "libdrm expat"
+LIB_DEPS += "libdrm expat udev"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
@@ -8,7 +8,9 @@ DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
+EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
+EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
+EXTRA_OECONF += "--disable-egl --enable-gbm"
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 05/11] mesa: Update to 8.0.4 (latest stable version)
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (3 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 04/11] mesa: enable the Graphic Buffer Manager library Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 06/11] mesa: Use 'require' instead of 'include' Ross Burton
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
- The license file has changed, but the project still has the same
license
- Patches have been rebased on top of the 8.0 branch. crossfix.patch
and crossfix-mklib.patch have been merged as they address the same
problem
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../mesa/{mesa-7.11.inc => mesa-8.0.4.inc} | 13 +++--
meta/recipes-graphics/mesa/mesa-common.inc | 4 +-
...ative_7.11.bb => mesa-dri-glsl-native_8.0.4.bb} | 4 +-
.../mesa/{mesa-dri_7.11.bb => mesa-dri_8.0.4.bb} | 0
meta/recipes-graphics/mesa/mesa-git.inc | 9 ++--
.../mesa/{mesa-xlib_7.11.bb => mesa-xlib_8.0.4.bb} | 0
.../mesa/mesa/0001-Compile-with-uclibc.patch | 52 ++++++++++++++++++++
...ossfix-mklib.patch => 0002-cross-compile.patch} | 39 ++++++++++++---
...sa_fix_for_x32.patch => 0003-fix-for-x32.patch} | 30 +++++++----
meta/recipes-graphics/mesa/mesa/crossfix.patch | 18 -------
meta/recipes-graphics/mesa/mesa/uclibc.patch | 42 ----------------
11 files changed, 118 insertions(+), 93 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-7.11.inc => mesa-8.0.4.inc} (67%)
rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.11.bb => mesa-dri-glsl-native_8.0.4.bb} (84%)
rename meta/recipes-graphics/mesa/{mesa-dri_7.11.bb => mesa-dri_8.0.4.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa-xlib_7.11.bb => mesa-xlib_8.0.4.bb} (100%)
create mode 100644 meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
rename meta/recipes-graphics/mesa/mesa/{crossfix-mklib.patch => 0002-cross-compile.patch} (68%)
rename meta/recipes-graphics/mesa/mesa/{mesa_fix_for_x32.patch => 0003-fix-for-x32.patch} (59%)
delete mode 100644 meta/recipes-graphics/mesa/mesa/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/uclibc.patch
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
similarity index 67%
rename from meta/recipes-graphics/mesa/mesa-7.11.inc
rename to meta/recipes-graphics/mesa/mesa-8.0.4.inc
index 7c4a690..d9d17bb 100644
--- a/meta/recipes-graphics/mesa/mesa-7.11.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -1,16 +1,15 @@
DEPENDS += "mesa-dri-glsl-native"
-
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://uclibc.patch \
- file://crossfix.patch \
- file://crossfix-mklib.patch \
- file://mesa_fix_for_x32.patch \
+ file://0001-Compile-with-uclibc.patch \
+ file://0002-cross-compile.patch \
+ file://0003-fix-for-x32.patch \
"
+
S = "${WORKDIR}/Mesa-${PV}"
-SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
-SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
+SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
do_configure_prepend() {
#check for python not python2, because python-native does not stage python2 binary/link
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 0987478..01eb5b3 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -10,9 +10,9 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r18"
+INC_PR = "r0"
PE = "2"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
similarity index 84%
rename from meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
rename to meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
index 9194595..a81fb6d 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc
DEPENDS = "makedepend-native"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
-SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
+SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri_7.11.bb
rename to meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 1b4c0a6..32b1d96 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -1,14 +1,15 @@
DEPENDS += "mesa-dri-glsl-native"
-SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2"
-PV = "7.11+gitr${SRCPV}"
+SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
+PV = "8.0.4+git${SRCPV}"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
- file://uclibc.patch \
- file://crossfix.patch \
+ file://0001-Compile-with-uclibc.patch \
+ file://0002-cross-compile.patch \
+ file://0003-fix-for-x32.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
rename to meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch b/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
new file mode 100644
index 0000000..d39270a
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
@@ -0,0 +1,52 @@
+Compile with uclibc
+
+Upstream-Status: Pending
+---
+ configure.ac | 3 +++
+ src/glsl/strtod.c | 2 +-
+ src/mesa/main/imports.c | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fbaa376..454dad2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -543,6 +543,9 @@ AC_SUBST([DLOPEN_LIBS])
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+
++dnl See if newlocale is available
++AC_CHECK_FUNCS_ONCE(newlocale)
++
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+ [AS_HELP_STRING([--enable-selinux],
+diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
+index a876e13..9fce7e9 100644
+--- a/src/glsl/strtod.c
++++ b/src/glsl/strtod.c
+@@ -45,7 +45,7 @@ double
+ glsl_strtod(const char *s, char **end)
+ {
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+- !defined(__HAIKU__)
++ !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
+ static locale_t loc = NULL;
+ if (!loc) {
+ loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
+index d3727ef..363bf32 100644
+--- a/src/mesa/main/imports.c
++++ b/src/mesa/main/imports.c
+@@ -767,7 +767,7 @@ float
+ _mesa_strtof( const char *s, char **end )
+ {
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+- !defined(ANDROID) && !defined(__HAIKU__)
++ !defined(ANDROID) && !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
+ static locale_t loc = NULL;
+ if (!loc) {
+ loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+--
+1.7.10.4
+
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
similarity index 68%
rename from meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
rename to meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
index dc08228..dc8e994 100644
--- a/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
+++ b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
@@ -1,4 +1,7 @@
-This patch is ported from WindRiver linux and to fix cross compile failure.
+cross compile
+
+This patch is ported from WindRiver linux and to fix cross compile
+failure.
And original commits are:
commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
@@ -7,10 +10,15 @@ commit 5c4212084b871a0c0fb7d174280ec9a634637deb
Upstream-Status: Pending
Signed-off-by: Kang Kai <kai.kang@windriver.com>
+---
+ bin/mklib | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
---- Mesa-7.10.2/bin/mklib.orig 2011-09-28 16:15:34.170000074 +0800
-+++ Mesa-7.10.2/bin/mklib 2011-09-28 16:15:42.370000073 +0800
-@@ -49,8 +49,8 @@
+diff --git a/bin/mklib b/bin/mklib
+index 9bac29e..b33aa90 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -49,8 +49,8 @@ expand_archives() {
/*) ;;
*) FILE="$ORIG_DIR/$FILE" ;;
esac
@@ -21,7 +29,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
for MEMBER in $MEMBERS ; do
NEWFILES="$NEWFILES $DIR/$MEMBER"
done
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ expand_archives() {
make_ar_static_lib() {
OPTS=$1
shift;
@@ -30,7 +38,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
shift;
LIBNAME=$1
shift;
-@@ -87,11 +87,11 @@
+@@ -87,11 +87,11 @@ make_ar_static_lib() {
rm -f ${LIBNAME}
# make static lib
@@ -45,7 +53,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
fi
echo ${LIBNAME}
-@@ -313,9 +313,9 @@
+@@ -313,9 +313,9 @@ case $ARCH in
if [ "x$LINK" = "x" ] ; then
# -linker was not specified so set default link command now
if [ $CPLUSPLUS = 1 ] ; then
@@ -57,7 +65,19 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
fi
fi
-@@ -531,9 +531,9 @@
+@@ -535,9 +535,9 @@ case $ARCH in
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=$CXX
+ else
+- LINK=gcc
++ LINK=$CC
+ fi
+ fi
+
+@@ -903,9 +903,9 @@ case $ARCH in
if [ "x$LINK" = "x" ] ; then
# -linker was not specified so set default link command now
if [ $CPLUSPLUS = 1 ] ; then
@@ -69,3 +89,6 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
fi
fi
+--
+1.7.10.4
+
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
similarity index 59%
rename from meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
rename to meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
index f072c34..2d6a150 100644
--- a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
@@ -1,16 +1,19 @@
Upstream-Status: Pending
-Using uname like this when cross compiling is a really bad idea. We
-provide the correct linker flags, lets just assume we can get this
+Using uname like this when cross compiling is a really bad idea. We
+provide the correct linker flags, lets just assume we can get this
right ourselves.
RP 2012/04/26
+---
+ bin/mklib | 16 ----------------
+ 1 file changed, 16 deletions(-)
-Index: Mesa-7.11/bin/mklib
-===================================================================
---- Mesa-7.11.orig/bin/mklib 2012-04-26 19:43:20.729150109 +0000
-+++ Mesa-7.11/bin/mklib 2012-04-26 20:30:22.421086163 +0000
-@@ -330,13 +330,7 @@
+diff --git a/bin/mklib b/bin/mklib
+index b33aa90..16cb017 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -330,15 +330,7 @@ case $ARCH in
;;
esac
@@ -18,13 +21,15 @@ Index: Mesa-7.11/bin/mklib
- # environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
- ABI32=`file $1 | grep 32-bit`
-- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
- fi
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
-@@ -387,13 +381,7 @@
+@@ -389,15 +381,7 @@ case $ARCH in
# exptmp is removed below
fi
@@ -32,9 +37,14 @@ Index: Mesa-7.11/bin/mklib
- # environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
- ABI32=`file $1 | grep 32-bit`
-- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
- fi
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
fi
+--
+1.7.10.4
+
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix.patch b/meta/recipes-graphics/mesa/mesa/crossfix.patch
deleted file mode 100644
index d300e2f..0000000
--- a/meta/recipes-graphics/mesa/mesa/crossfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Index: Mesa-7.5/bin/mklib
-===================================================================
---- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
-+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
-@@ -234,9 +234,9 @@
- if [ "x$LINK" = "x" ] ; then
- # -linker was not specified so set default link command now
- if [ $CPLUSPLUS = 1 ] ; then
-- LINK=g++
-+ LINK=$CXX
- else
-- LINK=gcc
-+ LINK=$CC
- fi
- fi
-
diff --git a/meta/recipes-graphics/mesa/mesa/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
deleted file mode 100644
index 49d0234..0000000
--- a/meta/recipes-graphics/mesa/mesa/uclibc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Index: Mesa-7.10.2/src/mesa/main/imports.c
-===================================================================
---- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.000000000 -0800
-+++ Mesa-7.10.2/src/mesa/main/imports.c 2011-07-20 19:08:49.441785510 -0700
-@@ -757,7 +757,7 @@
- float
- _mesa_strtof( const char *s, char **end )
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-Index: Mesa-7.10.2/src/glsl/strtod.c
-===================================================================
---- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.000000000 -0800
-+++ Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700
-@@ -44,7 +44,7 @@
- double
- glsl_strtod(const char *s, char **end)
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-Index: Mesa-7.10.2/configure.ac
-===================================================================
---- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.000000000 -0700
-+++ Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700
-@@ -450,6 +450,9 @@
- dnl See if posix_memalign is available
- AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
-
-+dnl See if newlocale is available
-+AC_CHECK_FUNCS_ONCE(newlocale)
-+
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
- [AS_HELP_STRING([--enable-selinux],
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 06/11] mesa: Use 'require' instead of 'include'
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (4 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 05/11] mesa: Update to 8.0.4 (latest stable version) Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 07/11] mesa: enable GLES v1 and v2 Ross Burton
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
These include files are really required, not optional.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb | 6 +++---
meta/recipes-graphics/mesa/mesa-dri_git.bb | 6 +++---
meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb | 6 +++---
meta/recipes-graphics/mesa/mesa-xlib_git.bb | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
index 219e555..bd62c98 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
@@ -1,4 +1,4 @@
-include mesa-common.inc
-include mesa-${PV}.inc
-include mesa-dri.inc
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
PR = "${INC_PR}.1"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index a0e1945..4b36f20 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -1,6 +1,6 @@
-include mesa-common.inc
-include mesa-git.inc
-include mesa-dri.inc
+require mesa-common.inc
+require mesa-git.inc
+require mesa-dri.inc
# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
DEFAULT_PREFERENCE = "-2"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
index 7547b22..a89640e 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
@@ -1,5 +1,5 @@
-include mesa-common.inc
-include mesa-${PV}.inc
-include mesa-xlib.inc
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
PR = "${INC_PR}.2"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
index be2f5d3..6647120 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
@@ -1,6 +1,6 @@
-include mesa-common.inc
-include mesa-git.inc
-include mesa-xlib.inc
+require mesa-common.inc
+require mesa-git.inc
+require mesa-xlib.inc
# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
DEFAULT_PREFERENCE = "-2"
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 07/11] mesa: enable GLES v1 and v2
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (5 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 06/11] mesa: Use 'require' instead of 'include' Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 08/11] mesa: enable EGL, with DRM and X11 platforms Ross Burton
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 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 | 10 ++++++++--
meta/recipes-graphics/mesa/mesa-dri.inc | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 01eb5b3..e1e5cb1 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 python-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:"
@@ -46,10 +46,14 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
libgl libgl-dev \
libglapi libglapi-dev libglapi-dbg\
libgbm libgbm-dev libgbm-dbg \
+ 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 +63,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}/GLES1 ${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..ab4487f 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -10,6 +10,7 @@ DRIDRIVERS_append_x86-64 = ",i915,i965"
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
+EXTRA_OECONF += "--enable-gles1 --enable-gles2"
EXTRA_OECONF += "--disable-egl --enable-gbm"
python populate_packages_prepend() {
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 08/11] mesa: enable EGL, with DRM and X11 platforms
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (6 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 07/11] mesa: enable GLES v1 and v2 Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE Ross Burton
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 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 | 6 +++---
meta/recipes-graphics/mesa/mesa-dri.inc | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index e1e5cb1..e5eb28c 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 = "r1"
+INC_PR = "r2"
PE = "2"
@@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
DEPENDS = "makedepend-native python-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
-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:"
@@ -59,7 +59,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 ab4487f..d558f06 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -8,10 +8,15 @@ DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
+EGL_PLATFORMS = "drm,x11"
+
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--enable-gles1 --enable-gles2"
-EXTRA_OECONF += "--disable-egl --enable-gbm"
+EXTRA_OECONF += "--enable-gbm"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', 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] 14+ messages in thread* [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (7 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 08/11] mesa: enable EGL, with DRM and X11 platforms Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 21:28 ` Martin Jansa
2012-08-01 15:36 ` [PATCH 10/11] mesa: no need to depend on python-native, the class does that Ross Burton
2012-08-01 15:36 ` [PATCH 11/11] mesa-demos: fix GLES2 build Ross Burton
10 siblings, 1 reply; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 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 | 16 ++++++-----
meta/recipes-graphics/mesa/mesa-dri.inc | 4 +--
meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
5 files changed, 43 insertions(+), 9 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 e5eb28c..661e76e 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 = "r2"
+INC_PR = "r3"
PE = "2"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
-
-DEPENDS = "makedepend-native python-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
+DEPENDS = "libxml2-native makedepend-native python-native flex-native bison-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
@@ -31,8 +27,14 @@ inherit autotools pkgconfig pythonnative
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
- --enable-glx-tls \
--enable-shared-glapi"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'x11', '--enable-glx-tls', '--disable-glx', d)}"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', 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-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index d558f06..35d17a4 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -8,14 +8,14 @@ DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
-EGL_PLATFORMS = "drm,x11"
+EGL_PLATFORMS = "drm"
+EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--enable-gles1 --enable-gles2"
EXTRA_OECONF += "--enable-gbm"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}", "--disable-egl"
python populate_packages_prepend() {
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] 14+ messages in thread* Re: [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE
2012-08-01 15:36 ` [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE Ross Burton
@ 2012-08-01 21:28 ` Martin Jansa
0 siblings, 0 replies; 14+ messages in thread
From: Martin Jansa @ 2012-08-01 21:28 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 6371 bytes --]
On Wed, Aug 01, 2012 at 04:36:36PM +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-8.0.4.inc | 1 +
> meta/recipes-graphics/mesa/mesa-common.inc | 16 ++++++-----
> meta/recipes-graphics/mesa/mesa-dri.inc | 4 +--
> meta/recipes-graphics/mesa/mesa-git.inc | 2 ++
> ...-gross-hack-to-prevent-from-install-libgl.patch | 29 ++++++++++++++++++++
> 5 files changed, 43 insertions(+), 9 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 e5eb28c..661e76e 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 = "r2"
> +INC_PR = "r3"
> PE = "2"
>
> -
> -PROTO_DEPS = "xf86driproto glproto"
> -LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
> -
> -DEPENDS = "makedepend-native python-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
> +DEPENDS = "libxml2-native makedepend-native python-native flex-native bison-native"
>
> PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
>
> @@ -31,8 +27,14 @@ inherit autotools pkgconfig pythonnative
> EXTRA_OECONF = "--enable-glu \
> --disable-glw \
> --disable-glut \
> - --enable-glx-tls \
> --enable-shared-glapi"
> +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'x11', '--enable-glx-tls', '--disable-glx', d)}"
^ this line was replaced by PACKAGECONFIG
> +
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', 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-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> index d558f06..35d17a4 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> @@ -8,14 +8,14 @@ DRIDRIVERS = "swrast"
> DRIDRIVERS_append_x86 = ",i915,i965"
> DRIDRIVERS_append_x86-64 = ",i915,i965"
>
> -EGL_PLATFORMS = "drm,x11"
> +EGL_PLATFORMS = "drm"
> +EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
>
> EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
> EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
> EXTRA_OECONF += "--enable-gles1 --enable-gles2"
> EXTRA_OECONF += "--enable-gbm"
>
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', d)}"
Maybe swap order of x11 DISTRO_FEATURE patch and egl patch for easier review.
> PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}", "--disable-egl"
>
> python populate_packages_prepend() {
> 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
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 10/11] mesa: no need to depend on python-native, the class does that
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (8 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:36 ` [PATCH 11/11] mesa-demos: fix GLES2 build Ross Burton
10 siblings, 0 replies; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 661e76e..dfc9266 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,10 +12,10 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r3"
+INC_PR = "r4"
PE = "2"
-DEPENDS = "libxml2-native makedepend-native python-native flex-native bison-native"
+DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 11/11] mesa-demos: fix GLES2 build
2012-08-01 15:36 [PATCH 00/11] Mesa upgrade/improvements V2 Ross Burton
` (9 preceding siblings ...)
2012-08-01 15:36 ` [PATCH 10/11] mesa: no need to depend on python-native, the class does that Ross Burton
@ 2012-08-01 15:36 ` Ross Burton
2012-08-01 15:40 ` Burton, Ross
10 siblings, 1 reply; 14+ messages in thread
From: Ross Burton @ 2012-08-01 15:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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] 14+ messages in thread