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

From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: otavio@ossystems.com.br
Subject: Re: [PATCH 27/27] xf86-video-glamo: fix build with xserver 1.16
Date: Sat, 27 Dec 2014 18:45:13 +0100	[thread overview]
Message-ID: <20141227174513.GH2465@jama> (raw)
In-Reply-To: <8769665d9efb22405435d730c01c1a41d7251b29.1419700394.git.akuster808@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 2977 bytes --]

On Sat, Dec 27, 2014 at 09:22:14AM -0800, Armin Kuster wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>

This shoudn't be needed in dizzy which has old enough xserver.

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Armin Kuster <akuster808@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@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 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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]