aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-01-12 12:18:50 -0600
committerTom Zanussi <tom.zanussi@intel.com>2012-01-12 12:27:30 -0600
commit4b6657ce65e3b15118c663f7b03249560d282cbd (patch)
treedc0371edd6ff4a8bc38cab780492e29962c9e2f0 /common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
parent9016be4d8005cfff3fedf4aded4600c6e110263a (diff)
downloadmeta-intel-4b6657ce65e3b15118c663f7b03249560d282cbd.tar.gz
meta-intel-4b6657ce65e3b15118c663f7b03249560d282cbd.tar.bz2
meta-intel-4b6657ce65e3b15118c663f7b03249560d282cbd.zip
meta-intel/common: fix ptr->int and Werror=address compile errors1.2_M2.rc11.2_M2.final
A couple of things that had previously been warnings are now errors, so they need to be fixed up. The first problem is a comparison between the address of a static struct and NULL, which can never be valid. A different fix for this is upstream, which includes an API usage change; we don't need 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. This also adds a missing PR to the xserver-xorg recipe. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc')
-rw-r--r--common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
index 888445d7..8c7009f5 100644
--- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
+++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
@@ -4,6 +4,10 @@ SRC_URI += "file://nodolt.patch \
# Misc build failure for master HEAD
SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+# What once were warnings now are errors, fix those up
+SRC_URI += "file://werror-address-fix.patch \
+ file://ptr-to-int-cast-fix.patch"
+
PROTO_DEPS += "xf86driproto dri2proto"
DEPENDS += "font-util"
EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
@@ -13,3 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
+PR = "r1"