diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-01-10 22:19:30 -0600 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-01-10 22:19:30 -0600 |
commit | 9016be4d8005cfff3fedf4aded4600c6e110263a (patch) | |
tree | 870964d946d100a28acb32e7c561456dabdd7c32 /meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc | |
parent | 38f2b670bc37515bcb0fa7f98e338e5242d70386 (diff) | |
download | meta-intel-9016be4d8005cfff3fedf4aded4600c6e110263a.tar.gz |
meta-emenlow: fix ptr->int and Werror=address compile errors
A couple of things that had previously been warnings are now errors,
so they need to be fixed up.
The first problem is the same problem encountered by xserver-kdrive,
and has the same fix, namely create a new version of REGION_INIT and
have all calls that pass in a pointer to a static struct use it
instead. A different fix for this is upstream, which includes an API
change; we don't need all that to fix this problem.
The second problem is a cast from pointer to integer in fbdevhw.c.
This also is fixed upstream by removing the whole section of code
which is bogus anyway, which is also done here.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc')
-rw-r--r-- | meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc index 0faee5ee..9ee9c97d 100644 --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r4" | 1 | PR = "r5" |
2 | 2 | ||
3 | PROTO_DEPS += "xf86driproto dri2proto" | 3 | PROTO_DEPS += "xf86driproto dri2proto" |
4 | 4 | ||
@@ -6,7 +6,9 @@ DEPENDS += "font-util" | |||
6 | 6 | ||
7 | SRC_URI += "file://nodolt.patch \ | 7 | SRC_URI += "file://nodolt.patch \ |
8 | file://crosscompile.patch \ | 8 | file://crosscompile.patch \ |
9 | file://libdrm-poulsbo.patch" | 9 | file://libdrm-poulsbo.patch \ |
10 | file://werror-address-fix.patch \ | ||
11 | file://ptr-to-int-cast-fix.patch" | ||
10 | 12 | ||
11 | # Misc build failure for master HEAD | 13 | # Misc build failure for master HEAD |
12 | SRC_URI += "file://fix_open_max_preprocessor_error.patch" | 14 | SRC_URI += "file://fix_open_max_preprocessor_error.patch" |