from:"Ross Burton"

[OE-core] [PATCH 2/4] libdrm: libdrm does not depend on xcb any more

2012-07-27 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/drm/libdrm.inc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/drm/libdrm.inc 
b/meta/recipes-graphics/drm/libdrm.inc
index 8a2c760..e9ca2f9 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -8,9 +8,9 @@ SECTION = x11/base
 LICENSE = MIT
 SRC_URI = http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
 PROVIDES = drm
-DEPENDS = libpthread-stubs udev cairo virtual/libx11
+DEPENDS = libpthread-stubs udev cairo
 
-INC_PR = r1
+INC_PR = r2
 
 #libpciaccess is required starting from libdrm 2.4.26
 DEPENDS +=  libpciaccess
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/4] drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1

2012-07-27 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/drm/libdrm.inc   |2 ++
 meta/recipes-graphics/drm/libdrm_2.4.35.bb |2 +-
 meta/recipes-graphics/drm/libdrm_git.bb|2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/drm/libdrm.inc 
b/meta/recipes-graphics/drm/libdrm.inc
index 20d7f1f..8a2c760 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -10,6 +10,8 @@ SRC_URI = 
http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
 PROVIDES = drm
 DEPENDS = libpthread-stubs udev cairo virtual/libx11
 
+INC_PR = r1
+
 #libpciaccess is required starting from libdrm 2.4.26
 DEPENDS +=  libpciaccess
 
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb 
b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 3677b8d..9d9ada1 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -2,7 +2,7 @@ require libdrm.inc
 
 LIC_FILES_CHKSUM = 
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
 
-PR = r0
+PR = ${INC_PR}.0
 
 SRC_URI += file://installtests.patch \
 file://GNU_SOURCE_definition.patch \
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb 
b/meta/recipes-graphics/drm/libdrm_git.bb
index c2f9855..d71b7f7 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = ${WORKDIR}/git
 
 SRCREV = 3f3c5be6f908272199ccf53f108b1124bfe0a00e
 PV = 2.4.15+git${SRCPV}
-PR = r1
+PR = ${INC_PR}.0
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/4] libdrm: Put the license md5sum in the common include

2012-07-27 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

With this, libdrm_git now does have LIC_FILES_CHKSUM as well.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/drm/libdrm.inc   |1 +
 meta/recipes-graphics/drm/libdrm_2.4.35.bb |2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/drm/libdrm.inc 
b/meta/recipes-graphics/drm/libdrm.inc
index e9ca2f9..5ddab85 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -6,6 +6,7 @@ accelerated OpenGL drivers.
 HOMEPAGE = http://dri.freedesktop.org;
 SECTION = x11/base
 LICENSE = MIT
+LIC_FILES_CHKSUM = 
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
 SRC_URI = http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
 PROVIDES = drm
 DEPENDS = libpthread-stubs udev cairo
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb 
b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 9d9ada1..58ee449 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -1,7 +1,5 @@
 require libdrm.inc
 
-LIC_FILES_CHKSUM = 
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
-
 PR = ${INC_PR}.0
 
 SRC_URI += file://installtests.patch \
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libpciaccess: lpci access does not depend on X

2012-07-27 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

So let's remove the X dependencies from DEPENDS and white list it in
xorg-lib-common.inc.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb |4 +---
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc|2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb 
b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
index 178e220..0ec6814 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
@@ -8,9 +8,7 @@ require xorg-lib-common.inc
 LICENSE = MIT  MIT-style
 LIC_FILES_CHKSUM = file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc
 
-PR = r0
-
-DEPENDS += xproto virtual/libx11
+PR = r1
 
 SRC_URI[md5sum] = 399a419ac6a54f0fc07c69c9bdf452dc
 SRC_URI[sha256sum] = 
27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc 
b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 73a4d1d..55eaf49 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
 EXTRA_OECONF = --enable-malloc0returnsnull --with-fop=no --without-xmlto
 
 python () {
-whitelist = [ pixman ]
+whitelist = [ pixman, libpciaccess ]
 if not d.getVar('BPN', True) in whitelist and not oe.utils.contains 
('DISTRO_FEATURES', 'x11', True, False, d):
 raise bb.parse.SkipPackage('x11' not in DISTRO_FEATURES)
 }
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] buildhistory: reduce the numeric delta to 10%

2012-07-30 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/lib/oe/buildhistory_analysis.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/buildhistory_analysis.py 
b/meta/lib/oe/buildhistory_analysis.py
index d0e0808..0a50432 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -23,7 +23,7 @@ numeric_fields = ['PKGSIZE', 'IMAGESIZE']
 # Fields to monitor
 monitor_fields = ['RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILELIST', 
'PKGSIZE', 'IMAGESIZE']
 # Percentage change to alert for numeric fields
-monitor_numeric_threshold = 20
+monitor_numeric_threshold = 10
 # Image files to monitor (note that image-info.txt is handled separately)
 img_monitor_files = ['installed-package-names.txt', 'files-in-image.txt']
 # Related context fields for reporting (note: PE, PV  PR are always reported 
for monitored package fields)
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gthumb: fix parallel build problems

2012-07-31 Thread Ross Burton

It's possible with a parallel build for make to spin waiting for a file change
when it isn't going to.  Fix the build rules so this doesn't happen.

[YOCTO #2319]

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-gnome/gthumb/files/parallel.patch |  158 
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb |6 +-
 2 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-gnome/gthumb/files/parallel.patch

diff --git a/meta/recipes-gnome/gthumb/files/parallel.patch 
b/meta/recipes-gnome/gthumb/files/parallel.patch
new file mode 100644
index 000..20ce5c5
--- /dev/null
+++ b/meta/recipes-gnome/gthumb/files/parallel.patch
@@ -0,0 +1,158 @@
+From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001
+From: Ross Burton ross.bur...@intel.com
+Date: Tue, 31 Jul 2012 17:26:27 +0100
+Subject: [PATCH] build: Fix parallel build problems with enum generation
+
+This is a backport from a patch against master.
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925]
+---
+ extensions/file_tools/Makefile.am|   10 --
+ extensions/importer/Makefile.am  |   10 --
+ extensions/pixbuf_savers/Makefile.am |   10 --
+ gthumb/Makefile.am   |   10 --
+ 4 files changed, 16 insertions(+), 24 deletions(-)
+
+diff --git a/extensions/file_tools/Makefile.am 
b/extensions/file_tools/Makefile.am
+index 7785eff..d70a8a5 100644
+--- a/extensions/file_tools/Makefile.am
 b/extensions/file_tools/Makefile.am
+@@ -24,17 +24,16 @@ HEADER_FILES = \
+   gth-file-tool-undo.h\
+   preferences.h
+ 
+-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
++enum-types.h: $(HEADER_FILES)
+   $(AM_V_GEN)( $(GLIB_MKENUMS) \
+   --fhead #ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include 
glib-object.h\n\nG_BEGIN_DECLS\n \
+   --fprod /* enumerations from \@filename@\ */\n \
+   --vhead GType @enum_name@_get_type (void);\n#define 
GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n \
+   --ftail G_END_DECLS\n\n#endif /* ENUM_TYPES_H */ \
+   $^ xgen-$(@F) \
+-   (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \
+-   rm -f xgen-$(@F) )
++   mv -f xgen-$(@F) enum-types.h )
+ 
+-enum-types.c: $(HEADER_FILES) enum-types.h
++enum-types.c: $(HEADER_FILES)
+   $(AM_V_GEN)( $(GLIB_MKENUMS) \
+   --fhead #include glib-object.h\n \
+   --fprod \n/* enumerations from \@filename@\ */\n#include 
\@filename@\ \
+@@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h
+   --vprod   { @VALUENAME@, \@VALUENAME@\, \@valuenick@\ 
}, \
+   --vtail   { 0, NULL, NULL }\n};\netype = 
g_@type@_register_static (\@EnumName@\, values);\n  }\n  return etype;\n}\n \
+   $^ xgen-$(@F) \
+-   (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \
+-   rm -f xgen-$(@F) )
++   mv -f xgen-$(@F) enum-types.c )
+ 
+ libfile_tools_la_SOURCES =\
+   $(ENUM_TYPES)   \
+diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am
+index 29e7f2c..07c1eba 100644
+--- a/extensions/importer/Makefile.am
 b/extensions/importer/Makefile.am
+@@ -14,17 +14,16 @@ HEADER_FILES = \
+   preferences.h   \
+   utils.h
+ 
+-gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
++gth-import-enum-types.h: $(HEADER_FILES)
+   $(AM_V_GEN)( $(GLIB_MKENUMS) \
+   --fhead #ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include 
glib-object.h\n\nG_BEGIN_DECLS\n \
+   --fprod /* enumerations from \@filename@\ */\n \
+   --vhead GType @enum_name@_get_type (void);\n#define 
GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n \
+   --ftail G_END_DECLS\n\n#endif /* ENUM_TYPES_H */ \
+   $^ xgen-$(@F) \
+-   (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) 
gth-import-enum-types.h ) \
+-   rm -f xgen-$(@F) )
++   mv -f xgen-$(@F) gth-import-enum-types.h )
+ 
+-gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h
++gth-import-enum-types.c: $(HEADER_FILES)
+   $(AM_V_GEN)( $(GLIB_MKENUMS) \
+   --fhead #include glib-object.h\n \
+   --fprod \n/* enumerations from \@filename@\ */\n#include 
\@filename@\ \
+@@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) 
gth-import-enum-types.h
+   --vprod   { @VALUENAME@, \@VALUENAME@\, \@valuenick@\ 
}, \
+   --vtail   { 0, NULL, NULL }\n};\netype = 
g_@type@_register_static (\@EnumName@\, values);\n  }\n  return etype;\n}\n \
+   $^ xgen-$(@F) \
+-   (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) 
gth-import-enum-types.c ) \
+-   rm -f xgen-$(@F) )
++   mv -f xgen

[OE-core] [PATCH 07/12] mesa: enable GLESv2

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |7 +--
 meta/recipes-graphics/mesa/mesa-dri.inc|1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index 01eb5b3..d9758b9 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/libgles2
 
 # for mesa-dri and mesa-xlib
 FILESEXTRAPATHS_append := ${THISDIR}/mesa:
@@ -46,10 +46,12 @@ PACKAGES =+ libegl libegl-dev libegl-dbg \
  libgl libgl-dev \
  libglapi libglapi-dev libglapi-dbg\
  libgbm libgbm-dev libgbm-dbg \
