[oe-commits] org.oe.dev merge of 'a6109edcbd4aec5e8bb368261b02f11ccc0e0a62'

[rwhitby commit]

merge of 'a6109edcbd4aec5e8bb368261b02f11ccc0e0a62'
     and 'db2b97c9756f9fee0b72ffe7725a8db0da899833'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 8292332b90148c1fb91e9c775883dcf0639290c7
ViewMTN: http://monotone.openembedded.org/revision/info/8292332b90148c1fb91e9c775883dcf0639290c7
Files:
1
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/madwifi/madwifi-ng_r3314-20080131.bb
Diffs:

#
# mt diff -ra6109edcbd4aec5e8bb368261b02f11ccc0e0a62 -r8292332b90148c1fb91e9c775883dcf0639290c7
#
# 
# 
# 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}"


#
# mt diff -rdb2b97c9756f9fee0b72ffe7725a8db0da899833 -r8292332b90148c1fb91e9c775883dcf0639290c7
#
# 
# 
# add_file "packages/madwifi/madwifi-ng_r3314-20080131.bb"
#  content [a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6]
# 
============================================================
--- packages/madwifi/madwifi-ng_r3314-20080131.bb	a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6
+++ packages/madwifi/madwifi-ng_r3314-20080131.bb	a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6
@@ -0,0 +1,12 @@
+# Bitbake recipe for the madwifi-ng driver
+
+DEFAULT_PREFERENCE = "-1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+# PR = "r1"