From cc0e53de68376fb1987e0a11cd977e481cd7d95d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 May 2011 17:18:15 +0200 Subject: xserver-xorg: upgrade from 1.10.1.902 to 1.10.2 and replace part of randr-support.patch with upstream patch Signed-off-by: Martin Jansa --- ...ack-assume-pixman-supports-overlapped-blt.patch | 14 --- .../hack-fbdev-ignore-return-mode.patch | 39 ------ .../xserver-xorg-1.10.1.902/randr-support.patch | 131 --------------------- .../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 ++++++++++ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++ .../hack-fbdev-ignore-return-mode.patch | 39 ++++++ .../xserver-xorg-1.10.2/randr-support.patch | 102 ++++++++++++++++ recipes/xorg-xserver/xserver-xorg_1.10.1.902.bb | 33 ------ recipes/xorg-xserver/xserver-xorg_1.10.2.bb | 34 ++++++ 9 files changed, 250 insertions(+), 217 deletions(-) delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-assume-pixman-supports-overlapped-blt.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-fbdev-ignore-return-mode.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.1.902/randr-support.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.1.902.bb create mode 100644 recipes/xorg-xserver/xserver-xorg_1.10.2.bb diff --git a/recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-assume-pixman-supports-overlapped-blt.patch deleted file mode 100644 index a947582f15..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-assume-pixman-supports-overlapped-blt.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.10.1.902/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-fbdev-ignore-return-mode.patch deleted file mode 100644 index d3661cbea2..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.10.1.902/hack-fbdev-ignore-return-mode.patch +++ /dev/null @@ -1,39 +0,0 @@ -Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 -(and probably other) while returning from chvt or resume on some -hardware (e. g. zaurus). - -Correct fix would require debugging of fbdev mode during LeaveVT and -EnterVT. - -This patch may cause staying in incorrect or corrupted display mode -after EnterVT, but on man affected devices it does not cause any visible -problems. - -Hacked code is never called on properly written drivers. - -Devices affected and testers involved for future patch removal: -Sharp Zaurus (spitz/akita): Stanislav Brabec - -See also: -https://bugzilla.redhat.com/show_bug.cgi?id=238451 - -The bug (first line indicates that your device is affected): - -(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode - -Fatal server error: -EnterVT failed for screen 0 - -Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c -=================================================================== ---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c -+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c -@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa - #if DEBUG - print_fbdev_mode("returned", &set_var); - #endif -- return FALSE; -+ /* return FALSE; UGLY HACK to allow return from chvt */ - } - - if (!check) diff --git a/recipes/xorg-xserver/xserver-xorg-1.10.1.902/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.10.1.902/randr-support.patch deleted file mode 100644 index 258deb3eb4..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.10.1.902/randr-support.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c ---- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200 -+++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200 -@@ -99,6 +99,8 @@ - return; \ - } - -+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) -+ - EventListPtr xf86Events = NULL; - - static int -@@ -1408,4 +1410,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] = 1; -+ invert[1] = 1; -+ break; -+ case RR_Rotate_270: -+ swap_axes = 0; -+ invert[0] = 1; -+ invert[1] = 0; -+ 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 -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c ---- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200 -+++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200 -@@ -389,6 +389,12 @@ - if (didLock) - crtc->funcs->unlock (crtc); - -+ /* -+ * Rotate Touchscreen -+ */ -+ xf86InputRotationNotify(crtc->rotation); -+ -+ - return ret; - } - -diff -ur xorg-server-1.10.1.901//randr/rrscreen.c git/xorg-server-1.10.1.901//randr/rrscreen.c ---- xorg-server-1.10.1.901//randr/rrscreen.c 2011-02-25 04:27:32.000000000 +0100 -+++ git/xorg-server-1.10.1.901//randr/rrscreen.c 2011-05-18 23:19:39.007760004 +0200 -@@ -910,11 +910,6 @@ - */ - width = mode->mode.width; - height = mode->mode.height; -- if (rotation & (RR_Rotate_90|RR_Rotate_270)) -- { -- width = mode->mode.height; -- height = mode->mode.width; -- } - - if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { - client->errorValue = width; -@@ -926,7 +921,12 @@ - free(pData); - return BadValue; - } -- -+ if (rotation & (RR_Rotate_90|RR_Rotate_270)) -+ { -+ width = mode->mode.height; -+ height = mode->mode.width; -+ } -+ - if (width != pScreen->width || height != pScreen->height) - { - int c; diff --git a/recipes/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch b/recipes/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch new file mode 100644 index 0000000000..2c4078a001 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch @@ -0,0 +1,61 @@ +From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001 +From: Aaron Plattner +Date: Tue, 24 May 2011 23:02:42 +0000 +Subject: randr: check rotated virtual size limits correctly + +Commit d1107918d4626268803b54033a07405122278e7f introduced checks to +the RandR path that cause RRSetScreenConfig requests to fail if the +size is too large. Unfortunately, when RandR 1.1 rotation is enabled +it compares the rotated screen dimensions to the unrotated limits, +which causes 90- and 270-degree rotation to fail unless your screen +happens to be square: + + X Error of failed request: BadValue (integer parameter out of range for operation) + Major opcode of failed request: 153 (RANDR) + Minor opcode of failed request: 2 (RRSetScreenConfig) + Value in failed request: 0x780 + Serial number of failed request: 14 + Current serial number in output stream: 14 + +Fix this by moving the check above the code that swaps the dimensions +based on the rotation. + +Signed-off-by: Aaron Plattner +Reviewed-by: Jeremy Huddleston +Tested-by: Robert Hooker +Tested-by: Kent Baxley +Signed-off-by: Keith Packard +(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3) +--- +diff --git a/randr/rrscreen.c b/randr/rrscreen.c +index 1bc1a9e..da6d48d 100644 +--- a/randr/rrscreen.c ++++ b/randr/rrscreen.c +@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client) + */ + width = mode->mode.width; + height = mode->mode.height; +- if (rotation & (RR_Rotate_90|RR_Rotate_270)) +- { +- width = mode->mode.height; +- height = mode->mode.width; +- } +- + if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { + client->errorValue = width; + free(pData); +@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client) + return BadValue; + } + ++ if (rotation & (RR_Rotate_90|RR_Rotate_270)) ++ { ++ width = mode->mode.height; ++ height = mode->mode.width; ++ } ++ + if (width != pScreen->width || height != pScreen->height) + { + int c; +-- +cgit v0.8.3-6-g21f6 diff --git a/recipes/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.10.2/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.10.2/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch @@ -0,0 +1,39 @@ +Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 +(and probably other) while returning from chvt or resume on some +hardware (e. g. zaurus). + +Correct fix would require debugging of fbdev mode during LeaveVT and +EnterVT. + +This patch may cause staying in incorrect or corrupted display mode +after EnterVT, but on man affected devices it does not cause any visible +problems. + +Hacked code is never called on properly written drivers. + +Devices affected and testers involved for future patch removal: +Sharp Zaurus (spitz/akita): Stanislav Brabec + +See also: +https://bugzilla.redhat.com/show_bug.cgi?id=238451 + +The bug (first line indicates that your device is affected): + +(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode + +Fatal server error: +EnterVT failed for screen 0 + +Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +=================================================================== +--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c ++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa + #if DEBUG + print_fbdev_mode("returned", &set_var); + #endif +- return FALSE; ++ /* return FALSE; UGLY HACK to allow return from chvt */ + } + + if (!check) diff --git a/recipes/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch new file mode 100644 index 0000000000..632a64ce52 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch @@ -0,0 +1,102 @@ +diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c +--- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200 ++++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200 +@@ -99,6 +99,8 @@ + return; \ + } + ++#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) ++ + EventListPtr xf86Events = NULL; + + static int +@@ -1408,4 +1410,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] = 1; ++ invert[1] = 1; ++ break; ++ case RR_Rotate_270: ++ swap_axes = 0; ++ invert[0] = 1; ++ invert[1] = 0; ++ 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 -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c +--- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200 ++++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200 +@@ -389,6 +389,12 @@ + if (didLock) + crtc->funcs->unlock (crtc); + ++ /* ++ * Rotate Touchscreen ++ */ ++ xf86InputRotationNotify(crtc->rotation); ++ ++ + return ret; + } + diff --git a/recipes/xorg-xserver/xserver-xorg_1.10.1.902.bb b/recipes/xorg-xserver/xserver-xorg_1.10.1.902.bb deleted file mode 100644 index 8c461df04e..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.10.1.902.bb +++ /dev/null @@ -1,33 +0,0 @@ -# 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" -DEFAULT_PREFERENCE_shr = "1" - -SRC_URI += " \ - file://randr-support.patch \ - file://hack-fbdev-ignore-return-mode.patch \ - file://hack-assume-pixman-supports-overlapped-blt.patch \ - " -SRC_URI[archive.md5sum] = "996d9e183ad1940f1cd802db2698b6e1" -SRC_URI[archive.sha256sum] = "06d9d25cde3c943709adb24dc44426df58f4a8774a048e422ce9543c34e37dbc" - -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_1.10.2.bb b/recipes/xorg-xserver/xserver-xorg_1.10.2.bb new file mode 100644 index 0000000000..95877c4b8f --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.10.2.bb @@ -0,0 +1,34 @@ +# 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" +DEFAULT_PREFERENCE_shr = "1" + +SRC_URI += " \ + file://50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch \ + file://randr-support.patch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ + " +SRC_URI[archive.md5sum] = "c9ba50bd44ea70da51f13100336a5484" +SRC_URI[archive.sha256sum] = "65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c" + +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 " -- cgit 1.2.3-korg