diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-18 14:13:36 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-21 07:47:46 +0100 |
| commit | 86dacb28c2b274691b24483a22a2b1d05102f006 (patch) | |
| tree | 64e41e8426e5095a6de1db069d4f23cfbe4c52f7 /recipes/xorg-xserver | |
| parent | 5a390f90eca8514aa7106e62acd79c18c4d10138 (diff) | |
| download | openembedded-86dacb28c2b274691b24483a22a2b1d05102f006.tar.gz | |
xorg: update recipes to latest releases 2010-01-18
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch | 14 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.7.4.bb | 26 |
2 files changed, 40 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb new file mode 100644 index 0000000000..bd2e6f82a8 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb @@ -0,0 +1,26 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + file://hack-fbdev-ignore-return-mode.patch;patch=1 \ + " + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " |