diff options
| -rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.3-pre.inc | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar-images.inc | 46 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar-images_cvs.bb | 5 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar.inc | 20 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-opie.bb | 6 |
6 files changed, 63 insertions, 18 deletions
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index fe71a6ab90..55a4c79e75 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -188,6 +188,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}" PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" @@ -378,6 +379,7 @@ SRCDATE_opie-systemtime = "${OPIE_SRCDATE}" SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}" SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}" SRCDATE_opie-taskbar = "${OPIE_SRCDATE}" +SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}" SRCDATE_opie-tetrix = "${OPIE_SRCDATE}" SRCDATE_opie-textedit = "${OPIE_SRCDATE}" SRCDATE_opie-theme = "${OPIE_SRCDATE}" diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc new file mode 100644 index 0000000000..f3cef44835 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -0,0 +1,46 @@ +DESCRIPTION = "Opie Launcher and Taskbar" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +RPROVIDES = "${PN}" +APPNAME = "qpe" + +S = "${WORKDIR}/launcher" + +# Wallpaper and welcome splash +PIXMAP_SIZE = "" +PIXMAP_SIZE_c7x0 = "-640x480" +PIXMAP_SIZE_spitz = "-640x480" +PIXMAP_SIZE_akita = "-640x480" +PIXMAP_SIZE_tosa = "-480x640" +PIXMAP_SIZE_simpad = "-800x600" +PIXMAP_SIZE_asus730 = "-480x640" +PIXMAP_SIZE_htcuniversal= "-480x640" +PIXMAP_SIZE_hx4700 = "-480x640" + +PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-240x320" + +#inherit opie + +do_install() { + install -d ${D}${palmtopdir}/pics/launcher + + install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg + + install -m 0644 ${WORKDIR}/pics/launcher/firstuse-480x640.jpg ${D}${palmtopdir}/pics/launcher/firstuse-480x640.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background-480x640.jpg ${D}${palmtopdir}/pics/launcher/opie-background-480x640.jpg + + install -m 0644 ${WORKDIR}/pics/launcher/firstuse-640x480.jpg ${D}${palmtopdir}/pics/launcher/firstuse-640x480.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background-640x480.jpg ${D}${palmtopdir}/pics/launcher/opie-background-640x480.jpg + + install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-800x600.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-800x600.jpg +} + +FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*" +FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*" +FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*" +FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*" + +PACKAGE_ARCH = "all" diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb new file mode 100644 index 0000000000..0566431474 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PV = "${OPIE_CVS_PV}" +PR = "r3" + +SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index aea8ff3486..4f43e550b9 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -3,21 +3,15 @@ SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-libqrsync opie-qss" +# Unfortunately, ipkg has buggy handling of Rdepends to multiple packages with the same Provides. +# Instead of seeing if something in package package lists selects needed package among the rest +# or errors out otherwise, it just install random package which has needed Provides. So, comment +# this out. +#RDEPENDS = "opie-taskbar-images" APPNAME = "qpe" S = "${WORKDIR}/launcher" -# Wallpaper and welcome splash -PIXMAP_SIZE = "" -PIXMAP_SIZE_c7x0 = "-640x480" -PIXMAP_SIZE_spitz = "-640x480" -PIXMAP_SIZE_akita = "-640x480" -PIXMAP_SIZE_tosa = "-480x640" -PIXMAP_SIZE_simpad = "-800x600" -PIXMAP_SIZE_asus730 = "-480x640" -PIXMAP_SIZE_htcuniversal= "-480x640" -PIXMAP_SIZE_hx4700 = "-480x640" - inherit opie do_configure_prepend() { @@ -56,8 +50,6 @@ do_install() { do install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p done - install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg - install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/ install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/ @@ -70,5 +62,3 @@ do_install() { } FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics" - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 7db76aa8dd..88cfcf90b2 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r10" +PR = "r12" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 7380b5fc20..1bdea2ed4d 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r9" +PR = "r10" PACKAGES = "task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -26,8 +26,10 @@ PACKAGES += "task-opie-everything" # Dependencies to get the launcher up and running # RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \ - opie-taskbar opie-pics opie-sounds opie-freetype \ + opie-taskbar opie-taskbar-images-240x320 opie-pics opie-sounds opie-freetype \ ttf-dejavu-sans ttf-dejavu-sans-mono" +# TODO: Instead of opie-taskbar-images-240x320 version for target machine should be used, pending +# mechanism to specify screen size for all machines. # # things for reasonable bootstrap image |