From 3dfab60a8029bc8e10a48f9bcadf0fcd0dcab5cf Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 18:16:38 +0000 Subject: opie-taskbar: Split machine (actutally, resolution) dependent files to another package. --- .../include/preferred-opie-versions-1.2.3-pre.inc | 2 ++ packages/opie-taskbar/opie-taskbar-images.inc | 32 ++++++++++++++++++++++ packages/opie-taskbar/opie-taskbar-images_cvs.bb | 6 ++++ packages/opie-taskbar/opie-taskbar.inc | 16 +---------- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 5 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 packages/opie-taskbar/opie-taskbar-images.inc create mode 100644 packages/opie-taskbar/opie-taskbar-images_cvs.bb 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..dafffe59f0 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -0,0 +1,32 @@ +DESCRIPTION = "Opie Launcher and Taskbar" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "opie-libqrsync opie-qss" +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_install() { + install -d ${D}${palmtopdir}/pics/launcher + + 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 +} + +FILES_${PN} += " ${palmtopdir}/pics" + +PACKAGE_ARCH = "${MACHINE_ARCH}" 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..39a8862afc --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +PV = "${OPIE_CVS_PV}" +PR = "r1.2" + +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..14f4ed0318 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -3,21 +3,11 @@ SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-libqrsync opie-qss" +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 +46,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 +58,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..18e88bf570 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 = "r11" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From 2f15c6d489ead5d531bee206829a1a5b4821dce2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 18:19:58 +0000 Subject: opie-taskbar-images: Fix PR. --- packages/opie-taskbar/opie-taskbar-images_cvs.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb index 39a8862afc..0f1854b9d0 100644 --- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -1,6 +1,5 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1.2" +PR = "r2" -SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ - " +SRC_URI = "${HANDHELDS_CVS};module=opie/pics" -- cgit v1.2.3 From 9c5576a8fb44075d861255398c42c419c4f1cca2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 19:30:26 +0000 Subject: opie-taskbar-images: Don't package images to machine-dependent file, instead package to separate packages for each reolution (otherwise, machine independent). Then, some higher-level task (task-opie) will select need package for specific machine. User still will be able to install another package fwiw, or even multiple (for example, to have nice wallpaper across screen rotations, but this of course will need runtime support). --- packages/opie-taskbar/opie-taskbar-images.inc | 24 +++++++++++++++++++----- packages/opie-taskbar/opie-taskbar-images_cvs.bb | 2 +- packages/opie-taskbar/opie-taskbar.inc | 6 +++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index dafffe59f0..f3cef44835 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Opie Launcher and Taskbar" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-libqrsync opie-qss" +RPROVIDES = "${PN}" APPNAME = "qpe" S = "${WORKDIR}/launcher" @@ -18,15 +18,29 @@ 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${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/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} += " ${palmtopdir}/pics" +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 = "${MACHINE_ARCH}" +PACKAGE_ARCH = "all" diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb index 0f1854b9d0..0566431474 100644 --- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +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 14f4ed0318..4f43e550b9 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -3,7 +3,11 @@ SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-libqrsync opie-qss" -RDEPENDS = "opie-taskbar-images" +# 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" -- cgit v1.2.3 From 67f53d7f0965c710ecc39aacaaa30c31827bc3b4 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 19:34:15 +0000 Subject: opie-taskbar: Bump PR. --- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 18e88bf570..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 = "r11" +PR = "r12" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From cd66d84736928e875b766d2f963cb32e4332f80d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 19:41:02 +0000 Subject: task-opie: Add dependency on opie-taskbar-images, 240x320 version until ways to provide screen size for all machines will be settled. --- packages/tasks/task-opie.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3