diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-16 17:46:41 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-18 16:31:40 +0100 |
| commit | eaae38582829203c85f4cb49b902176987ad3df5 (patch) | |
| tree | 25c9db8fbd11ba07ec3f12614f91ef4b22ac06b8 /meta-oe/recipes-graphics | |
| parent | b55fbf81bed5d56ce4592abed9210f27870f096f (diff) | |
| download | meta-openembedded-eaae38582829203c85f4cb49b902176987ad3df5.tar.gz | |
xf86-video-glamo: adapt to xserver 1.14 API
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch | 48 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb | 3 |
2 files changed, 50 insertions, 1 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch new file mode 100644 index 0000000000..fab0b238f6 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch @@ -0,0 +1,48 @@ +From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 16 Mar 2013 17:44:37 +0100 +Subject: [PATCH] glamo*driver: remove references to mibstore + +* fix build with xserver-1.14 + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/glamo-driver.c | 2 -- + src/glamo-kms-driver.c | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/src/glamo-driver.c b/src/glamo-driver.c +index 10b7762..22f57d7 100644 +--- a/src/glamo-driver.c ++++ b/src/glamo-driver.c +@@ -14,7 +14,6 @@ + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL) + } + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c +index c5c7a00..f192398 100644 +--- a/src/glamo-kms-driver.c ++++ b/src/glamo-kms-driver.c +@@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, + + GlamoKMSExaInit(pScrn); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); +-- +1.8.1.5 + diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb index b56b995181..f9eb3ce920 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb @@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" PE = "2" PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \ file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \ file://0001-fix-build-with-KMS-disabled.patch \ file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ + file://0001-glamo-driver-remove-references-to-mibstore.patch \ " S = "${WORKDIR}/git" |