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

6 files changed, 223 insertions, 8 deletions

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 4978421b63..f21c4d6545 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -20,9 +20,27 @@ cmake_do_configure() {
 
   cmake ${OECMAKE_SOURCEPATH} \
     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-    -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
+    -DCMAKE_FIND_ROOT_PATH:PATH=${STAGING_DIR_HOST} \
     ${EXTRA_OECMAKE} \
     -Wno-dev
 }
 
-EXPORT_FUNCTIONS do_configure
+cmake_do_compile()  {
+  if [ ${OECMAKE_BUILDPATH} ]
+  then
+     cd ${OECMAKE_BUILDPATH}
+  fi
+  
+  base_do_compile
+}
+
+cmake_do_install() {
+  if [ ${OECMAKE_BUILDPATH} ];
+  then
+     cd ${OECMAKE_BUILDPATH}
+  fi
+  
+  autotools_do_install
+}
+
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 074246e2aa..ef7d82b46c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -858,6 +858,10 @@ sha256=7bae2d456ede67312e1b34e4bfc277af7331e0eee55b95226de392e2d4fee340
 md5=5e47d51daf090c25635cf2c3597150bc
 sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878
 
+[http://downloads.sourceforge.net/project/performous/performous/0.4.0/Performous-0.4.0-Source.tar.bz2]
+md5=d7eafad29a94e3099c849d3c7208bfac
+sha256=4688546a70b09837311e428c233bac091ce5301c7dd4efe21137ca8867af8be0
+
 [http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-1.10.tar.gz]
 md5=b014170483cf85a93d08ee59196c53f9
 sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
@@ -8674,6 +8678,10 @@ sha256=f921da7c8beb396278591b5ca7159b432a38902f1f872c4ae2d40aeb38f9cf01
 md5=cacbcac3fc272dce01c6ea38354489e2
 sha256=a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
 
+[http://downloads.sourceforge.net/project/glew/glew/1.5.1/glew-1.5.1-src.tgz]
+md5=759a59853dfaae4d007b414a3c1712f2
+sha256=89e63d085cb563c32a191e3cd4907a192484f10438a6679f1349456db4b9c10a
+
 [ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz]
 md5=6fe30dad87c77b91b632def29dd69ef9
 sha256=6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
diff --git a/recipes/glew/files/autotools.patch b/recipes/glew/files/autotools.patch
new file mode 100644
index 0000000000..fc4df82a15
--- /dev/null
+++ b/recipes/glew/files/autotools.patch
@@ -0,0 +1,146 @@
+Index: glew/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/Makefile.am	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,5 @@
++
++ACLOCAL_AMFLAGS = -I m4 --install
++
++SUBDIRS = include src
++
+Index: glew/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/configure.ac	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,67 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.62])
++AC_INIT([glew], [1.5.1], [BUG-REPORT-ADDRESS])
++AC_CONFIG_SRCDIR([src/glew.c])
++AC_CONFIG_HEADERS([config.h])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AC_CONFIG_MACRO_DIR([m4])
++
++LT_INIT
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++
++# Checks for libraries.
++
++# Checks for header files.
++AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_TYPE_INT32_T
++AC_TYPE_INT64_T
++AC_TYPE_UINT64_T
++AC_CHECK_TYPES([ptrdiff_t])
++
++# Checks for library functions.
++AC_FUNC_MALLOC
++AC_CHECK_FUNCS([strtol])
++
++# Check for pkgconfig libs
++
++PKG_CHECK_MODULES([X11], [x11])
++AC_SUBST([X11_LIBS])
++AC_SUBST([X11_CFLAGS])
++
++PKG_CHECK_MODULES([XMU], [xmu])
++AC_SUBST([XMU_LIBS])
++AC_SUBST([XMU_CFLAGS])
++
++PKG_CHECK_MODULES([XI], [xi])
++AC_SUBST([XI_LIBS])
++AC_SUBST([XI_CFLAGS])
++
++PKG_CHECK_MODULES([XEXT], [xext])
++AC_SUBST([XEXT_LIBS])
++AC_SUBST([XEXT_CFLAGS])
++
++# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS
++PKG_CHECK_MODULES([GLU], [glu])
++AC_SUBST([GLU_LIBS])
++AC_SUBST([GLU_CFLAGS])
++
++# ENABLE option for Multiple Rendering Contexts support
++AC_CHECK_ENABLE_GLEWMX
++
++# for now we use the same version as the package, but that should be avoided
++# in the future
++
++AC_SUBST([LIBGLEW_SO_VERSION], [1:5:1])
++
++AC_CONFIG_FILES([Makefile
++                 include/Makefile
++                 src/Makefile])
++AC_OUTPUT
+Index: glew/src/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/src/Makefile.am	2009-12-02 00:33:48.690786110 +0100
+@@ -0,0 +1,35 @@
++
++AM_CPPFLAGS = -I$(top_srcdir)/include
++
++if ENABLE_GLEWMX
++AM_CPPFLAGS += -DGLEW_MX
++endif
++
++AM_CFLAGS = @X11_CFLAGS@ \
++            @XMU_CFLAGS@ \
++            @XI_CFLAGS@ \
++            @XEXT_CFLAGS@ \
++            @GLU_CFLAGS@
++
++lib_LTLIBRARIES = libGLEW.la
++
++libGLEW_la_SOURCES = glew.c
++
++libGLEW_la_LIBADD = @X11_LIBS@ \
++                    @XMU_LIBS@ \
++                    @XI_LIBS@ \
++                    @XEXT_LIBS@ \
++                    @GLU_LIBS@
++
++libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@
++
++bin_PROGRAMS = glewinfo visualinfo
++
++glewinfo_SOURCES = glewinfo.c
++
++glewinfo_LDADD = libGLEW.la
++
++visualinfo_SOURCES =  visualinfo.c
++
++visualinfo_LDADD = libGLEW.la
++
+Index: glew/m4/glewmx.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/m4/glewmx.m4	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,11 @@
++
++AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[
++AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support])
++AC_ARG_ENABLE([glewmx],
++   [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])],
++   [ENABLE_GLEWMX="$enableval"],
++   [ENABLE_GLEWMX="no"])
++AC_MSG_RESULT([${ENABLE_GLEWMX}])
++AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"])
++])
++
+Index: glew/include/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/include/Makefile.am	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,3 @@
++
++nobase_include_HEADERS = GL/glew.h  GL/glxew.h  GL/wglew.h
++
diff --git a/recipes/glew/libglew_1.5.1.bb b/recipes/glew/libglew_1.5.1.bb
new file mode 100644
index 0000000000..ed0b69c28b
--- /dev/null
+++ b/recipes/glew/libglew_1.5.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library."
+SECTION = "libs"
+LICENSE = "Modified BSD License, Mesa 3-D License, Khronos License"
+
+DEPENDS = "virtual/libx11 mesa libxext libxi libxmu"
+
+PR = "r0"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/1.5.1/glew-1.5.1-src.tgz \
+           file://autotools.patch;patch=1 \
+          "
+
+inherit autotools lib_package
+
+S = "${WORKDIR}/glew"
+
diff --git a/recipes/jack/jack_0.116.2.bb b/recipes/jack/jack_0.116.2.bb
index f0a2e7525e..fe7ef76e2c 100644
--- a/recipes/jack/jack_0.116.2.bb
+++ b/recipes/jack/jack_0.116.2.bb
@@ -5,14 +5,14 @@ themselves."
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "alsa-lib"
 
 SRC_URI = "http://jackaudio.org/downloads/jack-audio-connection-kit-${PV}.tar.gz"
 S = "${WORKDIR}/jack-audio-connection-kit-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools
 
 EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \
 		--disable-portaudio --disable-coreaudio --enable-oss --enable-alsa"
