diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
| commit | 8beb70740dbd64d2138df8a07aafc24719cb50a6 (patch) | |
| tree | b9afae298a6bcb79696984da4422d5ef939a4031 | |
| parent | d2bbf4ace892d7f32933ca26f1f2b320fc0bcb99 (diff) | |
| parent | e25bfd9221d17ae8fe0efdc96ed9cd74de0e4a4d (diff) | |
merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
71 files changed, 1035 insertions, 330 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 8af10a0c8a..18aee09a26 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,13 +13,15 @@ distutils_do_compile() { } distutils_stage_headers() { + install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ oefatal "python setup.py install_headers execution failed." } distutils_stage_all() { - install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages + # is this missing a lib below? PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ @@ -49,7 +51,7 @@ distutils_do_install() { done fi - rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth + rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth } EXPORT_FUNCTIONS do_compile do_install diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0e4285f633..4e187a6887 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -30,14 +30,14 @@ DISTRO_TYPE ?= "debug" IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' # These will be put under package management soon -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +#FEED_URIS += " \ +# no-arch##${ANGSTROM_URI}/unstable/feed/all \ +# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ +# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ +# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ +# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ +# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ +# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" @@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral angstrom-feed-configs \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 85c0d9d128..510a752211 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index ccd458da89..4d9509fc15 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20070819" +EFL_SRCDATE = "20071206" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" SRCDATE_python-emotion ?= "${EFL_SRCDATE}" +SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" @@ -102,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}" SRCDATE_expedite ?= "${EFL_SRCDATE}" SRCDATE_elitaire ?= "${EFL_SRCDATE}" SRCDATE_entice ?= "${EFL_SRCDATE}" +SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" +SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh new file mode 100755 index 0000000000..7ba5f8bf3b --- /dev/null +++ b/contrib/angstrom/build-release.sh @@ -0,0 +1,82 @@ +#!/bin/bash + +DO_UCLIBC=0 + +do_build() { + echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf + + BUILD_MODE="glibc" + if [ "$BUILD_CLEAN" != "" ] + then + bitbake -c clean $BUILD_CLEAN + fi + + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + + if [ $DO_UCLIBC = 1 ] + then + BUILD_MODE="uclibc" + echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + fi +} + +do_report_success() { + + echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log +} + +# No graphics +for machine in ep93xx gumstix-connex efika omap5912osk +do + BUILD_MACHINE=$machine + BUILD_TARGETS="minimal-image console-image" + do_build +done + +for machine in ixp4xxle ixp4xxbe +do + BUILD_MACHINE=$machine + BUILD_TARGETS="nslu2-minimal-image" + do_build +done + +# build altboot images for zaurus +for machine in c7x0 poodle tosa akita spitz collie +do + BUILD_MACHINE=$machine + BUILD_TARGETS="altboot-console-image" + do_build +done + +# graphics, flash storage +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 poodle tosa hx4700 c7x0 spitz akita collie +do + BUILD_MACHINE=$machine + BUILD_TARGETS="minimal-image console-image x11-image" + do_build +done + +# graphics, disk storage +for machine in spitz +do + BUILD_MACHINE=$machine + BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image" + BUILD_CLEAN="qmake2-native" + do_build +done + +#phones +for machine in fic-gta01 a780 +do + BUILD_MACHINE=$machine + BUILD_TARGETS="openmoko-image" + BUILD_CLEAN="qmake2-native" + do_build +done diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php new file mode 100644 index 0000000000..cf5a9e0218 --- /dev/null +++ b/contrib/angstrom/rss.php @@ -0,0 +1,48 @@ +<?php echo ('<?xml version="1.0" encoding="utf-8"?>'); ?> +<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <channel> + <title>Ångström autobuilder updates</title> + <link>http://www.angstrom-distribution.org/unstable/autobuild/</link> + <description></description> + <language>en</language> +<?php + +$base_path = "/home/angstrom/website/unstable/autobuild"; + +if ($handle = opendir("$base_path")) +{ + while (false !== ($file = readdir($handle))) + { + if(!(is_dir($file) && $file != "." && $file != "..")) + { + continue; + } + + $second_handle = opendir("$base_path/$file/"); + + while (false !== ($file2 = readdir($second_handle))) + { + if(is_file("/$base_path/$file/$file2")) + { + $fmtime = filemtime("$file/$file2"); + + echo "<item>\n" + echo "<title>$file/$file2 uploaded</title>\n"; + echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n"; + + $rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime); + + echo "<pubDate>$rsstime</pubDate>\n"; + echo "<dc:creator>Angstrom autobuilder</dc:creator>"; + echo "</item>\n"; + } + } + + closedir($second_handle); + } + + closedir($handle); +} +?> + </channel> +</rss> diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php new file mode 100644 index 0000000000..995c344e14 --- /dev/null +++ b/contrib/angstrom/rss2.php @@ -0,0 +1,63 @@ +<?php + +/* + * This generator expect only log from autobuilder in simple format: + * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE + * + * where TIME_OF_BUILD is epoch + * + * All what it does is parsing log and output it in reverse order (new builds + * first) in RSS 2.0 format. + * + * (C) 2007 Marcin Juszkiewicz + * + * License: MIT + * + */ + +$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/'; + +$builder_log_date = file('autobuilder.log'); + +if(empty($builder_log_date)) + die("No logs\n"); + +$builder_log_date = array_reverse($builder_log_date); + +$rss_xml = new xmlWriter(); + +if(!$rss_xml) + die("Unable to create XML Writer\n"); + +$rss_xml->openMemory(); + +$rss_xml->startDocument('1.0','utf-8'); +$rss_xml->startElement('rss'); +$rss_xml->writeAttribute('version', '2.0'); + +$rss_xml->startElement('channel'); + +$rss_xml->writeElement('title', 'Ångström autobuilder updates'); +$rss_xml->writeElement('link', $build_link_base); +$rss_xml->writeElement('description', 'Ångström autobuilder updates list'); + +foreach($builder_log_date as $build) +{ + $build = str_replace("\n", "", $build); + $data = explode(' ', $build); + + $rss_xml->startElement('item'); + $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}"); + $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/"); + $rss_xml->writeElement('pubDate', date('r', $data[0])); + + $rss_xml->endElement(); +} + +$rss_xml->endElement(); +$rss_xml->endElement(); + +echo $rss_xml->outputMemory(true); + +echo "\n"; +?> diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 1317f23b4a..d4b7ea16f6 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -2,7 +2,8 @@ # generate Python Manifest for the OpenEmbedded build system # (C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# MIT license +# (C) 2007 Jeremy Laine +# licensed under MIT, see COPYING.MIT import os import sys @@ -10,10 +11,10 @@ import time VERSION = "2.5.1" # increase when touching python-core, this should be the same ml version as in python_2.5.1.bb -BASEREV = 2 +BASEREV = 3 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -__version__ = "20070823" +__version__ = "20071205" class MakefileMaker: @@ -194,7 +195,10 @@ if __name__ == "__main__": "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) m.addPackage( 0, "python-curses", "Python Curses Support", "python-core", - "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package + "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module + + m.addPackage( 0, "python-ctypes", "Python C Types Support", "python-core", + "ctypes lib-dynload/_ctypes.so" ) # directory + low level module m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core python-codecs", "_strptime.* calendar.* lib-dynload/datetime.so" ) diff --git a/packages/e17/expedite/.mtn2git_empty b/packages/e17/expedite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e17/expedite/.mtn2git_empty diff --git a/packages/e17/expedite/hack-disable-opengl.patch b/packages/e17/expedite/hack-disable-opengl.patch new file mode 100644 index 0000000000..7d368d320d --- /dev/null +++ b/packages/e17/expedite/hack-disable-opengl.patch @@ -0,0 +1,87 @@ +Index: expedite/configure.in +=================================================================== +--- expedite.orig/configure.in ++++ expedite/configure.in +@@ -47,24 +47,11 @@ + PKG_CHECK_MODULES([EVAS], evas) + + dnl OpenGL GLEW +-PKG_CHECK_EXISTS(evas-opengl-glew, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support]) +- have_opengl_glew="yes" +- glew_libs="-lglew32 -lgdi32" +- ], +- [ have_opengl_glew="no" ] +-) ++have_opengl_glew="no" + AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes") + + dnl OpenGL X11 +-PKG_CHECK_EXISTS(evas-opengl-x11, +- [ +- AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support]) +- have_opengl_x11="yes" +- ], +- [ have_opengl_x11="no" ] +-) ++have_opengl_x11="no" + AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes") + + dnl Software X11 +@@ -109,49 +96,23 @@ + + # TODO: Check availability of libs + dnl DirectDraw +-PKG_CHECK_EXISTS(evas-software-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support]) +- have_software_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_ddraw="no" ] +-) ++have_software_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl 16bit DirectDraw +-PKG_CHECK_EXISTS(evas-software-16-ddraw, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support]) +- have_software_16_ddraw="yes" +- ddraw_libs="-lddraw -ldxguid" +- ], +- [ have_software_16_ddraw="no" ] +-) ++have_software_16_ddraw="no" + AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes") + + # TODO: Check availability of libs + dnl Direct3D +-PKG_CHECK_EXISTS(evas-direct3d, +- [ +- AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support]) +- have_direct3d="yes" +- d3d_libs="-ld3d9 -ld3dx9d" +- ], +- [ have_direct3d="no" ] +-) ++have_direct3d="no" + AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes") + + dnl Software SDL +-PKG_CHECK_EXISTS(evas-software-sdl, +- [ +- AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support]) +- have_software_sdl="yes" +- ], +- [ have_direct3d="no" ] +-) +-AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++have_software_sdl="no" ++AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes") ++ + + if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then + AC_PATH_XTRA diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index 9d8a7d6070..a35d3b182e 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,15 +1,18 @@ -DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas" -DEPENDS = "evas" +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" +DEPENDS = "eet evas" LICENSE = "MIT" PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" -inherit e +inherit autotools -SRC_URI = "${E_CVS};module=e17/apps/expedite" +SRC_URI = "${E_CVS};module=e17/apps/expedite \ + file://hack-disable-opengl.patch;patch=1" S = "${WORKDIR}/${PN}" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } +FILES_${PN} += "${datadir}" + diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb deleted file mode 100644 index ab527e214b..0000000000 --- a/packages/e17/rage_0.2.0.003.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "rage is a media center application based on EFL" -AUTHOR = "Carsten 'The Rasterman' Heitzler" -HOMEPAGE = "http://www.rasterman.com" -LICENSE = "GPL" -DEPENDS = "evas ecore edje" -SECTION = "x11/multimedia" - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz" - -inherit e diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb new file mode 100644 index 0000000000..e5b5032b10 --- /dev/null +++ b/packages/e17/rage_0.2.0.005.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Rage is a media center application based on EFL" +AUTHOR = "Carsten 'The Rasterman' Heitzler" +HOMEPAGE = "http://www.rasterman.com" +LICENSE = "GPL" +DEPENDS = "evas ecore edje" +SECTION = "x11/multimedia" + +SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 86c87214cf..b71a4b7582 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -9,9 +9,11 @@ PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -SRC_URI += "file://configure.patch;patch=1 \ - file://fix-tslib-configure.patch;patch=1 \ - file://fix-directfb-include.patch;patch=1" +# SRC_URI += "file://configure.patch;patch=1 \ +# file://fix-tslib-configure.patch;patch=1 \ +# file://fix-directfb-include.patch;patch=1" + +SRC_URI += "file://fix-directfb-include.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index dd6c467c54..53ee8642d8 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -6,8 +6,8 @@ EXTRA_OECONF = "\ --disable-ecore-x-xcb \ --enable-ecore-x \ --enable-ecore-job \ - --enable-ecore-directfb \ - --enable-ecore-sdl \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ --disable-ecore-evas-gl \ diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb index 8b8694899e..204abbb821 100644 --- a/packages/efl1/evas-native_cvs.bb +++ b/packages/efl1/evas-native_cvs.bb @@ -6,7 +6,7 @@ PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --disable-fb \ + --enable-fb \ --disable-directfb \ --disable-sdl \ --enable-buffer \ diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 840f2929c5..de3359114c 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -3,13 +3,13 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ down to using normal X11 primitives such as pixmaps, lines and rectangles if \ your CPU or graphics hardware are too slow." LICENSE = "MIT" -# can also depend on valgrind (?) -DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext" +# can also depend on valgrind, libsdl-x11, directfb +DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender" PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -SRC_URI += "file://fix-configure.patch;patch=1" +# SRC_URI += "file://fix-configure.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index b80ff8bcba..a19a9c944b 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,17 +1,17 @@ require evas.inc -PR = "r0" +PR = "r2" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-fb \ - --enable-directfb \ - --enable-sdl \ + --disable-directfb \ + --disable-sdl \ --enable-buffer \ --disable-software-ddraw \ --disable-software-qtopia \ --enable-software-x11 \ - --disable-software-16-x11 \ + --enable-software-16-x11 \ --disable-software-xcb \ --disable-gl-x11 \ --enable-xrender-x11 \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 2ac7c65279..8fb8521d62 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -1,14 +1,26 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library \ based on the enlightenment foundation libraries." -DEPENDS = "evas ecore edje emotion efreet" +DEPENDS = "evas ecore edje emotion efreet epsilon" RSUGGESTS_${PN} += "ewl-themes" LICENSE = "MIT" PV = "0.5.1+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library +EXTRA_OECONF = "\ + --enable-software-x11 \ + --enable-software-16-x11 \ + --enable-xrender-x11 \ + --disable-opengl-x11 \ + --disable-software-xcb \ + --disable-software-sdl \ + --enable-framebuffer \ + --enable-software-buffer \ + --disable-opengl-glew \ +" + # TODO package engines more granular PACKAGES += "${PN}-plugins ${PN}-engines" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 1f14bb83fb..b96aae37b9 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -220,10 +220,13 @@ python package_do_split_gconvs () { dot_re = re.compile("(.*)\.(.*)") # Collate the locales by base and encoding + utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0) encodings = {} for l in supported: l = l[:-1] (locale, charset) = l.split(" ") + if utf8_only and charset != 'UTF-8': + continue m = dot_re.match(locale) if m: locale = m.group(1) diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb new file mode 100644 index 0000000000..3c9995cf2e --- /dev/null +++ b/packages/images/console-mipv6-image.bb @@ -0,0 +1,7 @@ +# This image is for testing the ipv6 mobility extensions + +require console-image.bb +IMAGE_INSTALL += " task-mipl " + +export IMAGE_BASENAME = "console-mobile-ipv6-image" + diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index 329cd01217..557131e530 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r37" +DEFAULT_PREFERENCE_poodle = "99" + # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index b818b0f3e8..60305488ca 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r19" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 2084930192..d990a77e48 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -2,6 +2,7 @@ require linux-rp.inc PR = "r11" +DEFAULT_PREFERENCE_poodle = "-99" DEFAULT_PREFERENCE_collie = "1" # Handy URLs diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb index 939e630624..57094b3fb7 100644 --- a/packages/linux/linux-rp_2.6.22.bb +++ b/packages/linux/linux-rp_2.6.22.bb @@ -2,6 +2,8 @@ require linux-rp.inc PR = "r10" +DEFAULT_PREFERENCE_poodle = "-99" + # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 83077b66b8..3fb304f51f 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -4,6 +4,7 @@ PR = "r9" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" +DEFAULT_PREFERENCE_poodle = "-99" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/mipl-mipv6/mipv6_2.0.2.bb b/packages/mipl-mipv6/mipv6_2.0.2.bb new file mode 100644 index 0000000000..8bbcb4cb75 --- /dev/null +++ b/packages/mipl-mipv6/mipv6_2.0.2.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6" + +SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz" + +inherit autotools module-base + +CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + oe_runmake CFLAGS="${CFLAGS}" +} + +do_install() { + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/init.d + oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install +} + +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + diff --git a/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/packages/mozilla/firefox-2.0.0.3/mozconfig b/packages/mozilla/firefox-2.0.0.3/mozconfig index 9737330a77..96caace6bb 100644 --- a/packages/mozilla/firefox-2.0.0.3/mozconfig +++ b/packages/mozilla/firefox-2.0.0.3/mozconfig @@ -55,3 +55,6 @@ ac_add_options --enable-image-decoders=png,gif,jpeg #ac_add_options --disable-shared #ac_add_options --enable-static ac_add_options --enable-optimize=-O1 + +# Use cairo from system +ac_add_options --enable-system-cairo diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb index ede30a6b05..e1fb5a996d 100644 --- a/packages/mozilla/firefox_2.0.0.3.bb +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -1,17 +1,22 @@ -PR = "r2" +DEPENDS += "cairo" +PR = "r3" + SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://xptcstubs.patch;patch=1 \ file://no-xmb.patch;patch=1 \ file://jsautocfg.h \ file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://eabi-fix.patch;patch=1 \ + file://eabi-fix2.patch;patch=1 \ + file://eabi-fix3.patch;patch=1 \ + file://linkage-problem.patch;patch=1 \ " + S = "${WORKDIR}/mozilla" + DEFAULT_PREFERENCE = "-1" inherit mozilla @@ -36,4 +41,3 @@ do_stage() { # removes 2 lines that call absent headers sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h } - diff --git a/packages/mozilla/mozilla/.mtn2git_empty b/packages/mozilla/mozilla/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/.mtn2git_empty b/packages/mozilla/mozilla/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i386/.mtn2git_empty b/packages/mozilla/mozilla/files/i386/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/i386/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i386/jsautocfg.h b/packages/mozilla/mozilla/files/i386/jsautocfg.h new file mode 100644 index 0000000000..7e8171fc23 --- /dev/null +++ b/packages/mozilla/mozilla/files/i386/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/mozilla/files/i486/.mtn2git_empty b/packages/mozilla/mozilla/files/i486/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/i486/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i486/jsautocfg.h b/packages/mozilla/mozilla/files/i486/jsautocfg.h new file mode 100644 index 0000000000..7e8171fc23 --- /dev/null +++ b/packages/mozilla/mozilla/files/i486/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/mozilla/files/i586/.mtn2git_empty b/packages/mozilla/mozilla/files/i586/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/i586/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i586/jsautocfg.h b/packages/mozilla/mozilla/files/i586/jsautocfg.h new file mode 100644 index 0000000000..7e8171fc23 --- /dev/null +++ b/packages/mozilla/mozilla/files/i586/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/mozilla/files/i686/.mtn2git_empty b/packages/mozilla/mozilla/files/i686/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/files/i686/.mtn2git_empty diff --git a/packages/mozilla/mozilla/files/i686/jsautocfg.h b/packages/mozilla/mozilla/files/i686/jsautocfg.h new file mode 100644 index 0000000000..7e8171fc23 --- /dev/null +++ b/packages/mozilla/mozilla/files/i686/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty b/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty diff --git a/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch b/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/packages/openrdate/.mtn2git_empty b/packages/openrdate/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openrdate/.mtn2git_empty diff --git a/packages/openrdate/openrdate_1.1.3.bb b/packages/openrdate/openrdate_1.1.3.bb new file mode 100644 index 0000000000..265f4191f2 --- /dev/null +++ b/packages/openrdate/openrdate_1.1.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Date and time setting software implementing RFC 868 and RFC 2030 protocols" +HOMEPAGE = "http://sourceforge.net/projects/openrdate/" +SECTION = "admin" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openrdate/openrdate-${PV}.tar.gz" + +inherit autotools + +do_stage() { + autotools_stage_all +} diff --git a/packages/pimlico/contacts.inc b/packages/pimlico/contacts.inc index 5fa493fab3..6baab5e306 100644 --- a/packages/pimlico/contacts.inc +++ b/packages/pimlico/contacts.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Address-book application." LICENSE = "LGPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus" +DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" RDEPENDS = "libedata-book" inherit autotools pkgconfig diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 4c1e771ba8..40a88ea5c0 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Dates is a calendar application." LICENSE = "LGPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl" RDEPENDS = "libedata-cal" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/psplash/files/configurability.patch b/packages/psplash/files/configurability.patch index b923cb24f1..c9688655c9 100644 --- a/packages/psplash/files/configurability.patch +++ b/packages/psplash/files/configurability.patch @@ -1,8 +1,8 @@ Index: psplash/psplash.c =================================================================== ---- psplash.orig/psplash.c -+++ psplash/psplash.c -@@ -44,17 +44,17 @@ psplash_draw_msg (PSplashFB *fb, const c +--- psplash.orig/psplash.c 2007-12-06 11:14:23.000000000 +0000 ++++ psplash/psplash.c 2007-12-06 11:19:12.000000000 +0000 +@@ -44,17 +44,17 @@ /* Clear */ @@ -27,7 +27,7 @@ Index: psplash/psplash.c &radeon_font, msg); } -@@ -66,36 +66,36 @@ psplash_draw_progress (PSplashFB *fb, in +@@ -66,36 +66,36 @@ /* 4 pix border */ x = ((fb->width - BAR_IMG_WIDTH)/2) + 4 ; @@ -75,7 +75,7 @@ Index: psplash/psplash.c { char *command; int parsed=0; -@@ -103,21 +103,21 @@ parse_command (PSplashFB *fb, char *stri +@@ -103,21 +103,21 @@ parsed = strlen(string)+1; DBG("got cmd %s", string); @@ -103,7 +103,7 @@ Index: psplash/psplash.c { return 1; } -@@ -125,8 +125,8 @@ parse_command (PSplashFB *fb, char *stri +@@ -125,8 +125,8 @@ return 0; } @@ -114,7 +114,7 @@ Index: psplash/psplash.c { int err; ssize_t length = 0; -@@ -143,14 +143,14 @@ psplash_main (PSplashFB *fb, int pipe_fd +@@ -143,14 +143,14 @@ end = command; @@ -133,7 +133,7 @@ Index: psplash/psplash.c { /* if (errno == EINTR) -@@ -158,29 +158,29 @@ psplash_main (PSplashFB *fb, int pipe_fd +@@ -158,29 +158,29 @@ */ return; } @@ -171,7 +171,7 @@ Index: psplash/psplash.c FD_ZERO(&descriptors); FD_SET(pipe_fd,&descriptors); } -@@ -188,14 +188,14 @@ psplash_main (PSplashFB *fb, int pipe_fd +@@ -188,14 +188,14 @@ return; } @@ -189,7 +189,7 @@ Index: psplash/psplash.c signal(SIGHUP, psplash_exit); signal(SIGINT, psplash_exit); signal(SIGQUIT, psplash_exit); -@@ -214,10 +214,10 @@ main (int argc, char** argv) +@@ -214,10 +214,10 @@ angle = atoi(argv[i]); continue; } @@ -203,7 +203,7 @@ Index: psplash/psplash.c argv[0]); exit(-1); } -@@ -231,7 +231,7 @@ main (int argc, char** argv) +@@ -231,7 +231,7 @@ if (mkfifo(PSPLASH_FIFO, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)) { @@ -212,7 +212,7 @@ Index: psplash/psplash.c { perror("mkfifo"); exit(-1); -@@ -239,8 +239,8 @@ main (int argc, char** argv) +@@ -239,8 +239,8 @@ } pipe_fd = open (PSPLASH_FIFO,O_RDONLY|O_NONBLOCK); @@ -223,22 +223,20 @@ Index: psplash/psplash.c { perror("pipe open"); exit(-2); -@@ -252,30 +252,30 @@ main (int argc, char** argv) - if ((fb = psplash_fb_new(angle)) == NULL) +@@ -253,29 +253,29 @@ exit(-1); -- /* Clear the background with #ecece1 */ + /* Clear the background with #ecece1 */ - psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1); -+ /* Clear the background */ + psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B); /* Draw the OH logo */ - psplash_fb_draw_image (fb, - (fb->width - HAND_IMG_WIDTH)/2, -- (fb->height - HAND_IMG_HEIGHT)/2, +- ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, + psplash_fb_draw_image (fb, -+ (fb->width - HAND_IMG_WIDTH)/2, -+ (fb->height - HAND_IMG_HEIGHT)/2, ++ (fb->width - HAND_IMG_WIDTH)/2, ++ (fb->height - HAND_IMG_HEIGHT)/2, HAND_IMG_WIDTH, HAND_IMG_HEIGHT, HAND_IMG_BYTES_PER_PIXEL, @@ -249,8 +247,8 @@ Index: psplash/psplash.c - (fb->width - BAR_IMG_WIDTH)/2, - fb->height - (fb->height/6), + psplash_fb_draw_image (fb, -+ (fb->width - BAR_IMG_WIDTH)/2, -+ fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER), ++ (fb->width - BAR_IMG_WIDTH)/2, ++ fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER), BAR_IMG_WIDTH, BAR_IMG_HEIGHT, BAR_IMG_BYTES_PER_PIXEL, @@ -266,9 +264,9 @@ Index: psplash/psplash.c Index: psplash/psplash.h =================================================================== ---- psplash.orig/psplash.h -+++ psplash/psplash.h -@@ -54,6 +54,21 @@ typedef int bool; +--- psplash.orig/psplash.h 2007-12-06 11:15:35.000000000 +0000 ++++ psplash/psplash.h 2007-12-06 11:15:45.000000000 +0000 +@@ -54,6 +54,21 @@ #define TRUE 1 #endif diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index 398141de69..cf6e228d92 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/psplash" SECTION = "base" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r10" +PR = "r11" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND diff --git a/packages/pulseaudio/files/fix-dbus-without-hal.patch b/packages/pulseaudio/files/fix-dbus-without-hal.patch new file mode 100644 index 0000000000..f8ac5674a6 --- /dev/null +++ b/packages/pulseaudio/files/fix-dbus-without-hal.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.8/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.8.orig/src/Makefile.am ++++ pulseaudio-0.9.8/src/Makefile.am +@@ -1424,8 +1424,8 @@ + # HAL + libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h + libdbus_util_la_LDFLAGS = -avoid-version +-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la +-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) ++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la ++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS) + + module_hal_detect_la_SOURCES = modules/module-hal-detect.c + module_hal_detect_la_LDFLAGS = -module -avoid-version diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb index 76bf6e8411..93c8ffb849 100644 --- a/packages/pulseaudio/pulseaudio_0.9.8.bb +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -1,12 +1,17 @@ require pulse.inc +DEPENDS += "dbus" + # this is not correct (see below) -SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" +SRC_URI += "\ + file://disable-using-glibc-tls.patch;patch=1 \ + file://fix-dbus-without-hal.patch;patch=1 \ +" PR = "r0" # problems w/ pulseaudio 0.9.8 atm: -# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work) +# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) # 2.) doesn't build w/ glibc TLS support (hence patched out) DEFAULT_PREFERENCE = "-1" diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 85d47c4c0d..b73959513b 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Nov 15 16:11:01 2007 +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Dec 5 18:00:46 2007 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,287 +8,292 @@ ######################################################################################################################## -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml2" +PR_python-profile="ml3" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" +PR_python-threading="ml3" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" +PR_python-distutils="ml3" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml2" +PR_python-textutils="ml3" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" +PR_python-codecs="ml3" RDEPENDS_python-codecs="python-core" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " +DESCRIPTION_python-ctypes="Python C Types Support" +PR_python-ctypes="ml3" +RDEPENDS_python-ctypes="python-core" +FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " + DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml2" +PR_python-pickle="ml3" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml2" +PR_python-datetime="ml3" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml4" +PR_python-core="ml5" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml2" +PR_python-io="ml3" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml2" +PR_python-compiler="ml3" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml2" +PR_python-compression="ml3" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" +PR_python-re="ml3" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml2" +PR_python-xmlrpc="ml3" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml2" +PR_python-terminal="ml3" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml2" +PR_python-email="ml3" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml2" +PR_python-image="ml3" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml2" +PR_python-core-dbg="ml3" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml2" +PR_python-resource="ml3" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml2" +PR_python-devel="ml3" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml2" +PR_python-math="ml3" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml2" +PR_python-hotshot="ml3" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml2" +PR_python-unixadmin="ml3" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml2" +PR_python-syslog="ml3" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml2" +PR_python-tkinter="ml3" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml2" +PR_python-gdbm="ml3" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml2" +PR_python-fcntl="ml3" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" +PR_python-netclient="ml3" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml2" +PR_python-pprint="ml3" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml2" +PR_python-netserver="ml3" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml2" +PR_python-curses="ml3" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml2" +PR_python-smtpd="ml3" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml2" +PR_python-html="ml3" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml2" +PR_python-readline="ml3" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml2" +PR_python-subprocess="ml3" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml2" +PR_python-pydoc="ml3" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml2" +PR_python-logging="ml3" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml2" +PR_python-mailbox="ml3" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml2" +PR_python-xml="ml3" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" +PR_python-mime="ml3" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml2" +PR_python-sqlite3="ml3" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml2" +PR_python-tests="ml3" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml2" +PR_python-unittest="ml3" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml2" +PR_python-stringold="ml3" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml2" +PR_python-robotparser="ml3" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml2" +PR_python-lib-old-and-deprecated="ml3" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml2" +PR_python-compile="ml3" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml2" +PR_python-debugger="ml3" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml2" +PR_python-shell="ml3" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml2" +PR_python-bsddb="ml3" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml2" +PR_python-mmap="ml3" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml2" +PR_python-zlib="ml3" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml2" +PR_python-db="ml3" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml2" +PR_python-crypt="ml3" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml2" +PR_python-idle="ml3" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml2" +PR_python-lang="ml3" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml2" +PR_python-audio="ml3" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/enable-ctypes-module.patch b/packages/python/python-2.5.1/enable-ctypes-module.patch new file mode 100644 index 0000000000..dd5adaf0e7 --- /dev/null +++ b/packages/python/python-2.5.1/enable-ctypes-module.patch @@ -0,0 +1,106 @@ +diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py +--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 ++++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 +@@ -1321,16 +1329,16 @@ + ffi_configfile): + from distutils.dir_util import mkpath + mkpath(ffi_builddir) +- config_args = [] ++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] + + # Pass empty CFLAGS because we'll just append the resulting + # CFLAGS to Python's; -g or -O2 is to be avoided. +- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ +- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) + + res = os.system(cmd) + if res or not os.path.exists(ffi_configfile): +- print "Failed to configure _ctypes module" ++ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, ) + return False + + fficonfig = {} +diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c +--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 +@@ -273,11 +273,13 @@ + PyErr_NoMemory(); + return NULL; + } ++#if FFI_CLOSURES + p->pcl = MallocClosure(); + if (p->pcl == NULL) { + PyErr_NoMemory(); + goto error; + } ++#endif + + for (i = 0; i < nArgs; ++i) { + PyObject *cnv = PySequence_GetItem(converters, i); +@@ -315,12 +317,14 @@ + "ffi_prep_cif failed with %d", result); + goto error; + } ++#if FFI_CLOSURES + result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); + goto error; + } ++#endif + + p->converters = converters; + p->callable = callable; +@@ -328,8 +332,10 @@ + + error: + if (p) { ++#if FFI_CLOSURES + if (p->pcl) + FreeClosure(p->pcl); ++#endif + PyMem_Free(p); + } + return NULL; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c +--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 ++++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 +@@ -3419,7 +3419,9 @@ + Py_CLEAR(self->paramflags); + + if (self->thunk) { ++#if FFI_CLOSURES + FreeClosure(self->thunk->pcl); ++#endif + PyMem_Free(self->thunk); + self->thunk = NULL; + } +diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h +--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 +@@ -68,7 +68,9 @@ + }; + + typedef struct { ++#if FFI_CLOSURES + ffi_closure *pcl; /* the C callable */ ++#endif + ffi_cif cif; + PyObject *converters; + PyObject *callable; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c +--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 +@@ -27,7 +27,9 @@ + /******************************************************************/ + + typedef union _tagITEM { ++#if FFI_CLOSURES + ffi_closure closure; ++#endif + union _tagITEM *next; + } ITEM; + diff --git a/packages/python/python-cython-native_0.9.6.9.bb b/packages/python/python-cython-native_0.9.6.9.bb new file mode 100644 index 0000000000..cb7743e1bf --- /dev/null +++ b/packages/python/python-cython-native_0.9.6.9.bb @@ -0,0 +1,9 @@ +require python-cython_${PV}.bb +inherit native +DEPENDS = "python-native" +RDEPENDS = "" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR} +} diff --git a/packages/python/python-cython_0.9.6.9.bb b/packages/python/python-cython_0.9.6.9.bb new file mode 100644 index 0000000000..a513104108 --- /dev/null +++ b/packages/python/python-cython_0.9.6.9.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \ +It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ +and the messy, low-level world of C." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +SRCNAME = "cython" +PR = "ml0" + +SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.zip" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb index 73c9f1d0b6..8f4db6382e 100644 --- a/packages/python/python-ecore_cvs.bb +++ b/packages/python/python-ecore_cvs.bb @@ -1,5 +1,9 @@ require python-efl.inc DEPENDS += "ecore" -PR = "r1" +PR = "r2" + +do_stage() { + distutils_stage_all +} diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb new file mode 100644 index 0000000000..c667ceff11 --- /dev/null +++ b/packages/python/python-efl.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" +LICENSE = "MIT" +SECTION = "devel/python" +DEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" + +ALLOW_EMPTY = "1" + diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index aa12b979f8..727c718bd2 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -2,17 +2,15 @@ DESCRIPTION = "${PN} bindings" LICENSE = "BSD" AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>" HOMEPAGE = "http://www.enlightenment.org" -DEPENDS = "python-pyrex-native python-numeric" +# somewhere is a bug. cython should be self-contained, but somehow this +# does not compile unless pyrex has been built +DEPENDS = "python-cython-native python-pyrex-native python-numeric" PV = "0.1.1+cvs${SRCDATE}" -inherit distutils +inherit setuptools SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}" S = "${WORKDIR}/${PN}" -do_install_append() { - rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.* -} - FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb new file mode 100644 index 0000000000..81ebfcb0c7 --- /dev/null +++ b/packages/python/python-epsilon_cvs.bb @@ -0,0 +1,4 @@ +require python-efl.inc +DEPENDS += "epsilon python-ecore" + +PR = "r0" diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 0584d119c9..d53e3d5105 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pycairo python-pygobject" +DEPENDS = "gtk+ libglade" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml3" +PR = "ml5" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -19,16 +19,31 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } -do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +# dirty fix #1: remove dependency on python-pygobject-dev +do_install_append() { + find ${D} -name "*.la"|xargs rm -f + rm -f ${D}/${bindir}/pygtk-codegen-2.0 + rm -rf ${D}/${libdir}/pkgconfig } +# dirty fix #2: fix build system paths leaking in require fix-path.inc -FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*" +PACKAGES =+ "${PN}-demo" +FILES_${PN}-demo = "\ + ${bindir}/pygtk-demo \ + ${libdir}/pygtk \ +" +RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" + +# todo: revamp packaging, package demo seperatly +FILES_${PN}-dev += "\ + ${libdir}/pygtk/2.0 \ + ${bindir}/pygtk-* \ + ${datadir}/pygtk/2.0" do_stage() { autotools_stage_includes diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.10.bb index a18cf89466..a18cf89466 100644 --- a/packages/python/python-sword_1.5.9.bb +++ b/packages/python/python-sword_1.5.10.bb diff --git a/packages/python/python-sword_1.5.8.bb b/packages/python/python-sword_1.5.8.bb deleted file mode 100644 index b8e319c693..0000000000 --- a/packages/python/python-sword_1.5.8.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Python bindings for the sword library" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core sword" -DEPENDS = "sword-${PV} swig-native" -SRCNAME = "sword" -PR = "r0" - -SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" - -EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" - -inherit distutils autotools - -PARALLEL_MAKE = "" - -do_configure_prepend() { - ./autogen.sh -} - -do_compile() { - oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make -} - -do_install() { - cd ${S}/python - distutils_do_install -} diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 3ac2f7d390..c25cd6efb6 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.5" @@ -17,6 +17,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://fix-tkinter-detection.patch;patch=1 \ file://autohell.patch;patch=1 \ file://sitebranding.patch;patch=1 \ + file://enable-ctypes-module.patch;patch=1 \ file://default-is-optimized.patch;patch=1" S = "${WORKDIR}/Python-${PV}" diff --git a/packages/sword/sword_1.5.10.bb b/packages/sword/sword_1.5.10.bb new file mode 100644 index 0000000000..151bba366d --- /dev/null +++ b/packages/sword/sword_1.5.10.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "The SWORD Project is an open source, cross-platform \ +(Linux, Windows, Solaris, MacOSX etc.) API and library for \ +Bible software with a constantly growing list of front-ends \ +(GUI, textmode, web-based, etc.) and a library of over 200 text modules" +SECTION = "libs" +HOMEPAGE = "http://www.e-sword.net/" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--without-clucene --without-curl" + +do_stage() { + autotools_stage_all +} diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index bfb673293d..03a3fd35b3 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r47" +PR = "r48" inherit task diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb new file mode 100644 index 0000000000..9e2dce52f1 --- /dev/null +++ b/packages/tasks/task-mipl.bb @@ -0,0 +1,16 @@ +# Tasks for IPv6 Mobility extensions, needs: +# CONFIG_IPV6_MIP6=y +# CONFIG_IPV6=y +# in the kernel .config + +DESCRIPTION = "Mobile ipv6 extensions" + +inherit task + +PACKAGE_ARCH = "all" + +RDEPENDS = "mipv6" +RRECOMMENDS = "kernel-module-ipv6 \ + kernel-module-mip6 \ + " + diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 444eb73781..a1d9f444b1 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml20" +PR = "ml21" RDEPENDS = "\ python-ao \ @@ -9,10 +9,7 @@ RDEPENDS = "\ python-constraint \ python-dbus \ python-dialog \ - python-evas \ - python-ecore \ -# python-emotion \ -# python-edje \ + python-efl \ python-pycurl \ python-fam \ python-fnorb \ @@ -52,6 +49,7 @@ RDEPENDS = "\ python-pyiw \ python-pylinda \ python-pylint \ + python-pyqt \ python-pyraf \ python-pyreverse \ python-pyrex \ @@ -74,6 +72,7 @@ RDEPENDS = "\ python-spydi \ python-spyro \ python-sqlobject \ + python-sword \ python-tlslite \ python-urwid \ python-vmaps \ @@ -88,9 +87,7 @@ BROKEN_PACKAGES = "\ python-egenix-mx-base \ python-gammu \ python-m2crypto \ - python-sword \ python-mysqldb \ - python-pyqt \ python-pyqwt \ " diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb index 25841b357a..5dbd59d18a 100644 --- a/packages/tasks/task-python-sharprom_20060425.bb +++ b/packages/tasks/task-python-sharprom_20060425.bb @@ -20,7 +20,6 @@ RDEPENDS = "\ python-ao \ python-constraint \ python-dialog \ - python-egenix-mx-base \ python-fnorb \ python-fpconst \ python-gnosis \ @@ -28,7 +27,7 @@ RDEPENDS = "\ python-irclib \ python-itools \ python-libgmail \ - python-logilab \ + python-logilab-common \ python-lxml \ python-mad \ python-native \ @@ -53,7 +52,6 @@ RDEPENDS = "\ python-pyweather \ python-pyxml \ python-pyxmlrpc \ - python-quicklauncher \ python-scapy \ python-scons \ python-sip \ @@ -70,6 +68,7 @@ RDEPENDS = "\ twisted \ zope" +#fixme add python-egenix-mx-base if brought in from nonworking #fixme add python-pycap once libdnet is in again #fixme add python-pyx once kpathwhich-native is there #fixme add packages dynamically diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb deleted file mode 100644 index 27b5b5bb31..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.2.3.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "libx11-native libxext-native" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" - -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -inherit native - -EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 -} diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb deleted file mode 100644 index bc5aba4102..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.3.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "libx11-native libxext-native zlib-native" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r3" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" - -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -inherit native - -EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ - -qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static \ - -qt3support " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/sql && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/network && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/gui && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ -} diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index ee4c85e646..bf96dc26eb 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r13" +PR = "r15" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index 709cbbc9a9..567d68fde2 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -1,5 +1,4 @@ #!/bin/sh - # # One updater.sh to rule them all # @@ -22,10 +21,14 @@ # # 2007.11.23 Koen Kooi # - consistent error messages -## - fix flashing from case sensitive filesystem (e.g. ext2) +# - fix flashing from case sensitive filesystem (e.g. ext2) +# # 2007.11.23 Matthias 'CoreDump' Hentges # - Always treat MTD_PART_SIZE as HEX when comparing sizes # - Thanks to ZeroChaos for debugging +# +# 2007.12.04 Matthias 'CoreDump' Hentges +# - Unb0rk flashing of Akita kernels DATAPATH=$1 TMPPATH=/tmp/update @@ -190,42 +193,53 @@ do_flashing() /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 fi - #loop - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - if [ $ISLOGICAL = 0 ] - then - next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` - if [ "$next_addr" = "" ]; then - echo "Error: flash write" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; + # Looks like Akita is quite unique when it comes to kernel flashing + + if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then + echo "Note: Flashing Akita kernel" + echo $TARGETFILE':'$DATASIZE'bytes' + echo ' ' > /tmp/data + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 + echo "Kernel: Finished" + else + #loop + while [ $DATAPOS -lt $DATASIZE ] + do + #data create + bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE + TMPSIZE=`wc -c $TMPDATA` + TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` + DATAPOS=`expr $DATAPOS + $TMPSIZE` + + #handle data file + if [ $ISLOGICAL = 0 ] + then + next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` + if [ "$next_addr" = "" ]; then + echo "Error: flash write" + rm $TMPDATA > /dev/null 2>&1 + RESULT=3 + break; + fi + ADDR=$next_addr + else + /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 + ADDR=`expr $ADDR + $TMPSIZE` fi - ADDR=$next_addr - else - /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 - ADDR=`expr $ADDR + $TMPSIZE` - fi - rm $TMPDATA > /dev/null 2>&1 + rm $TMPDATA > /dev/null 2>&1 - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` + #progress + SPNUM=0 + while [ $SPNUM -lt $PROGSTEP ] + do + echo -n '.' + SPNUM=`expr $SPNUM + 1` + done done - done - + fi echo '' #finish @@ -298,9 +312,9 @@ do DATASIZE=`echo $DATASIZE | cut -d' ' -f1` # make TARGETFILE lowercase - TARGETFILE=`echo $TARGETFILE|tr A-Z a-z` + TARGETFILE_LC=`echo $TARGETFILE|tr A-Z a-z` - case "$TARGETFILE" in + case "$TARGETFILE_LC" in zimage|zimage.bin) if [ $FLASHED_KERNEL != 0 ] |