Patchwork [meta-oe] Upgrade geode video driver to 2.11.15

login
register
mail settings
Submitter blloyd
Date June 9, 2014, 7:46 p.m.
Message ID <1402343170-17707-1-git-send-email-blloyd@familyhonor.net>
Download mbox | patch
Permalink /patch/73553/
State Accepted, archived
Headers show

Comments

blloyd - June 9, 2014, 7:46 p.m.
From: blloyd <blloyd@familyhonor.net>

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.

Signed-off-by: Brian Lloyd <blloyd@familyhonor.net>
---
 .../xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch | 11 +++++++++++
 ...f86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
 rename meta-oe/recipes-graphics/xorg-driver/{nonworking/xf86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} (60%)
Martin Jansa - June 13, 2014, 11:32 a.m.
On Mon, Jun 09, 2014 at 02:46:10PM -0500, Brian Lloyd wrote:
> From: blloyd <blloyd@familyhonor.net>
> 
> 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.

^ This is exactly that kind of information which belongs to .patch file
with Upstream-Status: Backport

I've added it this time so no need to resend.

> 
> Signed-off-by: Brian Lloyd <blloyd@familyhonor.net>
> ---
>  .../xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch | 11 +++++++++++
>  ...f86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} |  6 ++++--
>  2 files changed, 15 insertions(+), 2 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
>  rename meta-oe/recipes-graphics/xorg-driver/{nonworking/xf86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} (60%)
> 
> 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
> new file mode 100644
> index 0000000..97d9d49
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
> @@ -0,0 +1,11 @@
> +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/nonworking/xf86-video-geode_2.11.14.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> similarity index 60%
> rename from meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
> rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> index 2fdb210..07d2d9b 100644
> --- a/meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> @@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
>  SUMMARY = "X.org server -- Geode GX2/LX display driver"
>  PR = "${INC_PR}.0"
>  
> -SRC_URI[md5sum] = "c9a4e1c5438240e5bdce332f92df9163"
> -SRC_URI[sha256sum] = "4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc"
> +SRC_URI[md5sum] = "7dafd19e274c771539b6d4d459423ccf"
> +SRC_URI[sha256sum] = "00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0"
> +
> +SRC_URI += "file://xf86SetModeDefaultName.patch"
>  
>  COMPATIBLE_HOST = "i.86.*-linux"
>  
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa - Oct. 2, 2014, 6:21 a.m.
On Mon, Jun 09, 2014 at 02:46:10PM -0500, Brian Lloyd wrote:
> From: blloyd <blloyd@familyhonor.net>
> 
> 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.

xf86-video-geode is broken again, would you mind fixing it to build with
glibc-2.20?

|                  from /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/xf86-video-geode/2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/lx_memory.c:26:
| /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
|  strndup(const char *str, size_t n);
|  ^


> 
> Signed-off-by: Brian Lloyd <blloyd@familyhonor.net>
> ---
>  .../xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch | 11 +++++++++++
>  ...f86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} |  6 ++++--
>  2 files changed, 15 insertions(+), 2 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
>  rename meta-oe/recipes-graphics/xorg-driver/{nonworking/xf86-video-geode_2.11.14.bb => xf86-video-geode_2.11.15.bb} (60%)
> 
> 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
> new file mode 100644
> index 0000000..97d9d49
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
> @@ -0,0 +1,11 @@
> +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/nonworking/xf86-video-geode_2.11.14.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> similarity index 60%
> rename from meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
> rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> index 2fdb210..07d2d9b 100644
> --- a/meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
> @@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
>  SUMMARY = "X.org server -- Geode GX2/LX display driver"
>  PR = "${INC_PR}.0"
>  
> -SRC_URI[md5sum] = "c9a4e1c5438240e5bdce332f92df9163"
> -SRC_URI[sha256sum] = "4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc"
> +SRC_URI[md5sum] = "7dafd19e274c771539b6d4d459423ccf"
> +SRC_URI[sha256sum] = "00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0"
> +
> +SRC_URI += "file://xf86SetModeDefaultName.patch"
>  
>  COMPATIBLE_HOST = "i.86.*-linux"
>  
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Otavio Salvador - Oct. 2, 2014, 5:37 p.m.
On Thu, Oct 2, 2014 at 3:21 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jun 09, 2014 at 02:46:10PM -0500, Brian Lloyd wrote:
>> From: blloyd <blloyd@familyhonor.net>
>>
>> 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.
>
> xf86-video-geode is broken again, would you mind fixing it to build with
> glibc-2.20?
>
> |                  from /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/xf86-video-geode/2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/lx_memory.c:26:
> | /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
> |  strndup(const char *str, size_t n);
> |  ^

I am not using it anymore so it'd be great if Brian could handle it.
blloyd - Oct. 3, 2014, 12:04 a.m.
On 2014-10-02 12:37, Otavio Salvador wrote:
> On Thu, Oct 2, 2014 at 3:21 AM, Martin Jansa <martin.jansa@gmail.com> 
> wrote:
>> On Mon, Jun 09, 2014 at 02:46:10PM -0500, Brian Lloyd wrote:
>>> From: blloyd <blloyd@familyhonor.net>
>>> 
>>> 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.
>> 
>> xf86-video-geode is broken again, would you mind fixing it to build 
>> with
>> glibc-2.20?
>> 
>> |                  from 
>> /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/xf86-video-geode/2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/lx_memory.c:26:
>> | 
>> /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: 
>> error: expected identifier or '(' before '__extension__'
>> |  strndup(const char *str, size_t n);
>> |  ^
> 
> I am not using it anymore so it'd be great if Brian could handle it.

Was already working on it.  My patch has already been accepted upstream 
for 2.11.17.
I'll get a patch for yocto 2.11.16 to use until 2.11.17 is released, as 
that is probably a very long way away.

In the meantime, add

#if HAVE_CONFIG_H
#include <config.h>
#endif

to the top of the file and it compiles if you need it.  I'm having 
issues with my dev box and didn't get the yocto patch out.  I should be 
able to get it out this weekend if I don't get it out before.

Patch

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
new file mode 100644
index 0000000..97d9d49
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/xf86SetModeDefaultName.patch
@@ -0,0 +1,11 @@ 
+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/nonworking/xf86-video-geode_2.11.14.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
similarity index 60%
rename from meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
index 2fdb210..07d2d9b 100644
--- a/meta-oe/recipes-graphics/xorg-driver/nonworking/xf86-video-geode_2.11.14.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.15.bb
@@ -4,8 +4,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
 SUMMARY = "X.org server -- Geode GX2/LX display driver"
 PR = "${INC_PR}.0"
 
-SRC_URI[md5sum] = "c9a4e1c5438240e5bdce332f92df9163"
-SRC_URI[sha256sum] = "4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc"
+SRC_URI[md5sum] = "7dafd19e274c771539b6d4d459423ccf"
+SRC_URI[sha256sum] = "00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0"
+
+SRC_URI += "file://xf86SetModeDefaultName.patch"
 
 COMPATIBLE_HOST = "i.86.*-linux"