From f39bf1b386f876aee67afe44006faafdf8db7705 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 9 Oct 2009 16:49:36 +0200 Subject: Revert "Add latest xorg stuff for xserver-1.7, script for easy recipe bump and xf86-video-glamo-kms" This reverts commit 117ec4def4dff7abad394279698e1ddaef9407a7. --- recipes/xorg-xserver/xorg-xserver-common.inc | 4 +- .../xserver-xorg-1.7.0/randr-support-1.7.0.patch | 96 ---------------------- recipes/xorg-xserver/xserver-xorg_1.7.0.bb | 19 ----- 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.7.0.bb (limited to 'recipes/xorg-xserver') diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index a6cfa09b9a..cfd350e886 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -47,7 +47,7 @@ FILES_${PN}-sdl = "${bindir}/Xsdl" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 ${libdir}/xorg/protocol.txt" +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" FILES_${PN}-xephyr = "${bindir}/Xephyr" @@ -67,7 +67,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ # 84.0k libxf4bpp.so PACKAGES =+ "${PN}-extension-dri \ - ${PN}-extension-dri2 \ ${PN}-extension-glx \ ${PN}-module-libint10 \ ${PN}-module-libafb \ @@ -79,7 +78,6 @@ PACKAGES =+ "${PN}-extension-dri \ ${PN}-module-libxf4bpp" FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch deleted file mode 100644 index fb8d3815be..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Nur xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c ---- xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c 2009-09-24 07:12:00.000000000 +0200 -+++ xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c 2009-10-08 11:45:50.000000000 +0200 -@@ -95,6 +95,8 @@ - - #include "os.h" - -+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) -+ - EventListPtr xf86Events = NULL; - - /** -@@ -1086,4 +1088,67 @@ - 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: -+ break; -+ case RR_Rotate_90: -+ swap_axes = 1; -+ invert[0] = 1; -+ break; -+ case RR_Rotate_180: -+ invert[0] = 1; -+ invert[1] = 1; -+ break; -+ case RR_Rotate_270: -+ swap_axes = 1; -+ 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 -Nur xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c ---- xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c 2009-10-01 08:27:36.000000000 +0200 -+++ xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c 2009-10-08 11:28:42.000000000 +0200 -@@ -391,6 +391,12 @@ - if (didLock) - crtc->funcs->unlock (crtc); - -+ /* -+ * Rotate Touchscreen -+ */ -+ xf86InputRotationNotify(crtc->rotation); -+ -+ - return ret; - } - diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb deleted file mode 100644 index 58b3614535..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-xserver-common.inc - -DESCRIPTION = "the X.Org X server" -DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa xorg-minimal-fonts" -PE = "2" -PR = "r1" - -SRC_URI += "file://sysroot_fix.patch;patch=1 \ - file://dolt-fix.patch;patch=1 \ - file://randr-support-1.7.0.patch;patch=1 \ - " -do_install_prepend() { - mkdir -p ${D}/${libdir}/X11/fonts -} - -EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-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 " -- cgit v1.2.3