[oe-commits] org.oe.dev merge of '506b85082c41d0d7ce9fd08a712622475cfcc48d'
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon Sep 24 09:19:20 UTC 2007
merge of '506b85082c41d0d7ce9fd08a712622475cfcc48d'
and '7068e31d13e1006027e2fa9ad5f9b3887c570b94'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: bbea886577d16293379de278796e667a3ca5aac3
ViewMTN: http://monotone.openembedded.org/revision/info/bbea886577d16293379de278796e667a3ca5aac3
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
packages/cairo/cairo-directfb_1.4.8.bb
packages/cairo/files/cairo_directfb_is_similar-typo.patch
packages/hal/hal-info_20070618.bb
packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
conf/distro/include/preferred-opie-versions-1.2.3.inc
packages/hal/hal-info_git.bb
packages/opie-taskbar/opie-taskbar-images.inc
Diffs:
#
# mt diff -r506b85082c41d0d7ce9fd08a712622475cfcc48d -rbbea886577d16293379de278796e667a3ca5aac3
#
#
#
# patch "packages/meta/slugos-packages.bb"
# from [738a66a4cd05dd74381dce0949ddcd547be2497f]
# to [3e624519aa3c29fb9c243930483b6363f1b191b9]
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [423fde1a30e871e390b48542349b88efb3a07ac9]
# to [16fa3c9f589d8b24e84de8555dad50affd97b735]
#
============================================================
--- packages/meta/slugos-packages.bb 738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb 3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
binutils \
bison \
bluez-utils \
+ bluez-hcidump \
bogofilter \
boost \
bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb 423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb 16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot
DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
S="${WORKDIR}/trunk"
export CFLAGS += "--std=c99"
#
# mt diff -r7068e31d13e1006027e2fa9ad5f9b3887c570b94 -rbbea886577d16293379de278796e667a3ca5aac3
#
#
#
# add_file "packages/cairo/cairo-directfb_1.4.8.bb"
# content [dde2408a5b6f4173c1643b3f9a941bec4811782c]
#
# add_file "packages/cairo/files/cairo_directfb_is_similar-typo.patch"
# content [8ad5983746fd3389080693561e83b9deecec3687]
#
# add_file "packages/hal/hal-info_20070618.bb"
# content [ff74677aefdf255f44b07ef35ce06e9e7012c226]
#
# add_file "packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb"
# content [ad2ba78ed368bbd20cdb67653fec0f64b6bba864]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3.inc"
# from [9a067222c36557f64b1ad239657000b6669f1f41]
# to [22eae7904db1714ab869c44a5359c3c968f94c4f]
#
# patch "packages/hal/hal-info_git.bb"
# from [f0a832db129be212bf9eb0aa44e1e80b35b070b0]
# to [ea0dfd0d1392763f6b62901fb50a78c466243aca]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [fa74199fe1a5102d17da7ed6417c493736dc2272]
# to [d97156ba4d20fe66cfadc440227deb97dec1fc1a]
#
============================================================
--- packages/cairo/cairo-directfb_1.4.8.bb dde2408a5b6f4173c1643b3f9a941bec4811782c
+++ packages/cairo/cairo-directfb_1.4.8.bb dde2408a5b6f4173c1643b3f9a941bec4811782c
@@ -0,0 +1,17 @@
+require cairo.inc
+
+DEPENDS = "directfb libsm libpng fontconfig"
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+ file://cairo_directfb_is_similar-typo.patch;patch=1 \
+ "
+
+EXTRA_OECONF += " --enable-directfb \
+ --disable-xlib \
+ --disable-win32"
+
+LDFLAGS_append += " -ldirectfb"
+CFLAGS_append += " -I${STAGING_INCDIR}/directfb"
+
+PR = "r0"
+
+S = "${WORKDIR}/cairo-${PV}"
============================================================
--- packages/cairo/files/cairo_directfb_is_similar-typo.patch 8ad5983746fd3389080693561e83b9deecec3687
+++ packages/cairo/files/cairo_directfb_is_similar-typo.patch 8ad5983746fd3389080693561e83b9deecec3687
@@ -0,0 +1,11 @@
+--- cairo-1.4.8/src/cairo-directfb-surface.c~org 2007-09-22 19:34:35.000000000 -0400
++++ cairo-1.4.8/src/cairo-directfb-surface.c 2007-09-22 19:36:01.000000000 -0400
+@@ -1572,7 +1572,7 @@
+ NULL, /* show_glyphs */
+ #endif
+ NULL, /* snapshot */
+- _cairo_directfb_is_similar,
++ _cairo_directfb_surface_is_similar,
+ NULL /* reset */
+ };
+
============================================================
--- packages/hal/hal-info_20070618.bb ff74677aefdf255f44b07ef35ce06e9e7012c226
+++ packages/hal/hal-info_20070618.bb ff74677aefdf255f44b07ef35ce06e9e7012c226
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hardware Abstraction Layer device information"
+HOMEPAGE = "http://freedesktop.org/Software/hal"
+SECTION = "unknown"
+LICENSE = "GPL AFL"
+
+SRC_URI = "http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-recall --disable-video"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/hal/"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb ad2ba78ed368bbd20cdb67653fec0f64b6bba864
+++ packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb ad2ba78ed368bbd20cdb67653fec0f64b6bba864
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+SRCDATE = "20070922"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3.inc 9a067222c36557f64b1ad239657000b6669f1f41
+++ conf/distro/include/preferred-opie-versions-1.2.3.inc 22eae7904db1714ab869c44a5359c3c968f94c4f
@@ -176,7 +176,7 @@ PREFERRED_VERSION_opie-taskbar = "${OPIE
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-taskbar-images = "${OPIE_VERSION}+cvs20070922"
PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
============================================================
--- packages/hal/hal-info_git.bb f0a832db129be212bf9eb0aa44e1e80b35b070b0
+++ packages/hal/hal-info_git.bb ea0dfd0d1392763f6b62901fb50a78c466243aca
@@ -6,6 +6,7 @@ PR = "r1"
PV = "${SRCDATE}+git"
PR = "r1"
+DEFAULT_PREFERENCE = "-1"
SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git"
@@ -17,4 +18,4 @@ PACKAGE_ARCH = "all"
PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/hal/"
-FILES_${PN} += "/usr/share/hal/"
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc fa74199fe1a5102d17da7ed6417c493736dc2272
+++ packages/opie-taskbar/opie-taskbar-images.inc d97156ba4d20fe66cfadc440227deb97dec1fc1a
@@ -18,7 +18,7 @@ PIXMAP_SIZE_hx4700 = "-480x640"
PIXMAP_SIZE_htcuniversal= "-480x640"
PIXMAP_SIZE_hx4700 = "-480x640"
-PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
+PACKAGES = "${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
do_install() {
install -d ${D}${palmtopdir}/pics/launcher
@@ -31,7 +31,7 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg
- for res in 480x640 640x480 800x600; do
+ for res in 320x480 480x320 480x640 640x480 800x600; do
install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
done
@@ -41,7 +41,7 @@ python do_package_prepend () {
}
python do_package_prepend () {
- reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800']
+ reslist = ['240x320','320x240', '320x320', '320x480', '480x320', '480x640','640x480', '800x600','600x800']
dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
pn = bb.data.getVar('PN', d, 1)
More information about the Openembedded-commits
mailing list