[oe-commits] org.oe.dev merge of '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'

[mickeyl commit]

merge of '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
     and 'e657326eb8ba936ca64ffbedee6d6415a1ac4ac5'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: fd02aa1602a7d21248a66f67a25e6435c8443a48
ViewMTN: http://monotone.openembedded.org/revision/info/fd02aa1602a7d21248a66f67a25e6435c8443a48
Files:
1
packages/python/python-gst_0.10.10.bb
classes/mono.bbclass
classes/sip.bbclass
classes/sip3.bbclass
packages/mono/README
Diffs:

#
# mt diff -r5210c083ec8a6cdc5a8ab04ea377114cbb2938b3 -rfd02aa1602a7d21248a66f67a25e6435c8443a48
#
# 
# 
# patch "packages/python/python-gst_0.10.10.bb"
#  from [d5aab69018139eb74a0a3d2b4a439c3a8196e9cd]
#    to [567b17a1de7384771221d1f7b1e49482a299d604]
# 
============================================================
--- packages/python/python-gst_0.10.10.bb	d5aab69018139eb74a0a3d2b4a439c3a8196e9cd
+++ packages/python/python-gst_0.10.10.bb	567b17a1de7384771221d1f7b1e49482a299d604
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base py
 DESCRIPTION = "Python Gstreamer bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
@@ -21,6 +21,12 @@ do_stage() {
 	autotools_stage_all
 }
 
+PACKAGES =+ "${PN}-examples"
+
 FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dev += "\
+  ${datadir}/gst-python/0.10/defs \
+  ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \
+"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"


#
# mt diff -re657326eb8ba936ca64ffbedee6d6415a1ac4ac5 -rfd02aa1602a7d21248a66f67a25e6435c8443a48
#
# 
# 
# patch "classes/mono.bbclass"
#  from [5d50e08d7aafe36c91db4fc56497a7b639ccc431]
#    to [151ae18991616e411a23875f2b867b1a38f6d548]
# 
# patch "classes/sip.bbclass"
#  from [19431964e31ac4c591edad007b98e47bc3efc3b7]
#    to [be6a303b7d4f75f2848b8a9ddf442eb07abe01ad]
# 
# patch "classes/sip3.bbclass"
#  from [73a1199d0cd0e38e5322e0047631d476afeb1f4b]
#    to [84dab383d7482a72c8bba8b75e317b6d2c68f7c8]
# 
# patch "packages/mono/README"
#  from [d1f3e17ed747876212c9db254308b2267f19c3c5]
#    to [ce24307d6afe8343f5db95c14efcac462e36c160]
# 
============================================================
--- classes/mono.bbclass	5d50e08d7aafe36c91db4fc56497a7b639ccc431
+++ classes/mono.bbclass	151ae18991616e411a23875f2b867b1a38f6d548
@@ -52,6 +52,8 @@ def mono_find_provides_and_requires(file
 	requires = [e for e in requires if not e in provides]
 	return provides, requires
 
+CLILIBSDIR = "${STAGING_DIR_HOST}/clilibs"
+
 python mono_do_clilibs() {
 	import bb, os, re, os.path
 
@@ -70,14 +72,9 @@ python mono_do_clilibs() {
 		bb.error("WORKDIR not defined")
 		return
 
-	staging = bb.data.getVar('STAGING_DIR', d, 1)
-	if not staging:
-		bb.error("STAGING_DIR not defined")
-		return
-
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 
-	clilibs_dir = os.path.join(staging, "clilibs")
+	clilibs_dir = bb.data.getVar('CLILIBSDIR', d, 1)
 	bb.mkdirhier(clilibs_dir)
 
 	provides, requires = {}, {}
============================================================
--- classes/sip.bbclass	19431964e31ac4c591edad007b98e47bc3efc3b7
+++ classes/sip.bbclass	be6a303b7d4f75f2848b8a9ddf442eb07abe01ad
@@ -55,6 +55,8 @@ sip_do_generate() {
 	done
 }
 
+do_generate[deptask] = "do_populate_staging"
+
 EXPORT_FUNCTIONS do_generate
 
 addtask generate after do_unpack do_patch before do_configure
============================================================
--- classes/sip3.bbclass	73a1199d0cd0e38e5322e0047631d476afeb1f4b
+++ classes/sip3.bbclass	84dab383d7482a72c8bba8b75e317b6d2c68f7c8
@@ -53,6 +53,8 @@ sip3_do_generate() {
 	done
 }
 
+do_generate[deptask] = "do_populate_staging"
+
 EXPORT_FUNCTIONS do_generate
 
 addtask generate after do_unpack do_patch before do_configure
============================================================
--- packages/mono/README	d1f3e17ed747876212c9db254308b2267f19c3c5
+++ packages/mono/README	ce24307d6afe8343f5db95c14efcac462e36c160
@@ -28,6 +28,6 @@ puts the information about provided asse
 calls to monodis --assembly and monodis --assemblyref) which assemblies are
 provided and required by a particular package. mono_do_clilibs then
 puts the information about provided assemblies into
-${STAGING_DIR}/clilibs/${packagename}.list and information about the
+${CLILIBSDIR}/${packagename}.list and information about the
 required packages into ${PKGDEST}/{packagename}.clilibdeps where it
 will later be picked up by read_shlibdeps.