Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

11 files changed, 64 insertions, 21 deletions

diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb
index 1eefddc917..db45cfdf16 100644
--- a/recipes/gdb/gdb-canadian-sdk_6.8.bb
+++ b/recipes/gdb/gdb-canadian-sdk_6.8.bb
@@ -1,8 +1,10 @@
 require gdb-canadian-cross.inc
+LICENSE = "GPLv3"
 
 SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
 	    file://gdb-6.8-mingw-3.patch;patch=1 \
 	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
+	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
 	    file://gdb-6.8-mips-mingw-sim-fixup.patch;patch=1"
 
 PR = "r1"
diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb
index 66e1454779..6d6fba7993 100644
--- a/recipes/gdb/gdb-cross-sdk_6.8.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.8.bb
@@ -1,4 +1,5 @@
 require gdb-cross.inc
+LICENSE = "GPLv3"
 
 SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
             file://gdb-6.8-fix-compile-karmic.patch;patch=1"
diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb
index 664ab5e323..2c24d4cac8 100644
--- a/recipes/gdb/gdb-cross_6.8.bb
+++ b/recipes/gdb/gdb-cross_6.8.bb
@@ -1,6 +1,8 @@
 require gdb-cross.inc
+LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0"
+SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
+            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
 
 inherit cross
 
diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index cc795e14a5..6449c82c8a 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -24,7 +24,10 @@ do_configure_prepend() {
 
 do_configure_append() {
 	for i in $(find ${S} -name "Makefile") ; do
-		sed -i -e s:'I/usr/include'::g -e s:'-I /usr/include -I /usr/local/include'::g $i
+		sed -i \
+			-e s:'-I/usr/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
+			-e s:'-I/usr/local/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
+			$i
 	done	
 }
 
diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc
new file mode 100644
index 0000000000..64a7f50794
--- /dev/null
+++ b/recipes/musicbrainz/libmusicbrainz.inc
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPL"
+DEPENDS = "expat neon"
+
+SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
+
+inherit cmake pkgconfig
+
+# Fight a compiler/link bug that leaks too many c++ symbols
+TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib "
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
index e01695eb3d..bd54419686 100644
--- a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
+++ b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
@@ -1,16 +1 @@
-DEFAULT_PREFERENCE = "-1"
-
-DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
-It allows you to access the data held on the MusicBrainz server."
-HOMEPAGE = "http://musicbrainz.org"
-LICENSE = "LGPL"
-DEPENDS = "expat neon"
-
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
-
-inherit cmake pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
+require ${PN}.inc
diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/recipes/octave/octave.inc b/recipes/octave/octave.inc
index 440de5c1a0..a7161bbec1 100644
--- a/recipes/octave/octave.inc
+++ b/recipes/octave/octave.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Matlab alternative for numerical computations"
 HOMEPAGE = "http://www.gnu.org/software/octave/"
 SECTION = "console/scientific"
 LICENSE = "GPL"
-DEPENDS = "readline ncurses fftw"
+DEPENDS = "gperf-native readline ncurses fftw"
 RDEPENDS = "libfftw3"
 # fftw compiled with --disable-fortran
 
@@ -14,6 +14,8 @@ EXTRA_OECONF = "--without-hdf5 --without-glpk -without-umfpack \
                 --without-colamd --without-ccolamd --without-cholmod \
                 --without-cxsparse"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 # additional missing dependency/functionality: Qhull gperf
 
 do_configure() {
diff --git a/recipes/octave/octave_3.0.3.bb b/recipes/octave/octave_3.0.3.bb
index b0fc06557d..c43cf166e0 100644
--- a/recipes/octave/octave_3.0.3.bb
+++ b/recipes/octave/octave_3.0.3.bb
@@ -1,6 +1,6 @@
 require octave.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch;patch=1"
diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc
index 086c9015ad..9e4ca1467e 100644
--- a/recipes/openssh/openssh.inc
+++ b/recipes/openssh/openssh.inc
@@ -2,6 +2,7 @@ DEPENDS = "zlib openssl"
 
 RCONFLICTS_${PN} = "dropbear"
 RCONFLICTS_${PN}-sshd = "dropbear"
+RCONFLICTS_${PN}-keygen = "ssh-keygen"
 
 SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
@@ -15,7 +16,7 @@ used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit autotools
 
diff --git a/recipes/oprofile/oprofile_0.9.5.bb b/recipes/oprofile/oprofile_0.9.5.bb
new file mode 100644
index 0000000000..d89624000d
--- /dev/null
+++ b/recipes/oprofile/oprofile_0.9.5.bb
@@ -0,0 +1,27 @@
+require oprofile.inc
+
+RDEPENDS += "binutils-symlinks"
+RRECOMMENDS += "kernel-vmlinux"
+PR = "r3"
+
+SRC_URI = "\
+	${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
+	file://acinclude.m4 \
+	"
+
+do_stage () {
+	# As of 0.9.4 there is a libopagent library to compile and link against.
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dev ${PN}-doc ${PN}-dbg ${PN}"
+
+FILES_${PN} += "\
+	${libdir}/oprofile/libopagent.so.* \
+"
+
+FILES_${PN}-dev += "\
+	${libdir}/oprofile/lib*.so \
+	${libdir}/oprofile/lib*.a \
+	${libdir}/oprofile/lib*.la \
+"