aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch18
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb (renamed from meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb)6
2 files changed, 2 insertions, 22 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
deleted file mode 100644
index b3e6109edd..0000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/xf86-video-geode_2.11.15.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
index 07d2d9b859..4e8df46c78 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
@@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
SUMMARY = "X.org server -- Geode GX2/LX display driver"
PR = "${INC_PR}.0"
-SRC_URI[md5sum] = "7dafd19e274c771539b6d4d459423ccf"
-SRC_URI[sha256sum] = "00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0"
-
-SRC_URI += "file://xf86SetModeDefaultName.patch"
+SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392"
+SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7"
COMPATIBLE_HOST = "i.86.*-linux"