[oe-commits] Martin Jansa : xf86-video-geode: Upgrade to 2.11.15

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 0c8de928a293e17f7d562fe0dd4b1a8966f1bba2
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=0c8de928a293e17f7d562fe0dd4b1a8966f1bba2

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Jun 13 13:33:05 2014 +0200

xf86-video-geode: Upgrade to 2.11.15

The latest driver corrected a number of issues and compiles without
warnings with just one patch.  The header included by the given patch
is already included in the geode master line, so will not be be
required after the next geode version release.

Signed-off-by: Brian Lloyd <blloyd at familyhonor.net>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xf86-video-geode/xf86SetModeDefaultName.patch      | 18 ++++++++++++++++++
 ...eo-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
new file mode 100644
index 0000000..b3e6109
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
@@ -0,0 +1,18 @@
+The latest driver corrected a number of issues and compiles without
+warnings with just one patch.  The header included by the given patch
+is already included in the geode master line, so will not be be
+required after the next geode version release.
+
+Upstream-Status: Backport
+
+diff -up xf86-video-geode-2.11.14/src/geode_dcon.c.jx xf86-video-geode-2.11.14/src/geode_dcon.c
+--- xf86-video-geode-2.11.14/src/geode_dcon.c.jx	2012-11-24 05:01:15.000000000 -0500
++++ xf86-video-geode-2.11.14/src/geode_dcon.c	2013-10-25 16:19:35.950234174 -0400
+@@ -29,6 +29,7 @@
+ 
+ /* Includes that are used by all drivers */
+ #include <xf86.h>
++#include <xf86Modes.h>
+ #include <xf86_OSproc.h>
+ #include <compiler.h>
+ 
diff --git a/meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
similarity index 60%
rename from meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
index 2fdb210..07d2d9b 100644
--- a/meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
@@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
 SUMMARY = "X.org server -- Geode GX2/LX display driver"
 PR = "${INC_PR}.0"
 
-SRC_URI[md5sum] = "c9a4e1c5438240e5bdce332f92df9163"
-SRC_URI[sha256sum] = "4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc"
+SRC_URI[md5sum] = "7dafd19e274c771539b6d4d459423ccf"
+SRC_URI[sha256sum] = "00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0"
+
+SRC_URI += "file://xf86SetModeDefaultName.patch"
 
 COMPATIBLE_HOST = "i.86.*-linux"