[oe-commits] org.oe.dev merge of '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'

[mickeyl commit]

merge of '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 10c1f42dcafdbf24dd3f01c6d05fceb03c01fbed
ViewMTN: http://monotone.openembedded.org/revision/info/10c1f42dcafdbf24dd3f01c6d05fceb03c01fbed
Files:
1
classes/kernel.bbclass
packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb
packages/totem/totem_2.23.4.bb
packages/xorg-font/xorg-minimal-fonts.bb
Diffs:

#
# mt diff -r3c94d9db3ba91b1d4e037bacbd0bce84e35642eb -r10c1f42dcafdbf24dd3f01c6d05fceb03c01fbed
#
#
#
# patch "classes/kernel.bbclass"
#  from [aaee7c587861c7c66d492ee0c8e7540f99932496]
#    to [fd4d710e7db2886e29dc83097649bf1ad8661939]
#
============================================================
--- classes/kernel.bbclass	aaee7c587861c7c66d492ee0c8e7540f99932496
+++ classes/kernel.bbclass	fd4d710e7db2886e29dc83097649bf1ad8661939
@@ -450,7 +450,7 @@ do_sizecheck() {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then
         	size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
                 	rm ${KERNEL_OUTPUT}


#
# mt diff -re50fc707da1372d68e46edaf3a6915bf53f628b9 -r10c1f42dcafdbf24dd3f01c6d05fceb03c01fbed
#
#
#
# add_file "packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb"
#  content [551f14ec8f3a53dee6c78e79206b8a6f4cdc3fc7]
# 
# patch "packages/totem/totem_2.23.4.bb"
#  from [ca586f7865ee50b901d0696b5893e1401d369fcf]
#    to [ca9973c5a03ac53e5f5ed4990c53a20ae2786bdd]
# 
# patch "packages/xorg-font/xorg-minimal-fonts.bb"
#  from [ead866f55cd01c842a77f7f3b8bf058f7592737f]
#    to [71e6ca7f3d680bb5770b766f7c0d049a6e8de2cf]
#
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb	551f14ec8f3a53dee6c78e79206b8a6f4cdc3fc7
+++ packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb	551f14ec8f3a53dee6c78e79206b8a6f4cdc3fc7
@@ -0,0 +1,21 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.gz \
+          "
+
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools 
+
+EXTRA_AUTORECONF = "--exclude=autoheader"
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/totem/totem_2.23.4.bb	ca586f7865ee50b901d0696b5893e1401d369fcf
+++ packages/totem/totem_2.23.4.bb	ca9973c5a03ac53e5f5ed4990c53a20ae2786bdd
@@ -6,11 +6,30 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org/projects/totem/"
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r3"
 
-DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base python" 
+DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
 RDEPENDS_${PN} += "iso-codes"
-RRECOMMENDS_${PN} += "gst-plugin-playbin gst-plugin-gconfelements gst-plugin-decodebin gst-plugin-decodebin2 gst-ffmpeg gst-plugin-audioresample gst-plugin-ximagesink gst-plugin-xvimagesink gst-plugin-alsa"
+RRECOMMENDS_${PN} += "gst-plugin-playbin \
+                      gst-plugin-gconfelements \
+		      gst-plugin-decodebin \
+		      gst-plugin-decodebin2 \
+		      gst-ffmpeg \
+		      gst-plugin-audioresample \
+		      gst-plugin-ximagesink \
+		      gst-plugin-xvimagesink \
+		      gst-plugin-alsa \
+		      gst-plugin-avi \
+		      gst-plugin-ffmpegcolorspace \
+		      gst-plugin-flvdemux \
+		      gst-plugin-nuvdemux \
+		      gst-plugin-videoscale \
+		      gst-plugin-a52dec \
+		      gst-plugin-mpegaudioparse \
+		      gst-plugin-ossaudio \
+		      gst-plugin-pulse \
+		      gst-plugin-autodetect \
+		      "
 
 inherit gnome
 
@@ -23,7 +42,7 @@ EXTRA_OECONF=" --disable-schemas-install
                --enable-gstreamer \
                --enable-browser-plugins \
 	       --disable-run-in-source-tree \
-	       --enable-python \
+	       --disable-python \
 	       --disable-vala \
 	       --with-dbus \
 	       "
============================================================
--- packages/xorg-font/xorg-minimal-fonts.bb	ead866f55cd01c842a77f7f3b8bf058f7592737f
+++ packages/xorg-font/xorg-minimal-fonts.bb	71e6ca7f3d680bb5770b766f7c0d049a6e8de2cf
@@ -2,12 +2,17 @@ LICENSE = "MIT-X"
 SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
+PR = "r1"
+
 SRC_URI = "file://misc"
 
 do_install() {
 	install -d ${D}/${datadir}/fonts/X11/misc
 	install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+	install -d ${D}/${libdir}/X11
+	ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
+
 }
 
 PACKAGE_ARCH = "all"
+FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
-FILES_${PN} = "${datadir}/fonts/X11/"