From 5250895e0421cbd95cb97d201fcb8fbc3a7bcc18 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 16 Aug 2010 15:43:45 +0200 Subject: [PATCH] xorg-xserver: move older not pinned versions to obsolete dir Acked-by: Khem Raj Signed-off-by: Martin Jansa --- .../xorg-xserver/files/xcalibrate-xorg.diff | 0 .../xorg-xserver/xorg-xserver-common.inc | 0 .../xserver-xorg-1.3.0.0/drmfix.patch | 0 .../xserver-xorg-1.3.0.0/glyphstr.patch | 0 .../xserver-xorg-1.4.2/drmfix.patch | 0 .../xserver-xorg-1.4/drmfix.patch | 0 .../xserver-xorg-1.5.1}/drmfix.patch | 0 .../xserver-xorg-1.5.3}/drmfix.patch | 0 .../xorg-server-1.5.3-configure.patch | 0 ...ver-1.5.3-glcore-prepare-for-dynamic.patch | 0 .../xserver-xorg-1.6.1}/drmfix.patch | 0 ...ssume-pixman-supports-overlapped-blt.patch | 0 ...ssume-pixman-supports-overlapped-blt.patch | 0 .../xorg-xserver/xserver-xorg/dolt-fix.patch | 0 .../xorg-xserver/xserver-xorg/drmfix.patch | 0 .../xorg-xserver/xserver-xorg/fontfile.patch | 0 .../xorg-xserver/xserver-xorg/freetype.patch | 0 .../hack-fbdev-ignore-return-mode.patch | 0 .../xserver-xorg/imake-installed.patch | 0 .../xserver-xorg/no-screen-blanking.patch | 0 .../xserver-xorg/xpconfig-parentdir.patch | 0 .../xorg}/xorg-xserver/xserver-xorg_1.2.0.bb | 0 .../xorg-xserver/xserver-xorg_1.3.0.0.bb | 0 .../xorg}/xorg-xserver/xserver-xorg_1.4.2.bb | 0 .../xorg}/xorg-xserver/xserver-xorg_1.4.bb | 0 .../xorg}/xorg-xserver/xserver-xorg_1.5.1.bb | 0 .../xorg}/xorg-xserver/xserver-xorg_1.5.3.bb | 0 .../xorg-xserver/xserver-xorg_1.6.1.bb | 0 .../xorg-xserver/xserver-xorg_1.7.2.bb | 0 .../xorg-xserver/xserver-xorg_1.7.3.bb | 0 .../fix-picturestr-include-order.patch | 0 .../report-correct-randr12.patch | 0 .../sysroot_fix.patch | 0 .../fix-picturestr-include-order.patch | 15 +++ .../report-correct-randr10.patch | 0 .../fix-picturestr-include-order.patch | 15 +++ .../fix-picturestr-include-order.patch | 15 +++ .../report-correct-randr10.patch | 25 +++++ .../pkgconfig_fix.patch | 0 .../report-correct-randr10.patch | 25 +++++ .../xorg-avr32-support.diff | 0 .../dolt-fix.patch} | 0 .../randr-support.patch} | 0 .../xserver-xorg-1.7.1/sysroot_fix.patch | 13 +++ .../xserver-xorg-1.7.4/dolt-fix.patch | 22 +++++ .../hack-fbdev-ignore-return-mode.patch | 39 ++++++++ .../xserver-xorg-1.7.4/randr-support.patch | 96 +++++++++++++++++++ .../xserver-xorg-1.7.4/sysroot_fix.patch | 13 +++ .../xserver-xorg-1.8.1/dolt-fix.patch | 22 +++++ .../hack-fbdev-ignore-return-mode.patch | 39 ++++++++ .../xserver-xorg-1.8.1/randr-support.patch | 96 +++++++++++++++++++ ...ure-that-DisplayModeRec-name-is-init.patch | 25 ----- .../xserver-xorg-1.8.99.906/dolt-fix.patch | 22 +++++ .../hack-fbdev-ignore-return-mode.patch | 39 ++++++++ .../randr-support.patch | 96 +++++++++++++++++++ recipes/xorg-xserver/xserver-xorg_1.7.1.bb | 4 +- recipes/xorg-xserver/xserver-xorg_1.7.4.bb | 4 +- recipes/xorg-xserver/xserver-xorg_1.8.1.bb | 4 +- .../xorg-xserver/xserver-xorg_1.8.99.906.bb | 6 +- recipes/xorg-xserver/xserver-xorg_git.bb | 13 ++- 60 files changed, 608 insertions(+), 40 deletions(-) rename recipes/{ => obsolete/xorg}/xorg-xserver/files/xcalibrate-xorg.diff (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xorg-xserver-common.inc (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.4/drmfix.patch (100%) rename recipes/obsolete/{xorg-xserver/xserver-xorg-1.6.1 => xorg/xorg-xserver/xserver-xorg-1.5.1}/drmfix.patch (100%) rename recipes/{xorg-xserver/xserver-xorg-1.5.1 => obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3}/drmfix.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch (100%) rename recipes/{xorg-xserver/xserver-xorg-1.5.3 => obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1}/drmfix.patch (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/dolt-fix.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/drmfix.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/fontfile.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/freetype.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/imake-installed.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/no-screen-blanking.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.2.0.bb (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.3.0.0.bb (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.4.2.bb (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.4.bb (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.5.1.bb (100%) rename recipes/{ => obsolete/xorg}/xorg-xserver/xserver-xorg_1.5.3.bb (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xserver-xorg_1.6.1.bb (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xserver-xorg_1.7.2.bb (100%) rename recipes/obsolete/{ => xorg}/xorg-xserver/xserver-xorg_1.7.3.bb (100%) rename recipes/xorg-xserver/{files => xserver-kdrive-1.3.0.0}/fix-picturestr-include-order.patch (100%) rename recipes/xorg-xserver/{files => xserver-kdrive-1.3.0.0}/report-correct-randr12.patch (100%) rename recipes/xorg-xserver/{files => xserver-kdrive-1.5.3}/sysroot_fix.patch (100%) create mode 100644 recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch rename recipes/xorg-xserver/{files => xserver-kdrive-imageon}/report-correct-randr10.patch (100%) create mode 100644 recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch create mode 100644 recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch create mode 100644 recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch rename recipes/xorg-xserver/{files => xserver-kdrive}/pkgconfig_fix.patch (100%) create mode 100644 recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch rename recipes/xorg-xserver/{files => xserver-kdrive}/xorg-avr32-support.diff (100%) rename recipes/xorg-xserver/{xserver-xorg/dolt-fix-1.7.0.patch => xserver-xorg-1.7.1/dolt-fix.patch} (100%) rename recipes/xorg-xserver/{xserver-xorg/randr-support-1.7.0.patch => xserver-xorg-1.7.1/randr-support.patch} (100%) create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch diff --git a/recipes/xorg-xserver/files/xcalibrate-xorg.diff b/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff similarity index 100% rename from recipes/xorg-xserver/files/xcalibrate-xorg.diff rename to recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff diff --git a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc b/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc similarity index 100% rename from recipes/obsolete/xorg-xserver/xorg-xserver-common.inc rename to recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/dolt-fix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch diff --git a/recipes/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/drmfix.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch diff --git a/recipes/xorg-xserver/xserver-xorg/fontfile.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/fontfile.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch diff --git a/recipes/xorg-xserver/xserver-xorg/freetype.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/freetype.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch diff --git a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch diff --git a/recipes/xorg-xserver/xserver-xorg/imake-installed.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/imake-installed.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch diff --git a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch diff --git a/recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.2.0.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.4.2.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.4.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.5.1.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb similarity index 100% rename from recipes/xorg-xserver/xserver-xorg_1.5.3.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb similarity index 100% rename from recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb rename to recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb diff --git a/recipes/xorg-xserver/files/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch similarity index 100% rename from recipes/xorg-xserver/files/fix-picturestr-include-order.patch rename to recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch diff --git a/recipes/xorg-xserver/files/report-correct-randr12.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch similarity index 100% rename from recipes/xorg-xserver/files/report-correct-randr12.patch rename to recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch diff --git a/recipes/xorg-xserver/files/sysroot_fix.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch similarity index 100% rename from recipes/xorg-xserver/files/sysroot_fix.patch rename to recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/files/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch similarity index 100% rename from recipes/xorg-xserver/files/report-correct-randr10.patch rename to recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch diff --git a/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch new file mode 100644 index 0000000000..540f598fad --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch @@ -0,0 +1,25 @@ +Index: xorg-server-1.1.0/randr/randr.c +=================================================================== +--- xorg-server-1.1.0.orig/randr/randr.c ++++ xorg-server-1.1.0/randr/randr.c +@@ -56,6 +56,9 @@ + #define SubPixelUnknown 0 + #endif + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 0 ++ + #define RR_VALIDATE + int RRGeneration; + int RRNScreens; +@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client) + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/recipes/xorg-xserver/files/pkgconfig_fix.patch b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch similarity index 100% rename from recipes/xorg-xserver/files/pkgconfig_fix.patch rename to recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch diff --git a/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch new file mode 100644 index 0000000000..540f598fad --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch @@ -0,0 +1,25 @@ +Index: xorg-server-1.1.0/randr/randr.c +=================================================================== +--- xorg-server-1.1.0.orig/randr/randr.c ++++ xorg-server-1.1.0/randr/randr.c +@@ -56,6 +56,9 @@ + #define SubPixelUnknown 0 + #endif + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 0 ++ + #define RR_VALIDATE + int RRGeneration; + int RRNScreens; +@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client) + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff similarity index 100% rename from recipes/xorg-xserver/files/xorg-avr32-support.diff rename to recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch rename to recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch diff --git a/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch similarity index 100% rename from recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch rename to recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch new file mode 100644 index 0000000000..59753d5803 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.4/xorg-server.m4 +=================================================================== +--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100 ++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100 +@@ -30,7 +30,7 @@ + + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch new file mode 100644 index 0000000000..e332ce0bbe --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/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.7.4/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch new file mode 100644 index 0000000000..fb8d3815be --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch @@ -0,0 +1,96 @@ +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.4/sysroot_fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch new file mode 100644 index 0000000000..59753d5803 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.4/xorg-server.m4 +=================================================================== +--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100 ++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100 +@@ -30,7 +30,7 @@ + + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch new file mode 100644 index 0000000000..e332ce0bbe --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/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.8.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch new file mode 100644 index 0000000000..fb8d3815be --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch @@ -0,0 +1,96 @@ +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.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch deleted file mode 100644 index adbc274fd7..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 30 Jun 2010 10:42:36 +0200 -Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName - ---- - hw/xfree86/modes/xf86Modes.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c -index 05f4319..09a9679 100644 ---- a/hw/xfree86/modes/xf86Modes.c -+++ b/hw/xfree86/modes/xf86Modes.c -@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode) - { - DisplayModePtr pNew; - -- pNew = xnfalloc(sizeof(DisplayModeRec)); -+ pNew = xnfcalloc(1, sizeof(DisplayModeRec)); - *pNew = *pMode; - pNew->next = NULL; - pNew->prev = NULL; --- -1.7.1 - diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch new file mode 100644 index 0000000000..e332ce0bbe --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/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.8.99.906/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch new file mode 100644 index 0000000000..fb8d3815be --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch @@ -0,0 +1,96 @@ +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.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb index a0bbab4f8b..60d45754bd 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb @@ -6,8 +6,8 @@ PE = "2" PR = "${INC_PR}.1" SRC_URI += "file://sysroot_fix.patch \ - file://dolt-fix-1.7.0.patch \ - file://randr-support-1.7.0.patch \ + file://dolt-fix.patch \ + file://randr-support.patch \ " do_install_prepend() { mkdir -p ${D}/${libdir}/X11/fonts diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb index ef57039922..41f0afc6d9 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb @@ -6,8 +6,8 @@ PE = "2" PR = "${INC_PR}.2" SRC_URI += "file://sysroot_fix.patch \ - file://dolt-fix-1.7.0.patch \ - file://randr-support-1.7.0.patch \ + file://dolt-fix.patch \ + file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ " diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb index 06f36cb142..31ce24a53b 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb @@ -9,8 +9,8 @@ PE = "2" PR = "${INC_PR}.2" SRC_URI += " \ - file://dolt-fix-1.7.0.patch \ - file://randr-support-1.7.0.patch \ + file://dolt-fix.patch \ + file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ " SRC_URI[archive.md5sum] = "7c3b873692f4e93938261d774510e78d" diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb index fc7530d71c..65583805dd 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb @@ -8,15 +8,13 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts fon PE = "2" PR = "${INC_PR}.3" -# 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://dolt-fix.patch \ + file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ - file://0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch \ " SRC_URI[archive.md5sum] = "d4ab361cacc35e2ed4587019980b7e57" SRC_URI[archive.sha256sum] = "7bb5e3d1e36b65e367d11707e7e11285d9eb087d3281c59c8143dfe90cf9977e" diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb index 46b0e0818a..9c821748cf 100644 --- a/recipes/xorg-xserver/xserver-xorg_git.bb +++ b/recipes/xorg-xserver/xserver-xorg_git.bb @@ -1,19 +1,21 @@ +# 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" -PV = "1.8.99.905" +PV = "1.8.99.906" PR = "${INC_PR}.4" PR_append = "+gitr${SRCPV}" PE = "2" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" -SRCREV = "6dae7f3792611aace1df0cca63bf50c50d93de43" +SRCREV = "71af1f71c0492c365707c6b3810f94642ff39352" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \ - file://dolt-fix-1.7.0.patch \ - file://randr-support-1.7.0.patch \ + file://dolt-fix.patch \ + file://randr-support.patch \ file://hack-fbdev-ignore-return-mode.patch \ " @@ -31,5 +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 " export LDFLAGS += " -ldl " -- 2.39.5