+ libgles2 libgles2-dev \
 
 
 FILES_libegl = ${libdir}/libEGL.so.* ${libdir}/egl/*.so
 FILES_libgbm = ${libdir}/libgbm.so.*
+FILES_libgles2 = ${libdir}/libGLESv2.so.*
 FILES_libgl = ${libdir}/libGL.so.*
 FILES_libglapi = ${libdir}/libglapi.so.*
 FILES_libglu = ${libdir}/libGLU.so.*
@@ -59,6 +61,7 @@ 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_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..1d325eb 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 += ${@base_contains('DISTRO_FEATURES', 'opengles2', 
'--enable-gles2', '', d)}
 EXTRA_OECONF += --disable-egl --enable-gbm
 
 python populate_packages_prepend() {
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/12] mesa: Use 'require' instead of 'include'

2012-08-01 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

These include files are really required, not optional.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/12] mesa: Update to 8.0.4 (latest stable version)

2012-08-01 Thread Ross Burton

From: Damien Lespiau damien.lesp...@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.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
 ...a-dri_7.11.bbappend = mesa-dri_8.0.4.bbappend} |0
 .../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 
 12 files changed, 118 insertions(+), 93 deletions(-)
 rename meta-yocto/recipes-graphics/mesa/{mesa-dri_7.11.bbappend = 
mesa-dri_8.0.4.bbappend} (100%)
 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-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend 
b/meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
similarity index 100%
rename from meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
rename to meta-yocto/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
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

[OE-core] [PATCH 01/12] mesa: format the packages list nicely

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/12] mesa: enable the Graphic Buffer Manager library

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 08/12] mesa: enable EGL, with DRM and X11 platforms

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |6 +++---
 meta/recipes-graphics/mesa/mesa-dri.inc|5 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index d9758b9..7963896 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/libgles2
+PROVIDES = virtual/libgl virtual/libgles2 virtual/egl
 
 # for mesa-dri and mesa-xlib
 FILESEXTRAPATHS_append := ${THISDIR}/mesa:
@@ -57,7 +57,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 1d325eb..0c5682c 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -8,10 +8,13 @@ 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 += ${@base_contains('DISTRO_FEATURES', 'opengles2', 
'--enable-gles2', '', d)}
-EXTRA_OECONF += --disable-egl --enable-gbm
+EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'egl', '--enable-egl 
--with-egl-platforms=${EGL_PLATFORMS}', '', d)}
+EXTRA_OECONF += --enable-gbm
 
 python populate_packages_prepend() {
 dri_drivers_root = os.path.join(d.getVar('libdir', True), dri)
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 10/12] poky: add EGL and OpenGLESv2 features

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta-yocto/conf/distro/poky.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index cc9fa6c..de7a36c 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -10,7 +10,7 @@ TARGET_VENDOR = -poky
 
 LOCALCONF_VERSION = 1
 
-DISTRO_FEATURES_append =  largefile opengl
+DISTRO_FEATURES_append =  largefile opengl opengles2 egl
 
 PREFERRED_VERSION_linux-yocto ?= 3.4%
 PREFERRED_VERSION_linux-yocto_qemux86 ?= 3.4%
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 00/12] Mesa upgrade/improvements

2012-08-01 Thread Ross Burton

This patch series upgrades mesa-dri to the latest upstream, enables GLES2 and
EGL, and lets mesa-dri build without X11.  mesa-xlib doesn't get all the new
packages as it's not that useful (no HW acceleration).

Tested on a Sandy Bridge, running glxgears/gles2gears.

The following changes since commit 3309cf42d314f0a26079a11836c6b9b9bb5f253e:

  package_rpm.bbclass: Accomodate dash when using arrays (2012-07-31 12:22:10 
+0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to 9a9c6f98362245a91a2e58daef6c4ff1bb415881:

  mesa-demos: fix GLES2 build (2012-08-01 13:17:10 +0100)


Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (10):
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLESv2
  mesa: enable EGL, with DRM and X11 platforms
  mesa: respect x11 DISTRO_FEATURE
  poky: add EGL and OpenGLESv2 features
  mesa: no need to depend on python-native, the class does that
  mesa-demos: fix GLES2 build

 meta-yocto/conf/distro/poky.conf   |2 +-
 ...a-dri_7.11.bbappend = mesa-dri_8.0.4.bbappend} |0
 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   37 ++
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   11 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc|   11 +++--
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb   |5 --
 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb  |5 ++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb|6 +--
 .../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 +++
 ...-gross-hack-to-prevent-from-install-libgl.patch |   29 +++
 meta/recipes-graphics/mesa/mesa/crossfix.patch |   18 ---
 meta/recipes-graphics/mesa/mesa/uclibc.patch   |   42 
 20 files changed, 204 insertions(+), 120 deletions(-)
 rename meta-yocto/recipes-graphics/mesa/{mesa-dri_7.11.bbappend = 
mesa-dri_8.0.4.bbappend} (100%)
 rename meta/recipes-graphics/mesa/{mesa-7.11.inc = mesa-8.0.4.inc} (60%)
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.11.bb = 
mesa-dri-glsl-native_8.0.4.bb} (84%)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
 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%)
 create mode 100644 
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/crossfix.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/uclibc.patch

Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (10):
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLESv2
  mesa: enable EGL, with DRM and X11 platforms
  mesa: respect x11 DISTRO_FEATURE
  poky: add EGL and OpenGLESv2 features
  mesa: no need to depend on python-native, the class does that
  mesa-demos: fix GLES2 build

 meta-yocto/conf/distro/poky.conf   |2 +-
 ...a-dri_7.11.bbappend = mesa-dri_8.0.4.bbappend} |0
 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   37 ++
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   11 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc

[OE-core] [PATCH 09/12] mesa: respect x11 DISTRO_FEATURE

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-8.0.4.inc  |1 +
 meta/recipes-graphics/mesa/mesa-common.inc |   10 ---
 meta/recipes-graphics/mesa/mesa-dri.inc|3 +-
 meta/recipes-graphics/mesa/mesa-git.inc|2 ++
 ...-gross-hack-to-prevent-from-install-libgl.patch |   29 
 5 files changed, 40 insertions(+), 5 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 7963896..e5e91a3 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,14 +12,16 @@ 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
+LIB_DEPS += ${@base_contains('DISTRO_FEATURES', 'x11', \
+ 'virtual/libx11 libxext libxxf86vm libxdamage libxfixes', '', d)}
 
-DEPENDS = makedepend-native python-native flex-native bison-native 
${PROTO_DEPS} ${LIB_DEPS}
+DEPENDS = libxml2-native makedepend-native python-native flex-native 
bison-native ${LIB_DEPS}
+DEPENDS += ${@base_contains('DISTRO_FEATURES', 'x11', '${PROTO_DEPS}', '', 
d)}
 
 PROVIDES = virtual/libgl virtual/libgles2 virtual/egl
 
@@ -31,8 +33,8 @@ 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)}
 
 # 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 0c5682c..4e025a0 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -8,7 +8,8 @@ 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}
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 000..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

[OE-core] [PATCH 12/12] mesa-demos: fix GLES2 build

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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..0685711 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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/12] mesa: no need to depend on python-native, the class does that

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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 e5e91a3..698f4fe 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 = r3
+INC_PR = r4
 PE = 2
 
 
@@ -20,7 +20,7 @@ PROTO_DEPS = xf86driproto glproto
 LIB_DEPS += ${@base_contains('DISTRO_FEATURES', 'x11', \
  'virtual/libx11 libxext libxxf86vm libxdamage libxfixes', '', d)}
 
-DEPENDS = libxml2-native makedepend-native python-native flex-native 
bison-native ${LIB_DEPS}
+DEPENDS = libxml2-native makedepend-native flex-native bison-native 
${LIB_DEPS}
 DEPENDS += ${@base_contains('DISTRO_FEATURES', 'x11', '${PROTO_DEPS}', '', 
d)}
 
 PROVIDES = virtual/libgl virtual/libgles2 virtual/egl
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/12] mesa: move glu.pc to libglu-dev

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 03/12] mesa: add --enable-shared-glapi, and package it in libglapi

2012-08-01 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 03/11] mesa: add --enable-shared-glapi, and package it in libglapi

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/11] mesa: Use 'require' instead of 'include'

2012-08-01 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

These include files are really required, not optional.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 00/11] Mesa upgrade/improvements V2

2012-08-01 Thread Ross Burton

Split out the meta-yocto changes, used PACKAGECONFIG (please review this
bit), dropped the gles feature, enabled glesv1.

Even if there is some debate over the latter GLES/EGL patches, it would be
good to see the earlier patches land.

The following changes since commit 3309cf42d314f0a26079a11836c6b9b9bb5f253e:

  package_rpm.bbclass: Accomodate dash when using arrays (2012-07-31 12:22:10 
+0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to ad0d7de863e412bb757f13e2d250fcab4e19dadb:

  mesa-demos: fix GLES2 build (2012-08-01 16:32:51 +0100)


Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (9):
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLES v1 and v2
  mesa: enable EGL, with DRM and X11 platforms
  mesa: respect x11 DISTRO_FEATURE
  mesa: no need to depend on python-native, the class does that
  mesa-demos: fix GLES2 build

 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   46 -
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   12 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc|   11 +++--
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb   |5 --
 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb  |5 ++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb|6 +--
 .../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 +++
 ...-gross-hack-to-prevent-from-install-libgl.patch |   29 +++
 meta/recipes-graphics/mesa/mesa/crossfix.patch |   18 ---
 meta/recipes-graphics/mesa/mesa/uclibc.patch   |   42 
 18 files changed, 210 insertions(+), 122 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-7.11.inc = mesa-8.0.4.inc} (60%)
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.11.bb = 
mesa-dri-glsl-native_8.0.4.bb} (84%)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
 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%)
 create mode 100644 
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/crossfix.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/uclibc.patch

Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (9):
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLES v1 and v2
  mesa: enable EGL, with DRM and X11 platforms
  mesa: respect x11 DISTRO_FEATURE
  mesa: no need to depend on python-native, the class does that
  mesa-demos: fix GLES2 build

 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   46 -
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   12 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc|   11 +++--
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb   |5 --
 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb  |5 ++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb|6 +--
 .../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

[OE-core] [PATCH 01/11] mesa: format the packages list nicely

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/11] mesa: enable the Graphic Buffer Manager library

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/11] mesa: Update to 8.0.4 (latest stable version)

2012-08-01 Thread Ross Burton

From: Damien Lespiau damien.lesp...@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.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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

[OE-core] [PATCH 02/11] mesa: move glu.pc to libglu-dev

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/11] mesa: enable GLES v1 and v2

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/11] mesa: respect x11 DISTRO_FEATURE

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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 000..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

[OE-core] [PATCH 08/11] mesa: enable EGL, with DRM and X11 platforms

2012-08-01 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 10/11] mesa: no need to depend on python-native, the class does that

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/11] mesa-demos: fix GLES2 build

2012-08-01 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 03/11] mesa: move glu.pc to libglu-dev

2012-08-02 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index da628b3..e508b6d 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 04/11] mesa: add --enable-shared-glapi, and package it in libglapi

2012-08-02 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index e508b6d..6582bcf 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,15 +44,18 @@ PACKAGES =+ libegl libegl-dev libegl-dbg \
  libglu libglu-dev \
  libosmesa libosmesa-dev \
  libgl libgl-dev \
+ libglapi libglapi-dev \
 
 
 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
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 05/11] mesa: enable the Graphic Buffer Manager library

2012-08-02 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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 6582bcf..ff9f882 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 \
+ libgbm libgbm-dev \
 
 
 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
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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 07/11] mesa: Use 'require' instead of 'include'

2012-08-02 Thread Ross Burton

From: Damien Lespiau damien.lesp...@intel.com

These include files are really required, not optional.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 08/11] mesa: enable GLES v1 and v2

2012-08-02 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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 aac3bbe..38b4ab0 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:
@@ -46,10 +46,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 +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}/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..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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 09/11] mesa-demos: fix GLES2 build

2012-08-02 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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 000..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.0 +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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 10/11] mesa: respect x11 DISTRO_FEATURE

2012-08-02 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-8.0.4.inc  |1 +
 meta/recipes-graphics/mesa/mesa-common.inc |   14 +-
 meta/recipes-graphics/mesa/mesa-git.inc|2 ++
 ...-gross-hack-to-prevent-from-install-libgl.patch |   29 
 4 files changed, 39 insertions(+), 7 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 38b4ab0..77107ab 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,9 +27,13 @@ inherit autotools pkgconfig pythonnative
 EXTRA_OECONF = --enable-glu \
 --disable-glw \
 --disable-glut \
---enable-glx-tls \
 --enable-shared-glapi
 
+PACKAGECONFIG ??= ${@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 000..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

[OE-core] [PATCH V3 00/11] Mesa upgrade/improvements

2012-08-02 Thread Ross Burton

Re-arranged and fixed up some problems.

The following changes since commit 62d42fe3cfa575cb97b484ccf7b2e9a25cc50770:

  tiny-init: Setup /dev/ptmx in init (2012-08-01 23:11:18 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to 5de29e150a720ccb8749362cfe5fb56f234fb385:

  mesa: enable EGL, with DRM and X11 platforms (2012-08-02 17:43:18 +0100)


Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (9):
  mesa: no need to depend on python-native, the class does that
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLES v1 and v2
  mesa-demos: fix GLES2 build
  mesa: respect x11 DISTRO_FEATURE
  mesa: enable EGL, with DRM and X11 platforms

 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   43 +++-
 .../mesa/mesa-demos/gles2-info.patch   |   15 ++
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   12 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc|   11 +++--
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb   |5 --
 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb  |5 ++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb|6 +--
 .../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 +++
 ...-gross-hack-to-prevent-from-install-libgl.patch |   29 +++
 meta/recipes-graphics/mesa/mesa/crossfix.patch |   18 ---
 meta/recipes-graphics/mesa/mesa/uclibc.patch   |   42 
 19 files changed, 222 insertions(+), 122 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-7.11.inc = mesa-8.0.4.inc} (60%)
 create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.11.bb = 
mesa-dri-glsl-native_8.0.4.bb} (84%)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
 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%)
 create mode 100644 
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/crossfix.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/uclibc.patch

Damien Lespiau (2):
  mesa: Update to 8.0.4 (latest stable version)
  mesa: Use 'require' instead of 'include'

Ross Burton (9):
  mesa: no need to depend on python-native, the class does that
  mesa: format the packages list nicely
  mesa: move glu.pc to libglu-dev
  mesa: add --enable-shared-glapi, and package it in libglapi
  mesa: enable the Graphic Buffer Manager library
  mesa: enable GLES v1 and v2
  mesa-demos: fix GLES2 build
  mesa: respect x11 DISTRO_FEATURE
  mesa: enable EGL, with DRM and X11 platforms

 .../mesa/{mesa-7.11.inc = mesa-8.0.4.inc} |   14 +++---
 meta/recipes-graphics/mesa/mesa-common.inc |   43 +++-
 .../mesa/mesa-demos/gles2-info.patch   |   15 ++
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +-
 ...ative_7.11.bb = mesa-dri-glsl-native_8.0.4.bb} |4 +-
 meta/recipes-graphics/mesa/mesa-dri.inc|   12 -
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 --
 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb   |4 ++
 meta/recipes-graphics/mesa/mesa-dri_git.bb |6 +--
 meta/recipes-graphics/mesa/mesa-git.inc|   11 +++--
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb   |5 --
 meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb  |5 ++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb|6 +--
 .../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

[OE-core] [PATCH V3 11/11] mesa: enable EGL, with DRM and X11 platforms

2012-08-02 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |7 ---
 meta/recipes-graphics/mesa/mesa-dri.inc|7 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index 77107ab..b0d7a9e 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:
@@ -29,7 +29,8 @@ EXTRA_OECONF = --enable-glu \
 --disable-glut \
 --enable-shared-glapi
 
-PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+   ${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', d)}
 
 X11_DEPS = xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage 
libxfixes
 PACKAGECONFIG[x11] = --enable-glx-tls,--disable-glx,${X11_DEPS}
@@ -59,7 +60,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..35d17a4 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
+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 += --disable-egl --enable-gbm
+EXTRA_OECONF += --enable-gbm
+
+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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3 06/11] mesa: Update to 8.0.4 (latest stable version)

2012-08-02 Thread Ross Burton

From: Damien Lespiau damien.lesp...@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.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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 ff9f882..aac3bbe 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

[OE-core] [PATCH V3 02/11] mesa: format the packages list nicely

2012-08-02 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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 403a961..da628b3 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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH V3 00/11] Mesa upgrade/improvements

2012-08-02 Thread Ross Burton

On Thursday, 2 August 2012 at 19:38, Koen Kooi wrote:
 This will still break every platform with a binary libegl and libgles.

That is true and I'm all ears for suggestions. My best proposal so far is to 
let a package hint a prefix to the Debian renamer, so these packages get 
renamed to libmesa-gl, libmesa-egl, etc.

That said I'm very curious how every platform with a binary libgl isn't already 
broken.  If that works for some reason then voila we have a solution, and if 
they are already broken then we're not breaking it any more than it was already 
broken.

Ross



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH V3 00/11] Mesa upgrade/improvements

2012-08-03 Thread Ross Burton

On Friday, 3 August 2012 at 11:18, Koen Kooi wrote:
libegl and libgles aren't built nowadays, so the problem is avoided. Noone
has dared to touch this subject the past 2.5 years:
http://cgit.openembedded.org/openembedded/commit/recipes/mesa?id=3d96f8cb61225d515b5cb4fe863f0d50c3ced436

The best solution[1] is to disable egl/gles in the mesa-recipes and add a
seperate recipe for them. That way you still get glu and other useful mesa
bits needed for gnome/efl/xfce/etc, but you can skip the sysroot/shlib
poisoning if needed.
After much digging I see that the Beagle PVR drivers only provide gles and egl,
which is why you say that the problem was avoided. Of course that's just one
specific driver, for example the Cedar Trail EMGD driver does build libgl,
libgles and libegl.

If the solution is put the egl/gles bits in another package then I'm totally
confused as to what the actual problem is. Considering there's numerous libegl
libraries for the many variants of PVR on ARM, I'm struggling to understand
exactly what is new here.

Can you explain clearly what the problem is, I'm obviously missing something.
Once I understand the problem I can help with a solution.
[1] The best solution if of course getting sgx support into mesa, but nothing
is happening on that front apart from some posturing on the fsf side, no
actual code.

HahahHAHAHAHahha. (wipes tears from eyes) The FSF can posture all they want
(wasn't aware they'd done that as the code is clearly closed source), but I
can't see Imagination opening all their code any day soon.

Cheers,
Ross

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/8] Enable EGL and GLES in x86 Mesa

2012-08-13 Thread Ross Burton

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

 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

-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/8] base.bbclass: fix PACKAGECONFIG handling code

2012-08-13 Thread Ross Burton

From: Yao Zhao yao.z...@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.z...@windriver.com
Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 6/8] mesa-demos: fix GLES2 build

2012-08-13 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@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 000..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.0 +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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/8] mesa: enable GLES v1 and v2

2012-08-13 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/8] mesa: Add a mesa-dri-glsl-native_git recipe

2012-08-13 Thread Ross Burton

From: Damien Lespiau damien.lesp...@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.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@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 000..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 000..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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 7/8] mesa: respect x11 DISTRO_FEATURE

2012-08-13 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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 000..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

[OE-core] [PATCH 5/8] core: Prefer mesa-dri as virtual/libopengles1/2 provider

2012-08-13 Thread Ross Burton

From: Damien Lespiau damien.lesp...@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.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/8] clutter: DOLT isn't used anymore

2012-08-13 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 8/8] mesa: enable EGL, with DRM and X11 platforms

2012-08-13 Thread Ross Burton

Patch originally by Damien Lespiau damien.lesp...@intel.com.

Signed-off-by: Ross Burton ross.bur...@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


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] owl-video: patches pushed upstream, so bump srcrev

2012-08-13 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../owl-video/gtk_multithread_safe.patch   |   40 
 .../owl-video-widget/owl-video/make-382.patch  |   17 -
 .../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++--
 3 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 
meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch

diff --git 
a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch 
b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
deleted file mode 100644
index 437f72b..000
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
-
-If the video player tries to play an unknown type file, it will enter
-the error_cb() function, which is called in another thread.
-Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
-multi-thread operation.
-
-Signed-off-by: Dongxiao Xu dongxiao...@intel.com
-
-Upstream-Status: Pending
-
-diff -ruN video-orig/src/video.c video/src/video.c
 video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
-+++ video/src/video.c  2010-10-15 16:25:51.780296717 +0800
-@@ -96,6 +96,7 @@
- {
- GtkWidget *dialog;
- 
-+gdk_threads_enter();
- dialog = gtk_message_dialog_new (data-window,
-  GTK_DIALOG_NO_SEPARATOR,
-  GTK_MESSAGE_ERROR,
-@@ -103,6 +104,7 @@
-  error-message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-+gdk_threads_leave();
- }
- 
- /**
-@@ -606,7 +608,9 @@
- 
- gtk_widget_show_all (GTK_WIDGET (data-window));
- 
-+gdk_threads_enter();
- gtk_main ();
-+gdk_threads_leave();
- 
- /**
-  * Cleanup.
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch 
b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
deleted file mode 100644
index d219c31..000
--- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make 3.82 is much stricter and demands tabs. Obey.
-
-JL - 15/12/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: video/Makefile.am
-===
 video.orig/Makefile.am
-+++ video/Makefile.am
-@@ -4,5 +4,5 @@ SUBDIRS = src
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure 
depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh 
Makefile.in missing
- 
- snapshot:
--$(MAKE) dist distdir=$(PACKAGE)-snap`date +%Y%m%d`
-+  $(MAKE) dist distdir=$(PACKAGE)-snap`date +%Y%m%d`
- 
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb 
b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index bc63273..ae08383 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -8,22 +8,20 @@ LIC_FILES_CHKSUM = 
file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
 SECTION = x11
 DEPENDS = libowl-av
 
-SRCREV = f133472318970796fae1ea3e98ac062156768baf
+SRCREV = 07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d
 PV = 0.1+git${SRCPV}
-PR = r1
+PR = r2
 
 S = ${WORKDIR}/git
 
 SRC_URI = git://git.yoctoproject.org/${BPN};protocol=git \
-   file://gtk_multithread_safe.patch \
file://owl-video-widget.png \
file://stock_media-play.png \
file://stock_volume-0.png \
file://stock_volume-min.png \
file://stock_volume-med.png \
file://stock_volume-max.png \
-   file://owl-video-widget.desktop \
-  file://make-382.patch
+   file://owl-video-widget.desktop
 
 inherit autotools pkgconfig
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] libowl updates

2012-08-13 Thread Ross Burton

Patches were merged upstream, so drop them and bump srcrev.

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/owl

for you to fetch changes up to d3e664ba768f4485f8d7984a86c571cf43815497:

  libowl-av: patches merged upstream, bump srcrev (2012-08-10 15:47:00 +0300)


Ross Burton (2):
  owl-video: patches pushed upstream, so bump srcrev
  libowl-av: patches merged upstream, bump srcrev

 .../libowl-av/gst_change_state.patch   |   42 
 .../owl-video-widget/libowl-av/make-382.patch  |   13 --
 .../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++--
 .../owl-video/gtk_multithread_safe.patch   |   40 ---
 .../owl-video-widget/owl-video/make-382.patch  |   17 
 .../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++--
 6 files changed, 6 insertions(+), 122 deletions(-)
 delete mode 100644 
meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
 delete mode 100644 
meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch

Ross Burton (2):
  owl-video: patches pushed upstream, so bump srcrev
  libowl-av: patches merged upstream, bump srcrev

 .../libowl-av/gst_change_state.patch   |   42 
 .../owl-video-widget/libowl-av/make-382.patch  |   13 --
 .../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++--
 .../owl-video/gtk_multithread_safe.patch   |   40 ---
 .../owl-video-widget/owl-video/make-382.patch  |   17 
 .../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++--
 6 files changed, 6 insertions(+), 122 deletions(-)
 delete mode 100644 
meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
 delete mode 100644 
meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch

-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] libowl-av: patches merged upstream, bump srcrev

2012-08-13 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../libowl-av/gst_change_state.patch   |   42 
 .../owl-video-widget/libowl-av/make-382.patch  |   13 --
 .../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++--
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 
meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
 delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch

diff --git 
a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch 
b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
deleted file mode 100644
index 5bc279a..000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix music player crash if adding unknown type files.
-
-Using bus message to call function flush_head/feed_head in main thread
-to protect private data operation.
-
-A better fix may be to listen to bus message CODEC_NOT_FOUND and
-MISSING_PLUGIN directly to avoid hooking into unknown-type signal.
-We will revisit it in next period.
-
-Signed-off-by: Dongxiao Xu dongxiao...@intel.com
-
-Upstream-Status: Pending
-
-diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c 
libowl-av/libowl-av/owl-tag-reader.c
 libowl-av-orig/libowl-av/owl-tag-reader.c  2010-10-12 14:30:26.0 
+0800
-+++ libowl-av/libowl-av/owl-tag-reader.c   2010-10-12 14:32:39.0 
+0800
-@@ -300,13 +300,23 @@
-GstCaps  *caps,
-OwlTagReader *tag_reader)
- {
-+GstMessage *message;
-+GstBus *bus;
-+
- tag_reader-priv-current_error =
- g_error_new (OWL_TAG_READER_ERROR,
-  OWL_TAG_READER_ERROR_UNKNOWN_TYPE,
-  Unknown type);
- 
--flush_head (tag_reader);
--feed_head (tag_reader);
-+/**
-+ * Post a message to the bus, as we are in another thread here.
-+ **/
-+message = gst_message_new_error(GST_OBJECT (decodebin),
-+tag_reader-priv-current_error, 
NULL);
-+
-+bus = gst_pipeline_get_bus (GST_PIPELINE 
(tag_reader-priv-pipeline));
-+gst_bus_post (bus, message);
-+gst_object_unref (GST_OBJECT (bus));
- }
- 
- /**
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch 
b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
deleted file mode 100644
index a8be781..000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libowl-av/Makefile.am
-===
 libowl-av.orig/Makefile.am
-+++ libowl-av/Makefile.am
-@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure 
depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh 
Makefile.in missing
- 
- snapshot:
--$(MAKE) dist distdir=$(PACKAGE)-snap`date +%Y%m%d`
-+  $(MAKE) dist distdir=$(PACKAGE)-snap`date +%Y%m%d`
- 
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb 
b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
index 4413d38..62a4a7d 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
@@ -12,14 +12,12 @@ DEPENDS = gtk+ gstreamer gst-plugins-base
 RDEPENDS_${PN} = gst-meta-base
 RRECOMMENDS_${PN} = gst-meta-audio gst-meta-video
 
-SRCREV = 1379fd230a32509e94971961183f1031f469737a
+SRCREV = 03030c41ea578cfa74a2ffceb875675b248318ae
 PV = 0.1+git${SRCPV}
-PR = r2
+PR = r3
 
 
-SRC_URI = git://git.yoctoproject.org/${BPN};protocol=git \
-   file://gst_change_state.patch \
-  file://make-382.patch
+SRC_URI = git://git.yoctoproject.org/${BPN};protocol=git
 
 S = ${WORKDIR}/git
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] Remove older GTK+ versions

2012-08-17 Thread Ross Burton

Remove the very old versions of GTK+ 2.x that we don't build.  They were
kept for their patches, but the patches don't apply anymore because the
relevant code has changed dramatically.

If someone still wants to use them, meta-oe is a better place for them to
live.

Ross

The following changes since commit af847d36375aa53f0c1ee2a00c97ba9f38837d1b:

  bitbake: bitbake: build.py: Add stampdir argument to cached_mtime_noerror 
(2012-08-16 12:27:41 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/gtk2

for you to fetch changes up to f6cf7bda28c1ae5f9033863f70657e1970b6bdc9:

  gtk+ remove 2.16.6 (2012-08-17 12:29:59 +0100)


Ross Burton (2):
  gtk+: remove 2.12.7
  gtk+ remove 2.16.6

 .../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch  |   34 -
 .../gtk+/gtk+-2.12.7/combo-arrow-size.patch|   69 -
 .../gtk+/gtk+-2.12.7/disable-print.patch   |   28 -
 .../gtk+/gtk+-2.12.7/entry-cairo.patch |  105 -
 .../gtk+/gtk+-2.12.7/filechooser-default.patch | 9523 
 .../gtk+/gtk+-2.12.7/filechooser-props.patch   |   59 -
 .../gtk+/gtk+-2.12.7/filechooser-sizefix.patch |   37 -
 .../gtk+/gtk+-2.12.7/filesystem-volumes.patch  |  200 -
 .../gtk+/gtk+-2.12.7/gtklabel-resize-patch |   12 -
 .../gtk+/gtk+-2.12.7/hardcoded_libtool.patch   |   31 -
 .../gtk+/gtk+-2.12.7/menu-deactivate.patch |   53 -
 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch |   12 -
 .../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff   | 2458 -
 .../gtk+/gtk+-2.12.7/range-no-redraw.patch |  130 -
 .../gtk+/gtk+-2.12.7/run-iconcache.patch   |   21 -
 .../gtk+/gtk+-2.12.7/scrolled-placement.patch  |   24 -
 .../gtk+/gtk+-2.12.7/toggle-font.diff  |  102 -
 .../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch |   18 -
 ...Duplicate-the-exec-string-returned-by-gtk.patch |   33 -
 .../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch  |   34 -
 .../gtk+-2.16.6/disable-gio-png-sniff-test.diff|   99 -
 .../gtk+/gtk+-2.16.6/entry-cairo.patch |  105 -
 .../gtk+/gtk+-2.16.6/hardcoded_libtool.patch   |   33 -
 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch |   12 -
 .../gtk+/gtk+-2.16.6/run-iconcache.patch   |   21 -
 .../gtk+/gtk+-2.16.6/toggle-font.diff  |  102 -
 .../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch |   18 -
 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb |   49 -
 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb |   49 -
 29 files changed, 13471 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb

Ross Burton (2):
  gtk+: remove 2.12.7
  gtk+ remove 2.16.6

 .../gtk+/gtk+-2.12.7/cellrenderer

[OE-core] [PATCH 2/2] gtk+ remove 2.16.6

2012-08-17 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 ...Duplicate-the-exec-string-returned-by-gtk.patch |   33 --
 .../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch  |   34 ---
 .../gtk+-2.16.6/disable-gio-png-sniff-test.diff|   99 --
 .../gtk+/gtk+-2.16.6/entry-cairo.patch |  105 
 .../gtk+/gtk+-2.16.6/hardcoded_libtool.patch   |   33 --
 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch |   12 ---
 .../gtk+/gtk+-2.16.6/run-iconcache.patch   |   21 
 .../gtk+/gtk+-2.16.6/toggle-font.diff  |  102 ---
 .../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch |   18 
 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb |   49 -
 10 files changed, 506 deletions(-)
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
 delete mode 100644 
meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb

diff --git 
a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 
b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
deleted file mode 100644
index 7d39a77..000
--- 
a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001
-From: Rob Bradford r...@linux.intel.com
-Date: Thu, 4 Jun 2009 15:43:20 +0100
-Subject: [PATCH] 
=?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This function states that the caller is responsible for freeing the string
-passed returned by reference. Unfortunately if you do this you get a crash
-since the internal value is returned without being duplicated.

- gtk/gtkrecentmanager.c |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Upstream-Status: Pending
-
-diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
-index 317b3d5..d062572 100644
 a/gtk/gtkrecentmanager.c
-+++ b/gtk/gtkrecentmanager.c
-@@ -1764,7 +1764,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo  
*info,
- }
-   
-   if (app_exec)
--*app_exec = ai-exec;
-+*app_exec = g_strdup (ai-exec);
-   
-   if (count)
- *count = ai-count;
--- 
-1.6.3.1
-
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch 
b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
deleted file mode 100644
index 2524b99..000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkcellrenderer.c
-===
-RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
-retrieving revision 1.55
-diff -u -r1.55 gtkcellrenderer.c
 gtk/gtkcellrenderer.c  14 May 2006 04:25:28 -  1.55
-+++ gtk/gtkcellrenderer.c  30 Jun 2006 10:57:43 -
-@@ -551,6 +551,7 @@
- 
-   if (cell-cell_background_set  !selected)
- {
-+#ifdef USE_CAIRO_INTERNALLY
-   cairo_t *cr = gdk_cairo_create (window);
- 
-   gdk_cairo_rectangle (cr, background_area);
-@@ -558,6 +559,16 @@
-   cairo_fill (cr);
-   
-   cairo_destroy (cr);
-+#else
-+  GdkGC *gc;
-+
-+  gc = gdk_gc_new (window);
-+  gdk_gc_set_rgb_fg_color (gc, priv-cell_background);
-+  gdk_draw_rectangle (window, gc, TRUE,
-+  background_area-x, background_area-y,
-+  background_area-width, background_area-height);
-+  g_object_unref (gc);
-+#endif
- }
- 
-   GTK_CELL_RENDERER_GET_CLASS (cell)-render (cell,
diff --git 
a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff 
b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
deleted file mode 100644
index c777b8e..000
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
+++ /dev/null
@@ -1,99 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: gtk+-2.14.2/configure.in
-===
 gtk+-2.14.2.orig/configure.in  2008-09-23 16:32

[OE-core] [PATCH] mesa: clean up PACKAGECONFIG

2012-08-20 Thread Ross Burton

Use machine overrides instead of machine features.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/mesa/mesa-common.inc |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc 
b/meta/recipes-graphics/mesa/mesa-common.inc
index de171f0..cfe4a37 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 = r2
+INC_PR = r3
 PE = 2
 
 DEPENDS = libxml2-native makedepend-native flex-native bison-native
@@ -29,9 +29,8 @@ EXTRA_OECONF = --enable-glu \
 --disable-glut \
 --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)}
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
+PACKAGECONFIG_append_x86 =  gles egl
 
 X11_DEPS = xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage 
libxfixes
 PACKAGECONFIG[x11] = --enable-glx-tls,--disable-glx,${X11_DEPS}
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gail: remove

2012-08-29 Thread Ross Burton

This functionality was integrated into GTK+ 2.13 and we've dropped support for
anything before that.

[ YOCTO #2954 ]

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-gnome/gnome/gail_1.20.2.bb |   19 ---
 1 file changed, 19 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gail_1.20.2.bb

diff --git a/meta/recipes-gnome/gnome/gail_1.20.2.bb 
b/meta/recipes-gnome/gnome/gail_1.20.2.bb
deleted file mode 100644
index df6cd03..000
--- a/meta/recipes-gnome/gnome/gail_1.20.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = GNOME Accessibility Implementation Library
-SECTION = x11/libs
-
-DEPENDS = gtk+
-PROVIDES = virtual/gail
-
-LICENSE = LGPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7
-
-PR = r2
-
-inherit gnome gtk-doc
-
-SRC_URI[archive.md5sum] = e805806f897cf6040e1f3e9c0cd2151b
-SRC_URI[archive.sha256sum] = 
5025b13a4f3b960c8ab7c3e5c7d6d86082e2e1af6ee18e61e37fd4ce3dcc0153
-
-FILES_${PN} += ${libdir}/gtk-2.0/modules/*.so
-FILES_${PN}-dbg += ${libdir}/gtk-2.0/modules/.debug
-
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] tzdata fixes

2012-08-29 Thread Ross Burton

tzdata is missing a file to make the local timezone detection actually work in
many programs, and isn't architecture specific.

The following changes since commit 603f6c631e9454d10517599e229943f2b26d08a5:

  atom-pc: Drop glibc --with-tls option, its now the only option for glibc 
(2012-08-21 12:15:33 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/tz

for you to fetch changes up to ba35808d6976ff17d3732ffcdb56e71f8014137c:

  tzdata: install /etc/localtime alongside /etc/timezone (2012-08-29 15:21:48 
+0100)


Ross Burton (2):
  tzdata: this package isn't architecture specific
  tzdata: install /etc/localtime alongside /etc/timezone

 meta/recipes-extended/tzdata/tzdata_2012d.bb |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Ross Burton (2):
  tzdata: this package isn't architecture specific
  tzdata: install /etc/localtime alongside /etc/timezone

 meta/recipes-extended/tzdata/tzdata_2012d.bb |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] tzdata: this package isn't architecture specific

2012-08-29 Thread Ross Burton

The data files are compiled to a binary but architecture-independent format, so
this package can be allarch.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-extended/tzdata/tzdata_2012d.bb |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/tzdata/tzdata_2012d.bb 
b/meta/recipes-extended/tzdata/tzdata_2012d.bb
index 605bf24..31e1266 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012d.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb
@@ -5,7 +5,9 @@ LICENSE = PD
 LIC_FILES_CHKSUM = 
file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234
 DEPENDS = tzcode-native
 
-PR = r0
+PR = r1
+
+inherit allarch
 
 RCONFLICTS_${PN} = timezones timezone-africa timezone-america 
timezone-antarctica \
  timezone-arctic timezone-asia timezone-atlantic \
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] tzdata: install /etc/localtime alongside /etc/timezone

2012-08-29 Thread Ross Burton

Lots of code (such a GLib) expects this to exist and link to the current
timezone data.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-extended/tzdata/tzdata_2012d.bb |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/tzdata/tzdata_2012d.bb 
b/meta/recipes-extended/tzdata/tzdata_2012d.bb
index 31e1266..9741101 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012d.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb
@@ -5,7 +5,7 @@ LICENSE = PD
 LIC_FILES_CHKSUM = 
file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234
 DEPENDS = tzcode-native
 
-PR = r1
+PR = r2
 
 inherit allarch
 
@@ -49,6 +49,7 @@ do_install () {
 # Install default timezone
 install -d ${D}${sysconfdir}
 echo ${DEFAULT_TIMEZONE}  ${D}${sysconfdir}/timezone
+ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} 
${D}${sysconfdir}/localtime
 
 chown -R root:root ${D}
 }
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] tzdata: install /etc/localtime alongside /etc/timezone

2012-08-29 Thread Ross Burton

Lots of code (such a GLib) expects this to exist and link to the current
timezone data.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-extended/tzdata/tzdata_2012d.bb |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/tzdata/tzdata_2012d.bb 
b/meta/recipes-extended/tzdata/tzdata_2012d.bb
index 31e1266..49ad2de 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012d.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb
@@ -5,7 +5,7 @@ LICENSE = PD
 LIC_FILES_CHKSUM = 
file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234
 DEPENDS = tzcode-native
 
-PR = r1
+PR = r2
 
 inherit allarch
 
@@ -49,6 +49,7 @@ do_install () {
 # Install default timezone
 install -d ${D}${sysconfdir}
 echo ${DEFAULT_TIMEZONE}  ${D}${sysconfdir}/timezone
+cp -pP ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} 
${D}${sysconfdir}/localtime
 
 chown -R root:root ${D}
 }
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] task-core-x11: default to xserver-xorg instead of kdrive

2012-08-29 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-sato/tasks/task-core-x11-mini.bb |2 +-
 meta/recipes-sato/tasks/task-core-x11.bb  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb 
b/meta/recipes-sato/tasks/task-core-x11-mini.bb
index 98189fe..ad736b9 100644
--- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-mini.bb
@@ -16,7 +16,7 @@ PACKAGES = \
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-XSERVER ?= xserver-kdrive-fbdev
+XSERVER ?= xserver-xorg xf86-video-fbdev xf86-input-evdev
 
 ALLOW_EMPTY = 1
 
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb 
b/meta/recipes-sato/tasks/task-core-x11.bb
index f1b06f9..00e3c0c 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -22,7 +22,7 @@ PACKAGES = \
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-XSERVER ?= xserver-kdrive-fbdev
+XSERVER ?= xserver-xorg xf86-video-fbdev xf86-input-evdev
 
 ALLOW_EMPTY = 1
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

2012-08-29 Thread Ross Burton

EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
it's being used.  Note that it's dynamically loaded so the automatic library
dependencies won't catch this, but as far as I'm aware nothing on oe-core or
meta-oe is using EXA.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 017ac91..b588c11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,5 @@ SRC_URI += file://crosscompile.patch \
 SRC_URI[md5sum] = 8796fff441e5435ee36a72579008af24
 SRC_URI[sha256sum] = 
fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 
-PR = r4
+PR = r5
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 98f3d14..738ccb3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -29,6 +29,7 @@ DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} font-util
 # Split out some modules and extensions from the main package
 # These aren't needed for basic operations and only take up space:
 #  32.0k   libdri.so
+#  91.0k   libexa.so
 #  336.0k  libglx.so
 #  1360k   libint10.so
 #  180.0k  libwfb.so
@@ -58,6 +59,7 @@ PACKAGES =+ ${PN}-security-policy \
  ${PN}-module-libwfb  \
  ${PN}-module-libmfb \
  ${PN}-module-libcfb \
+ ${PN}-module-exa \
  ${PN}-module-xaa \
  ${PN}-module-libxf1bpp \
  ${PN}-module-libxf4bpp
@@ -91,6 +93,7 @@ FILES_${PN}-module-libafb = ${libdir}/xorg/modules/libafb.so
 FILES_${PN}-module-libwfb = ${libdir}/xorg/modules/libwfb.so
 FILES_${PN}-module-libmfb = ${libdir}/xorg/modules/libmfb.so
 FILES_${PN}-module-libcfb = ${libdir}/xorg/modules/libcfb.so
+FILES_${PN}-module-exa = ${libdir}/xorg/modules/libexa.so
 FILES_${PN}-module-xaa = ${libdir}/xorg/modules/libxaa.so
 FILES_${PN}-module-libxf1bpp = ${libdir}/xorg/modules/libxf1bpp.so
 FILES_${PN}-module-libxf4bpp = ${libdir}/xorg/modules/libxf4bpp.so
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC] [PATCH] xserver-kdrive: remove.

2012-08-29 Thread Ross Burton

Hi,

This is the interesting bit of an in-progress branch to purge kdrive from
oe-core.  The commit message for some context:

xserver-kdrive: remove.

kdrive is effectively unmaintained upstream (it's only kept for Xephyr).

Apart from two headless machines in meta-yocto (patches sent), every BSP I
looked at (oe-core, meta-intel, meta-oe, meta-ti, meta-smartphone) is using 
the
traditional X.org X server.  Changing kdrive to Xorg means an extra ~200kb 
of
disk usage but extra features and more importantly continued maintenance.

I hope to finish the branch tomorrow and send it for review.

Ross

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] glib-2.0: don't disable all debugging functionality

2012-08-30 Thread Ross Burton

GLib will use minimal debugging on non-development builds and the extra safety
net and ability to debug at all is totally worth the small performance cost.

If someone has a need for every ounce of performance, a simple .bbappend can
restore this option.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb |2 +-
 meta/recipes-core/glib-2.0/glib.inc   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb 
b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
index 8f7cd69..7bc97d68 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = r4
+PR = r5
 PE = 1
 
 DEPENDS += libffi python-argparse-native zlib
diff --git a/meta/recipes-core/glib-2.0/glib.inc 
b/meta/recipes-core/glib-2.0/glib.inc
index 3540cd5..9dca440 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,7 +27,7 @@ S = ${WORKDIR}/glib-${PV}
 
 CORECONF = --disable-dtrace --disable-fam --disable-libelf 
--disable-systemtap
 
-EXTRA_OECONF = --disable-debug --enable-included-printf=no ${CORECONF}
+EXTRA_OECONF = --enable-included-printf=no ${CORECONF}
 EXTRA_OECONF_virtclass-native = ${CORECONF}
 EXTRA_OECONF_linuxstdbase = --enable-included-printf=no ${CORECONF}
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/6] bsp: set default XSERVER for PowerPC and MIPS machines to Xorg

2012-08-30 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../substrate/target/arch/mips/conf/machine/{{=machine}}.conf   |7 +--
 .../target/arch/powerpc/conf/machine/{{=machine}}.conf  |7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf 
b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
index ae27fe6..b7c86e8 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf
@@ -17,8 +17,11 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= 
{{=preferred_kernel_version}}%
 
 {{ input type:boolean name:xserver prio:50 msg:Do you need support for 
X? (y/n) default:y }}
 {{ if xserver == y: }}
-PREFERRED_PROVIDER_virtual/xserver = xserver-kdrive
-XSERVER = xserver-kdrive-fbdev
+PREFERRED_PROVIDER_virtual/xserver = xserver-xorg
+XSERVER = xserver-xorg \
+   xserver-xorg-extension-extmod \
+   xf86-input-evdev \
+   xf86-video-fbdev
 
 SERIAL_CONSOLE = 115200 ttyS0
 
diff --git 
a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf 
b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
index 18f5247..cbf3c32 100644
--- 
a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
+++ 
b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
@@ -41,8 +41,11 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= 
{{=preferred_kernel_version}}%
 
 {{ input type:boolean name:xserver prio:50 msg:Do you need support for 
X? (y/n) default:y }}
 {{ if xserver == y: }}
-PREFERRED_PROVIDER_virtual/xserver = xserver-kdrive
-XSERVER = xserver-kdrive-fbdev
+PREFERRED_PROVIDER_virtual/xserver = xserver-xorg
+XSERVER = xserver-xorg \
+   xserver-xorg-extension-extmod \
+   xf86-input-evdev \
+   xf86-video-fbdev
 
 {{ input type:edit name:uboot_entrypoint prio:40 msg:Please specify a 
value for UBOOT_ENTRYPOINT: default:0x }}
 UBOOT_ENTRYPOINT = {{=uboot_entrypoint}}
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/6] xserver-xorg: ship the exa module in a separate package

2012-08-30 Thread Ross Burton

EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
it's being used.  Note that it's dynamically loaded so the automatic library
dependencies won't catch this, but as far as I'm aware nothing on oe-core or
meta-oe is using EXA.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 017ac91..b588c11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,5 @@ SRC_URI += file://crosscompile.patch \
 SRC_URI[md5sum] = 8796fff441e5435ee36a72579008af24
 SRC_URI[sha256sum] = 
fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 
-PR = r4
+PR = r5
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 98f3d14..738ccb3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -29,6 +29,7 @@ DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} font-util
 # Split out some modules and extensions from the main package
 # These aren't needed for basic operations and only take up space:
 #  32.0k   libdri.so
+#  91.0k   libexa.so
 #  336.0k  libglx.so
 #  1360k   libint10.so
 #  180.0k  libwfb.so
@@ -58,6 +59,7 @@ PACKAGES =+ ${PN}-security-policy \
  ${PN}-module-libwfb  \
  ${PN}-module-libmfb \
  ${PN}-module-libcfb \
+ ${PN}-module-exa \
  ${PN}-module-xaa \
  ${PN}-module-libxf1bpp \
  ${PN}-module-libxf4bpp
@@ -91,6 +93,7 @@ FILES_${PN}-module-libafb = ${libdir}/xorg/modules/libafb.so
 FILES_${PN}-module-libwfb = ${libdir}/xorg/modules/libwfb.so
 FILES_${PN}-module-libmfb = ${libdir}/xorg/modules/libmfb.so
 FILES_${PN}-module-libcfb = ${libdir}/xorg/modules/libcfb.so
+FILES_${PN}-module-exa = ${libdir}/xorg/modules/libexa.so
 FILES_${PN}-module-xaa = ${libdir}/xorg/modules/libxaa.so
 FILES_${PN}-module-libxf1bpp = ${libdir}/xorg/modules/libxf1bpp.so
 FILES_${PN}-module-libxf4bpp = ${libdir}/xorg/modules/libxf4bpp.so
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/6] task-core-x11: default to xserver-xorg instead of kdrive

2012-08-30 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-sato/tasks/task-core-x11-mini.bb |4 ++--
 meta/recipes-sato/tasks/task-core-x11.bb  |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb 
b/meta/recipes-sato/tasks/task-core-x11-mini.bb
index 98189fe..0aed286 100644
--- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-mini.bb
@@ -6,7 +6,7 @@ DESCRIPTION = Tasks for core X11 applications
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PR = r0
+PR = r1
 
 PACKAGES = \
 task-core-x11-mini \
@@ -16,7 +16,7 @@ PACKAGES = \
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-XSERVER ?= xserver-kdrive-fbdev
+XSERVER ?= xserver-xorg xf86-video-fbdev xf86-input-evdev
 
 ALLOW_EMPTY = 1
 
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb 
b/meta/recipes-sato/tasks/task-core-x11.bb
index f1b06f9..764ea02 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -6,7 +6,7 @@ DESCRIPTION = Tasks for core X11 applications
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PR = r35
+PR = r36
 
 PACKAGES = \
 task-core-apps-x11-core \
@@ -22,7 +22,7 @@ PACKAGES = \
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-XSERVER ?= xserver-kdrive-fbdev
+XSERVER ?= xserver-xorg xf86-video-fbdev xf86-input-evdev
 
 ALLOW_EMPTY = 1
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 6/6] x11-common: don't prune .svn directories on install, we're in git now

2012-08-30 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb 
b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 6a04cfb..49de5a3 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = Common X11 scripts and configuration files
 LICENSE = GPLv2
 LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
 SECTION = x11
-PR = r46
+PR = r47
 
 SRC_URI = file://etc \
file://gplv2-license.patch
@@ -14,7 +14,6 @@ inherit allarch
 do_install() {
cp -R ${S}/etc ${D}${sysconfdir}
chmod -R 755 ${D}${sysconfdir}
-   find ${D}${sysconfdir} -type d -name .svn -prune -exec rm -rf {} \;
find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \;
 }
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] xserver-xorg: remove HAL option, nothing uses HAL anymore

2012-09-03 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 738ccb3..404c488 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -120,7 +120,6 @@ EXTRA_OECONF += --with-fop=no \
 
 
 PACKAGECONFIG ??= udev
-PACKAGECONFIG[hal] = --enable-config-hal,--disable-config-hal,,hal
 PACKAGECONFIG[udev] = --enable-config-udev,--disable-config-udev,udev
 
 do_install_append () {
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature

2012-09-04 Thread Ross Burton

If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |3 +--
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |5 -
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc|6 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b588c11..b4a348c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,4 @@ SRC_URI += file://crosscompile.patch \
 SRC_URI[md5sum] = 8796fff441e5435ee36a72579008af24
 SRC_URI[sha256sum] = 
fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 
-PR = r5
-
+PR = r6
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 404c488..94e83ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -119,8 +119,11 @@ EXTRA_OECONF += --with-fop=no \
  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 
 
-PACKAGECONFIG ??= udev
+PACKAGECONFIG ??= udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', 
'', d)}
 PACKAGECONFIG[udev] = --enable-config-udev,--disable-config-udev,udev
+PACKAGECONFIG[glx] = --enable-dri --enable-dri2 --enable-glx 
--enable-glx-tls,\
+  --disable-dri --disable-glx,\
+  xf86driproto dri2proto mesa-dri
 
 do_install_append () {
# Its assumed base-files creates this for us
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index ca7d33a..1322cfc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,12 +1,6 @@
 require xserver-xorg-common.inc
 
-PROTO_DEPS += xf86driproto dri2proto
-LIB_DEPS += mesa-dri
-
 EXTRA_OECONF += \
- --enable-dri \
- --enable-dri2 \
- --enable-glx-tls \
  --with-pic \
  --with-int10=x86emu \
  --without-xmlto \
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] xserver-xorg-common: add RREPLACES on xserver-xorg to -module-exa

2012-09-05 Thread Ross Burton

As the file moved from xserver-xorg to xserver-xorg-module-exa, the latter needs
to replace the former to ensure a smooth migration when upgrading the
packages.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |3 +--
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b588c11..b4a348c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,4 @@ SRC_URI += file://crosscompile.patch \
 SRC_URI[md5sum] = 8796fff441e5435ee36a72579008af24
 SRC_URI[sha256sum] = 
fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 
-PR = r5
-
+PR = r6
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 404c488..6133344 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -66,6 +66,7 @@ PACKAGES =+ ${PN}-security-policy \
 
 RRECOMMENDS_${PN} += ${PN}-security-policy xkeyboard-config rgb 
xserver-xf86-config
 RDEPENDS_${PN}-xvfb += xkeyboard-config
+RREPLACES_${PN}-module-exa = ${PN}
 
 FILES_${PN} = ${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards 
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so 
${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt 
${datadir}/X11/xorg.conf.d
 FILES_${PN}-dev += ${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gsettings.bbclass: fix whitespace

2012-09-05 Thread Ross Burton

As nothing in oe-core uses gsettings, it wasn't noticed that the whitespace is
wrong.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/classes/gsettings.bbclass |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/meta/classes/gsettings.bbclass b/meta/classes/gsettings.bbclass
index 1e3f7a1..dec5abc 100644
--- a/meta/classes/gsettings.bbclass
+++ b/meta/classes/gsettings.bbclass
@@ -18,20 +18,20 @@ gsettings_postinstrm () {
 }
 
 python populate_packages_append () {
-   pkg = d.getVar('PN', True)
-   bb.note(adding gsettings postinst scripts to %s % pkg)
-
-   postinst = d.getVar('pkg_postinst_%s' % pkg, True) or 
d.getVar('pkg_postinst', True)
-   if not postinst:
-   postinst = '#!/bin/sh\n'
-   postinst += d.getVar('gsettings_postinstrm', True)
-   d.setVar('pkg_postinst_%s' % pkg, postinst)
-
-   bb.note(adding gsettings postrm scripts to %s % pkg)
-
-   postrm = d.getVar('pkg_postrm_%s' % pkg, True) or 
d.getVar('pkg_postrm', True)
-   if not postrm:
-   postrm = '#!/bin/sh\n'
-   postrm += d.getVar('gsettings_postinstrm', True)
-   d.setVar('pkg_postrm_%s' % pkg, postrm)
+pkg = d.getVar('PN', True)
+bb.note(adding gsettings postinst scripts to %s % pkg)
+
+postinst = d.getVar('pkg_postinst_%s' % pkg, True) or 
d.getVar('pkg_postinst', True)
+if not postinst:
+postinst = '#!/bin/sh\n'
+postinst += d.getVar('gsettings_postinstrm', True)
+d.setVar('pkg_postinst_%s' % pkg, postinst)
+
+bb.note(adding gsettings postrm scripts to %s % pkg)
+
+postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', 
True)
+if not postrm:
+postrm = '#!/bin/sh\n'
+postrm += d.getVar('gsettings_postinstrm', True)
+d.setVar('pkg_postrm_%s' % pkg, postrm)
 }
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gst-plugins-good: disable (uninstalled) examples

2012-09-06 Thread Ross Burton

The examples pull in a GTK+ build dependency, so remove that too.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb 
b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index ac63f94..0fc34df 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = 
file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f
 \
 
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe
 
-DEPENDS += gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
+DEPENDS += gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
speex libsoup-2.4 pulseaudio
-PR = r2
+PR = r3
 
 inherit gettext gconf
 
 EXTRA_OECONF += --disable-aalib --disable-esd --disable-shout2 
--disable-libcaca --disable-hal --without-check \
- --disable-orc
+ --disable-orc --disable-examples
 
 do_configure_prepend() {
# This m4 file contains nastiness which conflicts with libtool 2.2.2
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] pulseaudio: remove ConsoleKit dependency

2012-09-06 Thread Ross Burton

ConsoleKit is a runtime dependency for the ConsoleKit module, but there isn't a
build-time dependency.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc|2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc 
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 315d4dc..14e90a2 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = 
file://GPL;md5=4325afd396febcb659c36b49533135d4 \
 DEPENDS = libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst 
libice libsm libxcb gtk+', '', d)}
 # optional
-DEPENDS += udev alsa-lib glib-2.0 dbus consolekit \
+DEPENDS += udev alsa-lib glib-2.0 dbus \
${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}
 
 SRC_URI = 
http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb 
b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 97bd4d3..e39b69e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = r2
+PR = r3
 
 DEPENDS += libjson gdbm speex libxml-parser-perl-native
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gssdp: build examples which require GTK+ only if we have X11

2012-09-06 Thread Ross Burton

Also they just need GTK+ not libglade, so fix the depends.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb 
b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
index f3494e7..ad41ac1 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
@@ -2,7 +2,9 @@ SUMMARY = Resource discovery and announcement over SSDP
 DESCRIPTION = GSSDP implements resource discovery and announcement over SSDP 
(Simpe Service Discovery Protocol).
 LICENSE = LGPLv2
 LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7
-DEPENDS = glib-2.0 libsoup-2.4 libglade gobject-introspection-stub
+DEPENDS = glib-2.0 libsoup-2.4 gobject-introspection-stub
+
+PR = r2
 
 SRC_URI = http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz;
 
@@ -17,9 +19,5 @@ FILES_gssdp-tools = ${bindir}/gssdp* 
${datadir}/gssdp/*.glade
 
 EXTRA_OECONF = --disable-introspection
 
-PR = r1
-
-SRC_URI[md5sum] = aec6a56ac1d4f8a4837da83f2d152556
-SRC_URI[sha256sum] = 
94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea 
-
-
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}
+PACKAGECONFIG[gtk] = --with-gtk,--without-gtk,gtk+
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gssdp: build examples which require GTK+ only if we have X11

2012-09-06 Thread Ross Burton

They just need GTK+ not libglade, so fix the depends.

The recipe also had multple checksums, so remove the old ones.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb 
b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
index f3494e7..b87c755 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
@@ -2,12 +2,14 @@ SUMMARY = Resource discovery and announcement over SSDP
 DESCRIPTION = GSSDP implements resource discovery and announcement over SSDP 
(Simpe Service Discovery Protocol).
 LICENSE = LGPLv2
 LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7
-DEPENDS = glib-2.0 libsoup-2.4 libglade gobject-introspection-stub
+DEPENDS = glib-2.0 libsoup-2.4 gobject-introspection-stub
+
+PR = r2
 
 SRC_URI = http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz;
 
-SRC_URI[md5sum] = 725c32e8f92a072cc34f0e091937df2a
-SRC_URI[sha256sum] = 
8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7
+SRC_URI[md5sum] = aec6a56ac1d4f8a4837da83f2d152556
+SRC_URI[sha256sum] = 
94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea 
 
 inherit autotools pkgconfig
 
@@ -17,9 +19,5 @@ FILES_gssdp-tools = ${bindir}/gssdp* 
${datadir}/gssdp/*.glade
 
 EXTRA_OECONF = --disable-introspection
 
-PR = r1
-
-SRC_URI[md5sum] = aec6a56ac1d4f8a4837da83f2d152556
-SRC_URI[sha256sum] = 
94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea 
-
-
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}
+PACKAGECONFIG[gtk] = --with-gtk,--without-gtk,gtk+
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] xserver-xorg: make DRI/GLX options respect opengl distro feature

2012-09-07 Thread Ross Burton

If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index a0309aa..210abad 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,21 +123,13 @@ EXTRA_OECONF += --with-fop=no \
  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 
 
-PACKAGECONFIG ??= udev
+PACKAGECONFIG ??= udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', 
'', d)}
 PACKAGECONFIG[udev] = --enable-config-udev,--disable-config-udev,udev
+PACKAGECONFIG[glx] = --enable-dri --enable-dri2 --enable-glx 
--enable-glx-tls,\
+  --disable-dri --disable-glx,\
+  xf86driproto dri2proto mesa-dri
 
 do_install_append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
 }
-
-
-# Mesa/GLX/DRI
-PROTO_DEPS += xf86driproto dri2proto
-LIB_DEPS += mesa-dri
-
-EXTRA_OECONF += \
- --enable-dri \
- --enable-dri2 \
- --enable-glx-tls \
-
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature

2012-09-07 Thread Ross Burton

If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../xorg-xserver/xserver-xorg-1.11.2.inc   |2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc|   16 
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b4a348c..c71896a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += file://crosscompile.patch \
 SRC_URI[md5sum] = 8796fff441e5435ee36a72579008af24
 SRC_URI[sha256sum] = 
fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 
-PR = r6
+PR = r7
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index a0309aa..210abad 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,21 +123,13 @@ EXTRA_OECONF += --with-fop=no \
  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 
 
-PACKAGECONFIG ??= udev
+PACKAGECONFIG ??= udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', 
'', d)}
 PACKAGECONFIG[udev] = --enable-config-udev,--disable-config-udev,udev
+PACKAGECONFIG[glx] = --enable-dri --enable-dri2 --enable-glx 
--enable-glx-tls,\
+  --disable-dri --disable-glx,\
+  xf86driproto dri2proto mesa-dri
 
 do_install_append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
 }
-
-
-# Mesa/GLX/DRI
-PROTO_DEPS += xf86driproto dri2proto
-LIB_DEPS += mesa-dri
-
-EXTRA_OECONF += \
- --enable-dri \
- --enable-dri2 \
- --enable-glx-tls \
-
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] packagegroup-core-x11-xserver: remove redundant PACKAGES statement

2012-09-10 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../packagegroups/packagegroup-core-x11-xserver.bb |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb 
b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
index bf39e63..fd6ed42 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
@@ -3,14 +3,12 @@
 #
 
 LICENSE = MIT
-PR = r38
+PR = r39
 
 inherit packagegroup
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-PACKAGES = ${PN}
-
 XSERVER ?= xserver-xorg xf86-video-fbdev xf86-input-evdev
 
 SUMMARY_${PN} = X11 display server
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] telepathy-idle: fix parallel build

2012-09-10 Thread Ross Burton

Apply a patch from upstream git, and clean up our other patch so that it
applies.

[ YOCTO #3056 ]

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../build-fix-for-make-j-safety.patch  |   39 
 .../fix-svc-gtk-doc.h-target.patch |   24 +---
 .../telepathy/telepathy-idle_0.1.12.bb |5 ++-
 3 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 
meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch

diff --git 
a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
 
b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
new file mode 100644
index 000..0aeed09
--- /dev/null
+++ 
b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
@@ -0,0 +1,39 @@
+From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001
+From: Dan Winship d...@gnome.org
+Date: Fri, 24 Aug 2012 12:19:45 -0400
+Subject: [PATCH] build: fix for make -j safety
+
+A make rule with multiple (non-pattern) targets just says that each of
+those files can be built by the rule, not that the rule builds all of
+them at once. So under make -j, extensions/Makefile would run three
+copies of glib-ginterface-gen.py at once, which could end up deleting
+each others' files and causing a make failure. Fix.
+
+Signed-off-by: Jonny Lamb jonny.l...@collabora.co.uk
+
+Upstream-Status: Backport [b092172e56393fad70e472afa26df4f886dfdbc0]
+Signed-off-by: Ross Burton ross.bur...@intel.com
+
+---
+ extensions/Makefile.am |5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 24efb6e..bb837da 100644
+--- a/extensions/Makefile.am
 b/extensions/Makefile.am
+@@ -42,7 +42,10 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
+   $(tools_dir)/doc-generator.xsl \
+   $  $@
+ 
+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
++_gen/svc.h: _gen/svc.c
++_gen/svc-gtk-doc.h: _gen/svc.c
++
++_gen/svc.c: _gen/all.xml \
+   $(tools_dir)/glib-ginterface-gen.py
+   $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+   --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
+-- 
+1.7.10.4
+
diff --git 
a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
 
b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
index a5efed4..2cd2c78 100644
--- 
a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
+++ 
b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
@@ -3,7 +3,7 @@ Upstream-Status: Pending
 Signed-off-by: Constantin Musca constantinx.mu...@intel.com
 --- a/extensions/Makefile.am
 +++ b/extensions/Makefile.am
-@@ -37,12 +37,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
+@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
--xinclude $(tools_dir)/identity.xsl \
$  $@
  
@@ -13,25 +13,3 @@ Signed-off-by: Constantin Musca constantinx.mu...@intel.com
$(tools_dir)/doc-generator.xsl \
$  $@
  
--_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
-+_gen/svc.c _gen/svc.h: _gen/all.xml \
-   $(tools_dir)/glib-ginterface-gen.py
-   $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
-   --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
 a/extensions/Makefile.in
-+++ b/extensions/Makefile.in
-@@ -585,12 +585,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
-   --xinclude $(tools_dir)/identity.xsl \
-   $  $@
- 
--extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml 
$(tools_dir)/doc-generator.xsl
-   $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
-   $(tools_dir)/doc-generator.xsl \
-   $  $@
- 
--_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
-+_gen/svc.c _gen/svc.h: _gen/all.xml \
-   $(tools_dir)/glib-ginterface-gen.py
-   $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
-   --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb 
b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
index c8163e2..c9e8b3b 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
@@ -5,10 +5,11 @@ DEPENDS = glib-2.0 dbus telepathy-glib openssl
 LICENSE = LGPLv2.1
 LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9
-PR = r0
+PR = r1
 
 SRC_URI = 
http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV

[OE-core] [PATCH] webkit-gtk: work around Make bug by re-running make

2012-09-10 Thread Ross Burton

GNU make 3.82 has a bug where it drops required dependencies.
https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+
bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug.

Work around this by running make again if it fails just in case the failure is
due to the bug.

Based on a patch by Andreas Müller schnitzelt...@googlemail.com.

[ YOCTO #2816 ]

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb |   22 ++
 1 file changed, 22 insertions(+)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb 
b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
index cf4129d..8beb6eb 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = 
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
 
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
 \
 
file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f
 
+PR = r1
+
 # Choice of language backends - icu has issues on Big Endian machines so use 
pango
 ICU_LIB = icu
 ICU_LIB_powerpc = pango
@@ -77,6 +79,26 @@ do_configure_append() {
done
 }
 
+# A dirty hack for GNU make 3.82 bug which means it drops required
+# dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+
+# bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug.  This is
+# fixed in Make CVS, so 3.83 won't have this problem.
+do_compile() {
+if [ x$MAKE = x ]; then MAKE=make; fi
+bbnote ${MAKE} ${EXTRA_OEMAKE} $@
+for error_count in 1 2 3; do
+bbnote Attempt $error_count of 3
+exit_code=0
+${MAKE} ${EXTRA_OEMAKE} $@ || exit_code=1
+if [ $exit_code = 0 ]; then
+break
+fi
+done
+if [ ! $exit_code = 0 ]; then
+die oe_runmake failed
+fi
+}
+
 do_install_append() {
rmdir ${D}${libexecdir}
 }
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/4] libx11-diet: you can't disable UDC, because it's always disabled

2012-09-10 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 6a898b5..4440a80 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -1,11 +1,11 @@
 require libx11.inc
 
-DESCRIPTION +=  Support for UDC, XCMS and XLOCALE is disabled in \
+DESCRIPTION +=  Support for XCMS and XLOCALE is disabled in \
 this version.
 
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-PR = r2
+PR = r3
 
 SRC_URI += file://x11_disable_makekeys.patch \
 file://X18NCMSstubs.diff \
@@ -25,6 +25,6 @@ DEPENDS += libxcb bigreqsproto xproto xextproto xtrans 
libxau xcmiscproto \
 
 FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
 
-EXTRA_OECONF += --disable-udc --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
+EXTRA_OECONF += --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
 CFLAGS += -D_GNU_SOURCE
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

2012-09-10 Thread Ross Burton

As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
.so, it's not worth splitting it into a separate package.

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc   |3 ---
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb  |2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 3d5a306..c39b859 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION +=  Support for XCMS is disabled in this version.
 LICENSE = MIT  MIT-style  BSD
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-PR = r1
+PR = r2
 
 DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto 
xf86bigfontproto xproto-native
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 592f116..29c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = 
file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
 EXTRA_OECONF += --with-groff=no --with-ps2pdf=no --with-fop=no 
--disable-specs
 
-PACKAGES =+ ${PN}-xcb
-
 FILES_${PN} += ${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB 
${libdir}/X11/Xcms.txt
-FILES_${PN}-xcb += ${libdir}/libX11-xcb.so.*
 FILES_${PN}-locale += ${datadir}/X11/locale ${libdir}/X11/locale
 
 do_compile_prepend() {
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index a65ab1f..e78d707 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = r1
+PR = r2
 
 BBCLASSEXTEND = native nativesdk
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/4] libx11: re-arrange recipies to make comparisons easier

2012-09-10 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |9 +++--
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |3 ---
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb  |4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 4440a80..5b1e367 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -3,10 +3,11 @@ require libx11.inc
 DESCRIPTION +=  Support for XCMS and XLOCALE is disabled in \
 this version.
 
-LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-
 PR = r3
 
+DEPENDS += libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+libxdmcp xf86bigfontproto kbproto inputproto xproto-native
+
 SRC_URI += file://x11_disable_makekeys.patch \
 file://X18NCMSstubs.diff \
 file://keysymdef_include.patch \
@@ -20,11 +21,7 @@ RPROVIDES_${PN}-locale = libx11-locale
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
 SRC_URI[sha256sum] = 
c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
-DEPENDS += libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-libxdmcp xf86bigfontproto kbproto inputproto xproto-native
-
 FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
 
 EXTRA_OECONF += --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
 CFLAGS += -D_GNU_SOURCE
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index c39b859..697fe66 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -2,9 +2,6 @@ require libx11.inc
 
 DESCRIPTION +=  Support for XCMS is disabled in this version.
 
-LICENSE = MIT  MIT-style  BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-
 PR = r2
 
 DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto 
xf86bigfontproto xproto-native
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index e78d707..dca220b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -5,8 +5,6 @@ PR = r2
 
 BBCLASSEXTEND = native nativesdk
 
-EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11
-
 DEPENDS += util-macros xtrans libxdmcp libxau \
 bigreqsproto xproto xextproto xcmiscproto \
 xf86bigfontproto kbproto inputproto libxcb \
@@ -19,3 +17,5 @@ SRC_URI +=  file://keysymdef_include.patch \
 
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
 SRC_URI[sha256sum] = 
c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
+
+EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] connman: remove trailing whitespace

2012-09-11 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-connectivity/connman/connman.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc 
b/meta/recipes-connectivity/connman/connman.inc
index 59ec1fa..5b94a1e 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -1,5 +1,5 @@
 SUMMARY = A daemon for managing internet connections within embedded devices
-DESCRIPTION = The ConnMan project provides a daemon for managing \ 
+DESCRIPTION = The ConnMan project provides a daemon for managing \
 internet connections within embedded devices running the Linux \
 operating system.  The Connection Manager is designed to be slim and \
 to use as few resources as possible, so it can be easily integrated. \
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 06/18] libx11: move keysymdefdir option to .inc

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |2 --
 meta/recipes-graphics/xorg-lib/libx11.inc   |4 +++-
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb  |2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index dd9e7d9..9a7de33 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -25,6 +25,6 @@ DEPENDS += libxcb bigreqsproto xproto xextproto xtrans 
libxau xcmiscproto \
 
 FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
 
-EXTRA_OECONF += --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11
+EXTRA_OECONF += --disable-xlocale
 CFLAGS += -D_GNU_SOURCE
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 9e88d45..714b993 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -18,5 +18,3 @@ RPROVIDES_${PN}-locale = libx11-locale
 
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
 SRC_URI[sha256sum] = 
c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
-
-EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11/
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 22b26cc..a524c5f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 inherit siteinfo
 
 PE = 1
-INC_PR = r3
+INC_PR = r4
 
 PROVIDES = virtual/libx11
 
@@ -23,6 +23,8 @@ FILES_${PN} += ${datadir}/X11/XKeysymDB 
${datadir}/X11/XErrorDB ${libdir}/X11/X
 FILES_${PN}-xcb += ${libdir}/libX11-xcb.so.*
 FILES_${PN}-locale += ${datadir}/X11/locale ${libdir}/X11/locale
 
+EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11/
+
 # Almost nothing uses XCMS
 PACKAGECONFIG ??= 
 PACKAGECONFIG[xcms] = --enable-xcms,--disable-xcms
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 2e47899..0ba0f9b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -5,8 +5,6 @@ PR = ${INC_PR}.0
 
 BBCLASSEXTEND = native nativesdk
 
-EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11
-
 DEPENDS += util-macros xtrans libxdmcp libxau \
 bigreqsproto xproto xextproto xcmiscproto \
 xf86bigfontproto kbproto inputproto libxcb \
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 01/18] libx11: use INC_PR

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc   |1 +
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb  |2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 7d4facd..ed5a890 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -5,7 +5,7 @@ this version.
 
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-PR = r1
+PR = ${INC_PR}.0
 
 SRC_URI += file://x11_disable_makekeys.patch \
 file://X18NCMSstubs.diff \
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 3d5a306..e8661f3 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION +=  Support for XCMS is disabled in this version.
 LICENSE = MIT  MIT-style  BSD
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-PR = r1
+PR = ${INC_PR}.0
 
 DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto 
xf86bigfontproto xproto-native
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 592f116..9e8c863 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,6 +9,7 @@ require xorg-lib-common.inc
 inherit siteinfo
 
 PE = 1
+INC_PR = r1
 
 PROVIDES = virtual/libx11
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index a65ab1f..2e47899 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = r1
+PR = ${INC_PR}.0
 
 BBCLASSEXTEND = native nativesdk
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 12/18] default-providers: default to libx11, not -trim

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/conf/distro/include/default-providers.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index 2d8a17d..07222c2 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -10,7 +10,7 @@ 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
+PREFERRED_PROVIDER_virtual/libx11 ?= libx11
 PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel
 
 #
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc   |6 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index e6aa63f..dd9e7d9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -25,6 +25,6 @@ DEPENDS += libxcb bigreqsproto xproto xextproto xtrans 
libxau xcmiscproto \
 
 FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
 
-EXTRA_OECONF += --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
+EXTRA_OECONF += --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11
 CFLAGS += -D_GNU_SOURCE
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index e8661f3..9e88d45 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -19,4 +19,4 @@ RPROVIDES_${PN}-locale = libx11-locale
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
 SRC_URI[sha256sum] = 
c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
-EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms 
+EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11/
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index fb1daf2..22b26cc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 inherit siteinfo
 
 PE = 1
-INC_PR = r2
+INC_PR = r3
 
 PROVIDES = virtual/libx11
 
@@ -23,6 +23,10 @@ FILES_${PN} += ${datadir}/X11/XKeysymDB 
${datadir}/X11/XErrorDB ${libdir}/X11/X
 FILES_${PN}-xcb += ${libdir}/libX11-xcb.so.*
 FILES_${PN}-locale += ${datadir}/X11/locale ${libdir}/X11/locale
 
+# Almost nothing uses XCMS
+PACKAGECONFIG ??= 
+PACKAGECONFIG[xcms] = --enable-xcms,--disable-xcms
+
 do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 04/18] xorg-lib: move options to disable documentation to xorg-lib-common

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11.inc  |4 +---
 meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb  |4 +---
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 9e8c863..fb1daf2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 inherit siteinfo
 
 PE = 1
-INC_PR = r1
+INC_PR = r2
 
 PROVIDES = virtual/libx11
 
@@ -17,8 +17,6 @@ XORG_PN = libX11
 LICENSE = MIT  MIT-style  BSD
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-EXTRA_OECONF += --with-groff=no --with-ps2pdf=no --with-fop=no 
--disable-specs
-
 PACKAGES =+ ${PN}-xcb
 
 FILES_${PN} += ${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB 
${libdir}/X11/Xcms.txt
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb 
b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
index 575d130..c327f25 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
@@ -14,11 +14,9 @@ LIC_FILES_CHKSUM = 
file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \
 DEPENDS += libxext inputproto
 
 PE = 1
-PR = r0
+PR = r1
 
 XORG_PN = libXi
 
-EXTRA_OECONF_append =  --enable-specs=no
-
 SRC_URI[md5sum] = 78ee882e1ff3b192cf54070bdb19938e
 SRC_URI[sha256sum] = 
f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc 
b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 55eaf49..c911925 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -13,7 +13,8 @@ S = ${WORKDIR}/${XORG_PN}-${PV}
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = --enable-malloc0returnsnull --with-fop=no --without-xmlto
+EXTRA_OECONF = --enable-malloc0returnsnull \
+--disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no 
--without-xmlto
 
 python () {
 whitelist = [ pixman, libpciaccess ]
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 10/18] libx11: make bigfont an optional (disabled by default) packageconfig option

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11.inc |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc 
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 85fdbe7..d56aa23 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ inherit siteinfo
 FILESPATH = ${FILE_DIRNAME}/libx11
 
 PE = 1
-INC_PR = r6
+INC_PR = r7
 
 PROVIDES = virtual/libx11
 
@@ -20,7 +20,7 @@ LICENSE = MIT  MIT-style  BSD
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
 DEPENDS += xproto xextproto xtrans libxcb kbproto inputproto
-DEPENDS += xf86bigfontproto xproto-native
+DEPENDS += xproto-native
 
 PACKAGES =+ ${PN}-xcb
 
@@ -30,9 +30,11 @@ FILES_${PN}-locale += ${datadir}/X11/locale 
${libdir}/X11/locale
 
 EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11/
 
-# Almost nothing uses XCMS
+# Let people with incredibly archaic requirements enable Xcms and BigFont, but
+# disable them by default.
 PACKAGECONFIG ??= 
 PACKAGECONFIG[xcms] = --enable-xcms,--disable-xcms
+PACKAGECONFIG[bigfont] = 
--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto
 
 do_compile_prepend() {
cd ${S}/src/util
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 08/18] libx11: merge patches into a single directory

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../xorg-lib/libx11-1.5.0/keysymdef_include.patch  |   23 -
 .../libx11-1.5.0/makekeys_crosscompile.patch   |   76 ---
 .../libx11-1.5.0/x11_disable_makekeys.patch|   34 --
 .../xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff   |  541 
 .../libx11-diet-1.5.0/fix-disable-xlocale.diff |   17 -
 .../libx11-diet-1.5.0/fix-utf8-wrong-define.patch  |   19 -
 .../libx11-diet-1.5.0/keysymdef_include.patch  |   23 -
 .../libx11-diet-1.5.0/x11_disable_makekeys.patch   |   34 --
 .../libx11-trim-1.5.0/keysymdef_include.patch  |   23 -
 .../libx11-trim-1.5.0/makekeys_crosscompile.patch  |   76 ---
 .../libx11-trim-1.5.0/x11_disable_makekeys.patch   |   34 --
 meta/recipes-graphics/xorg-lib/libx11.inc  |4 +-
 .../xorg-lib/libx11/X18NCMSstubs.diff  |  541 
 .../xorg-lib/libx11/fix-disable-xlocale.diff   |   17 +
 .../xorg-lib/libx11/fix-utf8-wrong-define.patch|   19 +
 .../xorg-lib/libx11/keysymdef_include.patch|   23 +
 .../xorg-lib/libx11/makekeys_crosscompile.patch|   76 +++
 .../xorg-lib/libx11/x11_disable_makekeys.patch |   34 ++
 18 files changed, 713 insertions(+), 901 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch

diff --git 
a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch 
b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch
deleted file mode 100644
index d1bdab9..000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Martin Jansa martin.ja...@gmail.com
-
-diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
 libX11-1.3.6.orig//configure.ac2010-09-20 08:04:16.0 +0200
-+++ libX11-1.3.6/configure.ac  2010-09-28 16:29:26.0 +0200
-@@ -355,7 +355,14 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysym definitions])
--KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+AC_ARG_WITH(keysymdefdir,
-+AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of 
keysymdef.h]),
-+KEYSYMDEFDIR=$withval, KEYSYMDEFDIR=)
-+
-+if test x$KEYSYMDEFDIR = x; then
-+  KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+fi
-+
- FILES=keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h
- for i in $FILES; do
- if test -f $KEYSYMDEFDIR/$i; then
diff --git 
a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch 
b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch
deleted file mode 100644
index daf3696..000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Because the size of unsigned long is different between 32-bit
-and 64-bit, judge whether target is 32-bit or 64-bit and tell
-makekey.
-
-The error information from LSB Test suite is as follow:
-VSW5TESTSUITE PURPOSE 7
-Assertion XStringToKeysym-7.(A)
-When the string argument is the name of a KeySym in the 
-table with the prefix XK_ removed, then a call to
-XStringToKeysym returns that KeySym.
-METH: For each KeySym name in table with code G:
-METH: Call XStringToKeysym to obtain the KeySym defined for that string.
-METH: Verify that XStringToKeysym did not return NoSymbol.
-METH: Verify that the returned string is correct.
-CHECK: XStringToKeysym-7 1, line 130 
-CHECK: XStringToKeysym-7 2, line

[OE-core] [RFC 15/18] libx11: drop makekeys_crosscompile.patch, effectively merged upstream

2012-09-11 Thread Ross Burton


Signed-off-by: Ross Burton ross.bur...@intel.com
---
 .../xorg-lib/libx11/makekeys_crosscompile.patch|   76 
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb |3 +-
 2 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch 
b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch
deleted file mode 100644
index daf3696..000
--- a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Because the size of unsigned long is different between 32-bit
-and 64-bit, judge whether target is 32-bit or 64-bit and tell
-makekey.
-
-The error information from LSB Test suite is as follow:
-VSW5TESTSUITE PURPOSE 7
-Assertion XStringToKeysym-7.(A)
-When the string argument is the name of a KeySym in the 
-table with the prefix XK_ removed, then a call to
-XStringToKeysym returns that KeySym.
-METH: For each KeySym name in table with code G:
-METH: Call XStringToKeysym to obtain the KeySym defined for that string.
-METH: Verify that XStringToKeysym did not return NoSymbol.
-METH: Verify that the returned string is correct.
-CHECK: XStringToKeysym-7 1, line 130 
-CHECK: XStringToKeysym-7 2, line 140 
-CHECK: XStringToKeysym-7 3, line 150 
-CHECK: XStringToKeysym-7 4, line 160 
-CHECK: XStringToKeysym-7 5, line 170 
-CHECK: XStringToKeysym-7 6, line 180 
-CHECK: XStringToKeysym-7 7, line 190 
-CHECK: XStringToKeysym-7 8, line 200 
-CHECK: XStringToKeysym-7 9, line 210 
-CHECK: XStringToKeysym-7 10, line 220 
-CHECK: XStringToKeysym-7 11, line 230 
-CHECK: XStringToKeysym-7 12, line 240 
-CHECK: XStringToKeysym-7 13, line 250 
-CHECK: XStringToKeysym-7 14, line 260 
-CHECK: XStringToKeysym-7 15, line 270 
-CHECK: XStringToKeysym-7 16, line 280 
-CHECK: XStringToKeysym-7 17, line 290 
-CHECK: XStringToKeysym-7 18, line 300 
-CHECK: XStringToKeysym-7 19, line 310 
-CHECK: XStringToKeysym-7 20, line 320
-
-Upstream-Status: Pending
-
-Signed-off-by: dbuit...@windriver.com
-
 libX11-1.3.4.orig/src/util/makekeys.c  2010-01-15 09:11:36.0 
+0800
-+++ libX11-1.3.4/src/util/makekeys.c   2011-05-24 19:04:25.454774908 +0800
-@@ -33,6 +33,7 @@
- #include X11/keysymdef.h
- #include stdio.h
- #include stdlib.h
-+#include stdint.h
- 
- typedef unsigned long Signature;
- 
-@@ -124,7 +125,12 @@
-   name = info[i].name;
-   sig = 0;
-   while ((c = *name++))
--  sig = (sig  1) + c;
-+#ifdef USE32
-+  sig = (uint32_t)(sig  1) + c;
-+#else
-+  sig = (uint64_t)(sig  1) + c;
-+#endif
-+  
-   first = j = sig % z;
-   for (k = 0; tab[j]; k++) {
-   j += first + 1;
-@@ -163,7 +169,11 @@
-   name = info[i].name;
-   sig = 0;
-   while ((c = *name++))
--  sig = (sig  1) + c;
-+#ifdef USE32
-+  sig = (uint32_t)(sig  1) + c;
-+#else
-+  sig = (uint64_t)(sig  1) + c;
-+#endif
-   first = j = sig % z;
-   while (offsets[j]) {
-   j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index c138785..5a66eb5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,13 +1,12 @@
 require libx11.inc
 inherit gettext
 
-PR = ${INC_PR}.0
+PR = ${INC_PR}.1
 
 BBCLASSEXTEND = native nativesdk
 
 SRC_URI +=  file://keysymdef_include.patch \
  file://x11_disable_makekeys.patch \
- file://makekeys_crosscompile.patch \
  
 
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 07/18] libx11: remove redundant license data

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |2 --
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |3 ---
 2 files changed, 5 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 9a7de33..04ee1b8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -3,8 +3,6 @@ require libx11.inc
 DESCRIPTION +=  Support for XCMS and XLOCALE is disabled in \
 this version.
 
-LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-
 PR = ${INC_PR}.2
 
 SRC_URI += file://x11_disable_makekeys.patch \
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 714b993..6550903 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -2,9 +2,6 @@ require libx11.inc
 
 DESCRIPTION +=  Support for XCMS is disabled in this version.
 
-LICENSE = MIT  MIT-style  BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-
 PR = ${INC_PR}.0
 
 DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto 
xf86bigfontproto xproto-native
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 11/18] libx11-diet: remove statements that are redundant

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 5ab..cb9a5ef 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -3,7 +3,7 @@ require libx11.inc
 DESCRIPTION +=  Support for XCMS and XLOCALE is disabled in \
 this version.
 
-PR = ${INC_PR}.2
+PR = ${INC_PR}.3
 
 SRC_URI += file://x11_disable_makekeys.patch \
 file://X18NCMSstubs.diff \
@@ -18,8 +18,4 @@ RPROVIDES_${PN}-locale = libx11-locale
 SRC_URI[md5sum] = 78b4b3bab4acbdf0abcfca30a8c70cc6
 SRC_URI[sha256sum] = 
c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
-FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
-
 EXTRA_OECONF += --disable-xlocale
-CFLAGS += -D_GNU_SOURCE
-
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RFC 03/18] libx11-diet: you can't disable UDC, because it's always disabled

2012-09-11 Thread Ross Burton

Signed-off-by: Ross Burton ross.bur...@intel.com
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb 
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index d821744..e6aa63f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -1,11 +1,11 @@
 require libx11.inc
 
-DESCRIPTION +=  Support for UDC, XCMS and XLOCALE is disabled in \
+DESCRIPTION +=  Support for XCMS and XLOCALE is disabled in \
 this version.
 
 LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
 
-PR = ${INC_PR}.1
+PR = ${INC_PR}.2
 
 SRC_URI += file://x11_disable_makekeys.patch \
 file://X18NCMSstubs.diff \
@@ -25,6 +25,6 @@ DEPENDS += libxcb bigreqsproto xproto xextproto xtrans 
libxau xcmiscproto \
 
 FILESDIR = ${@os.path.dirname(d.getVar('FILE', True))}/libx11
 
-EXTRA_OECONF += --disable-udc --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
+EXTRA_OECONF += --disable-xcms --disable-xlocale 
--with-keysymdefdir=${STAGING_INCDIR}/X11
 CFLAGS += -D_GNU_SOURCE
 
-- 
1.7.10


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

< 1 2 3 4 5 6 7 8 9 10 >

101 - 200 of 4987 matches

Mail list logo