diff options
31 files changed, 615 insertions, 51 deletions
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/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 12a1c4ce86..69e0df9dbe 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,8 +1,10 @@ -inherit e - +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas" DEPENDS = "evas-x11" - +LICENSE = "MIT" PV = "0.0+cvs${SRCDATE}" +PR = "r0" + +inherit e SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite" 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..0d05e68719 --- /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" +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/gpe-session-scripts/files/angstrom/matchbox-session b/packages/gpe-session-scripts/files/angstrom/matchbox-session index ad2d9b6a78..b0bec8c742 100644 --- a/packages/gpe-session-scripts/files/angstrom/matchbox-session +++ b/packages/gpe-session-scripts/files/angstrom/matchbox-session @@ -5,5 +5,4 @@ XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` matchbox-desktop & matchbox-panel --no-flip --orientation south & -exec matchbox-window-manager $@ diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session index bffd69a244..e4c0e0c68e 100644 --- a/packages/gpe-session-scripts/files/matchbox-session +++ b/packages/gpe-session-scripts/files/matchbox-session @@ -5,5 +5,4 @@ XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` matchbox-desktop & MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south & -exec matchbox-window-manager $@ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 2c17d99bb8..75b79ec870 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r9" +PR = "r10" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" @@ -26,6 +26,8 @@ do_configure_append_angstrom() { sed -i s:Industrial:Clearlooks:g X11/xsettings.default } +export CURSOR_HIDE = '${@base_contains("MACHINE_FEATURES","touchscreen","-use_cursor no","-use_cursor yes",d)}' + do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then @@ -33,6 +35,8 @@ do_install_append() { fi install -d ${D}${sysconfdir}/matchbox install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session + echo -e "exec matchbox-window-manager ${CURSOR_HIDE} \$@ \n" >> ${D}${sysconfdir}/matchbox/session + install -d ${D}${sysconfdir}/gpe/xsettings-default.d install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite 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/files/use-sane-default-font.patch b/packages/libxosd/files/use-sane-default-font.patch index 26db249366..0ede1351e2 100644 --- a/packages/libxosd/files/use-sane-default-font.patch +++ b/packages/libxosd/files/use-sane-default-font.patch @@ -1,11 +1,11 @@ Index: current/src/libxosd/xosd.c =================================================================== ---- current.orig/src/libxosd/xosd.c -+++ current/src/libxosd/xosd.c +--- current.orig/src/libxosd/xosd.c 2007-06-16 19:37:48.000000000 +0000 ++++ current/src/libxosd/xosd.c 2007-06-17 05:00:47.000000000 +0000 @@ -26,7 +26,7 @@ #define XOFFSET 10 - const char *osd_default_font = + const char * const osd_default_font = - "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*"; + "fixed"; #if 0 diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb index a184ca9074..b95c218df9 100644 --- a/packages/libxosd/libxosd_svn.bb +++ b/packages/libxosd/libxosd_svn.bb @@ -3,7 +3,7 @@ SECTION = "libs/x11" DEPENDS = "virtual/libx11 libxext" LICENSE = "LGPL" PV = "2.2.15+svn${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \ file://autofoo.patch;patch=1 \ @@ -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" # CONFIG_XIP_KERNEL is not set # @@ -230,7 +231,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -783,7 +783,7 @@ CONFIG_SPI_ATMEL=y # # Misc devices # -# CONFIG_TIFM_CORE is not set +CONFIG_TIFM_CORE=m # # LED devices @@ -806,13 +806,95 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m + +# +# V4L USB devices +# +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set + +# +# Radio Adapters +# +# CONFIG_USB_DSBR is not set # # Digital Video Broadcasting Devices # -# CONFIG_DVB is not set -# CONFIG_USB_DABUSB is not set +CONFIG_DVB=y +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +CONFIG_DVB_CINERGYT2_TUNING=y +CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 +CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 +CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 +CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y +CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=50 + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# + +# +# DVB-T (terrestrial) frontends +# + +# +# DVB-C (cable) frontends +# + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# + +# +# Tuners/PLL support +# + +# +# Miscellaneous devices +# +CONFIG_USB_DABUSB=m # # Graphics support @@ -850,12 +932,59 @@ CONFIG_LCD_DEVICE=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_AT91_AC97=m + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m # # HID Devices # -CONFIG_HID=y +CONFIG_HID=m # # USB support @@ -921,14 +1050,21 @@ CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_ACECAD is not set # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set -# CONFIG_USB_TOUCHSCREEN is not set +CONFIG_USB_TOUCHSCREEN=m +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_USB_TOUCHSCREEN_ITM=y +CONFIG_USB_TOUCHSCREEN_ETURBO=y +CONFIG_USB_TOUCHSCREEN_GUNZE=y +CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set @@ -1083,7 +1219,7 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_AT91=y -# CONFIG_MMC_TIFM_SD is not set +CONFIG_MMC_TIFM_SD=m # # Real Time Clock diff --git a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb index 242567634c..7624f32a8a 100644 --- a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb +++ b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb @@ -3,6 +3,7 @@ SECTION = "kernel" LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "h1940" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1 \ diff --git a/packages/linux/linux-h1940_2.6.14-h1940.bb b/packages/linux/linux-h1940_2.6.14-h1940.bb index 750750f5d1..5a657eb0b5 100644 --- a/packages/linux/linux-h1940_2.6.14-h1940.bb +++ b/packages/linux/linux-h1940_2.6.14-h1940.bb @@ -3,6 +3,7 @@ SECTION = "kernel" LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "h1940" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb index 5fbe040810..f7ad0185f3 100644 --- a/packages/linux/linux-h1940_2.6.17-h1940.bb +++ b/packages/linux/linux-h1940_2.6.17-h1940.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" PR = "r1" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "h1940" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1 \ diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 17e35c9512..bdc4fa5443 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -931,7 +931,7 @@ CONFIG_LEDS_MAGICIAN=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb index 05124370ba..13b83925b5 100644 --- a/packages/linux/linux_2.6.20.bb +++ b/packages/linux/linux_2.6.20.bb @@ -1,5 +1,7 @@ require linux.inc +DEFAULT_PREFERENCE_at91sam9263ek = "20" + PR = "r7" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/packages/python/python-gst_0.10.7.bb b/packages/python/python-gst_0.10.7.bb index ef4cac7b6b..8924c700d4 100644 --- a/packages/python/python-gst_0.10.7.bb +++ b/packages/python/python-gst_0.10.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Gstreamer bindings" SECTION = "devel/python" LICENSE = "LGPL" -DEPENDS = "gstreamer python-pygobject" +DEPENDS = "gstreamer gst-plugins-base python-pygobject" PR = "r1" SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb index a79032f301..1604b54715 100644 --- a/packages/python/python-pygobject_2.12.2.bb +++ b/packages/python/python-pygobject_2.12.2.bb @@ -9,6 +9,11 @@ S = "${WORKDIR}/pygobject-${PV}" inherit autotools distutils-base pkgconfig +# otherwise the main package keeps snatching the .pc file away +# and therefore depends on glib-2.0-dev (which only the -dev +# package should). +PACKAGES =+ "${PN}-dev" + do_stage() { autotools_stage_all install -d ${STAGING_LIBDIR}/../share/pygobject/ diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index d3811ddddd..ad1f36a205 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -17,6 +17,10 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base +PACKAGES =+ "${PN}-dev" +FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" + do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb index 156de2134f..717e5a119b 100644 --- a/packages/zope/zope_3.3.1.bb +++ b/packages/zope/zope_3.3.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "python" RDEPENDS = "python-core python-shell" LICENSE = "ZPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz" @@ -18,8 +18,12 @@ do_compile() { oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} } +PYTHON_MAJMIN = "2.4" + do_install() { + install -d ${D}${libdir}/python${PYTHON_MAJMIN} oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} + mv ${D}${libdir}/python/* ${D}${libdir}/python${PYTHON_MAJMIN} } PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg" @@ -27,15 +31,15 @@ PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg" FILES_${PN} = "${prefix}" FILES_${PN}_doc = "${prefix}/doc" FILES_${PN}-dbg += "\ -${libdir}/python/BTrees/.debug \ -${libdir}/python/persistent/.debug \ -${libdir}/python/zope/proxy/.debug \ -${libdir}/python/zope/thread/.debug \ -${libdir}/python/zope/security/.debug \ -${libdir}/python/zope/hookable/.debug \ -${libdir}/python/zope/app/container/.debug \ -${libdir}/python/zope/i18nmessageid/.debug \ -${libdir}/python/ZODB/.debug" -FILES_python-zopeinterface-dbg += "${libdir}/python/zope/interface/.debug " - -FILES_python-zopeinterface = "${libdir}/python/zope/interface/*.* ${libdir}/python/zope/interface/common" +${libdir}/python${PYTHON_MAJMIN}/BTrees/.debug \ +${libdir}/python${PYTHON_MAJMIN}/persistent/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/proxy/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/thread/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/security/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/hookable/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/app/container/.debug \ +${libdir}/python${PYTHON_MAJMIN}/zope/i18nmessageid/.debug \ +${libdir}/python${PYTHON_MAJMIN}/ZODB/.debug" +FILES_python-zopeinterface-dbg += "${libdir}/python${PYTHON_MAJMIN}/zope/interface/.debug " + +FILES_python-zopeinterface = "${libdir}/python${PYTHON_MAJMIN}/zope/interface/*.* ${libdir}/python${PYTHON_MAJMIN}/zope/interface/common" |