diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-12 12:01:59 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-17 12:59:52 +0100 |
commit | 19153a5797c8c484bccc773505cbceff15b14cc6 (patch) | |
tree | d17bc0c6c3df544589bc6c3b84233dfe2039fc07 /meta-oe/recipes-graphics/xorg-driver | |
parent | 2401f0367de108c311450847b62f98154c349fde (diff) | |
download | meta-openembedded-contrib-19153a5797c8c484bccc773505cbceff15b14cc6.tar.gz |
xf86-video-glamo: fix build with xserver 1.16
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-driver')
-rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch new file mode 100644 index 0000000000..a82037109e --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch @@ -0,0 +1,29 @@ +From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 12 Dec 2014 12:00:10 +0100 +Subject: [PATCH] glamo.h: use const for jbt6k74_state_path + +* fix build issue with xserver 1.16: + glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/glamo.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/glamo.h b/src/glamo.h +index 5fd5c04..5e072be 100644 +--- a/src/glamo.h ++++ b/src/glamo.h +@@ -148,7 +148,7 @@ typedef struct { + #endif + + #ifdef JBT6K74_SET_STATE +- char *jbt6k74_state_path; ++ const char *jbt6k74_state_path; + char saved_jbt6k74_state[14]; + #endif + +-- +2.1.3 + 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 38c12f3217..78c65648f9 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 @@ -14,6 +14,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \ 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 \ + file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \ " S = "${WORKDIR}/git" |