[oe] [PATCH 27/27] xf86-video-glamo: fix build with xserver 1.16

[akuster808]

On 12/27/2014 09:45 AM, Martin Jansa wrote:
> On Sat, Dec 27, 2014 at 09:22:14AM -0800, Armin Kuster wrote:
>> From: Martin Jansa <Martin.Jansa at gmail.com>
>
> This shoudn't be needed in dizzy which has old enough xserver.

Thanks I will drop it.

- armin
>
>> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
>> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
>> ---
>>   ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 ++++++++++++++++++++++
>>   .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>>   2 files changed, 30 insertions(+)
>>   create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>>
>> 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 0000000..a820371
>> --- /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 at 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 at 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 38c12f3..78c6564 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"
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>