diff options
Diffstat (limited to 'packages')
77 files changed, 965 insertions, 585 deletions
diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index 8bd0fe07e7..e5a6dcc2a3 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -5,8 +5,7 @@ PR = "r4" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ - task-base \ +RDEPENDS = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ " diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb index da40f7e00c..4c9bb83507 100644 --- a/packages/angstrom/angstrom-e-image.bb +++ b/packages/angstrom/angstrom-e-image.bb @@ -1,6 +1,6 @@ #Angstrom e image LICENSE = "MIT" -PR = "r0" +PR = "r1" PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" @@ -21,7 +21,6 @@ export IMAGE_BASENAME = "e-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-e-base-depends \ angstrom-e-depends \ diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb index 80673f61ec..624274de37 100644 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ b/packages/angstrom/angstrom-mokogateway-image.bb @@ -1,32 +1,17 @@ #Angstrom moko gateway image # tries to be a companion for openmoko based phones LICENSE = "MIT" -PR = "r0" +PR = "r2" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ - task-base \ +RDEPENDS = " \ + task-boot \ + task-base-bluetooth \ bluez-utils \ - blue-probe \ + blueprobe \ " -RRECOMMENDS = " \ - kernel-module-bluetooth \ - kernel-module-l2cap \ - kernel-module-rfcomm \ - kernel-module-hci-vhci \ - kernel-module-bnep \ - kernel-module-hidp \ - kernel-module-hci-uart \ - kernel-module-sco \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)} \ - " - export IMAGE_BASENAME = "mokogateway-image" export IMAGE_LINGUAS = "" export PACKAGE_INSTALL = "${RDEPENDS}" diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index dbb986ae65..c5d2675b60 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,6 @@ #Angstrom X11 image LICENSE = "MIT" -PR = "r5" +PR = "r6" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +16,6 @@ export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb index 228c637158..eb9f025743 100644 --- a/packages/angstrom/task-angstrom-e.bb +++ b/packages/angstrom/task-angstrom-e.bb @@ -24,4 +24,4 @@ RDEPENDS_angstrom-e-depends := "\ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ - gdk-pixbuf-loader-xpm"
\ No newline at end of file + gdk-pixbuf-loader-xpm" diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index f427f15ab8..a5f9be1938 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -109,12 +109,13 @@ RDEPENDS_angstrom-task-office := "\ gnumeric \ abiword \ imposter \ -# evince \ + evince \ gqview" RDEPENDS_angstrom-task-printing := "\ cups \ - gnome-cups-manager" +# gnome-cups-manager \ + " RDEPENDS_angstrom-task-sectest := "\ nmap \ diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb new file mode 100644 index 0000000000..3b20d33a7c --- /dev/null +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb @@ -0,0 +1,77 @@ +DESCRIPTION = "ARM Kernel Shim" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +# PR = "r0" + +COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" + +SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ + file://passthrough-atags.patch;patch=1 \ + file://cmdline_if_none.patch;patch=1 \ + file://config-nslu2.h \ + file://config-nas100d.h \ + file://config-dsmg600.h \ + file://config-fsg3.h" + +S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3 + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + mv ${S}/config.h ${S}/config.h.orig + # NSLU2 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" + # NAS100d + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" + # DSMG-600 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" + # FSG-3 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" + mv ${S}/config.h.orig ${S}/config.h +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/ +} diff --git a/packages/gdado/.mtn2git_empty b/packages/gdado/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gdado/.mtn2git_empty diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb new file mode 100644 index 0000000000..feaa6ed991 --- /dev/null +++ b/packages/gdado/gdado_2.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "gtk+ based dice roller for RPG games" +HOMEPAGE = "http://gdado.sf.net" +SECTION = "x11/games" +LICENSE = "GPLv2" +DEPENDS = "libgnomeui gtk+" +PR = "r1" +SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz" + +inherit autotools + +do_install_prepend() { + sed -i -e "s|Icon=gdado.png|Icon=${datadir}/pixmaps/gdado/gdado.png|" \ + gdado.desktop +} + diff --git a/packages/gloox b/packages/gloox deleted file mode 100644 index 09004a8182..0000000000 --- a/packages/gloox +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "full-featured Jabber/XMPP client library." -SECTION = "networking" -PRIORITY = "optional" -PR = "r0" - -DEPENDS = "iksemel libidn gnutls" - -inherit autotools pkgconfig - -SRC_URI = "http://camaya.net/download/${P}.tar.bz2" - -do_stage () { - autotools_stage_all -} diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 87daa1d227..0bb9765749 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -6,13 +6,10 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.10.0+svn${SRCDATE}" +PV = "2.16.0+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ - file://gconf-dbus-update.patch;patch=1;pnum=0 \ - file://xml-backend-locks-compile-fix.patch;patch=1 \ - file://xml-backend-oldxml-Makefile.patch \ file://69gconfd-dbus" inherit pkgconfig autotools @@ -20,23 +17,22 @@ S = "${WORKDIR}/trunk" PARALLEL_MAKE = "" -FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" -FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug" +FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \ + ${libdir}/GConf-dbus/2/*.so \ + ${libdir}/dbus-1.0 \ + ${sysconfdir} \ + ${datadir}/dbus*" +FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \ + ${libdir}/GConf-dbus/2/.debug "" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" -HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" - -do_compile_prepend() { - cd ${S} - patch -p1 < ../xml-backend-oldxml-Makefile.patch +do_configure_prepend() { + touch ${S}/gtk-doc.make } do_stage() { - oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gconf/2/gconf/ - ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) - install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 + autotools_stage_all } do_install_append () { @@ -45,3 +41,4 @@ do_install_append () { install -d ${D}/${datadir}/dbus-1.0/services/ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } + diff --git a/packages/gnome/gnome-desktop/.mtn2git_empty b/packages/gnome/gnome-desktop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/gnome-desktop/.mtn2git_empty diff --git a/packages/gnome/gnome-desktop/scrollkeeper.patch b/packages/gnome/gnome-desktop/scrollkeeper.patch new file mode 100644 index 0000000000..c1b7f3b44a --- /dev/null +++ b/packages/gnome/gnome-desktop/scrollkeeper.patch @@ -0,0 +1,17 @@ +Index: gnome-desktop-2.16.1/configure.in +=================================================================== +--- gnome-desktop-2.16.1.orig/configure.in 2006-10-02 19:00:52.000000000 +0000 ++++ gnome-desktop-2.16.1/configure.in 2007-04-12 21:12:36.000000000 +0000 +@@ -113,9 +113,9 @@ + dnl scrollkeeper checks + + AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +-if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) +-fi ++dnl if test x$SCROLLKEEPER_CONFIG = xno; then ++dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) ++dnl fi + + dnl Language Support + diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 647e751c57..1e3e814d17 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -6,6 +6,9 @@ inherit gnome pkgconfig DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +SRC_URI += "file://scrollkeeper.patch;patch=1" + +EXTRA_OECONF = "--disable-scrollkeeper" EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" do_configure_prepend () { diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 18d6d3012a..f190a5ae13 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -5,6 +5,8 @@ PR = "r1" inherit gnome +EXTRA_OECONF = "--disable-scrollkeeper" + FILES_${PN} += "${datadir}/xml*" do_stage() { diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb index b776b72385..349330047b 100644 --- a/packages/gpephone/gpe-applauncher_0.7.bb +++ b/packages/gpephone/gpe-applauncher_0.7.bb @@ -2,15 +2,14 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r2" +PR = "r1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client" GPE_TARBALL_SUFFIX= "gz" inherit gpephone autotools -SRC_URI += " file://default-icon.patch;patch=1;pnum=0 \ - file://fixfree.patch;patch=1" +SRC_URI += " file://default-icon.patch;patch=1;pnum=0" #EXTRA_OECONF = "--enable-gridlayout" diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index bef090e22a..ee59000133 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -41,7 +41,4 @@ do_install_append() { do_stage() { export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" autotools_stage_all - cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR} |