diff options
Diffstat (limited to 'packages')
38 files changed, 412 insertions, 100 deletions
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb index dcb5c412d0..e111ac9b61 100644 --- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb @@ -2,6 +2,8 @@ SECTION = "base" require e2fsprogs.inc inherit native +PR = "r1" + EXTRA_OECONF = "" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc index f209baf3b4..7673d49e21 100644 --- a/packages/e2fsprogs/e2fsprogs.inc +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -9,6 +9,7 @@ S = "${WORKDIR}/e2fsprogs-${PV}" inherit autotools -EXTRA_OECONF = " --enable-dynamic-e2fsck" +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF += " --enable-dynamic-e2fsck" PARALLEL_MAKE = "" diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index 2e8bf3d219..4f6f62bb12 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r8" +PR = "r10" SRC_URI += "file://no-hardlinks.patch;patch=1" diff --git a/packages/gcc/gcc-4.2.1/pr34130.patch b/packages/gcc/gcc-4.2.1/pr34130.patch new file mode 100644 index 0000000000..415335f4b4 --- /dev/null +++ b/packages/gcc/gcc-4.2.1/pr34130.patch @@ -0,0 +1,16 @@ +Index: gcc-4.1.2/gcc/fold-const.c +=================================================================== +--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100 ++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100 +@@ -5339,7 +5339,10 @@ + } + break; + } +- /* FALLTHROUGH */ ++ /* If the constant is negative, we cannot simplify this. */ ++ if (tree_int_cst_sgn (c) == -1) ++ break; ++ /* FALLTHROUGH */ + case NEGATE_EXPR: + if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0) + return fold_build1 (tcode, ctype, fold_convert (ctype, t1)); diff --git a/packages/gcc/gcc-4.2.2/pr34130.patch b/packages/gcc/gcc-4.2.2/pr34130.patch new file mode 100644 index 0000000000..415335f4b4 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/pr34130.patch @@ -0,0 +1,16 @@ +Index: gcc-4.1.2/gcc/fold-const.c +=================================================================== +--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100 ++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100 +@@ -5339,7 +5339,10 @@ + } + break; + } +- /* FALLTHROUGH */ ++ /* If the constant is negative, we cannot simplify this. */ ++ if (tree_int_cst_sgn (c) == -1) ++ break; ++ /* FALLTHROUGH */ + case NEGATE_EXPR: + if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0) + return fold_build1 (tcode, ctype, fold_convert (ctype, t1)); diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb index 1c1d094382..fe326d304b 100644 --- a/packages/gcc/gcc-cross-initial_4.2.1.bb +++ b/packages/gcc/gcc-cross-initial_4.2.1.bb @@ -1,5 +1,5 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -EXTRA_OECONF += "--disable-libmudflap \ +EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ --disable-libssp" diff --git a/packages/gcc/gcc-cross-initial_4.2.2.bb b/packages/gcc/gcc-cross-initial_4.2.2.bb index 1c1d094382..fe326d304b 100644 --- a/packages/gcc/gcc-cross-initial_4.2.2.bb +++ b/packages/gcc/gcc-cross-initial_4.2.2.bb @@ -1,5 +1,5 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -EXTRA_OECONF += "--disable-libmudflap \ +EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ --disable-libssp" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index da27c68d9a..eb20e147f8 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -16,5 +16,8 @@ require gcc3-build-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " - -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +# Do not build libssp libmudflap and libgomp +# We might need them for some beefy targets +EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ + --disable-libgomp --disable-libmudflap \ + --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 1d5ebdcc61..9a591e8899 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -14,7 +14,9 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc - SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " - -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +# Do not build libssp libmudflap and libgomp +# We might need them for some beefy targets +EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ + --disable-libgomp --disable-libmudflap \ + --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gpe-login/files/size-autolock-properly.patch b/packages/gpe-login/files/size-autolock-properly.patch new file mode 100644 index 0000000000..b8e2cd6f4f --- /dev/null +++ b/packages/gpe-login/files/size-autolock-properly.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>" +# Date 1196345352 -7200 +# Node ID ebe625e21708cb9257201a4dd6e536b99f1f0220 +# Parent 976c01632feacbcce2058a061a0b1f6faed2275a +When configuring autolock window, make sure to set not only the minimal +("requested") size, but also the actual one. This fixes issue that after +autolock screen have been shown in landscape mode, it no longer fits the +screen in portrait mode. + +Also, gtk_widget_set_usize() marked as deprecated, replace with +gtk_widget_set_size_request(). + +diff -r 976c01632fea -r ebe625e21708 gpe-login.c +--- a/gpe-login.c Sun Nov 25 22:39:23 2007 +0200 ++++ b/gpe-login.c Thu Nov 29 16:09:12 2007 +0200 +@@ -558,7 +558,8 @@ filter (GdkXEvent *xevp, GdkEvent *ev, g + { + spawn_xkbd (); + gtk_label_set_markup (GTK_LABEL (label_result), ""); +- gtk_widget_set_usize (window, gdk_screen_width (), gdk_screen_height ()); ++ gtk_widget_set_size_request (window, gdk_screen_width (), gdk_screen_height ()); ++ gtk_window_resize (window, gdk_screen_width (), gdk_screen_height ()); + gtk_widget_show_all (window); + if (ownerinfo) + { diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index c2a274ba8b..253d581953 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd gpe-theme-clearlooks" RPROVIDES_${PN} = "gpe-session-starter" -PR = "r4" +PR = "r5" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" @@ -18,6 +18,7 @@ SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " SRC_URI += " file://lock-on-supend.patch;patch=1 " SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 " +SRC_URI += " file://size-autolock-properly.patch;patch=1 " SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" diff --git a/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb deleted file mode 100644 index eba670912a..0000000000 --- a/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb +++ /dev/null @@ -1,39 +0,0 @@ -require gtk+_${PV}.bb -DEPENDS = "jpeg libpng gettext glib-2.0" -S = "${WORKDIR}/gtk+-${PV}" -FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" -SRC_URI += "file://reduce-dependencies.patch;patch=1" - -#clear recommends for uclibc builds -RRECOMMENDS = " " -RRECOMMENDS_${PN}_linux = " " -RRECOMMENDS_${PN}_linux-gnueabi = " " - -EXTRA_OECONF = "\ - --without-x \ - --with-gdktarget=linux-fb \ - --without-libtiff \ - --with-libjpeg \ - --with-libpng \ -" - -do_compile() { - cd gdk-pixbuf && oe_runmake -} - -do_stage() { -# oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr - autotools_stage_includes -# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include -# install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h -} - -do_install() { - : -} - -# override the function in gtk-*.inc (included by gtk+*.bb) -populate_packages_prepend () { - -} diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb new file mode 100644 index 0000000000..ecd2d51d49 --- /dev/null +++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb @@ -0,0 +1,86 @@ +DESCRIPTION = "Stand-alone libpixbuf, a pixelmap image i/o library from the \ +GTK+ multi-platform toolkit for creating graphical user interfaces." +HOMEPAGE = "http://www.gtk.org/" +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" +DEPENDS = "libpng gettext glib-2.0" +PR = "r1" + +S = "${WORKDIR}/gtk+-${PV}" +FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://automake-lossage.patch;patch=1 \ + file://reduce-dependencies.patch;patch=1" + +# file://no-xwc.patch;patch=1 \ +# file://disable-tooltips.patch;patch=1 \ +# file://gtklabel-resize-patch;patch=1 \ +# file://menu-deactivate.patch;patch=1 \ +# file://xsettings.patch;patch=1 \ +# file://scroll-timings.patch;patch=1 \ +# file://small-gtkfilesel.patch;patch=1 \ +# file://migration.patch;patch=1;pnum=0 \ +# file://run-iconcache.patch;patch=1 \ +# file://hardcoded_libtool.patch;patch=1 \ +# file://no-demos.patch;patch=1 \ +# file://single-click.patch;patch=1 \ +# file://spinbutton.patch;patch=1 \ +# file://gtk+-handhelds.patch;patch=1 \ +# file://filesel-fix-segfault.patch;patch=1 \ +# file://combo-arrow-size.patch;patch=1;pnum=0 \ +# file://range-no-redraw.patch;patch=1;pnum=0 \ +# file://scrolled-placement.patch;patch=1;pnum=0 \ +# file://treeview-checkbox-size.patch;patch=1;pnum=0 \ +# file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \ + +inherit autotools pkgconfig + +LIBV = "2.10.0" + +FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${bindir}/gtk-update-icon-cache \ + ${libdir}/lib*.so.*" + +FILES_${PN}-dev += " \ + ${datadir}/gtk-2.0/include \ + ${libdir}/gtk-2.0/include \ + ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ + ${bindir}/gdk-pixbuf-csource \ + ${bindir}/gtk-builder-convert" + +FILES_${PN}-dbg += " \ + ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/*" + +EXTRA_OECONF = "\ + --without-x \ + --with-gdktarget=linux-fb \ + --without-libtiff \ + --without-libjpeg \ + --with-libpng \ +" + +EXTRA_OECONF += "--disable-modules --with-included-loaders=png,tga" + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require gtk-fpu.inc +EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" + +do_compile() { + cd gdk-pixbuf && oe_runmake +} + +do_stage() { + oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr + autotools_stage_includes +# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include +# install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h +} + +do_install() { + oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${D}/${libdir} + cd gdk-pixbuf && oe_runmake install DESTDIR=${D} +} + diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb new file mode 100644 index 0000000000..db2312c613 --- /dev/null +++ b/packages/images/nslu2-minimal-image.bb @@ -0,0 +1,3 @@ +require minimal-image.bb + +INHERIT += nslu2-image diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 09cf05f7d4..6fa4791150 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -74,7 +74,7 @@ do_configure_prepend() { -e '/CONFIG_CMDLINE=/d' \ -i ${S}/.config echo "CONFIG_INET=y" >> ${S}/.config - echo "CONFIG_IP_PNP=y" >> ${S}/.config + echo "CONFIG_IP_PNP=y" >> ${S}/.config echo "CONFIG_USB_GADGET=y" >> ${S}/.config echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config echo "CONFIG_USB_ETH=y" >> ${S}/.config @@ -97,22 +97,24 @@ do_sizecheck() { fi } -do_install_prepend() { - if test -e arch/${ARCH}/boot/Image ; then - ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage - fi - - if test -e arch/${ARCH}/boot/images/uImage ; then - ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage - fi +UBOOT_ENTRYPOINT ?= "20008000" - if test -e arch/${ARCH}/kernel/vmlinux.lds ; then - ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux +do_compile_append() { + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage + rm -f linux.bin.gz fi + fi } -UBOOT_ENTRYPOINT ?= "20008000" - KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" @@ -120,24 +122,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib - - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin.gz - fi - fi - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin } do_deploy[dirs] = "${S}" diff --git a/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch new file mode 100644 index 0000000000..545d4808d9 --- /dev/null +++ b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>" +# Date 1196333272 -7200 +# Node ID 4ec785864bbe896eda3b933e65a5f2d71864b9b3 +# Parent 375f9e4a30d3de9852b00cd1decb259f4f04446e +Implement an IM [Unix-]signal-based visibility protocol, as supported +by xkbd. By receiving SISUSR1, IM implementation toggles its visibility. +The most valuable, default action for SIGUSR1 is process termination, so +we can send SIGUSR1 unconditionally, replacing old method of sending +SIGTERM (and there's also check for process existence before sending +signal, so if process is dead, it will be just restarted). + +diff -r 375f9e4a30d3 -r 4ec785864bbe mbinputmgr.c +--- a/mbinputmgr.c Wed Nov 28 03:41:20 2007 +0200 ++++ b/mbinputmgr.c Thu Nov 29 12:47:52 2007 +0200 +@@ -1,3 +1,4 @@ ++#include <signal.h> + #include "mbinputmgr.h" + + static void +@@ -233,8 +234,10 @@ mbinputmgr_toggle_selected_method (MBInp + if ( (inpmgr->PidCurrent != -1) /* Something running */ + && (kill(inpmgr->PidCurrent, 0) != -1) ) + { +- kill(inpmgr->PidCurrent, 15); /* kill it */ +- inpmgr->PidCurrent = -1; ++ /* Send a SIGUSR1. Smart IMs will toggle their visibility. ++ Dumb, which don't handle it at all, will just die ++ per default action for SIGUSR1, termination. */ ++ kill(inpmgr->PidCurrent, SIGUSR1); + } + else fork_exec(inpmgr, inpmgr->MethodSelected->exec); + } diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb index 4afdd426db..09f2a7d999 100644 --- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb +++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb @@ -3,11 +3,12 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm libmatchbox" SECTION = "x11/wm" -PR = "r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \ file://update-to-svn.diff;patch=1 \ file://mbinputmgr-libgtkinput.patch;patch=1 \ + file://visibility-protocol.patch;patch=1 \ " S = "${WORKDIR}/mb-applet-input-manager-${PV}" diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index 27ea4aea1d..696486b6ef 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -5,13 +5,13 @@ RCONFLICTS = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR="r6" +PR="r7" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch;patch=1 \ -# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ -# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ -# file://4-Add-rendering-debug-logging.patch;patch=1 \ + file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ + file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ + file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ " diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch new file mode 100644 index 0000000000..82f6cb50b9 --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch @@ -0,0 +1,16 @@ +diff -r cccb513c808c src/interface.c +--- a/src/interface.c Wed Nov 28 01:22:54 2007 +0200 ++++ b/src/interface.c Wed Nov 28 01:43:12 2007 +0200 +@@ -93,8 +93,12 @@ static void fill_user_list(GtkListStore + strcpy(linkpath, home_dir); + strcat(linkpath, "/"); + strcat(linkpath, USR_LAYOUT_SUFFIX); ++ if (access(linkpath, X_OK)) { ++ mkdir(linkpath, 0711); ++ } + dir = opendir(linkpath); + if(!dir) { ++ fprintf(stderr, "Cannot read %s directory: ", linkpath); + perror("opendir"); + exit(1); + } diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png Binary files differnew file mode 100644 index 0000000000..d08be372ac --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch new file mode 100644 index 0000000000..095a8d337a --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch @@ -0,0 +1,18 @@ +diff -r a6959d06b0fb mk-layouts-gui.desktop +--- a/mk-layouts-gui.desktop Wed Nov 28 02:07:06 2007 +0200 ++++ b/mk-layouts-gui.desktop Wed Nov 28 02:08:49 2007 +0200 +@@ -1,9 +1,9 @@ + [Desktop Entry] + Name=MK Layout Manager + Comment=Manage matchbox-keyboard layouts +-Exec=mk-layouts-gui ++Exec=mboxkbd-layouts-gui + Type=Application +-Icon=mk-layouts-gui.png +-Categories=Application;SystemSettings;MB +-StartupNotify=True +-SingleInstance=True ++Icon=mboxkbd-layouts-gui ++Categories=Application;SystemSettings;MB; ++StartupNotify=true ++SingleInstance=true diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb index 2dfba07fc7..6a466a1e9a 100644 --- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb @@ -3,12 +3,21 @@ AUTHOR = "Sergey Lapin" SECTION = "x11" LICENSE = "GPL" DEPENDS = "gtk+" -PR = "r3" +PR = "r5" -PV = "0.0+git${SRCDATE}" +PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f" -SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git" +SRC_URI = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \ +#git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \ + file://auto-mkdir.patch;patch=1 \ + file://sanitize-desktop-file.patch;patch=1 \ + file://mboxkbd-layouts-gui.png" S = "${WORKDIR}/git" inherit autotools + +do_install_append() { + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/mboxkbd-layouts-gui.png ${D}${datadir}/pixmaps/ +} diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index c9b2faf3f8..ca449168a9 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -41,6 +41,7 @@ iface wlan0 inet dhcp iface atml0 inet dhcp # Wired or wireless interfaces +auto eth0 iface eth0 inet dhcp iface eth1 inet dhcp diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 289e9bbc05..82464d82c6 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r24" +PR = "r25" inherit update-rc.d diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb new file mode 100644 index 0000000000..c05b6d3618 --- /dev/null +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "The OpenMoko Sample Project" +SECTION = "openmoko/applications" +DEPENDS = "libmokoui2 intltool gconf" +PV = "0.0.1+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +PACKAGES += "${PN}-src" +# path should match the toolchain path +FILES_${PN}-src = "/usr/local/openmoko" +PACKAGE_ARCH_${PN}-src = "all" + +do_configure_prepend() { + install -d ${WORKDIR}/source + cp -a ${S} ${WORKDIR}/source/ + find ${WORKDIR}/source -name ".svn"|xargs rm -rf +} + +do_install_append() { + install -d ${D}/usr/local/openmoko/source/ + cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ +} + diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index f765bec1a1..08b0b5cd14 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -3,7 +3,6 @@ HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" LICENSE = "LGPL" - DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib glib-2.0" diff --git a/packages/pulseaudio/pulseaudio_0.9.7.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb index d466086b50..76bf6e8411 100644 --- a/packages/pulseaudio/pulseaudio_0.9.7.bb +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -5,8 +5,8 @@ SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" PR = "r0" -# problems w/ pulseaudio 0.9.7 atm: -# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet) +# problems w/ pulseaudio 0.9.8 atm: +# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work) # 2.) doesn't build w/ glibc TLS support (hence patched out) DEFAULT_PREFERENCE = "-1" diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb index 062b05519b..945b4774f9 100644 --- a/packages/tasks/task-toolchain-openmoko-sdk.bb +++ b/packages/tasks/task-toolchain-openmoko-sdk.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -PR = "r1" LICENSE = "MIT" ALLOW_EMPTY = "1" +PR = "r2" + PACKAGES = "${PN}" RDEPENDS_${PN} = "\ @@ -25,4 +26,6 @@ RDEPENDS_${PN} = "\ libmokoui2-dev \ libmokopanelui2-dev \ libmokojournal2-dev \ + \ + openmoko-sample2-src \ " diff --git a/packages/wesnoth/.mtn2git_empty b/packages/wesnoth/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wesnoth/.mtn2git_empty diff --git a/packages/wesnoth/wesnoth_svn.bb b/packages/wesnoth/wesnoth_svn.bb new file mode 100644 index 0000000000..430abe7d0f --- /dev/null +++ b/packages/wesnoth/wesnoth_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "fantasy turn-based strategy game" +PV = "0.01+svnr${SRCREV}" +PR = "r1" +SECTION = "games" +LICENSE = "GPL" +DEPENDS += "libsdl-image libsdl-mixer libsdl-net" +SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http" + +EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem" + +S = "${WORKDIR}/trunk" + +inherit autotools + +addtask autogen after do_patch before do_configure + +do_autogen() { + cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi +} diff --git a/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch new file mode 100644 index 0000000000..0423ee1eed --- /dev/null +++ b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch @@ -0,0 +1,44 @@ +diff -r 6b20ef8fbdee src/kb.c +--- a/src/kb.c Tue Nov 27 21:28:21 2007 +0200 ++++ b/src/kb.c Tue Nov 27 22:27:09 2007 +0200 +@@ -954,6 +954,13 @@ void kb_send_keypress(button *b) + int slide_flag = 0; + + struct keycodeEntry vk_keycodes[10]; ++ ++ static KeySym ksSpace, ksBackSpace, ksReturn; ++ if (!ksSpace) { ++ ksSpace = XStringToKeysym("space"); ++ ksBackSpace = XStringToKeysym("BackSpace"); ++ ksReturn = XStringToKeysym("Return"); ++ } + + if (b->kb->state & KB_STATE_SHIFT || b->kb->state & KB_STATE_CAPS) + { +@@ -981,20 +988,17 @@ void kb_send_keypress(button *b) + ks = b->slide_up_ks; + if (ks == 0) ks = b->shift_ks; + break; +- case down : /* hold ctrl */ ++ case down : + ks = b->slide_down_ks; +- if (ks == 0) slide_flag = KB_STATE_CTRL; ++ if (ks == 0) ks = ksReturn; + break; +- case left : /* hold alt */ ++ case left : + ks = b->slide_left_ks; +- if (ks == 0) +- { +- ks = b->mod_ks; +- slide_flag = KB_STATE_MOD; +- } ++ if (ks == 0) ks = ksBackSpace; + break; +- case right : /* hold alt */ ++ case right : + ks = b->slide_right_ks; ++ if (ks == 0) ks = ksSpace; + break; + case none: + break; diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb index 2d070fd7ad..f27189f597 100644 --- a/packages/xkbd/xkbd_0.8.15.bb +++ b/packages/xkbd/xkbd_0.8.15.bb @@ -2,9 +2,10 @@ SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \ file://libtool-lossage.patch;patch=1;pnum=1 \ file://fix-equalsign.patch;patch=1 \ file://fix-circumkey.patch;patch=1 \ + file://add-default-common-slides.patch;patch=1 \ file://xkbd.png" LICENSE = "GPL" -PR = "r2" +PR = "r3" SECTION = "x11" DEPENDS = "libxpm libxtst libxft" diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off index 888f90bfc5..ec3cefb2ca 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-off +++ b/packages/zaurusd/files/zaurus-hinge.bl-off @@ -6,5 +6,13 @@ # Filename: zaurus-hinge.bl-off # Date: 04-Jun-06 -test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -${ZD_BINDIR}/bl off +#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" +#${ZD_BINDIR}/bl off + + +STEP=5 +DRIVER="`ls /sys/class/backlight/|head -n 1`" +BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" + +cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp +echo 0 > "$BRIGHTNESS_FILE" diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on index b9b0e68749..61598155f2 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-on +++ b/packages/zaurusd/files/zaurus-hinge.bl-on @@ -12,7 +12,7 @@ ${ZD_BINDIR}/bl on # If the backlight does not come back on after a suspend, the driver is # still "on" (hence "bl on" does nothing) with a brightness of "0" -if test "`bl | awk '{print $2}'`" = "0" +( if test "`bl | awk '{print $2}'`" = "0" then x=0 while test "$x" != 4 @@ -24,5 +24,29 @@ then let x=$x+1 done -fi + + if mkdir /var/run/display_brightness.lock + then + if test -e /var/run/display_brightness.tmp + then + OLD_VALUE="`cat /var/run/display_brightness.tmp`" + echo "OLD BRIGHTNESS SETTING FOUND: $OLD_VALUE" + + if test "$OLD_VALUE" -gt 1 + then + STEP=5 + DRIVER="`ls /sys/class/backlight/|head -n 1`" + BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" + + echo "SETTING $OLD_VALUE!" + echo "$OLD_VALUE" > "$BRIGHTNESS_FILE" + rm /var/run/display_brightness.tmp + echo "FINISH!" + fi + fi + rm -rf /var/run/display_brightness.lock + else + echo "BRIGHTNESS IS LOCKED" + fi +fi ) & diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape index e7b92b5140..a048769f7d 100644 --- a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape +++ b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape @@ -16,6 +16,10 @@ # urg mbinputmgr should kill below killproc ${ZD_BINDIR}/matchbox-keyboard killproc ${ZD_BINDIR}/matchbox-stroke + if [ -x ${ZD_BINDIR}/xrandr ]; then - xrandr -o normal + if ! ( xrandr | awk '{print $4}' | grep -q normal ) + then + ${ZD_BINDIR}/xrandr -o normal + fi fi diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait index bd04d328cc..291617cd02 100644 --- a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait +++ b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait @@ -1,7 +1,10 @@ #!/bin/sh if [ -x ${ZD_BINDIR}/xrandr ]; then - ${ZD_BINDIR}/xrandr -o left + if ! ( xrandr | awk '{print $4}' | grep -q left ) + then + ${ZD_BINDIR}/xrandr -o left + fi fi # just to be extra safe sleep 1 diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 8f559fbca0..8bc0b2ba58 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r13" +PR = "r14" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ |
