diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-04-06 10:37:22 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-04-11 15:12:26 +0200 |
commit | a39e33b7a508849a6dffe577370d7a80fbf26511 (patch) | |
tree | 9f92e55829e201f855c917c677029e8184734c99 /recipes/xorg-xserver | |
parent | 69f50f3c0314532d823dc2ce56b87de4ad24b04c (diff) | |
download | openembedded-a39e33b7a508849a6dffe577370d7a80fbf26511.tar.gz |
xorg: add new versions
* xserver-xorg-1.10 is added with D_P -1 until xf86-input-tslib is
ported, so 1.9.4 is still default version
* xserver-xorg-1.10, dolt was removed in upstream a769f4c22a9cfb5ba248c924a66c31ec966bd8a0
* xserver-xorg-1.10, randr-support needs to be updated, but maybe won't
be needed when new xinput-calibrator with config in xorg.conf.d is
used (waiting for Marco)
* xf86-input-tslib needs to be ported to XINPUT 12 ABI or obsoleted
* tested only on om-gta02 and nokia900, please test xserver-xorg-1.10 on
other devices
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-assume-pixman-supports-overlapped-blt.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch (renamed from recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-fbdev-ignore-return-mode.patch) | 0 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch | 25 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch | 102 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb | 31 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg_git.bb | 22 |
6 files changed, 42 insertions, 138 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch index a947582f15..a947582f15 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-assume-pixman-supports-overlapped-blt.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch index d3661cbea2..d3661cbea2 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/hack-fbdev-ignore-return-mode.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch deleted file mode 100644 index 1d57466ef6..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 04bb25e427ce9e407599af9141c8591e51c1750b Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 11 Nov 2010 12:09:00 +0100 -Subject: [PATCH] xf86Helper: fix LogVMessageVerb call - ---- - hw/xfree86/common/xf86Helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c -index 78e6b20..af08e00 100644 ---- a/hw/xfree86/common/xf86Helper.c -+++ b/hw/xfree86/common/xf86Helper.c -@@ -1190,7 +1190,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma - char *msg; - - msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format); -- LogVMessageVerb(type, verb, "%s", msg); -+ LogVMessageVerb(type, verb, format, args); - free(msg); - } - --- -1.7.3.2 - diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch deleted file mode 100644 index abc7db41eb..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/randr-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -uNr xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c ---- xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c 2010-08-13 07:53:48.000000000 +0200 -+++ xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c 2010-08-28 21:31:10.000000000 +0200 -@@ -106,6 +106,8 @@ - - #include "os.h" - -+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) -+ - EventListPtr xf86Events = NULL; - - /** -@@ -1359,4 +1361,73 @@ - EnableDevice(dev, TRUE); - } - -+/* Taken from evdev-properties.h. */ -+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap" -+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion" -+ -+/* This is a hack until we get device -> CRTC association. */ -+void -+xf86InputRotationNotify(Rotation rotation) -+{ -+ DeviceIntPtr dev; -+ LocalDevicePtr local; -+ int ret; -+ int swap_axes = 0; -+ CARD8 invert[2] = { 0, 0 }; -+ static Atom prop_swap = 0, prop_invert = 0; -+ static int atom_generation = -1; -+ -+ if (atom_generation != serverGeneration) { -+ prop_swap = 0; -+ prop_invert = 0; -+ } -+ -+ switch (rotation & RR_Rotate_All) { -+ case RR_Rotate_0: -+ swap_axes = 1; -+ invert[0] = 0; -+ invert[1] = 0; -+ break; -+ case RR_Rotate_90: -+ swap_axes = 0; -+ invert[0] = 0; -+ invert[1] = 1; -+ break; -+ case RR_Rotate_180: -+ swap_axes = 1; -+ invert[0] = 0; -+ invert[1] = 0; -+ break; -+ case RR_Rotate_270: -+ swap_axes = 0; -+ invert[0] = 0; -+ invert[1] = 1; -+ break; -+ } -+ -+ if (!prop_swap) -+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES, -+ strlen(EVDEV_PROP_SWAP_AXES), TRUE); -+ if (!prop_invert) -+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES, -+ strlen(EVDEV_PROP_INVERT_AXES), TRUE); -+ -+ for (dev = inputInfo.devices; dev; dev = dev->next) { -+ local = dev->public.devicePrivate; -+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8, -+ PropModeReplace, 1, &swap_axes, FALSE); -+ if (ret != Success) { -+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n"); -+ continue; -+ } -+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8, -+ PropModeReplace, 2, invert, FALSE); -+ if (ret != Success) { -+ xf86Msg(X_ERROR, "Changing invert property failed!\n"); -+ continue; -+ } -+ } -+} -+ -+ - /* end of xf86Xinput.c */ -diff -uNr xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c ---- xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c 2010-07-20 05:24:12.000000000 +0200 -+++ xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c 2010-08-28 21:28:48.000000000 +0200 -@@ -387,6 +387,12 @@ - if (didLock) - crtc->funcs->unlock (crtc); - -+ /* -+ * Rotate Touchscreen -+ */ -+ xf86InputRotationNotify(crtc->rotation); -+ -+ - return ret; - } - diff --git a/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb b/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb new file mode 100644 index 0000000000..9ac0c41843 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.10.0.902.bb @@ -0,0 +1,31 @@ +# 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" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += " \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ + " +SRC_URI[archive.md5sum] = "65e5db9e614cd75e97840247c3754521" +SRC_URI[archive.sha256sum] = "994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42" + +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 += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" + +export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb index 98831efe0b..d18bdd758b 100644 --- a/recipes/xorg-xserver/xserver-xorg_git.bb +++ b/recipes/xorg-xserver/xserver-xorg_git.bb @@ -3,24 +3,24 @@ DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" require xorg-xserver-common.inc +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" + DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" -PV = "1.9.99.1" +PV = "1.10.0.902" PR = "${INC_PR}.0" PR_append = "+gitr${SRCPV}" PE = "2" DEFAULT_PREFERENCE = "-1" -SRCREV = "965e709f2b0b17f1e59e5aeb5e7717fede51ef97" -SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \ - file://0001-xf86Helper-fix-LogVMessageVerb-call.patch \ - file://randr-support.patch \ - file://hack-fbdev-ignore-return-mode.patch \ - " - -SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" -SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" +SRCREV = "ec6e1e45627de2bb851f135df0507a360d0d99e6" +SRC_URI = " \ + git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ +" S = "${WORKDIR}/git" @@ -33,6 +33,6 @@ 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 += " --enable-dri2 --disable-unit-tests " +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl " |