[oe-commits] org.oe.dev merge of '41716f313f0efdbc890ccb2a7a5d8c24cae3ed69'

[oe commit]

merge of '41716f313f0efdbc890ccb2a7a5d8c24cae3ed69'
     and '6a15d9f49ea8804172ee689f3791cd3ee9ef66d6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 16d5c273533926e5a6b915d652e1d39e0ec61c10
ViewMTN: http://monotone.openembedded.org/revision/info/16d5c273533926e5a6b915d652e1d39e0ec61c10
Files:
1
packages/xorg-app/xkbcomp_1.0.4.bb
packages/xorg-app/xprop_1.0.4.bb
packages/xorg-app/xrandr_1.2.3.bb
packages/xorg-app/xrdb_1.0.5.bb
packages/xorg-xserver/files/sysroot_fix.patch
packages/xorg-xserver/xserver-xorg_1.4.bb
classes/seppuku.bbclass
Diffs:

#
# mt diff -r41716f313f0efdbc890ccb2a7a5d8c24cae3ed69 -r16d5c273533926e5a6b915d652e1d39e0ec61c10
#
#
#
# add_file "packages/xorg-app/xkbcomp_1.0.4.bb"
#  content [fe1c963076ee2385eee973a5e034b6ab916e0384]
# 
# add_file "packages/xorg-app/xprop_1.0.4.bb"
#  content [afd58f7276859c10b18d2bdb686bda00c31b4ade]
# 
# add_file "packages/xorg-app/xrandr_1.2.3.bb"
#  content [195d6b0f72976d76d8dc8fa08fe83a5e981ea5a1]
# 
# add_file "packages/xorg-app/xrdb_1.0.5.bb"
#  content [50cb61f5911a30c66e5aa43a50bad7edfac2a5f7]
# 
# add_file "packages/xorg-xserver/files/sysroot_fix.patch"
#  content [4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [390cc0513bf74cbc87ed0298fcaf45b4df70d20b]
#    to [b205054696412235974c4bc8ba8c5ab1d7eb3104]
#
============================================================
--- packages/xorg-app/xkbcomp_1.0.4.bb	fe1c963076ee2385eee973a5e034b6ab916e0384
+++ packages/xorg-app/xkbcomp_1.0.4.bb	fe1c963076ee2385eee973a5e034b6ab916e0384
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " virtual/libx11 libxkbfile"
============================================================
--- packages/xorg-app/xprop_1.0.4.bb	afd58f7276859c10b18d2bdb686bda00c31b4ade
+++ packages/xorg-app/xprop_1.0.4.bb	afd58f7276859c10b18d2bdb686bda00c31b4ade
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a property displayer for X"
+
+DEPENDS += " libxmu virtual/libx11"
============================================================
--- packages/xorg-app/xrandr_1.2.3.bb	195d6b0f72976d76d8dc8fa08fe83a5e981ea5a1
+++ packages/xorg-app/xrandr_1.2.3.bb	195d6b0f72976d76d8dc8fa08fe83a5e981ea5a1
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+
+SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
============================================================
--- packages/xorg-app/xrdb_1.0.5.bb	50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
+++ packages/xorg-app/xrdb_1.0.5.bb	50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
============================================================
--- packages/xorg-xserver/files/sysroot_fix.patch	4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9
+++ packages/xorg-xserver/files/sysroot_fix.patch	4fd50a4fa4f03b640617df6759ac8cc2c4a65ec9
@@ -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
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	390cc0513bf74cbc87ed0298fcaf45b4df70d20b
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	b205054696412235974c4bc8ba8c5ab1d7eb3104
@@ -3,9 +3,11 @@ PE = "1"
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
+PR = "r1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1"
+            file://pkgconfig_fix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
 
 MESA_VER = "7.0.2"
 


#
# mt diff -r6a15d9f49ea8804172ee689f3791cd3ee9ef66d6 -r16d5c273533926e5a6b915d652e1d39e0ec61c10
#
#
#
# patch "classes/seppuku.bbclass"
#  from [b6963b5b1f0c18fa720d13ba7e295b78f27861ed]
#    to [02ec3fae44701d38816aa59eb3db7429e3f666bc]
#
============================================================
--- classes/seppuku.bbclass	b6963b5b1f0c18fa720d13ba7e295b78f27861ed
+++ classes/seppuku.bbclass	02ec3fae44701d38816aa59eb3db7429e3f666bc
@@ -334,7 +334,7 @@ python seppuku_eventhandler() {
                                                                "pv"      : bb.data.getVar("PV", data, True),
                                                                }  
             log_file = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', event.data, True), event.task))
-            text     = "The %s step failed at %s for machine %s" % (e.task, bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) )
+            text     = "The %s step in %s failed at %s for machine %s" % (e.task, bb.data.getVar("PN", data, True), bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) )
             if len(log_file) != 0:
                 print >> debug_file, "Adding log file %s" % log_file[0]
                 file = open(log_file[0], 'r')