Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev

5 files changed, 49 insertions, 18 deletions

diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb
index 52a2b3ae0e..862dfd8933 100644
--- a/packages/clutter/aaina_svn.bb
+++ b/packages/clutter/aaina_svn.bb
@@ -1,5 +1,6 @@
 require aaina.inc
 
+SRCREV = "3597"
 PV = "0.3.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
diff --git a/packages/clutter/clutter_0.8+svn.bb b/packages/clutter/clutter_0.8+svn.bb
deleted file mode 100644
index a203165ca8..0000000000
--- a/packages/clutter/clutter_0.8+svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter.inc
-
-CLUTTER_REV = "3597"
-
-PV = "0.8.4+svnr${CLUTTER_REV}"
-PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http;rev=${CLUTTER_REV} \
-           file://enable_tests.patch;patch=1;maxrev=2989 \
-           file://enable-tests-r2990.patch;patch=1;minrev=2990"
-
-S = "${WORKDIR}/clutter-0-8"
-
-
-
diff --git a/packages/make/mingw-make-canadian-sdk_3.81.bb b/packages/make/mingw-make-canadian-sdk_3.81.bb
new file mode 100644
index 0000000000..3479dad249
--- /dev/null
+++ b/packages/make/mingw-make-canadian-sdk_3.81.bb
@@ -0,0 +1,16 @@
+PR = "r0"
+
+require make.inc
+
+inherit canadian-sdk
+
+DESCRIPTION = "GNU Make examines the timestamps on a set of \
+interdependent files, and, if necessary, issues commands \
+to bring them up-to-date - MinGW port."
+HOMEPAGE = "http://www.mingw.org/"
+
+DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/mingw32-make-3.81-20080326-src.tar.gz"
+
+S = "${WORKDIR}/make-${PV}-patched"
diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb
index 61d2429945..9ca9e8f54f 100644
--- a/packages/ogre/ogre-egl_svn.bb
+++ b/packages/ogre/ogre-egl_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D engine "
 LICENSE = "LGPL"
-DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl"
+DEPENDS = "gtk+ wgois cppunit zziplib boost freeimage freetype virtual/libx11 virtual/egl"
 
-PR = "r1"
+PR = "r3"
 
 SRCREV = "8310"
 PV = "1.6.1+svnr${SRCREV}"
@@ -14,7 +14,7 @@ SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https
 inherit autotools_stage
 
 # This is the EGL version
-EXTRA_OECONF = " --with-allocator=std --enable-threading=no --disable-cg --enable-gles "
+EXTRA_OECONF = " --with-gui=gtk --disable-freetypetest --enable-ogre-demos --with-allocator=std --enable-threading=no --disable-cg --enable-gles "
 
 S = "${WORKDIR}/trunk"
 
@@ -25,7 +25,20 @@ do_configure_prepend() {
 	sed -i -e /OGRE_DETECT_ENDIAN/d ${S}/configure.in
 }
 
-FILES_${PN}-dbg += "${libdir}/OGRE/.debug"
+do_install_append() {
+	install -d ${D}${datadir}/ogre3d/samples
+	mv ${D}${S}/Samples/* ${D}${datadir}/ogre3d/samples/
+	cp ${S}/Samples/Common/bin/Release/*cfg ${D}${datadir}/ogre3d/samples/Common/bin
+
+	install -d ${D}${datadir}/ogre3d/Media 
+	cp -r ${S}/Samples/Media/* ${D}${datadir}/ogre3d/Media/
+	find ${D} -name ".svn" | xargs rm -rf
+}
+
+PACKAGES += "${PN}-samples"
+
+FILES_${PN}-samples = "${datadir}/ogre3d/"
+FILES_${PN}-dbg += "${libdir}/OGRE/.debug ${datadir}/ogre3d/samples/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/OGRE/*.la"
 FILES_${PN} += "${libdir}/libOgreMain-*.so ${libdir}/OGRE/*.so"
 
diff --git a/packages/ogre/wgois_1.2.0.bb b/packages/ogre/wgois_1.2.0.bb
new file mode 100644
index 0000000000..ff59a3bcae
--- /dev/null
+++ b/packages/ogre/wgois_1.2.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Object Oriented Input System (OIS) is meant to be a cross platform, simple solution for using all kinds of Input Devices."
+LICENSE = "zlib"
+DEPENDS = "virtual/libx11"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wgois/ois_${PV}.tar.gz"
+
+inherit autotools_stage
+
+S = "${WORKDIR}/ois"
+
+FILES_${PN} += "${libdir}/libOIS-1*.so"
+
+
+
+