diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-22 12:32:30 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-22 19:51:03 +0200 |
| commit | 5cb3bdc4a3151c4ee9f7822e75ac9bf6d70395a4 (patch) | |
| tree | 2e795749e30328e8bfeda4ccc882a18e9bdb3e53 /recipes/xorg-xserver | |
| parent | 034c2cd49aa881b1b9dbc4f0abc203d5eaff11dd (diff) | |
xorg: bump packages 2010-06-22
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch | 14 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb | 37 |
2 files changed, 51 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.901/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.901/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.8.99.901.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb new file mode 100644 index 0000000000..2b3a6a9715 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.901.bb @@ -0,0 +1,37 @@ +# Assign it here, since the hal->udev transition happens post 1.7 in angstrom +DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" + +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" +PE = "2" +PR = "${INC_PR}.0" + +# Needs newer mesa-dri, where is D_P = "-1" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_shr = "1" + +SRC_URI += " \ + file://dolt-fix-1.7.0.patch \ + file://randr-support-1.7.0.patch \ + file://hack-fbdev-ignore-return-mode.patch \ + " +SRC_URI[archive.md5sum] = "ebc580fcf4ad9fb03ab9119525467f4a" +SRC_URI[archive.sha256sum] = "98ebdd4bf81fec29335f2c1366074b0212d18789385bcb9dc927c3a2dc94fbfb" + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +PACKAGE_ARCH_ion = "${MACHINE_ARCH}" +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${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 " |