aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-12-01 14:56:05 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-12-01 16:46:30 +0100
commit4e23fe26669910f27a5fafb1e6d98c6a35815a0c (patch)
tree716dc2868cd8dc27b69e3b800b9b55c519fcb814 /meta-oe/recipes-graphics/xorg-lib
parent812d5908976c56bc3fc2a840233a63dff190f38f (diff)
downloadmeta-openembedded-contrib-4e23fe26669910f27a5fafb1e6d98c6a35815a0c.tar.gz
pixman: replace pixman_0.24.0.bb with smaller bbappend with only diff against oe-core version
* disable iwmmxt for now, because it breaks build * neon is not really enabled for people not having FEED_ARCH in OVERRIDES * maybe this diff should be merged to oe-core recipes instead Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-lib')
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/pixman.inc13
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bb4
-rw-r--r--meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bbappend16
3 files changed, 19 insertions, 14 deletions
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman.inc b/meta-oe/recipes-graphics/xorg-lib/pixman.inc
deleted file mode 100644
index f77c6a8ba2..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/pixman.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "Low-level pixel manipulation library."
-LICENSE = "X11"
-
-DEPENDS = "perl-native"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/${BPN}-${PV}.tar.gz;name=archive "
-
-INC_PR = "r5"
-
-inherit autotools pkgconfig
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bb b/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bb
index 7037546076..258cbf1150 100644
--- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bb
@@ -18,4 +18,6 @@ SRC_URI[sha256sum] = "a5647c7158f103eedff5fba799018f4169f6b26b573ab7685812ebc9a1
NEON = " --disable-arm-neon "
NEON_armv7a = " "
-EXTRA_OECONF = "${NEON} --disable-gtk"
+IWMMXT = " --disable-arm-iwmmxt "
+
+EXTRA_OECONF += "${NEON} ${IWMMXT} --disable-gtk"
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bbappend
new file mode 100644
index 0000000000..61a9558ced
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bbappend
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+
+DEPENDS += "perl-native"
+BBCLASSEXTEND = "native"
+
+PRINC = "6"
+
+SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+NEON_armv7a-vfp-neon = " "
+
+IWMMXT = " --disable-arm-iwmmxt "
+
+EXTRA_OECONF += "${NEON} ${IWMMXT}"