[oe-commits] Martin Jansa : shr/ import Fix mesa and libdrm providers and add libxft old autoconf patch

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: cbae50ddb2e88c1f52f6feb9d6abec2282716c8b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cbae50ddb2e88c1f52f6feb9d6abec2282716c8b

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Oct 14 21:53:15 2009 +0000

shr/import Fix mesa and libdrm providers and add libxft old autoconf patch

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/preferred-shr-versions.inc    |    3 ---
 conf/distro/include/shr-om-gta02-kms.conf         |    3 ---
 conf/distro/include/shr-om-gta02.conf             |    4 ++--
 recipes/dri/libdrm_git.bb                         |    2 +-
 recipes/mesa/mesa-common.inc                      |    2 +-
 recipes/xorg-lib/libxft/autoconf.workaround.patch |   16 ++++++++++++++++
 recipes/xorg-lib/libxft_2.1.14.bb                 |    2 ++
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 62807aa..72a68f2 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -847,7 +847,6 @@ PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11"
 PREFERRED_VERSION_libdisplaymigration ?= "0.99"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libdotdesktop ?= "0.11"
-PREFERRED_VERSION_libdrm ?= "2.3.1"
 PREFERRED_VERSION_libdvb ?= "0.5.5.1"
 PREFERRED_VERSION_libdvdnav ?= "0.1.10"
 PREFERRED_VERSION_libdvdread ?= "0.9.6"
@@ -1207,8 +1206,6 @@ PREFERRED_VERSION_mdev ?= "1.2.1"
 PREFERRED_VERSION_mdk2 ?= "v33"
 PREFERRED_VERSION_memedit ?= "0.7"
 PREFERRED_VERSION_memtester ?= "4.0.6"
-PREFERRED_VERSION_mesa ?= "7.5.1"
-PREFERRED_VERSION_mesa-dri ?= "7.5.1"
 PREFERRED_VERSION_meta-e-x11 ?= "1.0"
 PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
 PREFERRED_VERSION_meta-gpe ?= "1.0"
diff --git a/conf/distro/include/shr-om-gta02-kms.conf b/conf/distro/include/shr-om-gta02-kms.conf
index d57cc35..2ddce41 100644
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ b/conf/distro/include/shr-om-gta02-kms.conf
@@ -1,8 +1,5 @@
 # SHR-specific overrides for building KMS enabled system
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-PREFERRED_PROVIDER_mesa = "mesa-dri"
 PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
 
-MACHINE_DRI_MODULES = "glamo"
-
 XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
index e66fba5..78d8e24 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -2,8 +2,8 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
-PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_PROVIDER_drm = "libdrm"
+PREFERRED_PROVIDER_mesa = "mesa-dri"
+MACHINE_DRI_MODULES = "glamo"
 
 XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index ac63ef7..236839b 100644
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -10,7 +10,7 @@ DEPENDS = "libpthread-stubs virtual/kernel"
 PV=2.4.15+gitr${SRCPV}
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_om-gta02 = "1"
+DEFAULT_PREFERENCE_om-gta02 = "2"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index 9cd10eb..bc0af63 100644
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
 S = "${WORKDIR}/Mesa-${PV}"
 
-PROVIDES = "virtual/libgl"
+PROVIDES = "virtual/libgl mesa"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/xorg-lib/libxft/autoconf.workaround.patch b/recipes/xorg-lib/libxft/autoconf.workaround.patch
new file mode 100644
index 0000000..f813a13
--- /dev/null
+++ b/recipes/xorg-lib/libxft/autoconf.workaround.patch
@@ -0,0 +1,16 @@
+diff -uNr libXft-2.1.14/include/X11/Xft/Xft.h.in libXft-2.1.14.new/include/X11/Xft/Xft.h.in
+--- libXft-2.1.14/include/X11/Xft/Xft.h.in	2009-10-06 09:36:40.000000000 +0200
++++ libXft-2.1.14.new/include/X11/Xft/Xft.h.in	2009-10-14 20:45:30.000000000 +0200
+@@ -27,9 +27,9 @@
+  * Current Xft version number, set from version in the Xft configure.ac file.
+  */
+ 
+-#undef XFT_MAJOR	/* Will be substituted by configure */
+-#undef XFT_MINOR	/* Will be substituted by configure */
+-#undef XFT_REVISION	/* Will be substituted by configure */
++#define XFT_MAJOR 2
++#define XFT_MINOR 1
++#define XFT_REVISION 14
+ 
+ #define XFT_VERSION	((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
+ #define XftVersion	XFT_VERSION
diff --git a/recipes/xorg-lib/libxft_2.1.14.bb b/recipes/xorg-lib/libxft_2.1.14.bb
index 84d0cc2..1cf91c8 100644
--- a/recipes/xorg-lib/libxft_2.1.14.bb
+++ b/recipes/xorg-lib/libxft_2.1.14.bb
@@ -8,6 +8,8 @@ PE = "1"
 
 XORG_PN = "libXft"
 
+SRC_URI += "file://autoconf.workaround.patch;patch=1"
+
 python do_package() {
         if bb.data.getVar('DEBIAN_NAMES', d, 1):
             bb.data.setVar('PKG_${PN}', 'libxft2', d)