merge of '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'

     and '3a233f347017316b01a5399291d49424a3a4ba9f'

14 files changed, 99 insertions, 18 deletions

diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 6493d36343..c4f4677dea 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -1,10 +1,10 @@
 require ffmpeg.inc
 
-DEPENDS += "libgsm"
+DEPENDS += "schroedinger libgsm"
 
 PE = "1"
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r31"
+PR = "r32"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
@@ -47,7 +47,8 @@ EXTRA_OECONF = " \
         --enable-libfaadbin \
         --enable-libgsm \
         --enable-libmp3lame \
-        --enable-swscale \
+        --enable-libschroedinger \
+	--enable-swscale \
         --arch=${TARGET_ARCH} \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc
index 975aa88fe7..9076c013e1 100644
--- a/packages/gcc/gcc-package-target.inc
+++ b/packages/gcc/gcc-package-target.inc
@@ -20,7 +20,7 @@ FILES_${PN} = "\
   ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
-  ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/include* \
 "
 FILES_${PN}-symlinks = "\
   ${bindir}/cc \
diff --git a/packages/gcc/gcc_4.3.2.bb b/packages/gcc/gcc_4.3.2.bb
index ee926bd169..e2c6e48a85 100644
--- a/packages/gcc/gcc_4.3.2.bb
+++ b/packages/gcc/gcc_4.3.2.bb
@@ -1,8 +1,13 @@
-PR = "r3"
+PR = "r4"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
+# Gcc 4.3.2 installs crt* in a '4.3.1' dir....
+FILES_${PN} += "\
+        ${gcclibdir}/${TARGET_SYS}/*/*.o \
+"
+
 SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 61d6a81aa3..3d4dcde40f 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.11.bb b/packages/gtk+/gtk+_2.12.11.bb
index 642154b207..d246eb8de9 100644
--- a/packages/gtk+/gtk+_2.12.11.bb
+++ b/packages/gtk+/gtk+_2.12.11.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb
index 7f2074b96c..642154b207 100644
--- a/packages/gtk+/gtk+_2.12.3.bb
+++ b/packages/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index e4e403c839..15075f022c 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -107,7 +107,7 @@ PYTHON_INSTALL = "\
 ZHONE_INSTALL = "\
   gsm0710muxd \
   frameworkd \
-  fso-gspd \
+  fso-gpsd \
   zhone \
 "
 
