[oe-commits] org.oe.dev merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'

[jeremy_laine commit]

merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
     and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 1c9d873ad515cea70c9e42397c95b1fb72041b1d
ViewMTN: http://monotone.openembedded.org/revision/info/1c9d873ad515cea70c9e42397c95b1fb72041b1d
Files:
1
classes/scratchbox-compat.bbclass
packages/python/python-connexion_svn.bb
packages/python/python-pygame_1.8.1.bb
packages/angstrom/angstrom-x11-base-depends.bb
Diffs:

#
# mt diff -r0e9b0714e6ab764eaa6afb85fbd5d15b41175604 -r1c9d873ad515cea70c9e42397c95b1fb72041b1d
#
#
#
# add_file "classes/scratchbox-compat.bbclass"
#  content [c92b81da78b27c09e13f34a3ce3f5fdfe8507d1c]
# 
# patch "packages/python/python-connexion_svn.bb"
#  from [9d23ee607ad730c208c9f30b164cf036dbbefb0f]
#    to [a1c62263239f68e4360ad23051ba93efe96856f7]
# 
# patch "packages/python/python-pygame_1.8.1.bb"
#  from [7c06795fb776e2174fb4c60091adb29c826fe448]
#    to [12e27ff430cdbf43b8ba5c00af1cf8ece4d3692f]
#
============================================================
--- classes/scratchbox-compat.bbclass	c92b81da78b27c09e13f34a3ce3f5fdfe8507d1c
+++ classes/scratchbox-compat.bbclass	c92b81da78b27c09e13f34a3ce3f5fdfe8507d1c
@@ -0,0 +1,13 @@
+# By adding this class to your build all binaries get the special rpath
+# "/scratchbox/host_shared/lib/:/scratchbox/tools/lib/"
+# Doing so makes libraries and programs runnable inside the Scratchbox
+# environment as native binaries (not for the CPU that Scratchbox is
+# emulating).
+
+do_configure_prepend () {
+  export LD_RUN_PATH="/scratchbox/host_shared/lib:/scratchbox/tools/lib"
+}
+
+do_compile_prepend () {
+  export LD_RUN_PATH="/scratchbox/host_shared/lib:/scratchbox/tools/lib"
+}
============================================================
--- packages/python/python-connexion_svn.bb	9d23ee607ad730c208c9f30b164cf036dbbefb0f
+++ packages/python/python-connexion_svn.bb	a1c62263239f68e4360ad23051ba93efe96856f7
@@ -4,7 +4,7 @@ PV = "${BV}+svnr${SRCREV}"
 LICENSE = "GPL"
 BV = "0.4.6"
 PV = "${BV}+svnr${SRCREV}"
-PR = "ml0"
+PR = "ml1"
 
 inherit distutils
 
@@ -24,3 +24,6 @@ do_install() {
 		cd ${S}/$i && distutils_do_install
 	done
 }
+
+RDEPENDS_${PN} += "python-ctypes"
+
============================================================
--- packages/python/python-pygame_1.8.1.bb	7c06795fb776e2174fb4c60091adb29c826fe448
+++ packages/python/python-pygame_1.8.1.bb	12e27ff430cdbf43b8ba5c00af1cf8ece4d3692f
@@ -5,7 +5,7 @@ SRCNAME = "pygame"
 LICENSE = "LGPL"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
 SRCNAME = "pygame"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "\
   ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
@@ -16,7 +16,7 @@ do_configure_prepend() {
 
 do_configure_prepend() {
 	cat ${WORKDIR}/Setup >Setup
-	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
+	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >>Setup
 }
 
 do_stage() {


#
# mt diff -r45a9c4a970e79c5b8343a4a4ff110589bcc19d2f -r1c9d873ad515cea70c9e42397c95b1fb72041b1d
#
#
#
# patch "packages/angstrom/angstrom-x11-base-depends.bb"
#  from [ebb380f6be2ff7abd7c358f31210ccbcdd1ba8c8]
#    to [c97d53e4dc66dcdb909ad83cdb1c4923b787f542]
#
============================================================
--- packages/angstrom/angstrom-x11-base-depends.bb	ebb380f6be2ff7abd7c358f31210ccbcdd1ba8c8
+++ packages/angstrom/angstrom-x11-base-depends.bb	c97d53e4dc66dcdb909ad83cdb1c4923b787f542
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r36"
+PR = "r37"
 
 inherit task