summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-08-15 18:11:34 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-08-15 18:11:34 +0200
commit9618437052db27491d9628be818c0e6709dcf9b3 (patch)
treebf77dc68992172df6ec039a57ec4a1cd0db93da0 /recipes/xorg-xserver
parent27856e71c4133815a4797ae5d84f14d57f820926 (diff)
L4T R15, oe-core Image V2.0Beta1
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/files/crash-hack.patch11
-rw-r--r--recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend6
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend4
-rw-r--r--recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend4
4 files changed, 21 insertions, 4 deletions
diff --git a/recipes/xorg-xserver/files/crash-hack.patch b/recipes/xorg-xserver/files/crash-hack.patch
new file mode 100644
index 0000000..0053a10
--- /dev/null
+++ b/recipes/xorg-xserver/files/crash-hack.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.11.2/miext/damage/damage.c~ 2011-04-24 06:54:03.000000000 +0200
++++ xorg-server-1.11.2/miext/damage/damage.c 2012-07-27 12:12:00.012473812 +0200
+@@ -596,6 +596,8 @@
+ ScreenPtr pScreen = pDst->pDrawable->pScreen;
+ PictureScreenPtr ps = GetPictureScreen(pScreen);
+ damageScrPriv(pScreen);
++ //ugly hack, the xserver crashes when gtk programs use some fancy font rendering, this prevents this
++ maskFormat = 0;
+
+ if (checkPictureDamage (pDst))
+ {
diff --git a/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 1615df3..883a3c2 100644
--- a/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,5 +1,3 @@
-PRINC = "2"
-
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+PRINC = "3"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend b/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend
new file mode 100644
index 0000000..77e6079
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.10.1.bbappend
@@ -0,0 +1,4 @@
+# Ugly temporary hack to have Xserver not segfaulting
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://xserver-instrumented.patch;pnum=2"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend b/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend
new file mode 100644
index 0000000..44ae424
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.11.2.bbappend
@@ -0,0 +1,4 @@
+# Ugly temporary hack to have Xserver not segfaulting
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://crash-hack.patch"