diff options
32 files changed, 434 insertions, 20 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f6888e760f..e8783abb4d 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -51,6 +51,7 @@ SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" # Misc packages, sorted by alphabet +SRCDATE_aufs ?= "20080826" SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_python-pydirectfb = "20071210" diff --git a/packages/aufs/.mtn2git_empty b/packages/aufs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/aufs/.mtn2git_empty diff --git a/packages/aufs/aufs/.mtn2git_empty b/packages/aufs/aufs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/aufs/aufs/.mtn2git_empty diff --git a/packages/aufs/aufs/aufs_create_no_manpage.patch b/packages/aufs/aufs/aufs_create_no_manpage.patch new file mode 100644 index 0000000000..ec7c0c1138 --- /dev/null +++ b/packages/aufs/aufs/aufs_create_no_manpage.patch @@ -0,0 +1,34 @@ +OE-only: +comment: Not building the manpage is just a hack. + +diff -Nur aufs.vanilla/util/Makefile aufs/util/Makefile +--- aufs.vanilla/util/Makefile 2008-08-23 13:00:37.000000000 +0200 ++++ aufs/util/Makefile 2008-08-23 15:40:26.000000000 +0200 +@@ -1,25 +1,10 @@ + + # $Id: Makefile,v 1.10 2008/05/26 04:02:40 sfjro Exp $ + +-all: aufs.5 aulchown ++all: aulchown + test -x ./mount.aufs || chmod a+x ./mount.aufs + +-aufs.5: aufs.in.5 ./c2tmac +- ${RM} $@ +- ./c2tmac > $@ +- awk '{ \ +- gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \ +- gsub(/\\\[oq\]\140/, "\\[oq]"); \ +- gsub(/\047\\\[cq\]/, "\\[cq]"); \ +- gsub(/\047/, "\\[aq]"); \ +- print; \ +- }' aufs.in.5 >> $@ +- chmod a-w $@ +- + CFLAGS += -O2 -Wall ${EXTRA_CFLAGS} ${ccflags-y} + +-.INTERMEDIATE: c2tmac.o c2tmac +-c2tmac.o: c2tmac.c ../include/linux/aufs_type.h +- + clean: +- ${RM} c2tmac aulchown aufs.5 *~ .*~ ++ ${RM} aulchown *~ .*~ diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb new file mode 100644 index 0000000000..e83071fa0b --- /dev/null +++ b/packages/aufs/aufs_cvs.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single directory." +HOMEPAGE = "http://aufs.sourceforge.net/" +LICENSE = "GPL" +RDEPENDS = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel sed-native" +PV = "cvs${SRCDATE}" +PR = "r0" +S = "${WORKDIR}/aufs" +inherit module + +# We do not create the manpage for aufs because we do not install it anyway. +# If you want to have the manpage created you will need to add host cc to +# the makefile else it will fail to crosscompile. +# See http://svn.exactcode.de/t2/trunk/package/filesystem/aufs/compile.patch.cross +# as an example how this could be done. + +SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE} \ + file://aufs_create_no_manpage.patch;patch=1 " + +EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" + +# We need to check the architecture and the kernel version to +# configure properly lokal.mk. We ignore the export CONFIG_AUFS_STAT option. +# If you want to have CONFIG_AUFS_STAT enabled you have to add some other ARCH checks. +# Debian does not enable CONFIG_AUFS_STAT for arm. +# We disable CONFIG_AUFS_SYSAUFS for arm because arm does not know about cmpxchg. +# If you want this feature enabled you have to define it. +# I suggest you to read http://osdir.com/ml/linux.kernel.tracing/2006-12/msg00020.html + +do_configure() { +echo ${S} > /home/nice/sdir + K_VERSION=$(echo ${KERNEL_VERSION} | awk 'BEGIN{FS="."}{print $3}') + cd ${S} + if [ $K_VERSION -ge 24 ] ; then + sed -i 's/CONFIG_AUFS_FAKE_DM\ =\ y/CONFIG_AUFS_FAKE_DM\ =/g' local.mk + fi + if [ $K_VERSION -eq 25 ] || [ $ARCH = "arm" ] ; then + sed -i 's/CONFIG_AUFS_SYSAUFS\ =\ y/CONFIG_AUFS_SYSAUFS\ =/g' local.mk + fi +} + +do_compile(){ + LDFLAGS="" + oe_runmake +} + +do_install() { + install -m 500 -p mount.aufs umount.aufs auplink aulchown ${D}/${sbindir} + mkdir -p ${D}/etc/default + echo FLUSH=ALL > ${D}/etc/default/auplink + mkdir -p ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/ + cp aufs.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/ +} + +pkg_postinst() { +if test "x$D" != "x"; then + exit 1 +else + depmod -ae +fi +} + diff --git a/packages/gnome/gnome-panel_2.22.2.bb b/packages/gnome/gnome-panel_2.22.2.bb new file mode 100644 index 0000000000..b5f207a632 --- /dev/null +++ b/packages/gnome/gnome-panel_2.22.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +DEPENDS = "libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" + +inherit gnome pkgconfig + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +FILES_${PN} =+ "${datadir}/gnome* \ + ${datadir}/icons" + +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgweather_2.22.3.bb b/packages/gnome/libgweather_2.22.3.bb new file mode 100644 index 0000000000..83fe45eb41 --- /dev/null +++ b/packages/gnome/libgweather_2.22.3.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +DEPENDS = "libgnome" + +inherit gnome + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +FILES_${PN} =+ "${datadir}/gnome* \ + ${datadir}/icons" + +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb index 6bc1a42f9e..996edb25a0 100644 --- a/packages/gphoto2/gphoto2_2.4.0.bb +++ b/packages/gphoto2/gphoto2_2.4.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" +DEPENDS = "libtool libgphoto2 popt" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb new file mode 100644 index 0000000000..996edb25a0 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.4.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libtool libgphoto2 popt" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb index fed7c41e40..fed7c41e40 100644 --- a/packages/libgphoto2/libgphoto2_2.1.4.bb +++ b/packages/gphoto2/libgphoto2_2.1.4.bb diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb index 67efc38785..67efc38785 100644 --- a/packages/libgphoto2/libgphoto2_2.1.5.bb +++ b/packages/gphoto2/libgphoto2_2.1.5.bb diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb index ad57ba8cf1..ad57ba8cf1 100644 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ b/packages/gphoto2/libgphoto2_2.1.6.bb diff --git a/packages/gphoto2/libgphoto2_2.4.2.bb b/packages/gphoto2/libgphoto2_2.4.2.bb new file mode 100644 index 0000000000..991f3ec759 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.4.2.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "libtool jpeg libusb libexif" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +inherit autotools pkgconfig lib_package + +OE_LT_RPATH_ALLOW=":${libdir}:" +OE_LT_RPATH_ALLOW[export]="1" + +EXTRA_OECONF = " --with-drivers=all ac_cv_lib_ltdl_lt_dlcaller_register=yes" + +PACKAGES =+ "libgphotoport libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" +RDEPENDS_${PN} = "libgphoto2-camlibs" + +FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" + +FILES_${PN} += "${libdir}/udev/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/konqueror/konqueror-embedded_20070316.bb b/packages/konqueror/konqueror-embedded_20070316.bb index 5a127515bb..83b5ab40a3 100644 --- a/packages/konqueror/konqueror-embedded_20070316.bb +++ b/packages/konqueror/konqueror-embedded_20070316.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" LICENSE = "LGPL GPL" -PR = "r5" +PR = "r6" # this Konqueror needs the KDEDIR set and the font helvetica installed on the target @@ -22,7 +22,7 @@ export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" #export exec_prefix = "${palmtopdir}" #export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" -export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS" +export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" # uncomment this for a static build # EXTRAFLAGS = "-lts" @@ -47,7 +47,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --disable-static \ --enable-shared \ --disable-debug \ - --with-gui=qpe \ + --with-gui=road \ --with-ipv6-lookup=no \ --without-xinerama \ # --disable-scrollbars \ @@ -63,7 +63,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --disable-selection \ --enable-final \ --enable-qt-embedded \ -# --enable-rtti-embedded \ + --enable-rtti-embedded \ --enable-mt \ --enable-qpe \ --enable-qt-mt \ diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 2218734fea..ebb49c0658 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -11,11 +11,12 @@ S = "${WORKDIR}/library" inherit palmtop +OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" QMAKE_PROFILES = "library.pro" EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" +CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" do_compile() { mkdir -p ${STAGING_INCDIR}/qpe \ diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb index a51d6a9225..0822385b9d 100644 --- a/packages/libqpe/libqpe-opie_1.2.3.bb +++ b/packages/libqpe/libqpe-opie_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r2" +PR = "r3" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index bbeac82431..7c69904cd2 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb index fabe788ba6..4f533b03e8 100644 --- a/packages/mythtv/mythtv_0.21.bb +++ b/packages/mythtv/mythtv_0.21.bb @@ -73,7 +73,8 @@ do_configure_prepend() { --cpu=${MYTHTV_ARCH} \ --arch=${MYTHTV_ARCH} \ --disable-altivec \ - --disable-opengl-video \ + --disable-directfb \ + --disable-opengl-video \ --disable-strip \ --enable-v4l \ --enable-audio-oss \ @@ -81,7 +82,7 @@ do_configure_prepend() { --enable-dvb \ --enable-libmp3lame \ --cross-compile \ - --dvb-path=${STAGING_INCDIR} \ + --dvb-path=${STAGING_INCDIR} \ --with-bindings= \ ${EXTRA_OECONF} diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb index c1c84d9dc1..692c92fa1d 100644 --- a/packages/openssh/openssh_4.6p1.bb +++ b/packages/openssh/openssh_4.6p1.bb @@ -14,7 +14,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sftp-server-nolibcrypto.patch;patch=1 \ @@ -57,17 +57,18 @@ do_install_append() { rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var } -PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" +PACKAGES =+ " ssh-keygen openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug" FILES_openssh-scp = "${bindir}/scp.${PN}" FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" -FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" +FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config" FILES_openssh-sftp = "${bindir}/sftp" FILES_openssh-sftp-server = "${libdir}exec/sftp-server" FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" +FILES_ssh-keygen = "${bindir}/ssh-keygen" -RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd" +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd ssh-keygen " DEPENDS_openssh-sshd += " update-rc.d" RDEPENDS_openssh-sshd += " update-rc.d" diff --git a/packages/python/python-numpy/arm/.mtn2git_empty b/packages/python/python-numpy/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-numpy/arm/.mtn2git_empty diff --git a/packages/python/python-numpy/arm/config.h b/packages/python/python-numpy/arm/config.h new file mode 100644 index 0000000000..17ef186d56 --- /dev/null +++ b/packages/python/python-numpy/arm/config.h @@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT + diff --git a/packages/python/python-numpy/arm/numpyconfig.h b/packages/python/python-numpy/arm/numpyconfig.h new file mode 100644 index 0000000000..c4bf6547f0 --- /dev/null +++ b/packages/python/python-numpy/arm/numpyconfig.h @@ -0,0 +1,17 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* + * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT + * */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ + diff --git a/packages/python/python-numpy/trycompile.diff b/packages/python/python-numpy/trycompile.diff new file mode 100644 index 0000000000..3ab3d72f2c --- /dev/null +++ b/packages/python/python-numpy/trycompile.diff @@ -0,0 +1,33 @@ +--- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200 ++++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200 +@@ -80,8 +80,7 @@ + raise SystemError,\ + "Non-existing %s. Perhaps you need to install"\ + " python-dev|python-devel." % (python_h) +- result = config_cmd.try_run(tc,include_dirs=[python_include], +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(tc) + if not result: + raise SystemError,"Failed to test configuration. "\ + "See previous error messages for more information." +@@ -95,7 +94,7 @@ + if mathlib: + mathlibs_choices.insert(0,mathlib.split(',')) + for libs in mathlibs_choices: +- if config_cmd.try_run(tc,libraries=libs): ++ if config_cmd.try_compile(tc): + mathlibs = libs + break + else: +@@ -180,10 +179,7 @@ + " python-dev|python-devel." % (python_h) + + config.numpy_include_dirs +- result = config_cmd.try_run(testcode, +- include_dirs = [python_include] + \ +- config.numpy_include_dirs, +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(testcode) + + if not result: + raise SystemError,"Failed to generate numpy configuration. "\ diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index e23c89e3cf..157dadadaf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -6,13 +6,22 @@ PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ file://unbreak-assumptions.diff;patch=1 \ - " + file://trycompile.diff;patch=1 \ + file://config.h \ + file://numpyconfig.h \ + " S = "${WORKDIR}/numpy-${PV}" inherit distutils -do_stage() { - cp -pPR Include/Num* ${STAGING_INCDIR} +# Make the build fail and replace *config.h with proper one +# This is a ugly, ugly hack - Koen +do_compile_prepend() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true + cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } + diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb new file mode 100644 index 0000000000..d257905896 --- /dev/null +++ b/packages/python/python-xappy_0.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine" +LICENSE = "GPLv2" + +DEPENDS += "xapian-core" + +SRC_URI = "http://xappy.googlecode.com/files/xappy-${PV}.tar.gz" + +inherit distutils + +S = "${WORKDIR}/xappy-${PV}" + +do_stage() { + distutils_stage_all +} + diff --git a/packages/sugar/etoys/.mtn2git_empty b/packages/sugar/etoys/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sugar/etoys/.mtn2git_empty diff --git a/packages/sugar/etoys/etoys.diff b/packages/sugar/etoys/etoys.diff new file mode 100644 index 0000000000..79b9acf51d --- /dev/null +++ b/packages/sugar/etoys/etoys.diff @@ -0,0 +1,65 @@ +--- /tmp/Makefile.in 2008-09-01 13:20:20.000000000 +0200 ++++ etoys-3.0.2076/Makefile.in 2008-09-01 13:29:37.453198000 +0200 +@@ -79,23 +79,23 @@ + dirs = $(bindir) $(etoysdir) $(mimedir) $(exmpldir) $(guidedir) $(docsdir) + + install-etoys: Content +- for d in $(dirs) ; do mkdir -p $$d ; done +- install -v etoys $(bindir) +- for f in $(etoys) ; do install -v -m 644 $$f $(etoysdir); done +- for f in $(examples); do install -v -m 644 $$f $(exmpldir); done ++ for d in $(dirs) ; do mkdir -p $(DESTDIR)$$d ; done ++ install -v etoys $(DESTDIR)$(bindir) ++ for f in $(etoys) ; do install -v -m 644 $$f $(DESTDIR)$(etoysdir); done ++ for f in $(examples); do install -v -m 644 $$f $(DESTDIR)$(exmpldir); done + for f in $(guides); do \ + dest=$(guidedir)/`basename $$f`; \ + echo -n $$dest; \ +- ( gunzip -c $$f | gzip -v --rsyncable > $$dest ); \ +- chmod 644 $$dest; \ ++ ( gunzip -c $$f | gzip -v --rsyncable > $(DESTDIR)$$dest ); \ ++ chmod 644 $(DESTDIR)$$dest; \ + done +- for f in $(docs) ; do install -v -m 644 $$f $(docsdir); done ++ for f in $(docs) ; do install -v -m 644 $$f $(DESTDIR)$(docsdir); done + for f in $(mos) ; do \ + dir=`dirname $$f|sed 's/^Content.//'` ; \ +- mkdir -p $(etoysdir)/$$dir ; \ +- install -v -m 644 $$f $(etoysdir)/$$dir ; \ ++ mkdir -p $(DESTDIR)$(etoysdir)/$$dir ; \ ++ install -v -m 644 $$f $(DESTDIR)$(etoysdir)/$$dir ; \ + done +- install -v -m 644 etoys.xml $(mimedir) ++ install -v -m 644 etoys.xml $(DESTDIR)$(mimedir) + + + # install activity - only used from sugar-jhbuild +@@ -109,20 +109,20 @@ + ./mkNews > $@ + + install-activity: $(activityall) +- mkdir -p $(activitydir)/activity +- mkdir -p $(activitydir)/bin +- install -v etoys-activity $(activitydir)/bin +- rm -f $(activitydir)/etoys-activity +- install -v -m 644 NEWS $(activitydir) +- install -v -m 644 activity.info $(activitydir)/activity +- install -v -m 644 activity-etoys.svg $(activitydir)/activity ++ mkdir -p $(DESTDIR)$(activitydir)/activity ++ mkdir -p $(DESTDIR)$(activitydir)/bin ++ install -v etoys-activity $(DESTDIR)$(activitydir)/bin ++ rm -f $(DESTDIR)$(activitydir)/etoys-activity ++ install -v -m 644 NEWS $(DESTDIR)$(activitydir) ++ install -v -m 644 activity.info $(DESTDIR)$(activitydir)/activity ++ install -v -m 644 activity-etoys.svg $(DESTDIR)$(activitydir)/activity + + + # install both, etoys and activity. + # RPM uses install-etoys only, and runs update-mime as post script + + install: install-etoys install-activity +- update-mime-database $(datadir)/mime ++ update-mime-database $(DESTDIR)$(datadir)/mime + + # build .xo bundle - invoke "make xo" manually + diff --git a/packages/sugar/etoys_3.0.2076.bb b/packages/sugar/etoys_3.0.2076.bb new file mode 100644 index 0000000000..60e52227f8 --- /dev/null +++ b/packages/sugar/etoys_3.0.2076.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Sugar etoys" +LICENSE = "GPLv2" + +DEPENDS = "sugar" +RDEPENDS = "sugar" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/etoys/etoys-${PV}.tar.gz \ + file://etoys.diff;patch=1" + +inherit autotools distutils-base + +do_configure_prepend() { + mkdir -p ${S}/m4 +} + +PACKAGES_ARCH = "all" +FILES_${PN} += "${datadir}/${PN} \ + ${datadir}/mime \ + ${datadir}/xsessions \ + ${datadir}/dbus-1 \ + ${datadir}/sugar/activities \ + ${sysconfdir} " + + diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index 69c3cab21d..0e616e72cc 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r8" +PR = "r10" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS = "librsvg-gtk \ @@ -23,7 +23,11 @@ RDEPENDS = "librsvg-gtk \ python-simplejson \ python-misc \ python-xmlrpc \ - " + python-compiler \ + python-pydoc \ + python-mmap \ + python-doctest \ + ssh-keygen" SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2" diff --git a/packages/sugar/sugar-datastore_0.82.0.bb b/packages/sugar/sugar-datastore_0.82.0.bb new file mode 100644 index 0000000000..918a8d01e8 --- /dev/null +++ b/packages/sugar/sugar-datastore_0.82.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Sugar datastore" +LICENSE = "GPLv2" + +PR = "r0" + +DEPENDS = "sugar-toolkit python-xappy " +RDEPENDS = "sugar-toolkit sugar-base python-xappy" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-datastore/${PN}-${PV}.tar.bz2" + +inherit autotools distutils-base + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + + +FILES_${PN} += "${datadir}/dbus-1" diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 2b5475bcb8..640e1d64ea 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r39" +PR = "r40" inherit task @@ -98,4 +98,7 @@ RDEPENDS_task-openmoko-feed = "\ tichy \ pidgin \ epdfview \ + midori \ + microcom \ + emacs \ " diff --git a/packages/xapian/xapian-core_1.0.7.bb b/packages/xapian/xapian-core_1.0.7.bb new file mode 100644 index 0000000000..289cae4ead --- /dev/null +++ b/packages/xapian/xapian-core_1.0.7.bb @@ -0,0 +1,16 @@ +DESCRPITION = "Open Source Search Engine Library" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib" +PR = "r0" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" + +inherit autotools + +do_stage () { + autotools_stage_all +} + |