From 29ab43535c95595889b29f1956ca2034cbc6d2d2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 1 Jul 2005 16:26:26 +0000 Subject: Bluez-Update: - update bluez-libs to 2.17 - update bluez-utils to 2.17 - fix base.patch against /etc/pcmcia/bluetooth to actually do something --- packages/bluez-libs/bluez-libs_2.16.bb | 20 ---------- packages/bluez-libs/bluez-libs_2.17.bb | 21 +++++++++++ packages/bluez-utils/bluez-utils-common_2.16.inc | 48 ------------------------ packages/bluez-utils/bluez-utils-common_2.17.inc | 48 ++++++++++++++++++++++++ packages/bluez-utils/bluez-utils-dbus_2.16.bb | 5 --- packages/bluez-utils/bluez-utils-dbus_2.17.bb | 5 +++ packages/bluez-utils/bluez-utils-nodbus_2.16.bb | 4 -- packages/bluez-utils/bluez-utils-nodbus_2.17.bb | 4 ++ packages/bluez-utils/files/base.patch | 19 +++++----- 9 files changed, 88 insertions(+), 86 deletions(-) delete mode 100644 packages/bluez-libs/bluez-libs_2.16.bb create mode 100644 packages/bluez-libs/bluez-libs_2.17.bb delete mode 100644 packages/bluez-utils/bluez-utils-common_2.16.inc create mode 100644 packages/bluez-utils/bluez-utils-common_2.17.inc delete mode 100644 packages/bluez-utils/bluez-utils-dbus_2.16.bb create mode 100644 packages/bluez-utils/bluez-utils-dbus_2.17.bb delete mode 100644 packages/bluez-utils/bluez-utils-nodbus_2.16.bb create mode 100644 packages/bluez-utils/bluez-utils-nodbus_2.17.bb diff --git a/packages/bluez-libs/bluez-libs_2.16.bb b/packages/bluez-libs/bluez-libs_2.16.bb deleted file mode 100644 index cf80d773e7..0000000000 --- a/packages/bluez-libs/bluez-libs_2.16.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez-libs/bluez-libs_2.17.bb b/packages/bluez-libs/bluez-libs_2.17.bb new file mode 100644 index 0000000000..7a5df4ebe4 --- /dev/null +++ b/packages/bluez-libs/bluez-libs_2.17.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez-utils/bluez-utils-common_2.16.inc b/packages/bluez-utils/bluez-utils-common_2.16.inc deleted file mode 100644 index 69f9514695..0000000000 --- a/packages/bluez-utils/bluez-utils-common_2.16.inc +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} pcmcia-cs" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://base.patch;patch=1 \ - file://blueboxes.patch;patch=1 \ - file://hcid.conf \ - file://bluetooth.default \ - file://bluetooth.conf " - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' and see if we break something with that -SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch" -SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \ - --enable-pcmcia --enable-initscripts" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ - install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth - cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" -FILES_${PN}-ciptool = "/bin/ciptool" -FILES_${PN}-bluepin = "/bin/bluepin" diff --git a/packages/bluez-utils/bluez-utils-common_2.17.inc b/packages/bluez-utils/bluez-utils-common_2.17.inc new file mode 100644 index 0000000000..69f9514695 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-common_2.17.inc @@ -0,0 +1,48 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} pcmcia-cs" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://base.patch;patch=1 \ + file://blueboxes.patch;patch=1 \ + file://hcid.conf \ + file://bluetooth.default \ + file://bluetooth.conf " + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' and see if we break something with that +SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch" +SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \ + --enable-pcmcia --enable-initscripts" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth + cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" +FILES_${PN}-ciptool = "/bin/ciptool" +FILES_${PN}-bluepin = "/bin/bluepin" diff --git a/packages/bluez-utils/bluez-utils-dbus_2.16.bb b/packages/bluez-utils/bluez-utils-dbus_2.16.bb deleted file mode 100644 index f405cd5133..0000000000 --- a/packages/bluez-utils/bluez-utils-dbus_2.16.bb +++ /dev/null @@ -1,5 +0,0 @@ -include bluez-utils-common_${PV}.inc -DEPENDS += "dbus" -SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" -EXTRA_OECONF += "--with-dbus" - diff --git a/packages/bluez-utils/bluez-utils-dbus_2.17.bb b/packages/bluez-utils/bluez-utils-dbus_2.17.bb new file mode 100644 index 0000000000..f405cd5133 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-dbus_2.17.bb @@ -0,0 +1,5 @@ +include bluez-utils-common_${PV}.inc +DEPENDS += "dbus" +SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" +EXTRA_OECONF += "--with-dbus" + diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb b/packages/bluez-utils/bluez-utils-nodbus_2.16.bb deleted file mode 100644 index 6334a4a499..0000000000 --- a/packages/bluez-utils/bluez-utils-nodbus_2.16.bb +++ /dev/null @@ -1,4 +0,0 @@ -include bluez-utils-common_${PV}.inc - -EXTRA_OECONF += "--without-dbus" - diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.17.bb b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb new file mode 100644 index 0000000000..6334a4a499 --- /dev/null +++ b/packages/bluez-utils/bluez-utils-nodbus_2.17.bb @@ -0,0 +1,4 @@ +include bluez-utils-common_${PV}.inc + +EXTRA_OECONF += "--without-dbus" + diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch index dbbff5199c..c4bb288303 100644 --- a/packages/bluez-utils/files/base.patch +++ b/packages/bluez-utils/files/base.patch @@ -3,19 +3,20 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- bluez-utils-2.14/pcmcia/bluetooth~base -+++ bluez-utils-2.14/pcmcia/bluetooth -@@ -15,6 +15,9 @@ - - if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi +--- bluez-utils-2.17/pcmcia/bluetooth~base.patch ++++ bluez-utils-2.17/pcmcia/bluetooth +@@ -18,6 +18,10 @@ + # Get device attributes + get_info $DEVICE +test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7" +test -z "$MANFID" && MANFID="bcsp" ++test "$MANFID" = "0000,0000" && MANFID="bcsp" + - # Get device attributes - get_info $DEVICE - -@@ -25,7 +28,7 @@ + # + # Serial devices + # +@@ -25,7 +29,7 @@ IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'` setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ -- cgit v1.2.3 From a0ab0fa421ccbb5b8cbba9ba86d427c0df4c645a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 1 Jul 2005 16:30:41 +0000 Subject: Python: fix python-datetime dependencies --- packages/python/python-2.4.1-manifest.inc | 6 +++--- packages/python/python_2.4.1.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/python/python-2.4.1-manifest.inc b/packages/python/python-2.4.1-manifest.inc index df5bd07dca..586a525cda 100644 --- a/packages/python/python-2.4.1-manifest.inc +++ b/packages/python/python-2.4.1-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Mon Jun 27 22:39:53 2005 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Fri Jul 1 18:03:30 2005 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -36,8 +36,8 @@ RDEPENDS_python-pickle="python-core python-codecs python-re" FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml4" -RDEPENDS_python-datetime="python-core python-locale" +PR_python-datetime="ml5" +RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb index 89b0d64e2f..9ac8cee701 100644 --- a/packages/python/python_2.4.1.bb +++ b/packages/python/python_2.4.1.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " PROVIDES = "python python-core" DEPENDS = "python-native zlib gdbm openssl" -PR = "ml4" +PR = "ml5" PYTHON_MAJMIN = "2.4" -- cgit v1.2.3 From 3221ab46e00aa659acc33eb384972e1bae594dbf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 1 Jul 2005 19:18:23 +0000 Subject: Opie: set default font size to 16pt on hires devices --- packages/opie-taskbar/opie-taskbar/akita/qpe.conf | 2 +- packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 2 +- packages/opie-taskbar/opie-taskbar/opie | 1 + packages/opie-taskbar/opie-taskbar/spitz/qpe.conf | 2 +- packages/opie-taskbar/opie-taskbar/tosa/qpe.conf | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 8 ++++---- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index 2267ede9fa..88bfd4fd34 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -3,6 +3,7 @@ [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root [ -z $HOME ] && export HOME=/home/$LOGNAME +export QWS_DISPLAY=Transformed:Rot0:0 export QTDIR=/opt/QtPalmtop export OPIEDIR=/opt/QtPalmtop export QPEDIR=/opt/QtPalmtop diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf index 75b4453cfd..3740bfc351 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 32 BigIconSize = 48 FontFamily = DejaVu_Sans FontStyle = Regular -FontSize = 14 +FontSize = 16 FixedFontFamily = DejaVu_Sans_Mono FixedFontStyle = Regular FixedFontSize = 14 diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 80a705a08a..f1fd277a9e 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,10 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/apps \ ${HANDHELDS_CVS};module=opie/root \ ${HANDHELDS_CVS};module=opie/etc \ - file://nomax.patch;patch=1;pnum=3 \ + file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ file://opie-reorgfiles \ file://opie \ file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" + file://locale.conf \ + file://opie_defaults" -- cgit v1.2.3 From 27b9cb0d23611e8a9760399a862e2f6e7726aa9e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:39:32 +0000 Subject: Add basic configuration files for maemo distribution. --- conf/distro/maemo-1.0.conf | 40 ++++++++++++++++++++++++++++++++++++++++ conf/distro/maemo-preferred.inc | 5 +++++ 2 files changed, 45 insertions(+) create mode 100644 conf/distro/maemo-1.0.conf create mode 100644 conf/distro/maemo-preferred.inc diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf new file mode 100644 index 0000000000..15ec45f34e --- /dev/null +++ b/conf/distro/maemo-1.0.conf @@ -0,0 +1,40 @@ +include conf/distro/familiar.conf + +DISTRO = "maemo" +DISTRO_NAME = "Maemo Linux" +DISTRO_VERSION = "v1.0b-${DATE}" + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +FEED_URIS += " \ + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + +#CVSDATE = 20050331 + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +#PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" +#PREFERRED_VERSION_gcc-cross = "3.4.4" +#PREFERRED_VERSION_gcc-cross-initial = "3.4.4 +#PREFERRED_VERSION_libtool-native = "1.5.6" +#PREFERRED_VERSION_libtool-cross= "1.5.6" + +# +# GPE +# + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_x11 = "diet-x11" + +include conf/distro/preferred-gpe-versions.inc + +# +# Maemo +# + +include conf/distro/maemo-preferred.inc diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc new file mode 100644 index 0000000000..6a8c311837 --- /dev/null +++ b/conf/distro/maemo-preferred.inc @@ -0,0 +1,5 @@ +PREFERRED_PROVIDER_gconf = "gconf-osso" +PREFERRED_PROVIDER_tslib = "tslib-maemo" +PREFERRED_VERSION_dbus = "0.23.1-osso5" +PREFERRED_VERSION_audiofile = "0.2.6-3osso4" +PREFERRED_PROVIDER_esd = "osso-esd" -- cgit v1.2.3 From 49f3db13f5b0ce0db3f9e0f6430d947471f65751 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:44:46 +0000 Subject: Add latest maemo stuff to meta package, improve sorting by using more "task" metapackages. --- packages/meta/maemo-image.bb | 19 ++++++------------- packages/meta/meta-maemo.bb | 34 ++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/packages/meta/maemo-image.bb b/packages/meta/maemo-image.bb index b9aad68edd..2adc88b958 100644 --- a/packages/meta/maemo-image.bb +++ b/packages/meta/maemo-image.bb @@ -2,31 +2,24 @@ # Meta package for maemo based system image # -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - maemo##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/maemo" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" +FEED_URIS_append_familiar = " maemo##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/maemo" -PR = "r1" +PR = "r2" export IMAGE_BASENAME = "maemo-image" GUI_MACHINE_CLASS ?= "none" -MAEMO_EXTRA_DEPENDS = "scap" -MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap" +MAEMO_EXTRA_DEPENDS = "scap dosfstools" +MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools" -#prefer some versions of the maemo stack -PREFERRED_VERSION_gtk+="gtk+-2.6.4-1.osso7" -PREFERRED_VERSION_dbus = "0.23.1-osso5" -PREFERRED_PROVIDER_gconf = "gconf-osso" +XSERVER ?= "xserver-kdrive-omap" DEPENDS = "task-bootstrap \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export IPKG_INSTALL = "task-bootstrap maemo-task-base \ +export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 4144a6c284..2482be0351 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,6 +1,6 @@ -PR = "r4" -PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install +PR = "r5" +PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor " @@ -28,21 +28,14 @@ RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}" maemo-task-base = "\ bluez-utils-dbus \ matchbox \ - xcursor-transparent-theme \ - sdk-default-theme \ - sdk-default-theme-config \ - sdk-default-icons \ - sapwood \ shared-mime-info \ rxvt-unicode \ xst \ xhost \ xrdb \ - ttf-bitstream-vera \ libgtkstylus \ detect-stylus \ outo \ - sapwood \ hildon-initscripts \ libosso \ osso-af-utils \ @@ -50,7 +43,8 @@ maemo-task-base = "\ osso-core-config \ osso-gnome-vfs2 \ osso-thumbnail \ - xauth" + xauth \ + esd" RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ gdk-pixbuf-loader-xpm \ @@ -58,8 +52,26 @@ RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ pango-module-basic-x \ pango-module-basic-fc \ ${maemo-task-base}" + DEPENDS += " ${maemo-task-base}" + +maemo-task-theme = "\ + xcursor-transparent-theme \ + sdk-default-theme \ + sdk-default-theme-config \ + sdk-default-icons \ + sapwood \ + ttf-bitstream-vera \ + sapwood \ + osso-sounds" + +RDEPENDS_maemo-task-theme := "${maemo-task-theme}" + +DEPENDS += " ${maemo-task-theme}" + + + maemo-task-apps = "\ osso-gwobex \ osso-gwconnect \ @@ -69,6 +81,8 @@ maemo-task-apps = "\ hildon-navigator \ hildon-control-panel \ osso-application-installer \ + osso-app-killer \ + osso-screenshot-tool \ gpe-todo-hildon \ gpe-contacts-maemo" -- cgit v1.2.3 From c0c13ed4c933845dc25fdb387774da8f476875aa Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:47:55 +0000 Subject: Add a set of packages for sound support in maemo images. --- packages/maemo/audiofile_0.2.6-3osso4.bb | 26 ++++++++++++++++++++++++++ packages/maemo/osso-dsp-headers_0.1.bb | 21 +++++++++++++++++++++ packages/maemo/osso-sounds_0.3-1.bb | 31 +++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 packages/maemo/audiofile_0.2.6-3osso4.bb create mode 100644 packages/maemo/osso-dsp-headers_0.1.bb create mode 100644 packages/maemo/osso-sounds_0.3-1.bb diff --git a/packages/maemo/audiofile_0.2.6-3osso4.bb b/packages/maemo/audiofile_0.2.6-3osso4.bb new file mode 100644 index 0000000000..46c1b701cb --- /dev/null +++ b/packages/maemo/audiofile_0.2.6-3osso4.bb @@ -0,0 +1,26 @@ +DEFAULT_PREFERENCE = "-1" +PR = "r0" +SECTION = "libs" +LICENSE = "LGPL GPL" +DESCRIPTION = "The Audio File Library provides a uniform and elegant \ +API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ +WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ +Research, Amiga IFF/8SVX, and NIST SPHERE." + +PACKAGES += "${PN}-bin" +FILES_${PN} = "${libdir}/libaudiofile*.so.*" +FILES_${PN}-dev += "${bindir}/*-config" +FILES_${PN}-bin += "${bindir}" +RPROVIDES_${PN} += "audiofile" + +SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/a/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.2.6 + +inherit autotools pkgconfig binconfig + +do_stage () { + install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/ + oe_libinstall -C libaudiofile libaudiofile ${STAGING_LIBDIR} + install -m 0644 audiofile.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/maemo/osso-dsp-headers_0.1.bb b/packages/maemo/osso-dsp-headers_0.1.bb new file mode 100644 index 0000000000..41e4fe87ea --- /dev/null +++ b/packages/maemo/osso-dsp-headers_0.1.bb @@ -0,0 +1,21 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " + +DEPENDS = "" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz" + +inherit autotools pkgconfig + +headers = "a_igeq.h amrnb_socket_node.h audio_socket_node.h pcm_socket_node.h \ + a_imumdrc.h amrwb_socket_node.h interface_common.h video_socket_node.h \ + aac_socket_node.h audio_pp_socket_node.h mp3_socket_node.h" + +do_stage () { + + install -d ${STAGING_INCDIR}/dsp + for h in ${headers}; do + install -m 0644 ${S}/include/dsp/$h ${STAGING_INCDIR}/dsp/$h + done +} \ No newline at end of file diff --git a/packages/maemo/osso-sounds_0.3-1.bb b/packages/maemo/osso-sounds_0.3-1.bb new file mode 100644 index 0000000000..588c3139fd --- /dev/null +++ b/packages/maemo/osso-sounds_0.3-1.bb @@ -0,0 +1,31 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " + +DEPENDS = "audiofile" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.3 + +datafiles = "game-chess_check.wav ui-charging_started.wav game-chess_checkmate.wav \ + ui-clock_alarm.mp3 game-chess_illegal_move.wav ui-confirmation_note.wav \ + game-chess_piece_capture.wav ui-connection_lost.wav \ + game-chess_successful_movement.wav ui-default_beep.wav \ + game-chess_successful_selection.wav ui-general_warning.wav \ + game-chess_unsuccesful_selection.wav ui-information_note.wav \ + game-mahjong_correct_combination.wav ui-key_press.wav \ + game-mahjong_hint_usage.wav ui-new_email.wav \ + game-mahjong_incorrect_combination.wav ui-operation_ready.wav \ + game-mahjong_incorrect_selection.wav ui-pen_down.wav \ + game-mahjong_shuffle_usage.wav ui-recharge_battery.wav \ + game-mahjong_successful_selection.wav ui-shutdown.wav \ + game-mahjong_undo_usage.wav ui-wake_up_tune.wav \ + ui-battery_low.wav ui-wrong_charger.wav" + +do_install () { + install -d ${D}/${datadir}/sounds + for h in ${datafiles}; do + install -m 0644 ${S}/usr/share/sounds/$h ${D}/${datadir}/sounds/$h + done +} -- cgit v1.2.3 From 6dde4d5dfdfba8b7fe16db6572059ad9bf5ae921 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:51:02 +0000 Subject: Add several utility applications for maemo images. --- packages/maemo/osso-app-killer_0.4-3.bb | 14 ++++++++++++++ packages/maemo/osso-screenshot-tool_1.20-1.bb | 10 ++++++++++ packages/maemo/tscalib/.mtn2git_empty | 0 packages/maemo/tscalib/makefile.patch | 24 ++++++++++++++++++++++++ packages/maemo/tscalib_0.0.1-3.bb | 19 +++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 packages/maemo/osso-app-killer_0.4-3.bb create mode 100644 packages/maemo/osso-screenshot-tool_1.20-1.bb create mode 100644 packages/maemo/tscalib/.mtn2git_empty create mode 100644 packages/maemo/tscalib/makefile.patch create mode 100644 packages/maemo/tscalib_0.0.1-3.bb diff --git a/packages/maemo/osso-app-killer_0.4-3.bb b/packages/maemo/osso-app-killer_0.4-3.bb new file mode 100644 index 0000000000..7ecc7723bf --- /dev/null +++ b/packages/maemo/osso-app-killer_0.4-3.bb @@ -0,0 +1,14 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " + +DEPENDS = "libosso" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = ${WORKDIR}/${PN}-0.4 + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/dbus-1.0" + diff --git a/packages/maemo/osso-screenshot-tool_1.20-1.bb b/packages/maemo/osso-screenshot-tool_1.20-1.bb new file mode 100644 index 0000000000..3b039be934 --- /dev/null +++ b/packages/maemo/osso-screenshot-tool_1.20-1.bb @@ -0,0 +1,10 @@ +PR = "r0" +LICENSE = "" +MAINTAINER = "Florian Boor " + +DEPENDS = "gtk+-2.6.4-1.osso7" +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-1.20" + +inherit pkgconfig autotools diff --git a/packages/maemo/tscalib/.mtn2git_empty b/packages/maemo/tscalib/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/maemo/tscalib/makefile.patch b/packages/maemo/tscalib/makefile.patch new file mode 100644 index 0000000000..7bfab4f142 --- /dev/null +++ b/packages/maemo/tscalib/makefile.patch @@ -0,0 +1,24 @@ +--- Makefile.orig 2005-06-20 18:44:26.000000000 +0200 ++++ Makefile 2005-06-20 18:43:56.000000000 +0200 +@@ -1,6 +1,4 @@ + +-CC = gcc +-CFLAGS = -Os + LIBS = -lts + PREFIX = /usr/local + +@@ -20,11 +18,11 @@ + rm -rf $(OBJECTS) $(TARGET) .depends + + install: $(TARGET) +- install -d -m 755 $(PREFIX)/bin +- install -c -m 755 $(TARGET) $(PREFIX)/bin/$(TARGET) ++ install -d -m 755 $(DESTDIR)/$(PREFIX)/bin ++ install -c -m 755 $(TARGET) $(DESTDIR)/$(PREFIX)/bin/$(TARGET) + + .depends: +- $(CC) -MM $(SOURCES) > .depends ++ $(CC) -MM $(CFLAGS) $(SOURCES) > .depends + + + -include .depends diff --git a/packages/maemo/tscalib_0.0.1-3.bb b/packages/maemo/tscalib_0.0.1-3.bb new file mode 100644 index 0000000000..6c1a72b185 --- /dev/null +++ b/packages/maemo/tscalib_0.0.1-3.bb @@ -0,0 +1,19 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " +DEPENDS = "virtual/xserver tslib" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/${PN}/${PN}_${PV}.tar.gz \ + file://makefile.patch;patch=1;pnum=0" + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +do_compile () { + oe_runmake PREFIX=${prefix} +} + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} -- cgit v1.2.3 From b1e85bd5d8485ef4c2017f23893a5f9850634849 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:53:29 +0000 Subject: Add ESD daemon for Nokia 770 to be used with DSP stuff. --- packages/maemo/osso-esd_0.5.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/maemo/osso-esd_0.5.bb diff --git a/packages/maemo/osso-esd_0.5.bb b/packages/maemo/osso-esd_0.5.bb new file mode 100644 index 0000000000..e2710c4a0b --- /dev/null +++ b/packages/maemo/osso-esd_0.5.bb @@ -0,0 +1,14 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " +PROVIDES = "esd" +RPROVIDES = "esd" + +DEPENDS = "audiofile osso-dsp-headers" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz" + +S = ${WORKDIR}/esd + +inherit autotools pkgconfig + -- cgit v1.2.3 From 7f08a13e5d04aaf9a3bac48278284c977ca76ded Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:54:56 +0000 Subject: Some formating changes. --- packages/maemo/hildon-fm_0.9.1-2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb index 8d4a71d0e0..f5346286c0 100644 --- a/packages/maemo/hildon-fm_0.9.1-2.bb +++ b/packages/maemo/hildon-fm_0.9.1-2.bb @@ -1,12 +1,12 @@ +PR = "r1" LICENSE = "GPL/LGPL" -MAINTAINER = "Koen Kooi " -PR = "r1" +MAINTAINER = "Koen Kooi " DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi xt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz" -S = "${WORKDIR}/hildon-fm-0.9.1" -FILES_${PN} += "${libdir}/outo/*.so" +S = "${WORKDIR}/hildon-fm-0.9.1" +FILES_${PN} += "${libdir}/outo/*.so" inherit pkgconfig autotools -- cgit v1.2.3 From 58f1ba500ad33487175d7a672e48a95527f76b87 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:58:16 +0000 Subject: Fix SRC_URI to contain patch. Fix shipped files. --- packages/maemo/hildon-libs_0.9.6-2.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb index aabd6b7fa7..05403155b5 100644 --- a/packages/maemo/hildon-libs_0.9.6-2.bb +++ b/packages/maemo/hildon-libs_0.9.6-2.bb @@ -1,17 +1,20 @@ -PR = "r1" +PR = "r1" LICENSE = "LGPL" -MAINTAINER = "Koen Kooi " +MAINTAINER = "Koen Kooi " DEPENDS = "dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7" -SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_${PV}.tar.gz \ - file://hildon-libs-no-werror.patch;patch=1" +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ + file://hildon-libs-no-werror.patch;patch=1" -S = "${WORKDIR}/hildon-libs-0.9.6" +S = "${WORKDIR}/hildon-libs-0.9.6" + +inherit autotools pkgconfig -inherit pkgconfig autotools EXTRA_OECONF = "--disable-gtk-doc" +FILES_${PN} += "${libdir}/outo/*.so" + do_stage() { install -d ${STAGING_LIBDIR}/outo install -m755 ${S}/ut/.libs/libhildonwidgets_unittests.so ${STAGING_LIBDIR}/outo @@ -20,4 +23,3 @@ do_stage() { install -d ${STAGING_INCDIR}/hildon-widgets install -m 644 hildon-widgets/*.h ${STAGING_INCDIR}/hildon-widgets } - -- cgit v1.2.3 From 4b646fd53b789a523067a77f5d7f95e8ca383230 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 20:59:49 +0000 Subject: Remove some obsolete stuff. --- packages/maemo/osso-thumbnail_0.3.1-1.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb index 93e41a47e4..03659654f3 100644 --- a/packages/maemo/osso-thumbnail_0.3.1-1.bb +++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb @@ -1,19 +1,16 @@ +PR = "r2" LICENSE = "" MAINTAINER = "Koen Kooi " -DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2" +DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_${PV}.tar.gz" -S = "${WORKDIR}/osso-thumbnail-0.3.1" + +S = "${WORKDIR}/osso-thumbnail-0.3.1" inherit pkgconfig autotools EXTRA_OECONF = "--disable-gtk-doc" -do_install_prepend() { - install -d ${D}/${libdir} - install thumbs/.libs/libossothumbnail.so.0.0.3 ${D}${libdir}/ -} - do_stage() { install -d ${STAGING_INCDIR} install -d ${STAGING_LIBDIR} -- cgit v1.2.3 From 0d7a6ee2b5a0abc79f17012cb9a6378f9fe583c9 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 1 Jul 2005 21:02:41 +0000 Subject: Disable per default to avoid trouble in distributions not using maemo stuff. --- packages/dbus/dbus_0.23.1-osso5.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index a313bb3f45..fffc93b636 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -1,5 +1,6 @@ +DEFAULT_PREFERENCE = "-1" SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -- cgit v1.2.3