diff --git a/packages/lmbench/lmbench-2.5/.mtn2git_empty b/packages/lmbench/lmbench-2.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lmbench/lmbench-2.5/.mtn2git_empty
diff --git a/packages/lmbench/lmbench-2.5/build.patch b/packages/lmbench/lmbench-2.5/build.patch
new file mode 100644
index 0000000000..e6283aea60
--- /dev/null
+++ b/packages/lmbench/lmbench-2.5/build.patch
@@ -0,0 +1,11 @@
+--- lmbench-2.5/scripts/build.old	2008-09-18 17:03:59.000000000 +0100
++++ lmbench-2.5/scripts/build	2008-09-18 17:04:01.000000000 +0100
+@@ -34,7 +34,7 @@
+ 	
+ # check for IA64 HP-UX w/ HP's ANSI compiler; may need pointer swizzling
+ arch=`echo $OS | awk -F- '{print $1;}'`
+-if [ X$CC = "Xcc" -a X$arch = "Xia64" ]
++if [ "X$CC" = "Xcc" -a "X$arch" = "Xia64" ]
+ then
+ 	echo "#include <stdlib.h>" > ${BASE}$$.c
+ 	echo "main(int ac, char *av[])" >> ${BASE}$$.c
diff --git a/packages/lmbench/lmbench/.mtn2git_empty b/packages/lmbench/lmbench/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lmbench/lmbench/.mtn2git_empty
diff --git a/packages/lmbench/lmbench-2.0.4/lmbench-run b/packages/lmbench/lmbench/lmbench-run
index 3674f6d265..3674f6d265 100644
--- a/packages/lmbench/lmbench-2.0.4/lmbench-run
+++ b/packages/lmbench/lmbench/lmbench-run
diff --git a/packages/lmbench/lmbench_2.5.bb b/packages/lmbench/lmbench_2.5.bb
new file mode 100644
index 0000000000..a51508017c
--- /dev/null
+++ b/packages/lmbench/lmbench_2.5.bb
@@ -0,0 +1,44 @@
+SECTION = "console/utils"
+DESCRIPTION = "Tools for performance analysis."
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
+	   file://build.patch;patch=1 \
+	   file://lmbench-run"
+S = "${WORKDIR}/lmbench-${PV}"
+
+EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \
+		TARGET="${TARGET_OS}" BASE="${prefix}"'
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('byebk_do_unpack', d)
+}
+
+byebk_do_unpack () {
+	find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf
+}
+
+do_compile () {
+	. ${CONFIG_SITE}
+	if [ X"$ac_cv_uint" == X"yes" ]; then
+		CFLAGS="${CFLAGS} -DHAVE_uint"
+	fi
+	install -d ${S}/bin/${TARGET_SYS}
+	oe_runmake -C src
+	sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \
+	       -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' ${WORKDIR}/lmbench-run
+}
+
+do_install () {
+        mkdir -p ${D}${libdir}/lmbench
+	oe_runmake 'BASE=${D}${prefix}' \
+		    -C src install
+	install -d ${D}${localstatedir}/lib/lmbench/config \
+		   ${D}${localstatedir}/run/lmbench \
+		   ${D}${bindir}
+	install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
+	mkdir -p ${D}${mandir}
+	mv ${D}${prefix}/man/* ${D}${mandir}/
+}
diff --git a/packages/schroedinger/schroedinger_1.0.5.bb b/packages/schroedinger/schroedinger_1.0.5.bb
index 06fc2a3808..defb758046 100644
--- a/packages/schroedinger/schroedinger_1.0.5.bb
+++ b/packages/schroedinger/schroedinger_1.0.5.bb
@@ -2,14 +2,21 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/"
 LICENSE = "MPL GPL LGPL MIT"
 DEPENDS = "liboil gstreamer gst-plugins-base"
 
+PR = "r1"
+
 SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz"
 
-inherit autotools pkgconfig
+inherit autotools 
 
 PACKAGES =+ "gst-plugin-schroedinger gst-plugin-schroedinger-dev gst-plugin-schroedinger-dbg"
 FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so"
 FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*"
 FILES_gst-plugin-schroedinger-dbg += "${libdir}/gstreamer-0.10/.debug/libgstschro.so"
 
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
 
 
diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb
index 4ffb13cee0..c9e2ebfd9b 100644
--- a/packages/zbedic/libbedic_1.1.bb
+++ b/packages/zbedic/libbedic_1.1.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "sqlite3"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/zbedic/misc"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz"
 
@@ -12,18 +13,30 @@ S = "${WORKDIR}"
 
 inherit palmtop
 # need to override this, because bedic contains exception handling
-export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS}"
+# pass VERSION as a string \\"${PV}.0\\"
+export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS} -DVERSION=\\"${PV}.0\\""
 
+# no sharedlib, only as staticlib
 do_configure() {
-	qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib -after \
-        INCLUDEPATH+=../include TARGET=bedic DESTDIR=${STAGING_LIBDIR} \
-	HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp \
-	SOURCES-=src/test_dynamic_dictionary.cpp \
-	SOURCES-=src/test_dynamic_database.cpp \
-	CXXFLAGS+=-fexceptions
+        qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib CONFIG+=sharedlib -after \
+        TARGET=bedic \
+        SOURCES-=src/xerox.cpp OBJECTS-=xerox.o \
+        SOURCES-=src/mkbedic.cpp OBJECTS-=mkbedic.o \
+        SOURCES-=src/test_dynamic_dictionary.cpp \
+}
+
+do_install() {
+    install -d ${D}${includedir}
+    install -m 0644 ${S}/include/*.h ${D}${includedir}
+    install -d ${D}${libdir}
+    oe_libinstall -a libbedic ${D}${libdir}
 }
 
 do_stage() {
     install -d ${STAGING_INCDIR}/libbedic/
     install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/libbedic/
+    oe_libinstall -a libbedic ${STAGING_LIBDIR}
 }
+
+FILES_${PN} = "${libdir}"
+FILES_${PN}-dev = "${includedir}"