diff options
16 files changed, 301 insertions, 7 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index c466f5cf77..6bcd936f48 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -1,3 +1,4 @@ +*.* collie/sharp_mmcsd_m.o corgi/sharp_mmcsd_m.o defconfig-shepherd diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh index 3f2910b439..a34e91ffb1 100644 --- a/packages/gpe-session-scripts/files/keymap.sh +++ b/packages/gpe-session-scripts/files/keymap.sh @@ -6,7 +6,7 @@ case $MACHINE in "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") xmodmap - < /etc/X11/shepherd.xmodmap ;; - "Sharp-Collie" + "Sharp-Collie") xmodmap - < /etc/X11/collie.xmodmap ;; "Simpad") diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb index 22b5f7fe20..dc758aee11 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r7" +PR = "r8" inherit gpe diff --git a/packages/qte/qte-4.0.0-b1/add-tslib-mousedriver.patch b/packages/hydra/hydra_4.5.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-4.0.0-b1/add-tslib-mousedriver.patch +++ b/packages/hydra/hydra_4.5.bb diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index b4faa4f458..8cada85370 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" SECTION = "libs" DEPENDS = "ncurses-native" +PACKAGES_prepend = "ncurses-tools " PACKAGES_append = " ncurses-terminfo" FILES_ncurses_append = " ${datadir}/tabset" -FILES_ncurses-terminfo = "${datadir}/terminfo" RSUGGESTS_${PN} = "ncurses-terminfo" -PR = "r4" +PR = "r5" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" @@ -15,6 +15,12 @@ S = "${WORKDIR}/ncurses-${PV}" inherit autotools +# This keeps only tput/tset in ncurses +# clear/reset are in already busybox +FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear ${bindir}/reset ${bindir}/tack " +FILES_ncurses-terminfo = "${datadir}/terminfo" +FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo" + EXTRA_OECONF = "--with-shared \ --without-profile \ --without-debug \ diff --git a/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb b/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb index e69de29bb2..ac4f2abcd2 100644 --- a/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb +++ b/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Game: shoot the asteroids" +SECTION = "opie/games" +PRIORITY = "optional" +MAINTAINER = "Team Opie <opie@handhelds.org>" +LICENSE = "GPL" +PR = "r1" + +APPNAME = "qasteroids" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + +S = "${WORKDIR}/${APPNAME}" + +inherit opie + +# FILES plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/* +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ + + for dir in bits exhaust missile powerups rock2 rock3 shield ship + do + install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir/ + done +} + diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb index 57e592e8b9..a3277912cc 100644 --- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb +++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb @@ -5,6 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" PV = "1.1.8+cvs-${CVSDATE}" APPNAME = "qasteroids" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \ ${HANDHELDS_CVS};module=opie/pics \ @@ -18,5 +19,11 @@ inherit opie do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ + + for dir in bits exhaust missile powerups rock2 rock3 shield ship + do + install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir/ + done } diff --git a/packages/qte/qte-4.0.0-b1/add-tslib-option.patch b/packages/pmacct/files/pmacct.conf.eth0 index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-4.0.0-b1/add-tslib-option.patch +++ b/packages/pmacct/files/pmacct.conf.eth0 diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.cpp b/packages/pmacct/files/pmacct.init index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.cpp +++ b/packages/pmacct/files/pmacct.init diff --git a/packages/pmacct/pmacct_0.7.9.bb b/packages/pmacct/pmacct_0.7.9.bb index e69de29bb2..421b3967cb 100644 --- a/packages/pmacct/pmacct_0.7.9.bb +++ b/packages/pmacct/pmacct_0.7.9.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Promiscuous mode IP Accounting package" +HOMEPAGE = "http://www.ba.cnr.it/~paolo/pmacct/" +LICENSE = "GPLv2" +DEPENDS = "libpcap" +PR = "r1" + +SRC_URI = "http://www.ba.cnr.it/~paolo/pmacct/pmacct-${PV}.tar.gz \ + file://pmacct.init \ + file://pmacct.conf.eth0" + +inherit autotools + +do_configure () { + oe_runconf +} + +do_install() { + autotools_do_install + install -d ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/pmacct + install -m 755 ${WORKDIR}/pmacct.init ${D}/${sysconfdir}/init.d/pmacct + install -m 644 ${WORKDIR}/pmacct.conf.eth0 ${D}/${sysconfdir}/pmacct +} + +CONFFILES_nylon = "/etc/pmacct/pmacct.conf.eth0" diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousedriverplugin.h +++ /dev/null diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.cpp +++ /dev/null diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.h +++ /dev/null diff --git a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro b/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qte/qte-4.0.0-b1/mousedrivers/tslib/tslibmousehandler.pro +++ /dev/null diff --git a/packages/qte/qte_4.0.0-b1.bb b/packages/qte/qte_4.0.0-b1.bb index e69de29bb2..ddadc2e368 100644 --- a/packages/qte/qte_4.0.0-b1.bb +++ b/packages/qte/qte_4.0.0-b1.bb @@ -0,0 +1,227 @@ +DESCRIPTION = "Qt/Embedded version ${PV}" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +DEPENDS = "zlib libpng jpeg tslib uicmoc4-native" +PROVIDES = "virtual/qte4 virtual/libqte4" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +PR = "ml4" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-opensource-${PV}.tar.bz2 \ + file://gcc34.patch;patch=1 \ + file://add-qatomic.patch;patch=1 \ + file://fix-mkspecs.patch;patch=1 \ + file://fix-qwidget.patch;patch=1 \ + file://fix-qwsmanager.patch;patch=1 \ + file://fix-vncdriver.patch;patch=1 \ + file://fix-sl5000driver.patch;patch=1 \ + file://no-moc-no-uic-no-rcc.patch;patch=1 \ + file://sharp_char.h \ + file://switches.h \ + file://update-qtfontdir" +S = "${WORKDIR}/qt-embedded-opensource-${PV}" + +DEFAULT_PREFERENCE = "-1" + +export QTDIR = "${S}" + +def qte_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +QTE_ARCH := "${@qte_arch(d)}" + +EXTRA_OECONF = "-embedded ${QTE_ARCH} \ + -system-libjpeg -system-libpng -system-zlib \ + -no-qvfb -no-nis -no-cups -no-stl -no-pch \ + -no-accessibility -no-compat \ + -qconfig large -depths 8,16,24,32 -fast \ + -qt-gfx-transformed \ + -qt-gfx-vnc \ + -plugin-kbd-sl5000 \ + -plugin-kbd-tty \ + -plugin-kbd-usb \ + -plugin-kbd-yopy \ + -plugin-mouse-pc \ + -plugin-mouse-bus \ + -plugin-mouse-linuxtp \ + -plugin-mouse-yopy \ + " + +EXTRA_OEMAKE = "-e" + +export EXTRA_CFLAGS = "-I${STAGING_INCDIR}" +export EXTRA_CXXFLAGS = "-I${STAGING_INCDIR}" +export EXTRA_LFLAGS = "-L${STAGING_LIBDIR} -Wl,-rpath-link,${STAGING_LIBDIR}" + +do_configure() { + unset QMAKESPEC + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS LINK + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + cp -fa ${WORKDIR}/mousedrivers/ ${S}/src/gui/embedded/ + + install -d include/asm/ + install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ + install -d include/linux/ + install -m 0644 ${WORKDIR}/switches.h include/linux/ + + oe_runmake +} + +do_stage() { + install -d ${STAGING_DIR}/${HOST_SYS}/qt4/lib + + for lib in Core Gui Network Sql Xml + do + cp -a lib/libQt${lib}* ${STAGING_DIR}/${HOST_SYS}/qt4/lib/ + done + + install -d ${STAGING_DIR}/${HOST_SYS}/qt4/include/ + cp -a include/* ${STAGING_DIR}/${HOST_SYS}/qt4/include +} + +do_install() { + install -d ${D}/${palmtopdir}/bin + install -d ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/update-qtfontdir ${D}/${sbindir}/ + install -d ${D}${palmtopdir}/lib/fonts/ + cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/ + + for lib in Core Gui Network Sql Xml + do + oe_soinstall lib/libQt${lib}.so.4.0.0 ${D}/${palmtopdir}/lib + done + + for i in `find . -perm 0755 -type f` + do + install -m 0755 $i ${D}/${palmtopdir}/bin/`basename $i` + done +} + +pkg_postinst() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +pkg_postinst_qte-font-unicode() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +pkg_postinst_qte-font-lcd () { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +pkg_postinst_qte-font-japanese() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +pkg_postinst_qte-font-micro() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +pkg_postinst_qte-font-courier() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +LIB_PACKAGES = "\ + libqte4-core \ + libqte4-gui \ + libqte4-network \ + libqte4-sql \ + libqte4-xml \ + " + + +FONT_PACKAGES = "\ + qte-font-fixed \ + qte-font-helvetica-small \ + qte-font-helvetica-large \ + qte-font-smoothtimes \ + qte-font-smallsmooth \ + qte-font-unicode \ + qte-font-lcd \ + qte-font-japanese \ + qte-font-micro \ + qte-font-courier \ + " + +PACKAGES = "${LIB_PACKAGES} ${FONT_PACKAGES} examples" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES_${PN} = "" +FILES_libqte4-core = "${palmtopdir}/lib/libQtCore.* /usr/sbin/update-qtfontdir" +FILES_libqte4-gui = "${palmtopdir}/lib/libQtGui.*" +FILES_libqte4-network = "${palmtopdir}/lib/libQtNetwork.*" +FILES_libqte4-sql = "${palmtopdir}/lib/libQtSql.*" +FILES_libqte4-xml = "${palmtopdir}/lib/libQtXml.*" +FILES_examples = "${palmtopdir}/bin" + +FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*" +PACKAGE_ARCH_qte-font-fixed = "all" + +FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \ + ${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf" +PACKAGE_ARCH_qte-font-helvetica-small = "all" + +FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \ + ${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf" +PACKAGE_ARCH_qte-font-helvetica-large = "all" + +FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*" +PACKAGE_ARCH_qte-font-smoothtimes = "all" + +FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*" +PACKAGE_ARCH_qte-font-smallsmooth = "all" + +FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf" +PACKAGE_ARCH_qte-font-unicode = "all" + +FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*" +PACKAGE_ARCH_qte-font-lcd = "all" + +FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*" +PACKAGE_ARCH_qte-font-japanese = "all" + +FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf" +PACKAGE_ARCH_qte-font-micro = "all" + +FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*" +PACKAGE_ARCH_qte-font-courier = "all" diff --git a/packages/tn5250/tn5250_0.16.5.bb b/packages/tn5250/tn5250_0.16.5.bb index 08e2fe9fdb..26c9100f74 100644 --- a/packages/tn5250/tn5250_0.16.5.bb +++ b/packages/tn5250/tn5250_0.16.5.bb @@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \ inherit autotools PACKAGES = "lib5250-0 tn5250-dev tn5250-doc tn5250" +FILES_${PN} = "${bindir}/tn5250" FILES_lib5250-0 = "${libdir}/lib*.so.*" AUTO_LIBNAME_PKGS = "lib5250" @@ -19,6 +20,3 @@ do_stage() { autotools_stage_includes oe_libinstall -so -a -C src lib5250 ${STAGING_LIBDIR} } - -do_install_append() { -} |