@@ -25,8 +25,5 @@ PACKAGES =+ "libjack jack-server jack-examples"
 FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
 FILES_jack-server = "${bindir}/jackd"
 FILES_jack-examples = "${bindir}/*"
-
-do_stage() {
-       autotools_stage_all
-}
+FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* "
 
diff --git a/recipes/performous/performous_0.4.0.bb b/recipes/performous/performous_0.4.0.bb
new file mode 100644
index 0000000000..246c71d4e8
--- /dev/null
+++ b/recipes/performous/performous_0.4.0.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "A game where you can sing caraoke or play instruments"
+HOMEPAGE = "http://performous.org/"
+SECTION = "apps"
+LICENSE = "GPL"
+
+DEPENDS = "boost glib-2.0 gstreamer pulseaudio pango freetype \
+           ffmpeg cairo gtk+ librsvg libxml++ imagemagick jack \
+           libglew virtual/libsdl \
+          "
+
+PR = "r1"
+
+inherit cmake
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/performous/performous/${PV}/Performous-${PV}-Source.tar.bz2"
+
+S = "${WORKDIR}/Performous-${PV}-Source"
+
+OECMAKE_BUILDPATH = "build"
+
+OECMAKE_SOURCEPATH = "../"
+
+FILES_${PN} += " ${datadir}/games/performous/themes/default/* \
+                 ${datadir}/games/performous/config/* \
+                 ${datadir}/games/performous/xsl/* \
+                 ${datadir}/games/performous/sounds/* \                                                                        
+                 ${datadir}/games/performous/backgrounds/* \
+               "
+