diff options
22 files changed, 145 insertions, 141 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 91ca9865fd..23a8f656b2 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -97,6 +97,9 @@ def check_sanity(e): if not check_app_exists('svn', e.data): raise_sanity_error('Please install the svn utility') + if not check_app_exists('bzip2', e.data): + raise_sanity_error('Please install the bzip2 utility') + oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True ) if not oes_bb_conf: raise_sanity_error('You do not include OpenEmbeddeds version of conf/bitbake.conf') diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index e668c3ce38..76e68fcc08 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -53,19 +53,13 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" PREFERRED_VERSION_glibc = "2.4" PREFERRED_VERSION_glibc-intermediate = "2.4" - -#<>------------------------------------------------------------------> -#<>Setting Preferred glib, dbus, db-native -#<>------------------------------------------------------------------< -PREFERRED_VERSION_glib-2.0-native = "2.6.5" -PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.12.0" -PREFERRED_VERSION_glib-1.2 = "1.2.10" -PREFERRED_VERSION_pango = "1.12.0" -PREFERRED_VERSION_dbus = "0.61" -PREFERRED_VERSION_dbus-native = "0.61" -PREFERRED_PROVIDER_dbus-glib = "dbus" -PREFERRED_PROVIDER_virtual/db-native = "db-native" +#<>-----------------------------------------------------------------> +#<>Patch for bitbake bug: +#<>Due to bitbake not grabbing glibc 2.4 properly +#<>we need to override it to be sure. Do it for both supported archs +#<>-----------------------------------------------------------------< +PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #<>------------------------------------------------------------------> @@ -110,17 +104,6 @@ require conf/distro/include/preferred-opie-versions.inc #<>------------------------------------------------------------------> -#<> Lets decide on a GPE versipns -#<> And lets override GTK to something that builds -#<>------------------------------------------------------------------< -require conf/distro/include/preferred-gpe-versions-2.7.inc -PREFERRED_VERSION_gtk+ = "2.8.16" -PREFERRED_VERSION_pango = "1.12.0" -PREFERRED_VERSION_cairo = "1.2.2" -PREFERRED_VERSION_gtk-engines = "2.7.4" - - -#<>------------------------------------------------------------------> #<> We want pcmciautils, not pcmcia-cs #<>------------------------------------------------------------------< PCMCIA_MANAGER = "pcmciautils" diff --git a/packages/abiword/abiword-embedded_2.4.5.bb b/packages/abiword/abiword-embedded_2.4.5.bb new file mode 100644 index 0000000000..9381bbd8a7 --- /dev/null +++ b/packages/abiword/abiword-embedded_2.4.5.bb @@ -0,0 +1,12 @@ +require abiword.inc + +EXTRA_OECONF += "--enable-embedded" + +RCONFLICTS = "abiword" +RPROVIDES += "abiword" + +do_compile_prepend() { + cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ + cp ${S}/src/wp/ap/unix/hildon/ap_EmbeddedFeatures.h ${S}/src/wp/ap/unix/ +} + diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb deleted file mode 100644 index 3573e87089..0000000000 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>" -LICENSE="GPLv2" - -DEPENDS = "abiword libwpd librsvg goffice poppler" -PR="r2" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ - file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" -S = "${WORKDIR}/abiword-${PV}/abiword-plugins" - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--without-libwmf" - -PACKAGES_DYNAMIC = "abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d) - - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') -} - diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword.inc index 1df0303634..1df0303634 100644 --- a/packages/abiword/abiword_2.4.4.bb +++ b/packages/abiword/abiword.inc diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb index 1df0303634..b97556b735 100644 --- a/packages/abiword/abiword_2.4.5.bb +++ b/packages/abiword/abiword_2.4.5.bb @@ -1,43 +1,4 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi <koen@linuxtogo.org>" -LICENSE="GPLv2" - -DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" -RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" -S = "${WORKDIR}/abiword-${PV}/abi" - -FILES_${PN} += " ${datadir}/icons/* \ -${datadir}/AbiSuite-2.4/AbiWord/glade \ -${datadir}/AbiSuite-2.4/AbiWord/scripts \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \ -#${datadir}/AbiSuite-2.4/templates/A4.awt \ -#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \ -${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \ -${datadir}/AbiSuite-2.4/templates/Business-Report.awt \ -${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \ -${datadir}/AbiSuite-2.4/templates/Resume.awt \ -${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \ -${datadir}/AbiSuite-2.4/templates/Memo.awt \ -${datadir}/AbiSuite-2.4/templates/Press-Release.awt " - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--disable-pspell --enable-enchant" - -do_install_append() { - install -d ${D}${datadir}/pixmaps/ - mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ -} +require abiword.inc +RCONFLICTS = "abiword-embedded" diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index 662f685fb9..9f8425c03f 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -6,8 +6,7 @@ DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ - file://cairo-fixed.patch;patch=1" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/cairo/files/cairo-fixed.patch b/packages/cairo/files/cairo-fixed.patch deleted file mode 100644 index 8df54d9cb5..0000000000 --- a/packages/cairo/files/cairo-fixed.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c ---- cairo-1.2.4/src/cairo-fixed.c 2006-06-10 07:07:37.000000000 +0300 -+++ cairo-1.2.4-new/src/cairo-fixed.c 2006-08-25 13:06:26.000000000 +0300 -@@ -43,12 +43,6 @@ - } - - cairo_fixed_t --_cairo_fixed_from_double (double d) --{ -- return (cairo_fixed_t) floor (d * 65536 + 0.5); --} -- --cairo_fixed_t - _cairo_fixed_from_26_6 (uint32_t i) - { - return i << 10; -diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h ---- cairo-1.2.4/src/cairoint.h 2006-08-18 17:20:16.000000000 +0300 -+++ cairo-1.2.4-new/src/cairoint.h 2006-08-25 13:14:07.000000000 +0300 -@@ -1117,8 +1117,21 @@ - - #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1) - --cairo_private cairo_fixed_t --_cairo_fixed_from_double (double d); -+#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */ -+ -+#ifdef WORDS_BIGENDIAN -+#define iman 1 -+#else -+#define iman 0 -+#endif -+ -+static inline cairo_fixed_t -+_cairo_fixed_from_double (double d) -+{ -+ d = d + CAIRO_DOUBLE2FIX_MAGIC; -+ -+ return ((cairo_fixed_t *) &d)[iman]; -+} - - cairo_private cairo_fixed_t - _cairo_fixed_from_26_6 (uint32_t i); diff --git a/packages/icecast/.mtn2git_empty b/packages/gnome/libbonobo/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/icecast/.mtn2git_empty +++ b/packages/gnome/libbonobo/.mtn2git_empty diff --git a/packages/gnome/libbonobo/configure-gthread.patch b/packages/gnome/libbonobo/configure-gthread.patch new file mode 100644 index 0000000000..005fa6760a --- /dev/null +++ b/packages/gnome/libbonobo/configure-gthread.patch @@ -0,0 +1,11 @@ +--- libbonobo-2.14.0/configure.in.orig 2006-09-04 09:21:54.000000000 +0100 ++++ libbonobo-2.14.0/configure.in 2006-09-04 09:22:58.000000000 +0100 +@@ -166,7 +166,7 @@ + AC_MSG_RESULT(no) + AC_MSG_ERROR( + [No working gthread-2.0 support found, using --disable-threads IS DISCOURAGED]) +- ] ++ ],[AC_MSG_RESULT(yes)] + ) + CFLAGS=$libbonobo_save_CFLAGS + LIBS=$libbonobo_save_LIBS diff --git a/packages/gnome/libbonobo_2.14.0.bb b/packages/gnome/libbonobo_2.14.0.bb new file mode 100644 index 0000000000..d3cdc3a1c8 --- /dev/null +++ b/packages/gnome/libbonobo_2.14.0.bb @@ -0,0 +1,60 @@ +LICENSE = "GPL" +PR = "r0" +SECTION = "x11/gnome/libs" +DESCRIPTION = "Bonobo CORBA interfaces library" + +inherit gnome + +SRC_URI += "file://configure-gthread.patch;patch=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "glib-2.0 orbit2 intltool-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \ + ${libdir}/bonobo-2.0/samples" + +PARALLEL_MAKE = "" + +do_configure_prepend() { + install -d m4 + install ${WORKDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ + bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ + bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ + bonobo-activation-server-info.h bonobo-activation-version.h" + +BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ + bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ + bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ + bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ + bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ + bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ + bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ + bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ + bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ + bonobo-app-client.h bonobo-application.h" + +do_compile() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" +} + +do_stage() { + install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation + for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done + install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo + for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done + install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ + install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} + oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} diff --git a/packages/libsndfile/libsndfile1_1.0.16.bb b/packages/libsndfile/libsndfile1_1.0.16.bb index e103b6636f..fb3ed30f38 100644 --- a/packages/libsndfile/libsndfile1_1.0.16.bb +++ b/packages/libsndfile/libsndfile1_1.0.16.bb @@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "libs/multimedia" LICENSE = "LGPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz" S = "${WORKDIR}/libsndfile-${PV}" @@ -17,5 +17,4 @@ do_stage() { } #FIXME package the rest -PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libsndfile.so*" diff --git a/packages/litestream/.mtn2git_empty b/packages/litestream/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/litestream/.mtn2git_empty diff --git a/packages/litestream/litestream_1.3RC3.bb b/packages/litestream/litestream_1.3RC3.bb new file mode 100644 index 0000000000..6c83266764 --- /dev/null +++ b/packages/litestream/litestream_1.3RC3.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +DESCRIPTION = "ShoutCast-compatible streamer" +PR = "r0" + +SRC_URI = "http://www.litestream.org/litestream/${PN}-${PV}.tar.gz" + +inherit autotools + +do_install () { + mkdir -p ${D}${bindir} + install -m 755 litestream ${D}${bindir} + install -m 755 literestream ${D}${bindir} + install -m 755 source ${D}${bindir} + install -m 755 client ${D}${bindir} + install -m 755 server ${D}${bindir} +}
\ No newline at end of file diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 241f999999..3b1ffb306c 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -99,6 +99,7 @@ SLUGOS_PACKAGES = "\ libvorbis \ libxml2 \ lirc \ + litestream \ lrzsz \ lsof \ lvm2 \ diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index e9c02ba3dd..80a88d384e 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://www.gnome.org" MAINTAINER = "Milan Plzik <mmp@handhelds.org>" PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" -RDEPENDS = "wpa-supplicant dhcdbd gnome-keyring hicolor-icon-theme" +RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r1" +PR = "r2" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ diff --git a/packages/nonworking/icecast/.mtn2git_empty b/packages/nonworking/icecast/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/icecast/.mtn2git_empty diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb index 7322af3087..7322af3087 100644 --- a/packages/icecast/icecast_2.2.0.bb +++ b/packages/nonworking/icecast/icecast_2.2.0.bb diff --git a/packages/rocksndiamonds/.mtn2git_empty b/packages/rocksndiamonds/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rocksndiamonds/.mtn2git_empty diff --git a/packages/rocksndiamonds/files/.mtn2git_empty b/packages/rocksndiamonds/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rocksndiamonds/files/.mtn2git_empty diff --git a/packages/rocksndiamonds/files/rocksndiamonds.png b/packages/rocksndiamonds/files/rocksndiamonds.png Binary files differnew file mode 100644 index 0000000000..a93d6d4e73 --- /dev/null +++ b/packages/rocksndiamonds/files/rocksndiamonds.png diff --git a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb new file mode 100644 index 0000000000..ab5a5c8932 --- /dev/null +++ b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Rocks'n'Diamonds - Boulderdash/Emerald Mine/Supaplex/Sokoban clone." +SECTION = "games" +LICENSE = "GPL" +HOMEPAGE = "http://www.artsoft.org/rocksndiamonds/" +AUTHOR = "Holger Schemel <info@artsoft.org>" +MAINTAINER = "Paul Sokolovsky <pmiscml@gmail.com>" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-${PV}.tar.gz \ + file://rocksndiamonds.png" + +DEPENDS += "libsdl-net smpeg" + +APPIMAGE = "../rocksndiamonds.png" +EXTRA_OEMAKE = "CC='${CC}' RO_GAME_DIR='${datadir}/${PN}' RW_GAME_DIR='${datadir}/${PN}'" + +inherit sdl + +do_install() { + install -d ${D}${bindir} + install -m 755 ${PN} ${D}${bindir} + install -d ${D}${datadir}/${PN} + cp -r graphics levels music scores sounds ${D}${datadir}/${PN}/ +} + + +FILES_${PN} += "${bindir}/${PN} ${datadir}/${PN}" |
