diff options
Diffstat (limited to 'recipes')
72 files changed, 1138 insertions, 66 deletions
diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb index c575cdcce1..d58e16b61d 100644 --- a/recipes/cairo/cairo-native_1.8.0.bb +++ b/recipes/cairo/cairo-native_1.8.0.bb @@ -3,8 +3,7 @@ require cairo_1.8.0.bb inherit native -DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native" +DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native" PROVIDES = "cairo-native" -PR = "r0" - +PR = "r1" diff --git a/recipes/cherokee/cherokee_0.99.24.bb b/recipes/cherokee/cherokee_0.99.24.bb index b5d016006f..05349033b3 100644 --- a/recipes/cherokee/cherokee_0.99.24.bb +++ b/recipes/cherokee/cherokee_0.99.24.bb @@ -1,6 +1,8 @@ require cherokee.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +DEPENDS = "libpcre openssl mysql" SRC_URI = "http://www.cherokee-project.com/download/0.99/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init " @@ -9,4 +11,4 @@ CONFFILES_${PN} = " \ ${sysconfdir}/cherokee/cherokee.conf \ ${sysconfdir}/init.d/cherokee \ " -EXTRA_OECONF += "--with-mysql=${STAGING_INCDIR}/mysql" +EXTRA_OECONF = "--enable-tls=openssl --disable-static --disable-nls --with-mysql=${STAGING_INCDIR}/mysql" diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb new file mode 100644 index 0000000000..4f2af1ed73 --- /dev/null +++ b/recipes/dri/libdrm_2.4.17.bb @@ -0,0 +1,16 @@ +SECTION = "x11/base" +DEPENDS = "libpthread-stubs" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" +PR = "r1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "${PN}-intel" + +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" diff --git a/recipes/freesmartphone/mickeydbus2_git.bb b/recipes/freesmartphone/mickeydbus2_git.bb new file mode 100644 index 0000000000..799cbe72c1 --- /dev/null +++ b/recipes/freesmartphone/mickeydbus2_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Mickey's DBus introspection and calling Program rewritten in vala" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console/network" +LICENSE = "GPLv2" + +DEPENDS = "vala-native glib-2.0 dbus dbus-glib" + +PV = "2.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" +S = "${WORKDIR}/git/tools/mdbus2" + +inherit autotools + + diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc index 77a9ca6a3e..a63fb6159b 100644 --- a/recipes/gdb/gdb.inc +++ b/recipes/gdb/gdb.inc @@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ @@ -43,5 +47,3 @@ do_install () { install -d ${D}${bindir} install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} } - - diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc index b98058fe5d..f477c3aa9c 100644 --- a/recipes/gdb/gdbserver.inc +++ b/recipes/gdb/gdbserver.inc @@ -1,6 +1,6 @@ require gdb-common.inc -INC_PR = "r1" +INC_PR = "r2" DEFAULT_PREFERENCE_avr32 = "-99" @@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext FILESPATHPKG =. "gdb-${PV}:" diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb index 77cbee2a14..72eca3a16a 100644 --- a/recipes/glib-1.2/glib-1.2_1.2.10.bb +++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "glib-1.2-native" -PR = "r2" +PR = "r3" LEAD_SONAME = "libglib-1.2.*" @@ -42,3 +42,4 @@ do_stage () { install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4 } +FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h" diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb index 3639407eb6..79b48b3f1b 100644 --- a/recipes/gnome/at-spi_1.28.0.bb +++ b/recipes/gnome/at-spi_1.28.0.bb @@ -6,8 +6,16 @@ LICENSE = "LGPL" DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native" RDEPENDS_${PN} = "libgail-gnome gtk-module-gail" +PR = "r1" + inherit gnome +do_configure_prepend () { + sed -i "s|ORBIT_IDL=.*|ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2|" ${S}/configure.in + sed -i "s|BONOBO_ACTIVATION_IDL_DIR=.*|BONOBO_ACTIVATION_IDL_DIR=${STAGING_DATADIR}/idl/bonobo-activation-2.0|" ${S}/configure.in + sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in +} + do_stage () { autotools_stage_all } diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb index 4b3fd2077b..971b83e6a7 100644 --- a/recipes/gnome/gnome-games_2.24.0.bb +++ b/recipes/gnome/gnome-games_2.24.0.bb @@ -1,9 +1,9 @@ LICENSE = "GPL" -DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl" +DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl libsdl-mixer" inherit gnome distutils-base gconf -PR = "r6" +PR = "r7" SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \ " @@ -18,7 +18,9 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \ # disable help dir and crappy old sdl-macro do_configure_prepend() { - rm m4/sdl.m4 + if [ -e m4/sdl.m4 ]; then + rm m4/sdl.m4 + fi for i in $(find ${S} -name "Makefile.am") ; do sed -i -e s:help::g $i done diff --git a/recipes/gnome/gnome-keyring_2.28.0.bb b/recipes/gnome/gnome-keyring_2.28.2.bb index 46d2de0fd0..70a7349a3b 100644 --- a/recipes/gnome/gnome-keyring_2.28.0.bb +++ b/recipes/gnome/gnome-keyring_2.28.2.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt" -inherit autotools gnome pkgconfig +inherit gnome pkgconfig EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/" @@ -23,6 +23,3 @@ PACKAGES =+ "gnome-keyring-pam-plugin" FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so" FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug" -do_stage() { - autotools_stage_all -} diff --git a/recipes/gnome/libbonobo_2.24.1.bb b/recipes/gnome/libbonobo_2.24.2.bb index efc71d24a8..efc71d24a8 100644 --- a/recipes/gnome/libbonobo_2.24.1.bb +++ b/recipes/gnome/libbonobo_2.24.2.bb diff --git a/recipes/gnome/libgdata_0.5.1.bb b/recipes/gnome/libgdata_0.5.1.bb new file mode 100644 index 0000000000..7c510d0b5f --- /dev/null +++ b/recipes/gnome/libgdata_0.5.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "libgdata is a GLib-based library for accessing online service APIs" +LICENSE = "LGPL" +DEPENDS = "libxml2 glib-2.0 libsoup-2.4" + +inherit gnome lib_package autotools_stage + +SRC_URI += " \ + file://gtk-doc.make \ +" + +do_configure_prepend() { + cp ${WORKDIR}/gtk-doc.make ${S}/ + sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make +} + + + diff --git a/recipes/irda-utils/irdadump/glib2.patch b/recipes/irda-utils/irdadump/glib2.patch new file mode 100644 index 0000000000..ea37ab151b --- /dev/null +++ b/recipes/irda-utils/irdadump/glib2.patch @@ -0,0 +1,13 @@ +Index: irdadump/configure.in +=================================================================== +--- irdadump.orig/configure.in ++++ irdadump/configure.in +@@ -9,7 +9,7 @@ AC_PROG_MAKE_SET + + dnl Checks for libraries. + AM_PROG_LIBTOOL +-AM_PATH_GLIB(1.2.0) ++AM_PATH_GLIB_2_0 + + dnl Checks for header files. + AC_HEADER_STDC diff --git a/recipes/irda-utils/irdadump_0.9.16.bb b/recipes/irda-utils/irdadump_0.9.16.bb index 5c64b2dd96..90fd03ecb3 100644 --- a/recipes/irda-utils/irdadump_0.9.16.bb +++ b/recipes/irda-utils/irdadump_0.9.16.bb @@ -1,14 +1,16 @@ DESCRIPTION = "Utility to dump IrDA traffic." SECTION = "base" LICENSE = "GPL" -DEPENDS = "glib-1.2" +DEPENDS = "glib-2.0 pkgconfig" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ + file://glib2.patch;patch=1" S="${WORKDIR}/irda-utils-${PV}/irdadump" -EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/" -EXTRA_LDFLAGS += "-lglib" +EXTRA_CFLAGS += "`pkg-config --cflags glib-2.0`" +EXTRA_LDFLAGS += "`pkg-config --libs glib-2.0`" inherit autotools diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb index a84f47d471..9f6ed35aeb 100644 --- a/recipes/konqueror/konqueror-embedded_20060404.bb +++ b/recipes/konqueror/konqueror-embedded_20060404.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" -export exec_prefix = "${palmtopdir}" +#export exec_prefix = "${palmtopdir}" export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" # uncomment this for a static build diff --git a/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch new file mode 100644 index 0000000000..65e790a145 --- /dev/null +++ b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch @@ -0,0 +1,24 @@ +Dont hide destructor, if we do then in moc_lnkproperties.cpp its not +seen and compiler puts in a default one and inlines it which is then +hidden as we ask it to use -fvisibility-inlines-hidden + +Now linker can merge the symbol visivility and promotes the most +restrictive visivility in output which means that the library will have +the destructor but it will be hidden + +-Khem + +Index: library/lnkproperties.h +=================================================================== +--- library.orig/lnkproperties.h 2010-01-19 10:49:36.771348810 -0800 ++++ library/lnkproperties.h 2010-01-19 10:49:59.318857574 -0800 +@@ -45,8 +45,8 @@ + // have this class. + #ifdef QTOPIA_INTERNAL_FSLP + LnkProperties( AppLnk* lnk, QWidget* parent = 0 ); +- ~LnkProperties(); + #endif ++ ~LnkProperties(); + + void done(int); + private slots: diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb index 5c1690ec12..bb154d013f 100644 --- a/recipes/libqpe/libqpe-opie_1.2.4.bb +++ b/recipes/libqpe/libqpe-opie_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ @@ -8,5 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ file://unbreak-logging.patch;patch=1 \ file://citytime-path-2.patch;patch=1 \ file://no-include-pro.patch;patch=1 \ + file://unhide_lnkproperties_destructor.patch;patch=1 \ " diff --git a/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 new file mode 100644 index 0000000000..6acf1b2fc3 --- /dev/null +++ b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 @@ -0,0 +1,203 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN([AM_PATH_SDL], +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + min_sdl_version=ifelse([$1], ,1.2.0,$1) + + if test "x$sdl_prefix$sdl_exec_prefix" = x ; then + PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version], + [sdl_pc=yes], + [dnl + AC_MSG_RESULT(no) + sdl_pc=no + ]) + else + sdl_pc=no + if test x$sdl_exec_prefix != x ; then + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + fi + + if test "x$sdl_pc" = xyes ; then + no_sdl="" + SDL_CONFIG="pkg-config sdl" + else + as_save_PATH="$PATH" + if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + PATH="$as_save_PATH" + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "SDL.h" + +char* +my_strdu |