From 47958ec67e67f9f8ff4e425345ed72d7cbf16a8c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 18 Feb 2008 23:30:36 +0000 Subject: xserver-kdrive-xomap: use fix-picturestr-include-order patch to fix compatibility with more modern xrender --- .../xorg-xserver/files/fix-picturestr-include-order.patch | 15 +++++++++++++++ packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb | 2 ++ .../xserver-kdrive/fix-picturestr-include-order.patch | 15 --------------- 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 packages/xorg-xserver/files/fix-picturestr-include-order.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch diff --git a/packages/xorg-xserver/files/fix-picturestr-include-order.patch b/packages/xorg-xserver/files/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/packages/xorg-xserver/files/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/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb index 372971e2ed..9a8db266b6 100644 --- a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb @@ -7,6 +7,7 @@ SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800" +PR = "r1" PE = "1" COMPATIBLE_MACHINE = "nokia(800|770)" @@ -23,6 +24,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1 file://fixups.patch;patch=1 \ file://button_only.patch;patch=1 \ file://calibrateext.patch;patch=1 \ + file://fix-picturestr-include-order.patch;patch=1 \ file://xcalibrate_coords.patch;patch=1" # file://kdrive-evdev.patch;patch=1 \ # file://kdrive-use-evdev.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch b/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch deleted file mode 100644 index 3da235e1e1..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch +++ /dev/null @@ -1,15 +0,0 @@ -# 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 { -- cgit v1.2.3