[oe-commits] org.oe.dev opie-taskbar-images: Don't package images to machine-dependent file, instead

[pfalcon commit]

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).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d1000035d7f72a068671033fe215e56a543b20d3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d1000035d7f72a068671033fe215e56a543b20d3
Files:
1
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
Diffs:

#
# mt diff -rbfba61520cf977154e1f17dabbfb7e2db55975dd -rd1000035d7f72a068671033fe215e56a543b20d3
#
# 
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [0005e76a7ac32919b48318914c0ffca324c71478]
#    to [d360a128f6873d3f280eb4f83502e056159dc8df]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  from [770f50bb6458c661716cbccd4560083f3840a74f]
#    to [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
# 
# patch "packages/opie-taskbar/opie-taskbar.inc"
#  from [836d4288e39a80b3570d2a05a20653bed000f171]
#    to [be2742efc78e19b24da24ffd4ac78bff559fed6e]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	0005e76a7ac32919b48318914c0ffca324c71478
+++ packages/opie-taskbar/opie-taskbar-images.inc	d360a128f6873d3f280eb4f83502e056159dc8df
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 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_hx4700      = "-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 = "all"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb	770f50bb6458c661716cbccd4560083f3840a74f
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb	f3d0e51204ca5fdab33a587c2c7f69acfa799f9e
@@ -1,5 +1,5 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/opie-taskbar/opie-taskbar.inc	836d4288e39a80b3570d2a05a20653bed000f171
+++ packages/opie-taskbar/opie-taskbar.inc	be2742efc78e19b24da24ffd4ac78bff559fed6e
@@ -1,9 +1,13 @@ DEPENDS = "opie-libqrsync opie-qss"
 DESCRIPTION = "Opie Launcher and Taskbar"
 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"