[PATCH 00/19] graphics recipes upgrade

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 00/19] graphics recipes upgrade
@ 2011-01-16 12:19 Yu Ke
  2011-01-16 12:19 ` [PATCH 01/19] xhost: upgrade to 1.0.4 Yu Ke
                   ` (19 more replies)
  0 siblings, 20 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

this patch series upgrade the graphics recpies. with this upgrade, the graphics recpies are aligned with
- the latest X11 release: X11R7.6 (http://www.x.org/releases/X11R7.6)
- the latest Intel 2010Q4 graphics package (http://intellinuxgraphics.org/2010Q4.html)

One note on the mesa3d lib:  both latest mesa 7.10 and old mesa 7.8.2 are provided. mesa 7.10 has dependency on GPLv3 lib (talloc), so it is only used when there is required functionality that mesa 7.8.2 can not provid, for example, SNB graphics support.  mesa 7.8.2 has no GPLv3 depdency, so it can be used in normal case. there is activity ongoing in upstream to remove the talloc depdency, we will monitor and adopt it once it is done.

for the root-less X support, there still some issue with the configuration, so the related patch will be sent later.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: kyu3/x-upgrade
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/x-upgrade

Thanks,
    Yu Ke <ke.yu@intel.com>
---


Yu Ke (19):
  xhost: upgrade to 1.0.4
  mkfontdir: upgrade to 1.0.6
  xinit: upgrade to 1.3.0
  bigreqsproto: upgrade to 1.1.1
  xprop: upgrade to 1.2.0
  mkfontscale: upgrade to 1.0.8
  xdpyinfo: upgrade to 1.2.0
  xf86-input-keyboard: upgrade to 1.5.0
  xkbcomp: upgrade to 1.2.0
  xf86-input-evdev: upgrade to 2.6.0
  xf86-input-synaptics: upgrade to 1.3.0
  libdrm: upgrade to 2.4.23
  xwininfo: upgrade to 1.1.1
  xf86-video-intel: upgrade to 2.14.0
  cairo: upgrade to 1.10.2
  mesa: upgrade to mesa 7.10
  mesa-glsl: add mesa glsl 7.8.2
  mesa: add mesa 7.8.2
  xserver-xf86-dri-lite: upgrade to 1.9.3

 .../distro/include/preferred-xorg-versions.inc     |   30 +++++-----
 .../cairo/{cairo_1.10.0.bb => cairo_1.10.2.bb}     |    6 +-
 .../installtests.patch                             |    0
 .../drm/{libdrm_2.4.22.bb => libdrm_2.4.23.bb}     |    4 +-
 meta/recipes-graphics/mesa/mesa-common.inc         |    4 +-
 .../mesa/mesa-dri-glsl-native_7.8.2.bb             |   27 +++++++++
 .../mesa/mesa-dri-glsl-native_7.9.bb               |   25 --------
 .../mesa/{mesa-dri_7.9.bb => mesa-dri_7.10.bb}     |   10 ++--
 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   59 ++++++++++++++++++++
 .../{mkfontdir_1.0.5.bb => mkfontdir_1.0.6.bb}     |    6 +-
 .../recipes-graphics/xorg-app/mkfontscale_1.0.7.bb |   12 ----
 .../recipes-graphics/xorg-app/mkfontscale_1.0.8.bb |   12 ++++
 .../{xdpyinfo_1.1.0.bb => xdpyinfo_1.2.0.bb}       |    6 +-
 meta/recipes-graphics/xorg-app/xhost_1.0.3.bb      |   10 ---
 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |   10 +++
 .../xorg-app/{xinit_1.2.1.bb => xinit_1.3.0.bb}    |    4 +-
 .../xorg-app/xkbcomp/cross-compile-fix.patch       |   35 ++++++++++++
 .../{xkbcomp_1.1.1.bb => xkbcomp_1.2.0.bb}         |    6 +-
 meta/recipes-graphics/xorg-app/xprop_1.1.0.bb      |   13 ----
 meta/recipes-graphics/xorg-app/xprop_1.2.0.bb      |   13 ++++
 .../{xwininfo_1.1.0.bb => xwininfo_1.1.1.bb}       |    4 +-
 ...ut-evdev_2.5.0.bb => xf86-input-evdev_2.6.0.bb} |    4 +-
 .../xorg-driver/xf86-input-keyboard_1.4.0.bb       |   10 ---
 .../xorg-driver/xf86-input-keyboard_1.5.0.bb       |   10 +++
 .../xorg-driver/xf86-input-synaptics_1.2.1.bb      |   10 ---
 .../xorg-driver/xf86-input-synaptics_1.3.0.bb      |   16 +++++
 ...-intel_2.13.0.bb => xf86-video-intel_2.14.0.bb} |    4 +-
 ...bigreqsproto_1.1.0.bb => bigreqsproto_1.1.1.bb} |    6 +-
 ...ite_1.9.2.bb => xserver-xf86-dri-lite_1.9.3.bb} |    4 +-
 29 files changed, 232 insertions(+), 128 deletions(-)
 rename meta/recipes-graphics/cairo/{cairo_1.10.0.bb => cairo_1.10.2.bb} (90%)
 rename meta/recipes-graphics/drm/{libdrm-2.4.22 => libdrm-2.4.23}/installtests.patch (100%)
 rename meta/recipes-graphics/drm/{libdrm_2.4.22.bb => libdrm_2.4.23.bb} (54%)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb
 rename meta/recipes-graphics/mesa/{mesa-dri_7.9.bb => mesa-dri_7.10.bb} (83%)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
 rename meta/recipes-graphics/xorg-app/{mkfontdir_1.0.5.bb => mkfontdir_1.0.6.bb} (62%)
 delete mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
 create mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb
 rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.1.0.bb => xdpyinfo_1.2.0.bb} (56%)
 delete mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb
 rename meta/recipes-graphics/xorg-app/{xinit_1.2.1.bb => xinit_1.3.0.bb} (59%)
 create mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
 rename meta/recipes-graphics/xorg-app/{xkbcomp_1.1.1.bb => xkbcomp_1.2.0.bb} (61%)
 delete mode 100644 meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xprop_1.2.0.bb
 rename meta/recipes-graphics/xorg-app/{xwininfo_1.1.0.bb => xwininfo_1.1.1.bb} (58%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.5.0.bb => xf86-input-evdev_2.6.0.bb} (54%)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb
 rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.13.0.bb => xf86-video-intel_2.14.0.bb} (72%)
 rename meta/recipes-graphics/xorg-proto/{bigreqsproto_1.1.0.bb => bigreqsproto_1.1.1.bb} (59%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.2.bb => xserver-xf86-dri-lite_1.9.3.bb} (75%)



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH 01/19] xhost: upgrade to 1.0.4
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 02/19] mkfontdir: upgrade to 1.0.6 Yu Ke
                   ` (18 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- LICENSE checksum changes due to that "Sun's copyrights now belong to Oracle". it is corp name change only, the license is still MIT-X.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 meta/recipes-graphics/xorg-app/xhost_1.0.3.bb      |   10 ----------
 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |   10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 84e42eb..bb85cfc 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -116,7 +116,7 @@ PREFERRED_VERSION_dri2proto ?= "2.3"
 PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
-PREFERRED_VERSION_xhost ?= "1.0.3"
+PREFERRED_VERSION_xhost ?= "1.0.4"
 PREFERRED_VERSION_xinit ?= "1.2.1"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.5"
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.3.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
deleted file mode 100644
index d39058a..0000000
--- a/meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Server access control program for X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cbe6a2ee97dc38c7265adfec5644689b"
-DEPENDS += "libxmu libxau"
-PR = "r0"
-PE = "1"
-
-SRC_URI[md5sum] = "c7f91b4a750d297f269c2a0a3206a1b2"
-SRC_URI[sha256sum] = "2d63007c65e89fe273a43f3e45b3c0133acbc3ceeda6bfc9671388409134ad17"
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb
new file mode 100644
index 0000000..602027b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
+DEPENDS += "libxmu libxau"
+PR = "r0"
+PE = "1"
+
+SRC_URI[md5sum] = "2be663a0afbcc0856c1591477d5bf32a"
+SRC_URI[sha256sum] = "5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 02/19] mkfontdir: upgrade to 1.0.6
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
  2011-01-16 12:19 ` [PATCH 01/19] xhost: upgrade to 1.0.4 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 03/19] xinit: upgrade to 1.3.0 Yu Ke
                   ` (17 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../{mkfontdir_1.0.5.bb => mkfontdir_1.0.6.bb}     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-app/{mkfontdir_1.0.5.bb => mkfontdir_1.0.6.bb} (62%)

diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb
similarity index 62%
rename from meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
rename to meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb
index aebc11d..9b843fc 100644
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb
@@ -3,7 +3,7 @@ require xorg-app-common.inc
 DESCRIPTION = "a program to create an index of X font files in a directory"
 
 PE = "1"
-PR = "r1"
+PR = "r0"
 
 RDEPENDS_${PN} += "mkfontscale"
 
@@ -11,5 +11,5 @@ BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f"
 
-SRC_URI[md5sum] = "9365ac66d19186eaf030482d312fca06"
-SRC_URI[sha256sum] = "a534650cff503619f9101577d816cde283da993bc039273477bd8dfbd01a2d0b"
+SRC_URI[md5sum] = "dc342dd8858416254bb5f71a9ddce589"
+SRC_URI[sha256sum] = "55d56c6310f8d2268cb8978e838d01d27c7d70e30282c373c5a935ab3fb8c859"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 03/19] xinit: upgrade to 1.3.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
  2011-01-16 12:19 ` [PATCH 01/19] xhost: upgrade to 1.0.4 Yu Ke
  2011-01-16 12:19 ` [PATCH 02/19] mkfontdir: upgrade to 1.0.6 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 04/19] bigreqsproto: upgrade to 1.1.1 Yu Ke
                   ` (16 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../xorg-app/{xinit_1.2.1.bb => xinit_1.3.0.bb}    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xinit_1.2.1.bb => xinit_1.3.0.bb} (59%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index bb85cfc..ce6f9cf 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -117,7 +117,7 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
 PREFERRED_VERSION_xhost ?= "1.0.4"
-PREFERRED_VERSION_xinit ?= "1.2.1"
+PREFERRED_VERSION_xinit ?= "1.3.0"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.5"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.2.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
similarity index 59%
rename from meta/recipes-graphics/xorg-app/xinit_1.2.1.bb
rename to meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
index 68150ca..6a87f42 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
@@ -7,5 +7,5 @@ PE = "1"
 
 FILES_${PN} += "${libdir}X11/xinit"
 
-SRC_URI[md5sum] = "56f2d202b3dc10fcd21931a67bb270f7"
-SRC_URI[sha256sum] = "16bcc73ae81b6d80fd1a9419ea757f38870d1043d440b6d56fcaa79d4c6c9b07"
+SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda"
+SRC_URI[sha256sum] = "ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 04/19] bigreqsproto: upgrade to 1.1.1
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (2 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 03/19] xinit: upgrade to 1.3.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 05/19] xprop: upgrade to 1.2.0 Yu Ke
                   ` (15 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    6 +++---
 ...bigreqsproto_1.1.0.bb => bigreqsproto_1.1.1.bb} |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{bigreqsproto_1.1.0.bb => bigreqsproto_1.1.1.bb} (59%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index ce6f9cf..a716281 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -3,9 +3,9 @@
 #
 
 PREFERRED_VERSION_applewmproto ?= "1.4.1"
-PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
-PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.1"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.1"
+PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.1"
 PREFERRED_VERSION_compositeproto ?= "0.4.2"
 PREFERRED_VERSION_damageproto ?= "1.2.1"
 PREFERRED_VERSION_dmxproto ?= "2.3"
diff --git a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.0.bb b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
similarity index 59%
rename from meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.0.bb
rename to meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
index 894c141..57d74ae 100644
--- a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-PR = "r2"
+PR = "r0"
 PE = "1"
 
 DEPENDS += "gettext"
@@ -11,5 +11,5 @@ BBCLASSEXTEND = "native nativesdk"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b12715630da6f268d0d3712ee1a504f4"
 
-SRC_URI[md5sum] = "d30c5dbf19ca6dffcd9788227ecff8c5"
-SRC_URI[sha256sum] = "4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd"
+SRC_URI[md5sum] = "6f6c24436c2b3ab235eb14a85b9aaacf"
+SRC_URI[sha256sum] = "1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 05/19] xprop: upgrade to 1.2.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (3 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 04/19] bigreqsproto: upgrade to 1.1.1 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 06/19] mkfontscale: upgrade to 1.0.8 Yu Ke
                   ` (14 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- LICENSE_CHECKSUM changed due to the commit "COPYING: replace stub with copyright notices". this commit add more accurate license info, and the license type is still MIT-X.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 meta/recipes-graphics/xorg-app/xprop_1.1.0.bb      |   13 -------------
 meta/recipes-graphics/xorg-app/xprop_1.2.0.bb      |   13 +++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xprop_1.2.0.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index a716281..f0dd923 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -121,7 +121,7 @@ PREFERRED_VERSION_xinit ?= "1.3.0"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.5"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
-PREFERRED_VERSION_xprop ?= "1.1.0"
+PREFERRED_VERSION_xprop ?= "1.2.0"
 PREFERRED_VERSION_xproto ?= "7.0.20"
 PREFERRED_VERSION_xproto-native ?= "7.0.20"
 PREFERRED_VERSION_xproto-nativesdk ?= "7.0.20"
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.1.0.bb b/meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
deleted file mode 100644
index cfa02dd..0000000
--- a/meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "utility to display window and font properties of an X server"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
-
-DEPENDS += " libxmu virtual/libx11"
-
-PR = "r0"
-PE = "1"
-
-SRC_URI[md5sum] = "f0bacbd30f0dd1c1e9ccafe97687b7a4"
-SRC_URI[sha256sum] = "cc8e07901574895f113baffda19272c54545879e02012314527ebbf2dcc66226"
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.0.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.0.bb
new file mode 100644
index 0000000..4d35636
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xprop_1.2.0.bb
@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "utility to display window and font properties of an X server"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
+
+DEPENDS += " libxmu virtual/libx11"
+
+PR = "r0"
+PE = "1"
+
+SRC_URI[md5sum] = "e6d0673a1e1e469f0a6220a6868fb94b"
+SRC_URI[sha256sum] = "53508c082b03dbbfd68489cb21392023f3e62ca9c921e1fb39b92ad10fbe6b9c"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 06/19] mkfontscale: upgrade to 1.0.8
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (4 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 05/19] xprop: upgrade to 1.2.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 07/19] xdpyinfo: upgrade to 1.2.0 Yu Ke
                   ` (13 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- update license checksum, due to commit "Sun's copyrights now belong to Oracle". the license type is not changed.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../recipes-graphics/xorg-app/mkfontscale_1.0.7.bb |   12 ------------
 .../recipes-graphics/xorg-app/mkfontscale_1.0.8.bb |   12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
 create mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb

diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
deleted file mode 100644
index c117519..0000000
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "a program to create an index of scalable font files for X"
-
-DEPENDS += " zlib libfontenc freetype virtual/libx11"
-
-BBCLASSEXTEND = "native"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ecbbbc1259a329e96ccc4dd86ad2ca2"
-
-SRC_URI[md5sum] = "96ca346f185c0ab48e42bf5bb0375da5"
-SRC_URI[sha256sum] = "8306b229cca233216a6582cb1ff60af78e37c47d6412ac823d7d41c3d7de7127"
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb
new file mode 100644
index 0000000..23bae39
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a program to create an index of scalable font files for X"
+
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
+
+BBCLASSEXTEND = "native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
+
+SRC_URI[md5sum] = "5210c9385c6cc4a00ce829d8dc9c819b"
+SRC_URI[sha256sum] = "6eb57786cd79eebfbaca386fe24dcfe50689dbf433d052e58291c2925f2050f9"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 07/19] xdpyinfo: upgrade to 1.2.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (5 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 06/19] mkfontscale: upgrade to 1.0.8 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 08/19] xf86-input-keyboard: upgrade to 1.5.0 Yu Ke
                   ` (12 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- update license checksume due to the commit "COPYING: replace stub with actual copyright notice". it provide more accurate license info. the license type is unchanged.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../{xdpyinfo_1.1.0.bb => xdpyinfo_1.2.0.bb}       |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.1.0.bb => xdpyinfo_1.2.0.bb} (56%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index f0dd923..e3cba65 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -102,7 +102,7 @@ PREFERRED_VERSION_xauth ?= "1.0.5"
 PREFERRED_VERSION_xcmiscproto ?= "1.2.1"
 PREFERRED_VERSION_xcmiscproto-native ?= "1.2.1"
 PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.1"
-PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
+PREFERRED_VERSION_xdpyinfo ?= "1.2.0"
 PREFERRED_VERSION_xev ?= "1.0.3"
 PREFERRED_VERSION_xextproto ?= "7.1.2"
 PREFERRED_VERSION_xextproto-native ?= "7.1.2"
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.1.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb
similarity index 56%
rename from meta/recipes-graphics/xorg-app/xdpyinfo_1.1.0.bb
rename to meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb
index ff5a58f..e448d3c 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb
@@ -1,14 +1,14 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "X display information utility"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
 PR = "r0"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
-SRC_URI[md5sum] = "d1d516610316138105cd07064b257c5c"
-SRC_URI[sha256sum] = "780d8dfe65653f42ee26d35928ab7f72f5f27ab08eda692fe4baad05126a0631"
+SRC_URI[md5sum] = "c52fda7bbc80e74b7839f29298cb1d77"
+SRC_URI[sha256sum] = "fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce"
 
 EXTRA_OECONF = "--disable-xkb"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 08/19] xf86-input-keyboard: upgrade to 1.5.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (6 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 07/19] xdpyinfo: upgrade to 1.2.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 09/19] xkbcomp: upgrade to 1.2.0 Yu Ke
                   ` (11 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- update license checksum due to commit "Sun's copyrights now belong to Oracle". the license type is unchanged.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../xorg-driver/xf86-input-keyboard_1.4.0.bb       |   10 ----------
 .../xorg-driver/xf86-input-keyboard_1.5.0.bb       |   10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index e3cba65..a093653 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -144,7 +144,7 @@ PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
 PREFERRED_VERSION_libpciaccess ?= "0.12.0"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.5.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-intel ?= "2.13.0"
 
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
deleted file mode 100644
index f5e51e0..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xf86-input-common.inc
-
-DESCRIPTION = "X.Org X server -- keyboard input driver"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
-
-PR = "r1"
-
-SRC_URI[md5sum] = "fd17158ffeacecc8cc670604460cb98b"
-SRC_URI[sha256sum] = "842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb
new file mode 100644
index 0000000..d3b58b3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb
@@ -0,0 +1,10 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "b74d7162db5ce7899c17927c6cfa9522"
+SRC_URI[sha256sum] = "2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 09/19] xkbcomp: upgrade to 1.2.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (7 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 08/19] xf86-input-keyboard: upgrade to 1.5.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 10/19] xf86-input-evdev: upgrade to 2.6.0 Yu Ke
                   ` (10 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- also pick one patch from upstream to fix the cross compiling error during the do_configure. it can be safely removed in the next upgrade.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../xorg-app/xkbcomp/cross-compile-fix.patch       |   35 ++++++++++++++++++++
 .../{xkbcomp_1.1.1.bb => xkbcomp_1.2.0.bb}         |    6 ++-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
 rename meta/recipes-graphics/xorg-app/{xkbcomp_1.1.1.bb => xkbcomp_1.2.0.bb} (61%)

diff --git a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
new file mode 100644
index 0000000..ca65345
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
@@ -0,0 +1,35 @@
+commit cc55d8f5ab021861308b071aab9c03016be15187
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Oct 31 20:35:24 2010 -0400
+
+    config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
+    
+    Testing for the presence of xkbparse.c is legitimate as this is a build
+    file, but the Autoconf macro assumes it is testing on the host system
+    and fails.
+    
+    Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+diff --git a/configure.ac b/configure.ac
+index c69230b..8e6bd6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
++# If both the C file and YACC are missing, the package cannot be build.
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
+-
++if test ! -f "$srcdir/xkbparse.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
++   fi
++fi
+ 
+ AC_CHECK_FUNCS([strdup strcasecmp])
+ 
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
similarity index 61%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
index bd40e42..b8592fa 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
 
 DEPENDS += "libxkbfile"
 
+SRC_URI += "file://cross-compile-fix.patch"
+
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "38c387bacdc01038c8ac280588792bcf"
-SRC_URI[sha256sum] = "9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663"
+SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
+SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 10/19] xf86-input-evdev: upgrade to 2.6.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (8 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 09/19] xkbcomp: upgrade to 1.2.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 11/19] xf86-input-synaptics: upgrade to 1.3.0 Yu Ke
                   ` (9 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 ...ut-evdev_2.5.0.bb => xf86-input-evdev_2.6.0.bb} |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.5.0.bb => xf86-input-evdev_2.6.0.bb} (54%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index a093653..32d5d80 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -142,7 +142,7 @@ PREFERRED_VERSION_xcb-proto ?= "1.6"
 PREFERRED_VERSION_libxcb ?= "1.7"
 PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
 PREFERRED_VERSION_libpciaccess ?= "0.12.0"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.5.0"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
similarity index 54%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.5.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
index 1b4470c..79e5f18 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.5.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
 
 PR = "r0"
 
-SRC_URI[md5sum] = "eceb6dc517c0649b772f18708a1aade8"
-SRC_URI[sha256sum] = "9dec173ac9d8d09ef5cb2f79e74471f5f3ddd108827f3e95958b623766260333"
+SRC_URI[md5sum] = "f33fe9413bde68936d8909206a13e8a1"
+SRC_URI[sha256sum] = "b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 11/19] xf86-input-synaptics: upgrade to 1.3.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (9 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 10/19] xf86-input-evdev: upgrade to 2.6.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 12/19] libdrm: upgrade to 2.4.23 Yu Ke
                   ` (8 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- update license checksum due to commit "COPYING: add three missing authors listed in synaptics.c". the license type is unchanged.
- Pass correct "sdkdir" value for cross compiling

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../xorg-driver/xf86-input-synaptics_1.2.1.bb      |   10 ----------
 .../xorg-driver/xf86-input-synaptics_1.3.0.bb      |   16 ++++++++++++++++
 3 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 32d5d80..2a982ba 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -145,7 +145,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.12.0"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-intel ?= "2.13.0"
 
 
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
deleted file mode 100644
index 84adb85..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xf86-input-common.inc
-
-DESCRIPTION = "X.Org X server -- keyboard input driver"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=08955125302e95a16628a4bec64ade5f"
-
-DEPENDS += "libxi"
-
-SRC_URI[md5sum] = "29a6f9da5123149e4abc8ff83880ed5c"
-SRC_URI[sha256sum] = "a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb
new file mode 100644
index 0000000..8c2999f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb
@@ -0,0 +1,16 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5"
+
+DEPENDS += "libxi"
+
+#
+# the xorg-synaptics.pc has hardcoded sdkdir=/usr/include/xorg, which is not correct
+# for cross compiling, so pass the correct sdkdir as include path
+#
+EXTRA_OEMAKE += " sdkdir=${STAGING_INCDIR}/xorg "
+
+SRC_URI[md5sum] = "b4e58eba1bdca13f0929a4b03b262135"
+SRC_URI[sha256sum] = "30a33250c4f3d2daa8a61cab847dc7befd3248db0fca139d17fd7b890b5a8fd7"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 12/19] libdrm: upgrade to 2.4.23
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (10 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 11/19] xf86-input-synaptics: upgrade to 1.3.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 13/19] xwininfo: upgrade to 1.1.1 Yu Ke
                   ` (7 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../installtests.patch                             |    0
 .../drm/{libdrm_2.4.22.bb => libdrm_2.4.23.bb}     |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/drm/{libdrm-2.4.22 => libdrm-2.4.23}/installtests.patch (100%)
 rename meta/recipes-graphics/drm/{libdrm_2.4.22.bb => libdrm_2.4.23.bb} (54%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 2a982ba..84460ca 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -137,7 +137,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.1.0"
 PREFERRED_VERSION_mesa-dri ?= "7.9"
-PREFERRED_VERSION_libdrm ?= "2.4.22"
+PREFERRED_VERSION_libdrm ?= "2.4.23"
 PREFERRED_VERSION_xcb-proto ?= "1.6"
 PREFERRED_VERSION_libxcb ?= "1.7"
 PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch
similarity index 100%
rename from meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch
rename to meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.22.bb b/meta/recipes-graphics/drm/libdrm_2.4.23.bb
similarity index 54%
rename from meta/recipes-graphics/drm/libdrm_2.4.22.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.23.bb
index d8e0fff..1546cea 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.22.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.23.bb
@@ -3,7 +3,7 @@ require libdrm.inc
 LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
 
 SRC_URI += "file://installtests.patch"
-SRC_URI[md5sum] = "3bdfa33f35d1c902e5115cceb5500c83"
-SRC_URI[sha256sum] = "0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d"
+SRC_URI[md5sum] = "7577ff36ec364d88fae466d4f7fc5fc6"
+SRC_URI[sha256sum] = "c0f06d68c3edba7a1ad937f5481a8c287efd4cd368cee66cd9e678b06a911c18"
 
 PR = "r0"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 13/19] xwininfo: upgrade to 1.1.1
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (11 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 12/19] libdrm: upgrade to 2.4.23 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 14/19] xf86-video-intel: upgrade to 2.14.0 Yu Ke
                   ` (6 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 .../{xwininfo_1.1.0.bb => xwininfo_1.1.1.bb}       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xwininfo_1.1.0.bb => xwininfo_1.1.1.bb} (58%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 84460ca..6bdfa9c 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans ?= "1.2.6"
 PREFERRED_VERSION_xtrans-native ?= "1.2.6"
 PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwininfo ?= "1.1.0"
+PREFERRED_VERSION_xwininfo ?= "1.1.1"
 PREFERRED_VERSION_mesa-dri ?= "7.9"
 PREFERRED_VERSION_libdrm ?= "2.4.23"
 PREFERRED_VERSION_xcb-proto ?= "1.6"
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.0.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.1.bb
similarity index 58%
rename from meta/recipes-graphics/xorg-app/xwininfo_1.1.0.bb
rename to meta/recipes-graphics/xorg-app/xwininfo_1.1.1.bb
index 8e37294..0011a0a 100644
--- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.1.bb
@@ -7,5 +7,5 @@ DEPENDS += "libxext libxmu"
 PR = "r0"
 PE = "0"
 
-SRC_URI[md5sum] = "932cb1393dee3caaf26f3515f640d783"
-SRC_URI[sha256sum] = "759e03d80b2a8bc843d501d5fd91fe1506da403019b6f165d32aa1b9909f8cf8"
+SRC_URI[md5sum] = "7a7f44b826d877ba39c19cf5913978d7"
+SRC_URI[sha256sum] = "645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 14/19] xf86-video-intel: upgrade to 2.14.0
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (12 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 13/19] xwininfo: upgrade to 1.1.1 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 15/19] cairo: upgrade to 1.10.2 Yu Ke
                   ` (5 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 ...-intel_2.13.0.bb => xf86-video-intel_2.14.0.bb} |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.13.0.bb => xf86-video-intel_2.14.0.bb} (72%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 6bdfa9c..4d4a475 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.13.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.14.0"
 
 
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
similarity index 72%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
index 6f0c81c..54dc11b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
@@ -11,5 +11,5 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-SRC_URI[md5sum] = "de2f8a5836d90c71f3175dcd46d03ec0"
-SRC_URI[sha256sum] = "d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887"
+SRC_URI[md5sum] = "05f187582aeabda57fcd6f2782cfbf8e"
+SRC_URI[sha256sum] = "e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 15/19] cairo: upgrade to 1.10.2
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (13 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 14/19] xf86-video-intel: upgrade to 2.14.0 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 16/19] mesa: upgrade to mesa 7.10 Yu Ke
                   ` (4 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../cairo/{cairo_1.10.0.bb => cairo_1.10.2.bb}     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/cairo/{cairo_1.10.0.bb => cairo_1.10.2.bb} (90%)

diff --git a/meta/recipes-graphics/cairo/cairo_1.10.0.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
similarity index 90%
rename from meta/recipes-graphics/cairo/cairo_1.10.0.bb
rename to meta/recipes-graphics/cairo/cairo_1.10.2.bb
index 59e5ff9..603b51d 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,12 +2,12 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e"
-SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
+SRC_URI[md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
+SRC_URI[sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
 
 RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \
 		  cairo-perf-utils"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 16/19] mesa: upgrade to mesa 7.10
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (14 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 15/19] cairo: upgrade to 1.10.2 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 17/19] mesa-glsl: add mesa glsl 7.8.2 Yu Ke
                   ` (3 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

- add SRC_URI checksum
- remove the DEFAULT_PREFERENCE for atom_pc, since mesa 7.10 has dependency on GPLv3 talloc. the latest non-GPLv3 one is mesa 7.8.2, atom_pc can use that vesion.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../mesa/{mesa-dri_7.9.bb => mesa-dri_7.10.bb}     |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-dri_7.9.bb => mesa-dri_7.10.bb} (83%)

diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.9.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb
similarity index 83%
rename from meta/recipes-graphics/mesa/mesa-dri_7.9.bb
rename to meta/recipes-graphics/mesa/mesa-dri_7.10.bb
index 313b655..3031e4b 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb
@@ -6,19 +6,19 @@ PROTO_DEPS = "xf86driproto glproto dri2proto"
 LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
             libxml2-native talloc"
 
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch"
 
+SRC_URI[md5sum] = "33fb94eccc02cbb4d8d1365615e38e46"
+SRC_URI[sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df6e0aca"
+
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-# Atom PCs have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_atom-pc = "1"
-
 LEAD_SONAME = "libGL.so.1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 17/19] mesa-glsl: add mesa glsl 7.8.2
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (15 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 16/19] mesa: upgrade to mesa 7.10 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 18/19] mesa: add mesa 7.8.2 Yu Ke
                   ` (2 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

mesa glsl is required by mesa 7.8.2, so add it.

Signed-off-by: Yu Ke <ke.y@intel.com>
---
 .../mesa/mesa-dri-glsl-native_7.8.2.bb             |   27 ++++++++++++++++++++
 .../mesa/mesa-dri-glsl-native_7.9.bb               |   25 ------------------
 2 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb

diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
new file mode 100644
index 0000000..d6f2c33
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://apps/compile.c;endline=26;md5=27c2833286ce9566b162bcbe21d5b267"
+PR = "r0"
+
+DEPENDS = "makedepend-native"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+SRC_URI[md5sum] = "6be2d343a0089bfd395ce02aaf8adb57"
+SRC_URI[sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
+
+S = "${WORKDIR}/Mesa-7.8.2/src/glsl/"
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+	ln -s ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb
deleted file mode 100644
index ffc113b..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://main.cpp;endline=22;md5=a12a9c0208ee64a07ce314dfed4c81eb"
-PR = "r0"
-
-DEPENDS = "makedepend-native talloc-native"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-
-S = "${WORKDIR}/Mesa-${PV}/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}
-	install -m 755 ${S}/glsl_compiler ${D}/${bindir}/
-}
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 18/19] mesa: add mesa 7.8.2
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (16 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 17/19] mesa-glsl: add mesa glsl 7.8.2 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-16 12:19 ` [PATCH 19/19] xserver-xf86-dri-lite: upgrade to 1.9.3 Yu Ke
  2011-01-18 22:29 ` [PATCH 00/19] graphics recipes upgrade Saul Wold
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

The latest mesa 7.10 has dependency on GPLv3 library talloc, so it is still necessary to keep one old non-GPLv3 mesa.And the latest non-GPLv3 version is mesa 7.8.2, so this patch add it.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 meta/recipes-graphics/mesa/mesa-common.inc         |    4 +-
 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   59 ++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 4d4a475..19dd340 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.6"
 PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.1.1"
-PREFERRED_VERSION_mesa-dri ?= "7.9"
+PREFERRED_VERSION_mesa-dri ?= "7.8.2"
 PREFERRED_VERSION_libdrm ?= "2.4.23"
 PREFERRED_VERSION_xcb-proto ?= "1.6"
 PREFERRED_VERSION_libxcb ?= "1.7"
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index f029d3d..0294c8f 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -4,8 +4,8 @@ BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 "
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
 
 S = "${WORKDIR}/Mesa-${PV}"
 
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
new file mode 100644
index 0000000..60edddf
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
@@ -0,0 +1,59 @@
+include mesa-common.inc
+
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
+
+PROTO_DEPS = "xf86driproto glproto dri2proto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
+
+PR = "r2"
+
+SRC_URI += "file://crossfix.patch"
+
+SRC_URI[mesalib.md5sum] = "6be2d343a0089bfd395ce02aaf8adb57"
+SRC_URI[mesalib.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
+
+SRC_URI[mesademos.md5sum] = "757d9e2e06f48b1a52848be9b0307ced"
+SRC_URI[mesademos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
+
+LEAD_SONAME = "libGL.so.1"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
+
+# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+do_configure_prepend() {
+	sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile
+}
+
+do_install_append () {
+	install -d ${D}/usr/bin
+	install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
+}
+
+python populate_packages_prepend() {
+	import os.path
+
+	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
+
+PACKAGES =+ "${PN}-xprogs"
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+#
+# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl
+# then run gen_matypes > matypes.h on device
+#
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH 19/19] xserver-xf86-dri-lite: upgrade to 1.9.3
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (17 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 18/19] mesa: add mesa 7.8.2 Yu Ke
@ 2011-01-16 12:19 ` Yu Ke
  2011-01-18 22:29 ` [PATCH 00/19] graphics recipes upgrade Saul Wold
  19 siblings, 0 replies; 21+ messages in thread
From: Yu Ke @ 2011-01-16 12:19 UTC (permalink / raw)
  To: poky

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 ...ite_1.9.2.bb => xserver-xf86-dri-lite_1.9.3.bb} |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.2.bb => xserver-xf86-dri-lite_1.9.3.bb} (75%)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 19dd340..3e375d6 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,7 +129,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.3.4"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.2"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
 PREFERRED_VERSION_xset ?= "1.2.1"
 PREFERRED_VERSION_xtrans ?= "1.2.6"
 PREFERRED_VERSION_xtrans-native ?= "1.2.6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
similarity index 75%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
index 670604a..9ff85de 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
@@ -16,7 +16,7 @@ SRC_URI += "file://nodolt.patch \
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
-SRC_URI[md5sum] = "5c8773499a6a8c1ddaedf33577ec9634"
-SRC_URI[sha256sum] = "8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34"
+SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
+SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
 
 EXTRA_OECONF += "--enable-dri --enable-dri2"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 21+ messages in thread

* Re: [PATCH 00/19] graphics recipes upgrade
  2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
                   ` (18 preceding siblings ...)
  2011-01-16 12:19 ` [PATCH 19/19] xserver-xf86-dri-lite: upgrade to 1.9.3 Yu Ke
@ 2011-01-18 22:29 ` Saul Wold
  19 siblings, 0 replies; 21+ messages in thread
From: Saul Wold @ 2011-01-18 22:29 UTC (permalink / raw)
  To: Yu Ke; +Cc: poky

On 01/16/2011 04:19 AM, Yu Ke wrote:
> this patch series upgrade the graphics recpies. with this upgrade, the graphics recpies are aligned with
> - the latest X11 release: X11R7.6 (http://www.x.org/releases/X11R7.6)
> - the latest Intel 2010Q4 graphics package (http://intellinuxgraphics.org/2010Q4.html)
>
> One note on the mesa3d lib:  both latest mesa 7.10 and old mesa 7.8.2 are provided. mesa 7.10 has dependency on GPLv3 lib (talloc), so it is only used when there is required functionality that mesa 7.8.2 can not provid, for example, SNB graphics support.  mesa 7.8.2 has no GPLv3 depdency, so it can be used in normal case. there is activity ongoing in upstream to remove the talloc depdency, we will monitor and adopt it once it is done.
>
> for the root-less X support, there still some issue with the configuration, so the related patch will be sent later.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: kyu3/x-upgrade
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/x-upgrade
>
> Thanks,
>      Yu Ke<ke.yu@intel.com>
> ---
>
>
> Yu Ke (19):
>    xhost: upgrade to 1.0.4
>    mkfontdir: upgrade to 1.0.6
>    xinit: upgrade to 1.3.0
>    bigreqsproto: upgrade to 1.1.1
>    xprop: upgrade to 1.2.0
>    mkfontscale: upgrade to 1.0.8
>    xdpyinfo: upgrade to 1.2.0
>    xf86-input-keyboard: upgrade to 1.5.0
>    xkbcomp: upgrade to 1.2.0
>    xf86-input-evdev: upgrade to 2.6.0
>    xf86-input-synaptics: upgrade to 1.3.0
>    libdrm: upgrade to 2.4.23
>    xwininfo: upgrade to 1.1.1
>    xf86-video-intel: upgrade to 2.14.0
>    cairo: upgrade to 1.10.2
>    mesa: upgrade to mesa 7.10
>    mesa-glsl: add mesa glsl 7.8.2
>    mesa: add mesa 7.8.2
>    xserver-xf86-dri-lite: upgrade to 1.9.3
>
>   .../distro/include/preferred-xorg-versions.inc     |   30 +++++-----
>   .../cairo/{cairo_1.10.0.bb =>  cairo_1.10.2.bb}     |    6 +-
>   .../installtests.patch                             |    0
>   .../drm/{libdrm_2.4.22.bb =>  libdrm_2.4.23.bb}     |    4 +-
>   meta/recipes-graphics/mesa/mesa-common.inc         |    4 +-
>   .../mesa/mesa-dri-glsl-native_7.8.2.bb             |   27 +++++++++
>   .../mesa/mesa-dri-glsl-native_7.9.bb               |   25 --------
>   .../mesa/{mesa-dri_7.9.bb =>  mesa-dri_7.10.bb}     |   10 ++--
>   meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   59 ++++++++++++++++++++
>   .../{mkfontdir_1.0.5.bb =>  mkfontdir_1.0.6.bb}     |    6 +-
>   .../recipes-graphics/xorg-app/mkfontscale_1.0.7.bb |   12 ----
>   .../recipes-graphics/xorg-app/mkfontscale_1.0.8.bb |   12 ++++
>   .../{xdpyinfo_1.1.0.bb =>  xdpyinfo_1.2.0.bb}       |    6 +-
>   meta/recipes-graphics/xorg-app/xhost_1.0.3.bb      |   10 ---
>   meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |   10 +++
>   .../xorg-app/{xinit_1.2.1.bb =>  xinit_1.3.0.bb}    |    4 +-
>   .../xorg-app/xkbcomp/cross-compile-fix.patch       |   35 ++++++++++++
>   .../{xkbcomp_1.1.1.bb =>  xkbcomp_1.2.0.bb}         |    6 +-
>   meta/recipes-graphics/xorg-app/xprop_1.1.0.bb      |   13 ----
>   meta/recipes-graphics/xorg-app/xprop_1.2.0.bb      |   13 ++++
>   .../{xwininfo_1.1.0.bb =>  xwininfo_1.1.1.bb}       |    4 +-
>   ...ut-evdev_2.5.0.bb =>  xf86-input-evdev_2.6.0.bb} |    4 +-
>   .../xorg-driver/xf86-input-keyboard_1.4.0.bb       |   10 ---
>   .../xorg-driver/xf86-input-keyboard_1.5.0.bb       |   10 +++
>   .../xorg-driver/xf86-input-synaptics_1.2.1.bb      |   10 ---
>   .../xorg-driver/xf86-input-synaptics_1.3.0.bb      |   16 +++++
>   ...-intel_2.13.0.bb =>  xf86-video-intel_2.14.0.bb} |    4 +-
>   ...bigreqsproto_1.1.0.bb =>  bigreqsproto_1.1.1.bb} |    6 +-
>   ...ite_1.9.2.bb =>  xserver-xf86-dri-lite_1.9.3.bb} |    4 +-
>   29 files changed, 232 insertions(+), 128 deletions(-)
>   rename meta/recipes-graphics/cairo/{cairo_1.10.0.bb =>  cairo_1.10.2.bb} (90%)
>   rename meta/recipes-graphics/drm/{libdrm-2.4.22 =>  libdrm-2.4.23}/installtests.patch (100%)
>   rename meta/recipes-graphics/drm/{libdrm_2.4.22.bb =>  libdrm_2.4.23.bb} (54%)
>   create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
>   delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb
>   rename meta/recipes-graphics/mesa/{mesa-dri_7.9.bb =>  mesa-dri_7.10.bb} (83%)
>   create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
>   rename meta/recipes-graphics/xorg-app/{mkfontdir_1.0.5.bb =>  mkfontdir_1.0.6.bb} (62%)
>   delete mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
>   create mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.0.8.bb
>   rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.1.0.bb =>  xdpyinfo_1.2.0.bb} (56%)
>   delete mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
>   create mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb
>   rename meta/recipes-graphics/xorg-app/{xinit_1.2.1.bb =>  xinit_1.3.0.bb} (59%)
>   create mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
>   rename meta/recipes-graphics/xorg-app/{xkbcomp_1.1.1.bb =>  xkbcomp_1.2.0.bb} (61%)
>   delete mode 100644 meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
>   create mode 100644 meta/recipes-graphics/xorg-app/xprop_1.2.0.bb
>   rename meta/recipes-graphics/xorg-app/{xwininfo_1.1.0.bb =>  xwininfo_1.1.1.bb} (58%)
>   rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.5.0.bb =>  xf86-input-evdev_2.6.0.bb} (54%)
>   delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
>   create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.5.0.bb
>   delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
>   create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.3.0.bb
>   rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.13.0.bb =>  xf86-video-intel_2.14.0.bb} (72%)
>   rename meta/recipes-graphics/xorg-proto/{bigreqsproto_1.1.0.bb =>  bigreqsproto_1.1.1.bb} (59%)
>   rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.2.bb =>  xserver-xf86-dri-lite_1.9.3.bb} (75%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Pulled into Master

Thanks
	Sau!




^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2011-01-18 22:29 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-16 12:19 [PATCH 00/19] graphics recipes upgrade Yu Ke
2011-01-16 12:19 ` [PATCH 01/19] xhost: upgrade to 1.0.4 Yu Ke
2011-01-16 12:19 ` [PATCH 02/19] mkfontdir: upgrade to 1.0.6 Yu Ke
2011-01-16 12:19 ` [PATCH 03/19] xinit: upgrade to 1.3.0 Yu Ke
2011-01-16 12:19 ` [PATCH 04/19] bigreqsproto: upgrade to 1.1.1 Yu Ke
2011-01-16 12:19 ` [PATCH 05/19] xprop: upgrade to 1.2.0 Yu Ke
2011-01-16 12:19 ` [PATCH 06/19] mkfontscale: upgrade to 1.0.8 Yu Ke
2011-01-16 12:19 ` [PATCH 07/19] xdpyinfo: upgrade to 1.2.0 Yu Ke
2011-01-16 12:19 ` [PATCH 08/19] xf86-input-keyboard: upgrade to 1.5.0 Yu Ke
2011-01-16 12:19 ` [PATCH 09/19] xkbcomp: upgrade to 1.2.0 Yu Ke
2011-01-16 12:19 ` [PATCH 10/19] xf86-input-evdev: upgrade to 2.6.0 Yu Ke
2011-01-16 12:19 ` [PATCH 11/19] xf86-input-synaptics: upgrade to 1.3.0 Yu Ke
2011-01-16 12:19 ` [PATCH 12/19] libdrm: upgrade to 2.4.23 Yu Ke
2011-01-16 12:19 ` [PATCH 13/19] xwininfo: upgrade to 1.1.1 Yu Ke
2011-01-16 12:19 ` [PATCH 14/19] xf86-video-intel: upgrade to 2.14.0 Yu Ke
2011-01-16 12:19 ` [PATCH 15/19] cairo: upgrade to 1.10.2 Yu Ke
2011-01-16 12:19 ` [PATCH 16/19] mesa: upgrade to mesa 7.10 Yu Ke
2011-01-16 12:19 ` [PATCH 17/19] mesa-glsl: add mesa glsl 7.8.2 Yu Ke
2011-01-16 12:19 ` [PATCH 18/19] mesa: add mesa 7.8.2 Yu Ke
2011-01-16 12:19 ` [PATCH 19/19] xserver-xf86-dri-lite: upgrade to 1.9.3 Yu Ke
2011-01-18 22:29 ` [PATCH 00/19] graphics recipes upgrade Saul Wold

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.