diff options
Diffstat (limited to 'packages')
48 files changed, 324 insertions, 101 deletions
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb index adc4bb0756..0280859fdc 100644 --- a/packages/angstrom/angstrom-gpe-task-settings.bb +++ b/packages/angstrom/angstrom-gpe-task-settings.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r33" +PR = "r34" inherit task RDEPENDS_${PN} = "\ matchbox-panel-manager \ mboxkbd-layouts-gui \ - gpe-su \ + connman-gnome \ + gpe-su \ gpe-conf \ gpe-package \ gpe-shield \ diff --git a/packages/apr/apr-util/configure_fixes.patch b/packages/apr/apr-util/configure_fixes.patch index 16f88b3bba..7c6fa6a4d2 100644 --- a/packages/apr/apr-util/configure_fixes.patch +++ b/packages/apr/apr-util/configure_fixes.patch @@ -1,7 +1,5 @@ -Index: apr-util-1.2.12/configure.in -=================================================================== ---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000 -+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000 +--- /tmp/configure.in 2009-02-06 16:34:14.000000000 +0100 ++++ apr-util-1.2.12/configure.in 2009-02-06 16:34:38.000000000 +0100 @@ -8,13 +8,13 @@ AC_CONFIG_HEADER(include/private/apu_config.h) AC_CONFIG_AUX_DIR(build) @@ -23,3 +21,17 @@ Index: apr-util-1.2.12/configure.in dnl Generate ./config.nice for reproducing runs of configure dnl +@@ -45,10 +45,10 @@ + # against installed versions of libapr instead of those just + # built. + case $host in +-*-apple-darwin*) LT_NO_INSTALL="" ;; +-*) LT_NO_INSTALL="-no-install" ;; ++*-apple-darwin*) LV_NO_INSTALL="" ;; ++*) LV_NO_INSTALL="-no-install" ;; + esac +-AC_SUBST(LT_NO_INSTALL) ++AC_SUBST(LV_NO_INSTALL) + + dnl + dnl compute the top directory of the build diff --git a/packages/apr/apr-util_1.2.12.bb b/packages/apr/apr-util_1.2.12.bb index 64f6bcbcf8..6613ab99a8 100644 --- a/packages/apr/apr-util_1.2.12.bb +++ b/packages/apr/apr-util_1.2.12.bb @@ -3,7 +3,9 @@ SECTION = "libs" DEPENDS = "apr expat gdbm" LICENSE = "Apache License, Version 2.0" -PR = "r2" +PR = "r3" + +inherit autotools lib_package binconfig # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ @@ -16,12 +18,16 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \ --with-expat=${STAGING_DIR_HOST}${layout_prefix}" -inherit autotools lib_package binconfig - OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" +EXTRA_OEMAKE = " LIBTOOL=\"${S}/${TARGET_PREFIX}libtool\" " + +export LIBTOOL="${S}/${TARGET_PREFIX}libtool" do_configure_prepend() { + cp ${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool ${S}/ cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + echo "AC_PROG_LIBTOOL" >> ${S}/configure.in + libtoolize --force } do_stage() { diff --git a/packages/byacc/byacc-native_20081225.bb b/packages/byacc/byacc-native_20081225.bb new file mode 100644 index 0000000000..2973c3231b --- /dev/null +++ b/packages/byacc/byacc-native_20081225.bb @@ -0,0 +1,5 @@ +PR = "r0" + +require byacc.inc + +inherit native diff --git a/packages/byacc/byacc.inc b/packages/byacc/byacc.inc new file mode 100644 index 0000000000..7d35974203 --- /dev/null +++ b/packages/byacc/byacc.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Berkeley Yacc" +SECTION = "devel" +LICENSE = "public domain" + +SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz" +EXTRA_OECONF += "--program-transform-name='s,^,b,'" +S = "${WORKDIR}/byacc-${PV}" + +inherit autotools + +do_configure() { + oe_runconf +} diff --git a/packages/byacc/byacc_20081225.bb b/packages/byacc/byacc_20081225.bb new file mode 100644 index 0000000000..dd3b71db3b --- /dev/null +++ b/packages/byacc/byacc_20081225.bb @@ -0,0 +1,3 @@ +PR = "r0" + +require byacc.inc diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc index 60c7a480de..e900c43209 100644 --- a/packages/clutter/clutter.inc +++ b/packages/clutter/clutter.inc @@ -36,6 +36,10 @@ DEPENDS_omap3evm = "${STDDEPENDS} libgles-omap3 tslib" EXTRA_OECONF_omap3evm = "${BASE_CONF} --with-flavour=eglx --with-gles=2.0" PACKAGE_ARCH_omap3evm = "${MACHINE_ARCH}" +DEPENDS_overo = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_overo = "${BASE_CONF} --with-flavour=eglx --with-gles=2.0" +PACKAGE_ARCH_overo = "${MACHINE_ARCH}" + DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" diff --git a/packages/connman/connman-gnome_0.4.bb b/packages/connman/connman-gnome_0.4.bb index 7714a08bf4..fdcf61823d 100644 --- a/packages/connman/connman-gnome_0.4.bb +++ b/packages/connman/connman-gnome_0.4.bb @@ -3,9 +3,18 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SECTION = "libs/network" LICENSE = "GPL" DEPENDS = "gtk+ dbus" -PR = "r1" +PR = "r7" -SRC_URI = "ftp://ftp.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz" +RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi" + +SRC_URI = "http://repo.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \ + file://phrase-lenght.diff;patch=1 \ + file://connman-applet.desktop" inherit autotools gtk-icon-cache +do_install_append() { + install -d ${D}${datadir}/applications/ + install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/ +} + diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc index a97ca44c90..c79c22cabb 100644 --- a/packages/connman/connman.inc +++ b/packages/connman/connman.inc @@ -24,6 +24,10 @@ do_configure_append() { ln -sf . include/connman } +do_compile_append() { + sed -i -e s:deny:allow:g src/connman-dbus.conf +} + do_install_append() { install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman } diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb index a20bf24ea5..dfd631b9bf 100644 --- a/packages/connman/connman_0.10.bb +++ b/packages/connman/connman_0.10.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r5" +PR = "r6" EXTRA_OECONF += "\ --disable-gtk-doc \ @@ -30,7 +30,7 @@ EXTRA_OECONF += "\ " SRC_URI = "\ - http://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \ + http://repo.moblin.org/connman/releases/connman-${PV}.tar.gz \ file://connman \ " diff --git a/packages/connman/files/connman-applet.desktop b/packages/connman/files/connman-applet.desktop new file mode 100644 index 0000000000..ad17682507 --- /dev/null +++ b/packages/connman/files/connman-applet.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Connection Manager +Comment=Connection Manager applet +Icon=stock_internet +Exec=connman-applet +Terminal=false +Type=Application +Categories=Network;GTK + diff --git a/packages/connman/files/phrase-lenght.diff b/packages/connman/files/phrase-lenght.diff new file mode 100644 index 0000000000..383c86cd3a --- /dev/null +++ b/packages/connman/files/phrase-lenght.diff @@ -0,0 +1,23 @@ +From: Marcel Holtmann <marcel@holtmann.org> +Date: Fri, 30 Jan 2009 14:34:05 +0000 (+0100) +Subject: Don't limit input field length for passphrases +X-Git-Url: http://git.moblin.org/cgi-bin/gitweb/gitweb.cgi?p=projects%2Fconnman-gnome.git;a=commitdiff_plain;h=faa1dee0cea9bdf47d91f5665880dab335dd94b4 + +Don't limit input field length for passphrases +--- + +diff --git a/applet/main.c b/applet/main.c +index cf12a34..434e7c8 100644 +--- a/applet/main.c ++++ b/applet/main.c +@@ -151,8 +151,8 @@ static void passphrase_dialog(const char *path, const char *name) + GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + + entry = gtk_entry_new(); +- gtk_entry_set_max_length(GTK_ENTRY(entry), 16); +- gtk_entry_set_width_chars(GTK_ENTRY(entry), 16); ++ gtk_entry_set_max_length(GTK_ENTRY(entry), 120); ++ gtk_entry_set_width_chars(GTK_ENTRY(entry), 20); + gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + gtk_container_add(GTK_CONTAINER(vbox), entry); diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb index 1a02827021..9e48c2c572 100644 --- a/packages/console-tools/console-tools_0.3.2.bb +++ b/packages/console-tools/console-tools_0.3.2.bb @@ -1,7 +1,7 @@ SECTION = "base" LICENSE = "GPL" DESCRIPTION = "Allows you to set-up and manipulate the Linux console." -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://codepage.patch;patch=1 \ @@ -32,17 +32,20 @@ do_install () { mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN} mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN} mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN} + mv ${D}${bindir}/showkey ${D}${bindir}/showkey.${PN} } pkg_postinst_${PN} () { update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100 update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100 update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100 + update-alternatives --install ${bindir}/showkey showkey showkey.${PN} 100 } pkg_prerm_${PN} () { update-alternatives --remove chvt chvt.${PN} update-alternatives --remove deallocvt deallocvt.${PN} update-alternatives --remove openvt openvt.${PN} + update-alternatives --remove showkey showkey.${PN} } diff --git a/packages/eglibc/eglibc-package.bbclass b/packages/eglibc/eglibc-package.bbclass index 2de24db859..74c9b739fb 100644 --- a/packages/eglibc/eglibc-package.bbclass +++ b/packages/eglibc/eglibc-package.bbclass @@ -193,9 +193,41 @@ python package_do_split_gconvs () { locales_dir = base_path_join(datadir, "i18n", "locales") binary_locales_dir = base_path_join(libdir, "locale") - do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv') + def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-gconv-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-gconv-%s' % group.lower(), d) + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', hook=calc_gconv_deps, extra_depends='eglibc-gconv') + + def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-charmap-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-charmap-%s' % group.lower(), d) - do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='') + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='') def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): deps = [] @@ -211,7 +243,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group.lower(), d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb index e2cac82280..7643bb3f6b 100644 --- a/packages/eglibc/eglibc_2.9.bb +++ b/packages/eglibc/eglibc_2.9.bb @@ -4,7 +4,7 @@ DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "r1" +PR = "r2" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index fc3ed590e7..9cf0393f79 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -5,7 +5,7 @@ SRCREV = "7542" # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9+svnr${SRCREV}" -PR = "r1" +PR = "r2" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb new file mode 100644 index 0000000000..7038d5e0f9 --- /dev/null +++ b/packages/freesmartphone/fso-abyss_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +SECTION = "console/network" +DEPENDS = "vala-native dbus dbus-glib libgee" +LICENSE = "GPL" +PV = "0.1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools + +RDEPENDS = "dbus dbus-glib" +RCONFLICTS = "gsm0710muxd fso-gsm0710muxd" + +FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/packages/gdb/gdbserver_6.8.bb b/packages/gdb/gdbserver_6.8.bb new file mode 100644 index 0000000000..67fc280ea2 --- /dev/null +++ b/packages/gdb/gdbserver_6.8.bb @@ -0,0 +1 @@ +require gdbserver.inc diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb index c7abc18855..22d30bfd01 100644 --- a/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb +++ b/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb @@ -15,6 +15,7 @@ EXTRA_OECONF = "\ --without-libtiff \ --with-libjpeg \ --with-libpng \ + --disable-cups \ " do_compile() { diff --git a/packages/gtk+/gtk+_2.14.2.bb b/packages/gtk+/gtk+_2.14.2.bb index b0002b8102..38dd3a411d 100644 --- a/packages/gtk+/gtk+_2.14.2.bb +++ b/packages/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r1" +PR = "r3" DEPENDS += "cairo jasper" @@ -41,3 +41,8 @@ python populate_packages_prepend () { if (bb.data.getVar('DEBIAN_NAMES', d, 1)): bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } + +RPROVIDES_${PN} = "libgailutil18" +RCONFLICTS_${PN} = "libgailutil18" +RREPLACES_${PN} = "libgailutil18" + diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig index 22e9cb3c93..b3f1a4cbf0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig @@ -1530,7 +1530,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig index d65aaff1bb..5d3f16ee19 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig @@ -1550,7 +1550,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 0742e23e58..f6bb17302d 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r24" +PR = "r25" DEFAULT_PREFERENCE = "-1" diff --git a/packages/mumpot/files/mumpot-cyclemap.desktop b/packages/mumpot/files/mumpot-cyclemap.desktop index e761d0f3f1..495e712bac 100644 --- a/packages/mumpot/files/mumpot-cyclemap.desktop +++ b/packages/mumpot/files/mumpot-cyclemap.desktop @@ -4,5 +4,5 @@ Comment=Mumpot cyclemap Exec=mumpot-cyclemap Terminal=0 Type=Application -Categories=Application;PIM;GTK +Categories=X-PIM;GTK;Education;Science;Geography; StartupNotify=True diff --git a/packages/mumpot/files/mumpot-mapnik.desktop b/packages/mumpot/files/mumpot-mapnik.desktop index b02b077de1..9d852d2577 100644 --- a/packages/mumpot/files/mumpot-mapnik.desktop +++ b/packages/mumpot/files/mumpot-mapnik.desktop @@ -4,5 +4,5 @@ Comment=Mumpot Mapnuk Exec=mumpot-mapnik Terminal=0 Type=Application -Categories=Application;PIM;GTK +Categories=X-PIM;GTK;Education;Science;Geography; StartupNotify=True diff --git a/packages/mumpot/files/mumpot-tah.desktop b/packages/mumpot/files/mumpot-tah.desktop index bcdba40b0a..805c1d42d9 100644 --- a/packages/mumpot/files/mumpot-tah.desktop +++ b/packages/mumpot/files/mumpot-tah.desktop @@ -4,5 +4,5 @@ Comment=Mumpot t@h Exec=mumpot-tah Terminal=0 Type=Application -Categories=Application;PIM;GTK +Categories=X-PIM;GTK;Education;Science;Geography; StartupNotify=True diff --git a/packages/mumpot/mumpot_0.3.1.bb b/packages/mumpot/mumpot_0.3.1.bb deleted file mode 100644 index c5b9091bdb..0000000000 --- a/packages/mumpot/mumpot_0.3.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "A map-viewer, simple editor and routing application for OSM maps" -HOMEPAGE = "http://wiki.openstreetmap.org/index.php/Mumpot" -AUTHOR = "Andreas Kemnade" -SECTION = "x11/applications" -LICENSE = "GPLv2" -DEPENDS = "gtk+ bluez-libs bzip2 libxml2 libpng jpeg" - -SRC_URI = "http://osm.andi.de1.cc/mumpot-${PV}.tar.gz \ - file://mumpot-tah.desktop \ - file://mumpot-mapnik.desktop" - -inherit autotools pkgconfig - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/mumpot-tah.desktop ${D}${datadir}/applications/mumpot-tah.desktop - install -m 0644 ${WORKDIR}/mumpot-mapnik.desktop ${D}${datadir}/applications/mumpot-mapnik.desktop -} diff --git a/packages/mumpot/mumpot_0.3.2.bb b/packages/mumpot/mumpot_0.4.bb index ab9d876902..ab9d876902 100644 --- a/packages/mumpot/mumpot_0.3.2.bb +++ b/packages/mumpot/mumpot_0.4.bb diff --git a/packages/powervr-drivers/libgles-omap3.inc b/packages/powervr-drivers/libgles-omap3.inc index 3533c47ad9..2789ac8bc5 100644 --- a/packages/powervr-drivers/libgles-omap3.inc +++ b/packages/powervr-drivers/libgles-omap3.inc @@ -15,8 +15,6 @@ FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${bindir}/pvrsrvinit" FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx" FILES_${PN}-tests = "${bindir}/*" -PACKAGE_ARCH = "${MACHINE_ARCH}" - RRECOMMENDS_${PN} = "${PN}-tests \ omap3-sgx-modules" @@ -32,16 +30,21 @@ Y ${S}" | ${WORKDIR}/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin } -addtask accept_license after do_unpack before do_compile +addtask accept_license after do_unpack before do_configure -do_compile () { - : +do_compile() { + for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so") $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do + if [ "$(readlink -n ${sofile})" = "" ] ; then + mv $sofile ${sofile}.${IMGPV} + ln -sf $(basename ${sofile}.${IMGPV}) ${sofile} + fi + done } do_install () { install -d ${D}${libdir} - cp -pR ${BINLOCATION}/*.so* ${D}${libdir} + cp -pP ${BINLOCATION}/*.so* ${D}${libdir} install -d ${D}${bindir}/ cp -pP ${BINLOCATION}/*_test ${D}${bindir}/ diff --git a/packages/powervr-drivers/libgles-omap3/rc.pvr b/packages/powervr-drivers/libgles-omap3/rc.pvr index 3fa0aff02f..4476a9d7e9 100755 --- a/packages/powervr-drivers/libgles-omap3/rc.pvr +++ b/packages/powervr-drivers/libgles-omap3/rc.pvr @@ -1,11 +1,11 @@ #!/bin/sh -rmmod bc_example +#rmmod bc_example rmmod omaplfb rmmod pvrsrvkm insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko") -modprobe bc_example +#modprobe bc_example modprobe omaplfb pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3` diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb index 62c69a0ed0..814ca04637 100644 --- a/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb +++ b/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb @@ -2,11 +2,11 @@ require libgles-omap3.inc # Not released yet DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" SGXPV = "3_00_00_05" +IMGPV = "1.2.12.838" # Quality control is really poor on these SDKs, so hack around the latest madness: FILES_${PN} += "${libdir}/*.so" FILES_${PN}-dev = "${includedir}" - diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb index 8a1ea57371..9fae1ff149 100644 --- a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb +++ b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb @@ -2,9 +2,10 @@ require libgles-omap3.inc # Not released yet DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r5" SGXPV = "3_00_00_06" +IMGPV = "1.3.13.1397" do_accept_license() { export HOME="${WORKDIR}" diff --git a/packages/python/divmod.inc b/packages/python/divmod.inc new file mode 100644 index 0000000000..20be1b2e38 --- /dev/null +++ b/packages/python/divmod.inc @@ -0,0 +1,17 @@ +SRC_URI = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/${REALPN}-${PV}.tar.gz?format=raw" + +DEPENDS += "python-twisted-native" + +do_unpack2() { + cd ${WORKDIR} + tar zxvf ${REALPN}-${PV}.tar.gz?format=raw +} + +addtask unpack2 after do_unpack before do_configure + +inherit distutils + +S = "${WORKDIR}/${REALPN}-${PV}" + + + diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb index 2c6ee0c9c6..bf9d964f99 100644 --- a/packages/python/python-coherence_0.6.0.bb +++ b/packages/python/python-coherence_0.6.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends" -SECTION = "python/devel" +SECTION = "devel/python" LICENSE = "MIT" HOMEPAGE = "http://coherence.beebits.net/wiki" PR = "r5" diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb new file mode 100644 index 0000000000..831e3a5ba6 --- /dev/null +++ b/packages/python/python-coherence_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends" +SECTION = "devel/python" +LICENSE = "MIT" +HOMEPAGE = "http://coherence.beebits.net/wiki" + +PR = "r5" +PV = "0.6.0+svnr${SRCREV}" + +inherit setuptools + +SRC_URI = "svn://coherence.beebits.net/svn/trunk;module=Coherence;proto=https" +S = "${WORKDIR}/Coherence" + +FILES_${PN} += "${datadir}" +RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \ + python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \ + zope python-modules python-pygobject python-gdata" + + diff --git a/packages/python/python-divmodepsilon_0.5.11.bb b/packages/python/python-divmodepsilon_0.5.11.bb new file mode 100644 index 0000000000..5184b69252 --- /dev/null +++ b/packages/python/python-divmodepsilon_0.5.11.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "A small utility package that depends on tools too recent for Twisted " +LICENSE = "MIT" + +REALPN = "Epsilon" + +require divmod.inc + diff --git a/packages/python/python-elementtree_1.2.7-20070827-preview.bb b/packages/python/python-elementtree_1.2.7-20070827-preview.bb new file mode 100644 index 0000000000..f1e4c8b322 --- /dev/null +++ b/packages/python/python-elementtree_1.2.7-20070827-preview.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Lightweight Python components for handling XML" +SECTION = "devel/python" +LICENSE = "Python" +HOMEPAGE = "http://effbot.org/zone/element-index.htm" +PR = "r0" + +inherit distutils + +SRC_URI = "http://effbot.org/media/downloads/elementtree-${PV}.zip" +S = "${WORKDIR}/elementtree-${PV}" + +FILES_${PN} += "${datadir}" + + diff --git a/packages/python/python-gdata_1.2.4.bb b/packages/python/python-gdata_1.2.4.bb new file mode 100644 index 0000000000..2e7e424976 --- /dev/null +++ b/packages/python/python-gdata_1.2.4.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Google Data APIs Python Client Library" +SECTION = "devel/python" +LICENSE = "Apache" +HOMEPAGE = "http://code.google.com/p/gdata-python-client/" +PR = "r0" + +inherit distutils + +SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz" +S = "${WORKDIR}/gdata.py-${PV}" + +FILES_${PN} += "${datadir}" + +RDEPENDS = "python-elementtree" + diff --git a/packages/python/python-nevow_0.9.32.bb b/packages/python/python-nevow_0.9.32.bb new file mode 100644 index 0000000000..155157c517 --- /dev/null +++ b/packages/python/python-nevow_0.9.32.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Nevow is a web application construction kit written in Python" +LICENSE = "MIT" + +REALPN = "Nevow" + +require divmod.inc + +FILES_${PN} += "${datadir}" +DEPENDS += "python-twisted-native" + diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb index db628a5b0e..0cccd76d0f 100644 --- a/packages/python/python-pycairo_1.4.0.bb +++ b/packages/python/python-pycairo_1.4.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Python Bindings for the Cairo canvas library" -SECTION = "python-devel" +SECTION = "devel/python" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" diff --git a/packages/python/python-pycairo_1.8.0.bb b/packages/python/python-pycairo_1.8.0.bb index fdcb6521f9..4e3e4633ba 100644 --- a/packages/python/python-pycairo_1.8.0.bb +++ b/packages/python/python-pycairo_1.8.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Python Bindings for the Cairo canvas library" -SECTION = "python-devel" +SECTION = "devel/python" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" # cairo >= 1.8.0 diff --git a/packages/python/python-twisted-native_8.2.0.bb b/packages/python/python-twisted-native_8.2.0.bb new file mode 100644 index 0000000000..063f0fdb13 --- /dev/null +++ b/packages/python/python-twisted-native_8.2.0.bb @@ -0,0 +1,7 @@ +require python-twisted_${PV}.bb + +inherit native + +do_stage() { + distutils_stage_all +} diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb index ae9cda69fb..5c5f1ae6d1 100644 --- a/packages/python/python-xappy_0.5.bb +++ b/packages/python/python-xappy_0.5.bb @@ -1,5 +1,5 @@ DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine" -SECTION = "python/devel" +SECTION = "devel/python" LICENSE = "GPLv2" DEPENDS = "xapian-core" PR = "ml0" diff --git a/packages/serial-utils/pty-forward-native.bb b/packages/serial-utils/pty-forward-native.bb index 972070d6b6..54ff591928 100644 --- a/packages/serial-utils/pty-forward-native.bb +++ b/packages/serial-utils/pty-forward-native.bb @@ -1,7 +1,11 @@ -LICENSE="GPL" -SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY" +DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY" +AUTHOR = "Holger 'Zecke' Freyther" +LICENSE = "GPL" +SECTION = "console/network" +PV = "1.0.0+svnr${SRCREV}"" +PR = "r0" -SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" S = "${WORKDIR}/serial_forward" inherit native @@ -21,4 +25,3 @@ do_deploy() { } addtask deploy before do_package after do_install - diff --git a/packages/serial-utils/serial-forward.bb b/packages/serial-utils/serial-forward.bb index 3cc33770d6..c3b879a0ee 100644 --- a/packages/serial-utils/serial-forward.bb +++ b/packages/serial-utils/serial-forward.bb @@ -1,8 +1,12 @@ -LICENSE="GPL" -SUMMARY="Forward a serial using TCP/IP" +DESCRIPTION = "Forward a serial using TCP/IP" +AUTHOR = "Holger 'Zecke' Freyther'" +LICENSE = "GPL" +SECTION = "console/devel" +PV = "1.0.0+svnr${SRCREV}" +PR = "r0" -SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" -S="${WORKDIR}/serial_forward" +SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S = "${WORKDIR}/serial_forward" do_compile() { cd ${S} diff --git a/packages/tasks/task-beagleboard-demo.bb b/packages/tasks/task-beagleboard-demo.bb index 35c8d6582e..72edd0646d 100644 --- a/packages/tasks/task-beagleboard-demo.bb +++ b/packages/tasks/task-beagleboard-demo.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for Beagleboard-demo-image" -PR = "r6" +PR = "r7" inherit task @@ -37,6 +37,7 @@ RDEPENDS_${PN} = "\ angstrom-gnome-icon-theme-enable \ openssh-scp openssh-ssh \ picodlp-control \ + connman-gnome \ " # Install all kernel modules diff --git a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch index 5c89721d8f..b3bb762415 100644 --- a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch +++ b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch @@ -110,10 +110,10 @@ index c4612ea..4c1ec6b 100644 diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c new file mode 100644 -index 0000000..f8a41a8 +index 0000000..10050e4 --- /dev/null +++ b/pixman/pixman-arm-neon.c -@@ -0,0 +1,1397 @@ +@@ -0,0 +1,1387 @@ +/* + * Copyright © 2009 Mozilla Corporation + * @@ -319,12 +319,10 @@ index 0000000..f8a41a8 + "b 9f\n\t" +// LOOP + "2:\n\t" -+ "vld1.8 {d0}, [%[src]]\n\t" -+ "vld1.8 {d4}, [%[dst]]\n\t" ++ "vld1.8 {d0}, [%[src]]!\n\t" ++ "vld1.8 {d4}, [%[dst]]!\n\t" + "vst1.8 {d20}, [%[keep_dst]]\n\t" -+ "mov %[keep_dst], %[dst]\n\t" -+ "add %[src], %[src], #8\n\t" -+ "add %[dst], %[dst], #8\n\t" ++ "sub %[keep_dst], %[dst], #8\n\t" + "subs %[w], %[w], #8\n\t" + "9:\n\t" + "vqadd.u8 d20, d0, d4\n\t" @@ -468,12 +466,10 @@ index 0000000..f8a41a8 + "b 9f\n\t" +// LOOP + "2:\n\t" -+ "vld4.8 {d0-d3}, [%[src]]\n\t" -+ "vld4.8 {d4-d7}, [%[dst]]\n\t" ++ "vld4.8 {d0-d3}, [%[src]]!\n\t" ++ "vld4.8 {d4-d7}, [%[dst]]!\n\t" + "vst4.8 {d20-d23}, [%[keep_dst]]\n\t" -+ "mov %[keep_dst], %[dst]\n\t" -+ "add %[src], %[src], #8*4\n\t" -+ "add %[dst], %[dst], #8*4\n\t" ++ "sub %[keep_dst], %[dst], #8*4\n\t" + "subs %[w], %[w], #8\n\t" + "9:\n\t" + "vmvn.8 d31, d3\n\t" @@ -746,12 +742,10 @@ index 0000000..f8a41a8 + "b 9f\n\t" +// LOOP + "2:\n\t" -+ "vld4.8 {d0-d3}, [%[src]]\n\t" -+ "vld4.8 {d4-d7}, [%[dst]]\n\t" ++ "vld4.8 {d0-d3}, [%[src]]!\n\t" ++ "vld4.8 {d4-d7}, [%[dst]]!\n\t" + "vst4.8 {d20-d23}, [%[keep_dst]]\n\t" -+ "mov %[keep_dst], %[dst]\n\t" -+ "add %[src], %[src], #8*4\n\t" -+ "add %[dst], %[dst], #8*4\n\t" ++ "sub %[keep_dst], %[dst], #8*4\n\t" + "subs %[w], %[w], #8\n\t" + + "9:\n\t" @@ -957,12 +951,10 @@ index 0000000..f8a41a8 +// LOOP + "2:\n\t" + -+ "vld1.16 {q12}, [%[dst]]\n\t" -+ "vld1.8 {d31}, [%[mask]]\n\t" ++ "vld1.16 {q12}, [%[dst]]!\n\t" ++ "vld1.8 {d31}, [%[mask]]!\n\t" + "vst1.16 {q10}, [%[keep_dst]]\n\t" -+ "mov %[keep_dst], %[dst]\n\t" -+ "add %[mask], %[mask], #8\n\t" -+ "add %[dst], %[dst], #8*2\n\t" ++ "sub %[keep_dst], %[dst], #8*2\n\t" + "subs %[w], %[w], #8\n\t" + "9:\n\t" +// expand 0565 q12 to 8888 {d4-d7} @@ -1294,12 +1286,10 @@ index 0000000..f8a41a8 + "b 9f\n\t" +// LOOP + "2:\n\t" -+ "vld4.8 {d4-d7}, [%[dst]]\n\t" -+ "vld1.8 {d31}, [%[mask]]\n\t" ++ "vld4.8 {d4-d7}, [%[dst]]!\n\t" ++ "vld1.8 {d31}, [%[mask]]!\n\t" + "vst4.8 {d20-d23}, [%[keep_dst]]\n\t" -+ "mov %[keep_dst], %[dst]\n\t" -+ "add %[mask], %[mask], #8\n\t" -+ "add %[dst], %[dst], #8*4\n\t" ++ "sub %[keep_dst], %[dst], #8*4\n\t" + "subs %[w], %[w], #8\n\t" + "9:\n\t" + @@ -1371,7 +1361,7 @@ index 0000000..f8a41a8 + dval = vld1_u8((void*)dst); + + temp = neon2mul(sval2,alpha); -+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector))); ++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector))); + + vst1_u8((void*)dst,res); + @@ -1387,7 +1377,7 @@ index 0000000..f8a41a8 + dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst)); + + temp = neon2mul(sval2,alpha); -+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector))); ++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector))); + + vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0); + } @@ -1513,12 +1503,12 @@ index 0000000..f8a41a8 + diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h new file mode 100644 -index 0000000..a473841 +index 0000000..bab4dee --- /dev/null +++ b/pixman/pixman-arm-neon.h @@ -0,0 +1,137 @@ +/* -+ * Copyright © 2008 Mozilla Corporation ++ * Copyright © 2009 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -1539,7 +1529,7 @@ index 0000000..a473841 + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * -+ * Author: Jeff Muizelaar (jeff@infidigm.net) ++ * Author: Ian Rickards (ian.rickards@arm.com) + * + */ + diff --git a/packages/xorg-lib/pixman_0.13.2.bb b/packages/xorg-lib/pixman_0.13.2.bb index 5b304de104..4b489f89a6 100644 --- a/packages/xorg-lib/pixman_0.13.2.bb +++ b/packages/xorg-lib/pixman_0.13.2.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" |