[oe-commits] org.oe.dev xserver-kdrive-imagen 1.2.0: Fixed include order in picturestr.h to

[sirfred commit]

xserver-kdrive-imagen 1.2.0: Fixed include order in picturestr.h to 
allow compilation against renderproto 0.9.3

Author: sirfred at openembedded.org
Branch: org.openembedded.dev
Revision: db2b97c9756f9fee0b72ffe7725a8db0da899833
ViewMTN: http://monotone.openembedded.org/revision/info/db2b97c9756f9fee0b72ffe7725a8db0da899833
Files:
1
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:

#
# mt diff -rb36b4b65fad552470e8f307d8ec58001f8765563 -rdb2b97c9756f9fee0b72ffe7725a8db0da899833
#
# 
# 
# add_file "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
#  content [e5e3556e1bceb28bc0993ea107c09a15d5f6b215]
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [ab6b7713f6a5d17b7c19e07445de40a86cc924e5]
#    to [4b5d3af5cb182cae469a03c02b833de42df211ed]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch	e5e3556e1bceb28bc0993ea107c09a15d5f6b215
+++ packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch	e5e3556e1bceb28bc0993ea107c09a15d5f6b215
@@ -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 {
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	ab6b7713f6a5d17b7c19e07445de40a86cc924e5
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	4b5d3af5cb182cae469a03c02b833de42df211ed
@@ -7,7 +7,7 @@ PE = "1"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
         file://kdrive-imageon.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
         file://enable-builtin-fonts.patch;patch=1 \
+	file://fix-picturestr-include-order.patch;patch=1 \
         "
        
 S = "${WORKDIR}/xorg-server-${PV}"