From 079dcb139403431fb19b752df884fc14aa506abe Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 4 May 2006 08:23:27 +0000 Subject: xcb-proto: add 0.9 release --- packages/xproto/xcb-proto_0.9.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/xproto/xcb-proto_0.9.bb diff --git a/packages/xproto/xcb-proto_0.9.bb b/packages/xproto/xcb-proto_0.9.bb new file mode 100644 index 0000000000..ba5e3ed953 --- /dev/null +++ b/packages/xproto/xcb-proto_0.9.bb @@ -0,0 +1,6 @@ +include proto-common.inc + +SRC_URI = "http://xcb.freedesktop.org/dist/${P}.tar.bz2" + + + -- cgit v1.2.3 From 2e051e06d50974e32d414212a01cd07d834e6062 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 4 May 2006 11:50:48 +0000 Subject: qscintilla: added 1.65-gpl-1.6 (build as shared, no packaged yet) --- packages/qscintilla/qscintilla_1.65-gpl-1.6.bb | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/qscintilla/qscintilla_1.65-gpl-1.6.bb diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb new file mode 100644 index 0000000000..a313d8c73e --- /dev/null +++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component" +SECTION = "opie/libs" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz" + +S = "${WORKDIR}/qscintilla-${PV}/qt" + +inherit opie + +QMAKE_PROFILES = "qscintilla.pro" + +EXTRA_QMAKEVARS_POST += " CONFIG-=thread INCLUDEPATH+=${S}/patches DEFINES+=ZPATCH \ + HEADERS-=qextscintillaprinter.h \ + SOURCES-=qextscintillaprinter.cpp \ + SOURCES+=patches/qsettings.cpp \ + SOURCES+=patches/qsettings_unix.cpp \ + HEADERS+=patches/qsettings.h" + +PARALLEL_MAKE = "" + + +do_stage() { + install -m 0644 qextscintilla*.h ${STAGING_INCDIR}/ + oe_libinstall -so libqscintilla ${STAGING_LIBDIR} +} -- cgit v1.2.3 From f7dc666421ae0de3d8859aad345239cd13bcc256 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 4 May 2006 11:52:34 +0000 Subject: visiscript: added 0.4.3 - need qscintilla 1.65 (broken for now) --- packages/visiscript/visiscript_0.4.3.bb | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/visiscript/visiscript_0.4.3.bb diff --git a/packages/visiscript/visiscript_0.4.3.bb b/packages/visiscript/visiscript_0.4.3.bb new file mode 100644 index 0000000000..b975e63bee --- /dev/null +++ b/packages/visiscript/visiscript_0.4.3.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "VisiScript is a simple graphical frontend for \ +scripting languages like minscript, Python,Ruby, Perl or others. \ +VisiScript runs on the Qtopia desktop environment of the Zaurus." +SECTION = "opie/applications" +MAINTAINER = "Michael 'Mickey' Lauer " +DEPENDS = "qscintilla" +LICENSE = "GPL" +APPNAME = "visiscript" +APPTYPE = "binary" +APPDESKTOP = "${S}" + +BROKEN = "1" + +SRC_URI = "http://www.mneuroth.de/privat/zaurus/visiscript_src_${PV}.tar.gz \ + file://qptrlist.h file://qcleanuphandler.h" + +S = "${WORKDIR}/visiscript-${PV}" + +inherit opie + +QMAKE_PROFILES = "zvisiscript.pro" +PARALLEL_MAKE = "" + +EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.65-gpl-1.6/qt/libqscintilla.a LIBS+=-lqscintilla LIBS+=-ldl" +export OE_QMAKE_LINK="${CXX}" + +do_compile_prepend() { + install -m 0644 ${WORKDIR}/*.h ${S} +} + +do_install() { + install -d ${D}${palmtopdir}/pics/ + install -m 0644 Visiscript.png ${D}${palmtopdir}/pics +} + +#FIXME: package help and translation -- cgit v1.2.3 From 195155f18b2298eda12ca3eacc828f8229e012d5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 4 May 2006 13:56:00 +0000 Subject: qscintilla 1.65: add patch to remove bogus DynLibrary use when built against Qt/Embedded --- packages/qscintilla/files/.mtn2git_empty | 0 packages/qscintilla/files/no-external-lexers.patch | 24 ++++++++++++++++++++++ packages/qscintilla/qscintilla_1.65-gpl-1.6.bb | 14 ++++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 packages/qscintilla/files/.mtn2git_empty create mode 100644 packages/qscintilla/files/no-external-lexers.patch diff --git a/packages/qscintilla/files/.mtn2git_empty b/packages/qscintilla/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qscintilla/files/no-external-lexers.patch b/packages/qscintilla/files/no-external-lexers.patch new file mode 100644 index 0000000000..5953043190 --- /dev/null +++ b/packages/qscintilla/files/no-external-lexers.patch @@ -0,0 +1,24 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- ../src/ExternalLexer.cpp~no-external-lexers ++++ ../src/ExternalLexer.cpp +@@ -110,7 +110,7 @@ + // Initialise some members... + first = NULL; + last = NULL; +- ++#ifndef ZPATCH + // Load the DLL + lib = DynamicLibrary::Load(ModuleName); + if (lib->IsValid()) { +@@ -155,6 +155,7 @@ + } + } + } ++#endif + next = NULL; + } + diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb index a313d8c73e..1620ef62c5 100644 --- a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb +++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb @@ -4,7 +4,8 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" PR = "r0" -SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz" +SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \ + file://no-external-lexers.patch;patch=1;pnum=0" S = "${WORKDIR}/qscintilla-${PV}/qt" @@ -12,7 +13,8 @@ inherit opie QMAKE_PROFILES = "qscintilla.pro" -EXTRA_QMAKEVARS_POST += " CONFIG-=thread INCLUDEPATH+=${S}/patches DEFINES+=ZPATCH \ +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/patches \ + DEFINES+=ZPATCH DEFINES+=ZAURUS \ HEADERS-=qextscintillaprinter.h \ SOURCES-=qextscintillaprinter.cpp \ SOURCES+=patches/qsettings.cpp \ @@ -21,8 +23,14 @@ EXTRA_QMAKEVARS_POST += " CONFIG-=thread INCLUDEPATH+=${S}/patches DEFINES+=ZPAT PARALLEL_MAKE = "" - do_stage() { install -m 0644 qextscintilla*.h ${STAGING_INCDIR}/ oe_libinstall -so libqscintilla ${STAGING_LIBDIR} } + +do_install() { + install -d ${D}${libdir} + oe_libinstall -so libqscintilla ${D}${libdir} +} + +FILES_${PN} = "${libdir}" -- cgit v1.2.3 From 6d289b938f340136223d2655ef597096cdc15fc5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 4 May 2006 13:57:16 +0000 Subject: zvisiscript 0.4.3: always use EXTRA_QMAKEVARS_POST +=, not = don't tweak CONFIG+/- thread, palmtop.bbclass handles this globally now --- packages/visiscript/visiscript_0.4.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/visiscript/visiscript_0.4.3.bb b/packages/visiscript/visiscript_0.4.3.bb index b975e63bee..977cb80738 100644 --- a/packages/visiscript/visiscript_0.4.3.bb +++ b/packages/visiscript/visiscript_0.4.3.bb @@ -21,7 +21,7 @@ inherit opie QMAKE_PROFILES = "zvisiscript.pro" PARALLEL_MAKE = "" -EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.65-gpl-1.6/qt/libqscintilla.a LIBS+=-lqscintilla LIBS+=-ldl" +EXTRA_QMAKEVARS_POST += "LIBS-=../qscintilla-1.65-gpl-1.6/qt/libqscintilla.a LIBS+=-lqscintilla LIBS+=-ldl" export OE_QMAKE_LINK="${CXX}" do_compile_prepend() { -- cgit v1.2.3 From 933e08b824e43b80a76bd9100b1b3aedebd5153a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 May 2006 14:58:33 +0000 Subject: gcc-csl-2005q3: Add missing patch --- packages/gcc/gcc-csl-arm/gcc_optab_arm.patch | 95 ++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 packages/gcc/gcc-csl-arm/gcc_optab_arm.patch diff --git a/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch b/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch new file mode 100644 index 0000000000..fa21b26554 --- /dev/null +++ b/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch @@ -0,0 +1,95 @@ +ARM is the only architecture that has a helper function that returns +an unbiased result. This fix is trivial enough that we can show it +doesn't effect any of the other arches. Can we consider this a +regression fix since it used to work until the helper was added :} + +Tested with no regressions on x86_64-pc-linux-gnu and arm-none-eabi. + +Cheers, +Carlos. +-- +Carlos O'Donell +CodeSourcery +carlos@codesourcery.com +(650) 331-3385 x716 + +gcc/ + +2006-01-27 Carlos O'Donell + + * optabs.c (prepare_cmp_insn): If unbaised and unsigned then bias + the comparison routine return. + +gcc/testsuite/ + +2006-01-27 Carlos O'Donell + + * gcc.dg/unsigned-long-compare.c: New test. + +Index: gcc/optabs.c +=================================================================== +--- 1/gcc/optabs.c (revision 110300) ++++ 2/gcc/optabs.c (working copy) +@@ -3711,18 +3711,24 @@ + result = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST_MAKE_BLOCK, + word_mode, 2, x, mode, y, mode); + ++ /* There are two kinds of comparison routines. Biased routines ++ return 0/1/2, and unbiased routines return -1/0/1. Other parts ++ of gcc expect that the comparison operation is equivalent ++ to the modified comparison. For signed comparisons compare the ++ result against 1 in the unbiased case, and zero in the biased ++ case. For unsigned comparisons always compare against 1 after ++ biasing the unbased result by adding 1. This gives us a way to ++ represent LTU. */ + *px = result; + *pmode = word_mode; +- if (TARGET_LIB_INT_CMP_BIASED) +- /* Integer comparison returns a result that must be compared +- against 1, so that even if we do an unsigned compare +- afterward, there is still a value that can represent the +- result "less than". */ +- *py = const1_rtx; +- else ++ *py = const1_rtx; ++ ++ if (!TARGET_LIB_INT_CMP_BIASED) + { +- *py = const0_rtx; +- *punsignedp = 1; ++ if (*punsignedp) ++ *px = plus_constant (result, 1); ++ else ++ *py = const0_rtx; + } + return; + } +Index: gcc/testsuite/gcc.dg/unsigned-long-compare.c +=================================================================== +--- 1/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) ++++ 2/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) +@@ -0,0 +1,24 @@ ++/* Copyright (C) 2006 Free Software Foundation, Inc. */ ++/* Contributed by Carlos O'Donell on 2006-01-27 */ ++ ++/* Test a division corner case where the expression simplifies ++ to a comparison, and the optab expansion is wrong. The optab ++ expansion emits a function whose return is unbiased and needs ++ adjustment. */ ++/* Origin: Carlos O'Donell */ ++/* { dg-do run { target arm-*-*eabi* } } */ ++/* { dg-options "" } */ ++#include ++ ++#define BIG_CONSTANT 0xFFFFFFFF80000000ULL ++ ++int main (void) ++{ ++ unsigned long long OneULL = 1ULL; ++ unsigned long long result; ++ ++ result = OneULL / BIG_CONSTANT; ++ if (result) ++ abort (); ++ exit (0); ++} -- cgit v1.2.3 From db10e32baddaf8a653b25d4f8f1f712fc3ac5e5f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 4 May 2006 16:12:11 +0000 Subject: libsm: correct SRC_URI (add X11R7.0) --- packages/xlibs/libsm_X11R7.0-1.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb index 14ec6ffac0..d102f7db7a 100644 --- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb +++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb @@ -7,8 +7,8 @@ LICENSE = "MIT-X" DEPENDS = "libx11 libice util-macros" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-1.0.0.tar.bz2" -S = "${WORKDIR}/libSM-1.0.0" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-${PV}.tar.bz2" +S = "${WORKDIR}/libSM-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From 27f543c217767640f9cb0c1af6a2452338a3cfe6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 4 May 2006 18:14:25 +0000 Subject: hh pxa 2.6: eabi enums patch is on upstream cvs --- packages/linux/handhelds-pxa-2.6_cvs.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 0423268abe..e7df211acb 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,14 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert " LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r1" +PR = "r2" # COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ - file://eabi-enums.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel26" -- cgit v1.2.3 From 98d48268244946112cf179a1dfeb7101c9370652 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 4 May 2006 18:37:14 +0000 Subject: base.bbclass: fix .la file fixup rule in oe_libinstall - attach 'g' to the s/${WORKDIR}/${STAGING_LIBDIR}/ sed rule to fix up multiple references to yet unstaged .la files --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 1728b65709..6a9077d55a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi -- cgit v1.2.3 From b95f0f59875dab15e2709ed54ab916a56c4154ac Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Apr 2006 12:37:34 +0000 Subject: slugos-image: put in an image pre-process command to remove the busybox S20syslog init scripts from rc?.d, because slugos-init uses it's own destination-specific init scripts. --- packages/meta/slugos-image.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index 9434e5076f..0fa0ba7482 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r26" +PR = "r27" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -32,6 +32,9 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" +# This hack does what the hack in busybox.bb is supposed to do but doesn't for some reason. +IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/etc/rc?.d/?20syslog;" + # Building a full image. If required do a post-process command which builds # the full flash image using slugimage. At present this only works for NSLU2 images. PACK_IMAGE = "" -- cgit v1.2.3 From 0facb6980ff8e78435b5ede411f84da6e28f0f57 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Apr 2006 12:38:04 +0000 Subject: base-files: Bumped PR as it's the only way to rebuild base-files when a distro version changes. --- packages/base-files/base-files_3.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 25cb1b1bbe..8fec5b01d4 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r48" +PR = "r49" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From 21cc8f8c8c48b2961c47e9805210630105e6af94 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Apr 2006 12:38:27 +0000 Subject: slugos.conf: Bumped distro version to 3.7 for final testing before a 3.8 beta release. --- conf/distro/slugos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index acb055eb42..b1591efadd 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "3.6" +SLUGOS_VERSION = "3.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): -- cgit v1.2.3 From 6de77d51375f042db0cb2c4e3c44f5895f4c7dff Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Apr 2006 12:55:12 +0000 Subject: slugos-image: Removed the pre-process command for syslog, now the bitbake bug is fixed (thanks zecke). --- packages/meta/slugos-image.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index 0fa0ba7482..428a48bc28 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r27" +PR = "r28" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -32,9 +32,6 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" -# This hack does what the hack in busybox.bb is supposed to do but doesn't for some reason. -IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/etc/rc?.d/?20syslog;" - # Building a full image. If required do a post-process command which builds # the full flash image using slugimage. At present this only works for NSLU2 images. PACK_IMAGE = "" -- cgit v1.2.3