diff options
40 files changed, 9819 insertions, 46 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index dbd255ea49..749a719a23 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11905,3 +11905,7 @@ sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041 [ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz] md5=274ca4d36ee6fb216fa6cf01ad5eaa84 sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c + +[http://simh.trailing-edge.com/sources/simhv37-1.zip] +md5=c8c57379e2e9afbf9817fbbe99ee1106 +sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9931389c26..46a293235d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -132,7 +132,9 @@ PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh8" + +PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" # Needed for crappy ipaqs with broken hostap in the kernel PREFERRED_VERSION_hostap-modules ?= "0.4.7" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 719c9a5b03..aa30d3164e 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -34,15 +34,21 @@ XSERVER = "xserver-kdrive-fbdev" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ + kernel-module-af-key \ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-leds-magician \ kernel-module-magician-ts \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" + # # Modules autoload and other boot properties # @@ -54,6 +60,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" diff --git a/packages/flumotion/.mtn2git_empty b/packages/flumotion/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/flumotion/.mtn2git_empty diff --git a/packages/flumotion/files/.mtn2git_empty b/packages/flumotion/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/flumotion/files/.mtn2git_empty diff --git a/packages/flumotion/files/no-check-for-python-stuff.patch b/packages/flumotion/files/no-check-for-python-stuff.patch new file mode 100644 index 0000000000..08503c82e0 --- /dev/null +++ b/packages/flumotion/files/no-check-for-python-stuff.patch @@ -0,0 +1,68 @@ +Index: flumotion-0.4.1/configure.ac +=================================================================== +--- flumotion-0.4.1.orig/configure.ac 2007-03-05 17:16:48.121264330 +0100 ++++ flumotion-0.4.1/configure.ac 2007-03-05 17:20:40.343837320 +0100 +@@ -73,13 +73,6 @@ + AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version]) + fi + +-if test "x$DISPLAY" != "x"; then +- AS_PYTHON_IMPORT([gtk.glade],, +- AC_MSG_ERROR([You need to have python libglade bindings installed])) +-else +- AC_MSG_NOTICE([Not trying to import gtk.glade because DISPLAY is unset]) +-fi +- + if test $GST_010_SUPPORTED = "no"; then + AC_MSG_ERROR([No appropriate version of PyGTK installed. Correct the above + errors and try again.]) +@@ -94,16 +87,6 @@ + [AC_MSG_RESULT([$PYGST_010_PKG_ERRORS]) + GST_010_SUPPORTED=no]) + +- if test $GST_010_SUPPORTED = "yes"; then +- saved_PYTHONPATH=$PYTHONPATH +- export PYTHONPATH=$PYGST_010_DIR:$PYTHONPATH +- AS_PYTHON_IMPORT([gst],, +- [AC_MSG_NOTICE([Unable to import gst-python 0.10 -- check your PYTHONPATH?]) +- GST_010_SUPPORTED=no], +- [import pygst; pygst.require('0.10')], +- [assert gst.pygst_version[[1]] == 10 or (gst.pygst_version[[1]] == 9 and gst.pygst_version[[2]] >= 7)]) +- +- fi + fi + + if test $GST_010_SUPPORTED = "no"; then +@@ -158,32 +141,7 @@ + AC_CHECK_PROG(PYCHECKER, pychecker, yes, no) + AM_CONDITIONAL(HAVE_PYCHECKER, test "x$PYCHECKER" = "xyes") + +-dnl check for Twisted +-AS_PYTHON_IMPORT(twisted, +- [ +- AC_MSG_CHECKING(for Twisted >= 2.0.1) +- prog=" +-import sys +-import twisted.copyright +-minver = '2.0.1' +-if twisted.copyright.version < minver: +- sys.exit(1) +-sys.exit(0) +-" +- if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC +- then +- AC_MSG_RESULT(found) +- else +- AC_MSG_RESULT(too old) +- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted]) +- fi +- ] +- , +- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted]) +-) + +-TWISTED_MODULE([twisted.names]) +-TWISTED_MODULE([twisted.web]) + + AC_CONFIG_FILES([env], [chmod +x env]) + AC_CONFIG_FILES([bin/flumotion], [chmod +x bin/flumotion]) diff --git a/packages/flumotion/files/python-path.patch b/packages/flumotion/files/python-path.patch new file mode 100644 index 0000000000..377994e729 --- /dev/null +++ b/packages/flumotion/files/python-path.patch @@ -0,0 +1,25 @@ +Index: flumotion-0.3.1/common/as-python.m4 +=================================================================== +--- flumotion-0.3.1.orig/common/as-python.m4 2007-03-02 15:26:46.704717964 +0100 ++++ flumotion-0.3.1/common/as-python.m4 2007-03-02 15:27:28.601326374 +0100 +@@ -199,6 +199,12 @@ + AC_MSG_CHECKING(for headers required to compile python extensions) + + dnl deduce PYTHON_INCLUDES ++ ++ AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++ if test x$py_exec_prefix != x; then ++ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +@@ -206,6 +212,7 @@ + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++ fi + AC_SUBST(PYTHON_INCLUDES) + + dnl check if the headers exist: diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb new file mode 100644 index 0000000000..d32fe6ced2 --- /dev/null +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Fluendo Streaming Server" +LICENSE = "GPL" +DEPENDS = "gstreamer python-gst twisted python-pygtk2" +RDEPENDS = " python-compression python-fcntl python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface python-textutils python-core python-gst python-misc" +RDEPENDS_${PN}-gui = "${PN} python-pygtk2" +PR = "r6" + +SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ + file://python-path.patch;patch=1 \ + file://no-check-for-python-stuff.patch;patch=1" + +inherit autotools distutils-base pkgconfig + +export EPYDOC = "no" + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + +#Yes, we know: +#ERROR: flumotion-dbg is listed in PACKAGES mutliple times, this leads to packaging errors. +#ERROR: Please fix the metadata/report this as bug to OE bugtracker. + +PACKAGES =+ "${PN}-dbg flumotion-gui" + +FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*" +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion" +FILES_${PN}-dev += "${libdir}/pkgconfig" +FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \ + ${libdir}/flumotion/python/flumotion/admin/gtk \ + ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \ + ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \ + ${libdir}/flumotion/python/flumotion/extern \ + ${libdir}/flumotion/python/flumotion/manager \ + ${libdir}/flumotion/python/flumotion/ui \ + ${libdir}/flumotion/python/flumotion/wizard \ + ${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications" diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb index 2023cdac5d..4f8cd1de7b 100644 --- a/packages/gnome/gnome-cups-manager_0.31.bb +++ b/packages/gnome/gnome-cups-manager_0.31.bb @@ -6,6 +6,9 @@ DEPENDS="glib-2.0 gtk+ pango libgnomecups" inherit gnome pkgconfig +FILES += "${datadir}/icons/hicolor/48x48/stock/data/emblem-*.png \ + ${datadir}/icons/hicolor/48x48/devices/gnome-dev-printer-new.png" + SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.31/gnome-cups-manager-0.31.tar.bz2" do_stage() { diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc index e14bfdeefe..c417280cd6 100644 --- a/packages/iproute2/iproute2.inc +++ b/packages/iproute2/iproute2.inc @@ -12,15 +12,23 @@ SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}" +inherit update-alternatives + EXTRA_OEMAKE = "CC='${CC}' \ KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include \ DOCDIR=${docdir}/iproute2 \ SUBDIRS='lib tc ip' \ - SBINDIR=/sbin" + SBINDIR=${base_sbindir}" do_install () { oe_runmake DESTDIR=${D} install + mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 } FILES_${PN} += "/usr/lib/tc/*" FILES_${PN}-dbg += "/usr/lib/tc/.debug" + +ALTERNATIVE_NAME = "ip" +ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2" +ALTERNATIVE_LINK = "${base_bindir}/ip" +ALTERNATIVE_PRIORITY = "100" diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb index fc87b9e3b5..9d261927f6 100644 --- a/packages/iproute2/iproute2_2.6.16.bb +++ b/packages/iproute2/iproute2_2.6.16.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ file://new-flex-fix.patch;patch=1" diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb index 9d85126b68..ad62b5344a 100644 --- a/packages/iproute2/iproute2_2.6.18.bb +++ b/packages/iproute2/iproute2_2.6.18.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ file://new-flex-fix.patch;patch=1" diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb new file mode 100644 index 0000000000..5efdf98f2d --- /dev/null +++ b/packages/iproute2/iproute2_2.6.20.bb @@ -0,0 +1,11 @@ +PR = "r2" + +SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ + file://ip6tunnel.patch;patch=1 \ + file://man-pages-fix.patch;patch=1 \ + file://no-strip.patch;patch=1" + +require iproute2.inc + +DIRNAME = "iproute" +DATE = "070313" diff --git a/packages/kanjipad/kanjipad.inc b/packages/kanjipad/kanjipad.inc index ce9613b3ab..bebd753495 100644 --- a/packages/kanjipad/kanjipad.inc +++ b/packages/kanjipad/kanjipad.inc @@ -1,8 +1,10 @@ DESCRIPTION = "Hand-writing recognition for Japanese Kanji characters (no kana)" AUTHOR = "Owen Taylor <otaylor@fishsoup.net>" HOMEPAGE = "http://fishsoup.net/software/kanjipad/" +SECTION = "inputmethods" PRIORITY = "optional" LICENSE = "GPL" +DEPENDS = "gtk+" SRC_URI="http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz" diff --git a/packages/libmatchbox/files/16bppfixes-2.patch b/packages/libmatchbox/files/16bppfixes-2.patch new file mode 100644 index 0000000000..ab9cdc74a5 --- /dev/null +++ b/packages/libmatchbox/files/16bppfixes-2.patch @@ -0,0 +1,258 @@ +--- libmatchbox/libmb/mbpixbuf.c.orig 2007-05-04 14:41:55.000000000 +0100 ++++ libmatchbox/libmb/mbpixbuf.c 2007-05-04 14:41:55.000000000 +0100 +@@ -710,46 +710,19 @@ + return colnum; + } + +- +-static unsigned long +-mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a) ++/* ++ * Split the mb_pixbuf_get_pixel() function into several specialized ++ * functions which we will inline; this allows us to optimize ++ * mb_pixbuf_img_render_to_drawable_with_gc () by taking some of the ++ * decision taking outside of the double loop ++ */ ++ ++/* ++ * Get pixel value for rgb values and pixel depth <= 8 ++ */ ++static inline unsigned long ++mb_pixbuf_get_pixel_le8_rgb (MBPixbuf *pb, int r, int g, int b) + { +- if (pb->depth > 8) +- { +- switch (pb->depth) +- { +- case 15: +- return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); +- case 16: +- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); +- case 24: +- case 32: +- switch (pb->byte_order) +- { +- case BYTE_ORD_24_RGB: +- return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); +- case BYTE_ORD_24_RBG: +- return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff); +- case BYTE_ORD_24_BRG: +- return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff); +- case BYTE_ORD_24_BGR: +- return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff); +- case BYTE_ORD_24_GRB: +- return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff); +- case BYTE_ORD_24_GBR: +- return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff); +- case BYTE_ORD_32_ARGB: +- return (a << 24) | (r << 16) | (g << 8) | b; +- default: +- return 0; +- } +- default: +- return 0; +- } +- return 0; +- } +- +- /* pb->depth <= 8 */ + switch(pb->vis->class) + { + case PseudoColor: +@@ -794,6 +767,111 @@ + return 0; + } + ++/* ++ * Get pixel value from a pointer to 16bbp value for pixel depth <= 8 ++ * and advance the pointer ++ */ ++static inline unsigned long ++mb_pixbuf_get_pixel_le8_16bpp_advance (MBPixbuf *pb, unsigned char ** p) ++{ ++ unsigned short s = SHORT_FROM_2BYTES(*p); ++ int r, b, g; ++ ++ r = (s & 0xf800) >> 8; ++ g = (s & 0x07e0) >> 3; ++ b = (s & 0x001f) << 3; ++ ++ *p += 2; ++ ++ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b); ++} ++ ++/* ++ * Get pixel value for rgba values and pixel depth > 8 ++ * ++ */ ++static inline unsigned long ++mb_pixbuf_get_pixel_gt8_rgba (MBPixbuf *pb, int r, int g, int b, int a) ++{ ++ switch (pb->depth) ++ { ++ case 15: ++ switch (pb->byte_order) ++ { ++ case BYTE_ORD_24_RGB: ++ return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); ++ case BYTE_ORD_24_BGR: ++ return ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); ++ } ++ case 16: ++ switch (pb->byte_order) ++ { ++ case BYTE_ORD_24_RGB: ++ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); ++ case BYTE_ORD_24_BGR: ++ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); ++ } ++ case 24: ++ case 32: ++ switch (pb->byte_order) ++ { ++ case BYTE_ORD_24_RGB: ++ return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); ++ case BYTE_ORD_24_RBG: ++ return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff); ++ case BYTE_ORD_24_BRG: ++ return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff); ++ case BYTE_ORD_24_BGR: ++ return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff); ++ case BYTE_ORD_24_GRB: ++ return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff); ++ case BYTE_ORD_24_GBR: ++ return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff); ++ case BYTE_ORD_32_ARGB: ++ return (a << 24) | (r << 16) | (g << 8) | b; ++ default: ++ return 0; ++ } ++ default: ++ return 0; ++ } ++} ++ ++/* ++ * Get pixel value from pointer to 16bpp data for pixel depth > 8 ++ * and advance the pointer ++ * ++ * TODO ? We could take the 32bit case out of here, which would allow ++ * to ignore the alpha value for <15, 24>, but we might not gain that ++ * much by this on arm due to the conditional execution. ++ */ ++static inline unsigned long ++mb_pixbuf_get_pixel_gt8_16bpp_advance (MBPixbuf *pb, unsigned char ** p, ++ int has_alpha) ++{ ++ unsigned short s = SHORT_FROM_2BYTES(*p); ++ int r, b, g, a; ++ ++ r = (s & 0xf800) >> 8; ++ g = (s & 0x07e0) >> 3; ++ b = (s & 0x001f) << 3; ++ ++ *p += 2; ++ ++ a = has_alpha ? *(*p)++ : 0xff; ++ ++ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a); ++} ++ ++static inline unsigned long ++mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a) ++{ ++ if (pb->depth > 8) ++ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a); ++ ++ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b); ++} ++ + unsigned long + mb_pixbuf_lookup_x_pixel(MBPixbuf *pb, int r, int g, int b, int a) + { +@@ -1825,7 +1903,6 @@ + mb_pixbuf_img_render_to_drawable_with_gc(pb, img, drw, drw_x, drw_y, pb->gc); + } + +- + void + mb_pixbuf_img_render_to_drawable_with_gc(MBPixbuf *pb, + MBPixbufImage *img, +@@ -1883,31 +1960,57 @@ + + if (pb->internal_bytespp == 2) + { +- for(y=0; y<img->height; y++) +- for(x=0; x<img->width; x++) +- { +- /* Below is potentially dangerous. +- */ +- pixel = ( *p | (*(p+1) << 8)); +- +- p += ((img->has_alpha) ? 3 : 2); +- +- XPutPixel(img->ximg, x, y, pixel); +- } ++ if (pb->depth > 8) ++ { ++ for(y=0; y<img->height; y++) ++ for(x=0; x<img->width; x++) ++ { ++ pixel = mb_pixbuf_get_pixel_gt8_16bpp_advance(pb, &p, ++ img->has_alpha); ++ XPutPixel(img->ximg, x, y, pixel); ++ } ++ } ++ else ++ { ++ for(y=0; y<img->height; y++) ++ for(x=0; x<img->width; x++) ++ { ++ pixel = mb_pixbuf_get_pixel_le8_16bpp_advance(pb, &p); ++ XPutPixel(img->ximg, x, y, pixel); ++ } ++ } + } + else + { +- for(y=0; y<img->height; y++) ++ if (pb->depth > 8) + { +- for(x=0; x<img->width; x++) ++ for(y=0; y<img->height; y++) + { +- r = ( *p++ ); +- g = ( *p++ ); +- b = ( *p++ ); +- a = ((img->has_alpha) ? *p++ : 0xff); ++ for(x=0; x<img->width; x++) ++ { ++ r = ( *p++ ); ++ g = ( *p++ ); ++ b = ( *p++ ); ++ a = ((img->has_alpha) ? *p++ : 0xff); + +- pixel = mb_pixbuf_get_pixel(pb, r, g, b, a); +- XPutPixel(img->ximg, x, y, pixel); ++ pixel = mb_pixbuf_get_pixel_gt8_rgba(pb, r, g, b, a); ++ XPutPixel(img->ximg, x, y, pixel); ++ } ++ } ++ } ++ else ++ { ++ for(y=0; y<img->height; y++) ++ { ++ for(x=0; x<img->width; x++) ++ { ++ r = ( *p++ ); ++ g = ( *p++ ); ++ b = ( *p++ ); ++ ++ pixel = mb_pixbuf_get_pixel_le8_rgb(pb, r, g, b); ++ XPutPixel(img->ximg, x, y, pixel); ++ } + } + } + } diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb index d87eb09150..b9044a1d60 100644 --- a/packages/libmatchbox/libmatchbox_1.9.bb +++ b/packages/libmatchbox/libmatchbox_1.9.bb @@ -1,8 +1,9 @@ require libmatchbox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://check.m4" + file://16bppfixes-2.patch;patch=1 \ + file://check.m4" do_configure_prepend () { mv ${WORKDIR}/check.m4 ${S}/ diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb index ef1068d035..b95c218df9 100644 --- a/packages/libxosd/libxosd_svn.bb +++ b/packages/libxosd/libxosd_svn.bb @@ -16,6 +16,5 @@ do_stage() { autotools_stage_all } -PACKAGES =+ "${PN}-examples" +PACKAGES =+ "${PN}-dbg ${PN}-examples" FILES_${PN}-examples = "${bindir}" - diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb index af177ba62e..9ee0539ac3 100644 --- a/packages/linux/LAB-kernel_2.6.13-hh2.bb +++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb @@ -3,6 +3,7 @@ DESCRIPTION = "Liux As Bootloader kernelm" LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "h2200" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 475f3b5773..c7b72ab7f2 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -9,6 +9,7 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-1" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "h2200" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" @@ -27,8 +28,8 @@ ALLOW_EMPTY_kernel-image_h2200 = "1" K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "16" -HHV = "0" +K_MICRO = "21" +HHV = "8" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" diff --git a/packages/linux/a780-kernel_2.6.bb b/packages/linux/a780-kernel_2.6.bb deleted file mode 100644 index b60bbaa3bc..0000000000 --- a/packages/linux/a780-kernel_2.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "a780" -COMPATIBLE_MACHINE = "a780" -require linux-ezx_2.6.16.13.bb diff --git a/packages/linux/e680-kernel_2.6.bb b/packages/linux/e680-kernel_2.6.bb deleted file mode 100644 index 1917275473..0000000000 --- a/packages/linux/e680-kernel_2.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -COMPATIBLE_MACHINE = "(e680|a780)" -require linux-ezx_2.6.16.13.bb diff --git a/packages/linux/linux-2.6.20/at91sam9263ek/defconfig b/packages/linux/linux-2.6.20/at91sam9263ek/defconfig index 220ee87479..f7604678c8 100644 --- a/packages/linux/linux-2.6.20/at91sam9263ek/defconfig +++ b/packages/linux/linux-2.6.20/at91sam9263ek/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20 -# Thu Jun 14 13:48:57 2007 +# Sun Jun 17 11:47:54 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -190,7 +190,8 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -209,7 +210,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,17105363 root=/dev/ram0 rw" +CONFIG_CMDLINE="mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0" |