diff options
48 files changed, 1584 insertions, 159 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/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7baa18781c..5c4a23764c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -79,7 +79,7 @@ SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e" -SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" +SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/aufs/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/sane/sane-backends-1.0.17/.mtn2git_empty +++ 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/dia/dia_0.96.1.bb b/packages/dia/dia_0.96.1.bb new file mode 100644 index 0000000000..9e2f104831 --- /dev/null +++ b/packages/dia/dia_0.96.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the GPL license." +LICENSE = "GPL" +SECTION = "x11/graphics" +DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2" + +inherit gnome pkgconfig + +#work around some pkgconfig breakages +LDFLAGS += "-lart_lgpl_2 -lxml2 -lgthread-2.0 -lglib-2.0" +CFLAGS += "-I${STAGING_INCDIR}/libart-2.0 " + +FILES_${PN} += "${datadir}/mime-info/" + + 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/sane/sane-backends-1.0.19/.mtn2git_empty b/packages/sane/sane-backends-1.0.19/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/.mtn2git_empty diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.19/Makefile.in.patch index d73a2f0fb5..d73a2f0fb5 100644 --- a/packages/sane/sane-backends-1.0.17/Makefile.in.patch +++ b/packages/sane/sane-backends-1.0.19/Makefile.in.patch diff --git a/packages/sane/sane-backends-1.0.19/byteorder.m4 b/packages/sane/sane-backends-1.0.19/byteorder.m4 new file mode 100644 index 0000000000..693f939b7d --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/byteorder.m4 @@ -0,0 +1,354 @@ +dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE ) +dnl Copyright 2001-2002 by Dan Fandrich <dan@coneharvesters.com> +dnl This file may be copied and used freely without restrictions. No warranty +dnl is expressed or implied. +dnl +dnl Create a header file that guarantees that byte swapping macros of the +dnl ntohl variety as well as the extended types included in OpenBSD and +dnl NetBSD such as le32toh are defined. If possible, the standard ntohl +dnl are overloaded as they are optimized for the given platform, but when +dnl this is not possible (e.g. on a big-endian machine) they are defined +dnl in this file. + +dnl Look for a symbol in a header file +dnl AC_HAVE_SYMBOL ( IDENTIFIER, HEADER-FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND ) +AC_DEFUN([AC_HAVE_SYMBOL], +[ +AC_MSG_CHECKING(for $1 in $2) +AC_EGREP_CPP([symbol is present|\<$1\>],[ +#include <$2> +#ifdef $1 + symbol is present +#endif + ], +[AC_MSG_RESULT(yes) +$3 +], +[AC_MSG_RESULT(no) +$4 +])]) + + +dnl Create a header file that defines extended byte swapping macros +AC_DEFUN([AC_NEED_BYTEORDER_H], +[ +changequote(, )dnl +ac_dir=`echo $1|sed 's%/[^/][^/]*$%%'` +changequote([, ])dnl +if test "$ac_dir" != "$1" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" +fi + +# We're only interested in the target CPU, but it's not always set +effective_target="$target" +if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then + effective_target="$host" +fi +AC_SUBST(effective_target) + +cat > "$1" << EOF +/* This file is generated automatically by configure */ +/* It is valid only for the system type ${effective_target} */ + +#ifndef __BYTEORDER_H +#define __BYTEORDER_H + +EOF + +dnl First, do an endian check +AC_C_BIGENDIAN + +dnl Look for NetBSD-style extended byte swapping macros +AC_HAVE_SYMBOL(le32toh,machine/endian.h, + [HAVE_LE32TOH=1 + cat >> "$1" << EOF +/* extended byte swapping macros are already available */ +#include <machine/endian.h> + +EOF], + +[ + +dnl Look for standard byte swapping macros +AC_HAVE_SYMBOL(ntohl,arpa/inet.h, + [cat >> "$1" << EOF +/* ntohl and relatives live here */ +#include <arpa/inet.h> + +EOF], + + [AC_HAVE_SYMBOL(ntohl,netinet/in.h, + [cat >> "$1" << EOF +/* ntohl and relatives live here */ +#include <netinet/in.h> + +EOF],true)]) +]) + +dnl Look for generic byte swapping macros + +dnl OpenBSD +AC_HAVE_SYMBOL(swap32,machine/endian.h, + [cat >> "$1" << EOF +/* swap32 and swap16 are defined in machine/endian.h */ + +EOF], + + [ +dnl Linux GLIBC + AC_HAVE_SYMBOL(bswap_32,byteswap.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include <byteswap.h> +#define swap16(x) bswap_16(x) +#define swap32(x) bswap_32(x) +#define swap64(x) bswap_64(x) + +EOF], + + [ +dnl NetBSD + AC_HAVE_SYMBOL(bswap32,machine/endian.h, + dnl We're already including machine/endian.h if this test succeeds + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +EOF + if test "$HAVE_LE32TOH" != "1"; then + echo '#include <machine/endian.h>'>> "$1" + fi +cat >> "$1" << EOF +#define swap16(x) bswap16(x) +#define swap32(x) bswap32(x) +#define swap64(x) bswap64(x) + +EOF], + + [ +dnl FreeBSD + AC_HAVE_SYMBOL(__byte_swap_long,sys/types.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include <sys/types.h> +#define swap16(x) __byte_swap_word(x) +#define swap32(x) __byte_swap_long(x) +/* No optimized 64 bit byte swapping macro is available */ +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF], + + [ +dnl OS X + AC_HAVE_SYMBOL(NXSwapLong,machine/byte_order.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include <machine/byte_order.h> +#define swap16(x) NXSwapShort(x) +#define swap32(x) NXSwapLong(x) +#define swap64(x) NXSwapLongLong(x) + +EOF], + [ + if test $ac_cv_c_bigendian = yes; then + cat >> "$1" << EOF +/* No other byte swapping functions are available on this big-endian system */ +#define swap16(x) ((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8))) +#define swap32(x) ((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\ + ((uint32_t)(x) << 8) & 0x00ff0000UL | \\ + ((x) >> 8) & 0x0000ff00UL | \\ + ((x) >> 24) & 0x000000ffUL)) +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF + else + cat >> "$1" << EOF +/* Use these as generic byteswapping macros on this little endian system */ +#define swap16(x) ntohs(x) +#define swap32(x) ntohl(x) +/* No optimized 64 bit byte swapping macro is available */ +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF + fi +]) + ]) + ]) + ]) +]) + + +[ +if test "$HAVE_LE32TOH" != "1"; then + cat >> "$1" << EOF +/* The byte swapping macros have the form: */ +/* EENN[a]toh or htoEENN[a] where EE is be (big endian) or */ +/* le (little-endian), NN is 16 or 32 (number of bits) and a, */ +/* if present, indicates that the endian side is a pointer to an */ +/* array of uint8_t bytes instead of an integer of the specified length. */ +/* h refers to the host's ordering method. */ + +/* So, to convert a 32-bit integer stored in a buffer in little-endian */ +/* format into a uint32_t usable on this machine, you could use: */ +/* uint32_t value = le32atoh(&buf[3]); */ +/* To put that value back into the buffer, you could use: */ +/* htole32a(&buf[3], value); */ + +/* Define aliases for the standard byte swapping macros */ +/* Arguments to these macros must be properly aligned on natural word */ +/* boundaries in order to work properly on all architectures */ +#define htobe16(x) htons(x) +#define htobe32(x) htonl(x) +#define be16toh(x) ntohs(x) +#define be32toh(x) ntohl(x) + +#define HTOBE16(x) (x) = htobe16(x) +#define HTOBE32(x) (x) = htobe32(x) +#define BE32TOH(x) (x) = be32toh(x) +#define BE16TOH(x) (x) = be16toh(x) + +EOF + + if test $ac_cv_c_bigendian = yes; then + cat >> "$1" << EOF +/* Define our own extended byte swapping macros for big-endian machines */ +#define htole16(x) swap16(x) +#define htole32(x) swap32(x) +#define le16toh(x) swap16(x) +#define le32toh(x) swap32(x) + +#define htobe64(x) (x) +#define be64toh(x) (x) + +#define HTOLE16(x) (x) = htole16(x) +#define HTOLE32(x) (x) = htole32(x) +#define LE16TOH(x) (x) = le16toh(x) +#define LE32TOH(x) (x) = le32toh(x) + +#define HTOBE64(x) (void) (x) +#define BE64TOH(x) (void) (x) + +EOF + else + cat >> "$1" << EOF +/* On little endian machines, these macros are null */ +#define htole16(x) (x) +#define htole32(x) (x) +#define htole64(x) (x) +#define le16toh(x) (x) +#define le32toh(x) (x) +#define le64toh(x) (x) + +#define HTOLE16(x) (void) (x) +#define HTOLE32(x) (void) (x) +#define HTOLE64(x) (void) (x) +#define LE16TOH(x) (void) (x) +#define LE32TOH(x) (void) (x) +#define LE64TOH(x) (void) (x) + +/* These don't have standard aliases */ +#define htobe64(x) swap64(x) +#define be64toh(x) swap64(x) + +#define HTOBE64(x) (x) = htobe64(x) +#define BE64TOH(x) (x) = be64toh(x) + +EOF + fi +fi + +cat >> "$1" << EOF +/* Define the C99 standard length-specific integer types */ +#include <_stdint.h> + +EOF + +case "${effective_target}" in + i[3456]86-*) + cat >> "$1" << EOF +/* Here are some macros to create integers from a byte array */ +/* These are used to get and put integers from/into a uint8_t array */ +/* with a specific endianness. This is the most portable way to generate */ +/* and read messages to a network or serial device. Each member of a */ +/* packet structure must be handled separately. */ + +/* The i386 and compatibles can handle unaligned memory access, */ +/* so use the optimized macros above to do this job */ +#define be16atoh(x) be16toh(*(uint16_t*)(x)) +#define be32atoh(x) be32toh(*(uint32_t*)(x)) +#define be64atoh(x) be64toh(*(uint64_t*)(x)) +#define le16atoh(x) le16toh(*(uint16_t*)(x)) +#define le32atoh(x) le32toh(*(uint32_t*)(x)) +#define le64atoh(x) le64toh(*(uint64_t*)(x)) + +#define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x) +#define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x) +#define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x) +#define htole16a(a,x) *(uint16_t*)(a) = htole16(x) +#define htole32a(a,x) *(uint32_t*)(a) = htole32(x) +#define htole64a(a,x) *(uint64_t*)(a) = htole64(x) + +EOF + ;; + + *) + cat >> "$1" << EOF +/* Here are some macros to create integers from a byte array */ +/* These are used to get and put integers from/into a uint8_t array */ +/* with a specific endianness. This is the most portable way to generate */ +/* and read messages to a network or serial device. Each member of a */ +/* packet structure must be handled separately. */ + +/* Non-optimized but portable macros */ +#define be16atoh(x) ((uint16_t)(((x)[0]<<8)|(x)[1])) +#define be32atoh(x) ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])) +#define be64atoh(x) ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\ + ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) +#define le16atoh(x) ((uint16_t)(((x)[1]<<8)|(x)[0])) +#define le32atoh(x) ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) +#define le64atoh(x) ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\ + ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) + +#define htobe16a(a,x) (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x) +#define htobe32a(a,x) (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\ + (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x) +#define htobe64a(a,x) (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\ + (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\ + (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\ + (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x) +#define htole16a(a,x) (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) +#define htole32a(a,x) (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\ + (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) +#define htole64a(a,x) (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\ + (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\ + (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\ + (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) + +EOF + ;; +esac +] + +cat >> "$1" << EOF +#endif /*__BYTEORDER_H*/ +EOF]) diff --git a/packages/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.19/sane-plustek.patch index f6920c6e22..f6920c6e22 100644 --- a/packages/sane/sane-backends-1.0.17/sane-plustek.patch +++ b/packages/sane/sane-backends-1.0.19/sane-plustek.patch diff --git a/packages/sane/sane-backends-1.0.19/sane-symbols.diff b/packages/sane/sane-backends-1.0.19/sane-symbols.diff new file mode 100644 index 0000000000..268c50bac0 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/sane-symbols.diff @@ -0,0 +1,11 @@ +--- /tmp/Makefile.in 2008-09-01 18:46:13.000000000 +0200 ++++ sane-backends-1.0.19/frontend/Makefile.in 2008-09-01 18:46:31.773198000 +0200 +@@ -98,7 +98,7 @@ + $(LIBS) + + scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB) +- @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANE) $(LIBS) ++ @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANEI) $(LIBSANE) $(LIBSANEI) $(LIBS) + + # tstbackend is not compiled by default. + # To compile it, add tstbackend to BINPROGS. diff --git a/packages/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.19/saned.xinetd index f4e890fdbe..f4e890fdbe 100644 --- a/packages/sane/sane-backends-1.0.17/saned.xinetd +++ b/packages/sane/sane-backends-1.0.19/saned.xinetd diff --git a/packages/sane/sane-backends-1.0.19/stdint.m4 b/packages/sane/sane-backends-1.0.19/stdint.m4 new file mode 100644 index 0000000000..f95b28c773 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/stdint.m4 @@ -0,0 +1,734 @@ +dnl AC_NEED_STDINT_H ( HEADER-TO-GENERATE ) +dnl Copyright 2001-2002 by Dan Fandrich <dan@coneharvesters.com> +dnl This file may be copied and used freely without restrictions. No warranty +dnl is expressed or implied. +dnl +dnl Look for a header file that defines size-specific integer types like the +dnl ones recommended to be in stdint.h in the C99 standard (e.g. uint32_t). +dnl This is a dumbed-down version of the macro of the same name in the file +dnl ac_need_stdint_h.m4 which is part of the ac-archive, available at +dnl <URL:http://ac-archive.sourceforge.net/> (also, another macro +dnl AC_CREATE_STDINT_H by the same author). This version is not as smart, +dnl but works on older autoconf versions and has a different license. + +dnl AX_CHECK_DEFINED_TYPE ( TYPE, FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND ) +dnl This is similar to _AC_CHECK_TYPE_NEW (a.k.a. new syntax version of +dnl AC_CHECK_TYPE) in autoconf 2.50 but works on older versions +AC_DEFUN([AX_CHECK_DEFINED_TYPE], +[AC_MSG_CHECKING([for $1 in $2]) +AC_EGREP_CPP(changequote(<<,>>)dnl +<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl +changequote([,]), [#include <$2>], +ac_cv_type_$1=yes, ac_cv_type_$1=no)dnl +AC_MSG_RESULT($ac_cv_type_$1) +if test $ac_cv_type_$1 = yes; then + $3 +else + $4 +fi +]) + +dnl Look for a header file that defines size-specific integer types +AC_DEFUN([AX_NEED_STDINT_H], +[ +changequote(, )dnl +ac_dir=`echo "$1"|sed 's%/[^/][^/]*$%%'` +changequote([, ])dnl +if test "$ac_dir" != "$1" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" +fi + +AX_CHECK_DEFINED_TYPE(uint8_t, +stdint.h, +[ +cat > "$1" <<EOF +/* This file is generated automatically by configure */ +#include <stdint.h> +EOF], +[AX_CHECK_DEFINED_TYPE(uint8_t, +inttypes.h, +[cat > "$1" <<EOF +/* This file is generated automatically by configure */ +#include <inttypes.h> +EOF], +[AX_CHECK_DEFINED_TYPE(uint8_t, +sys/types.h, +[cat > "$1" <<EOF +/* This file is generated automatically by configure */ +#include <sys/types.h> +EOF], +[AX_CHECK_DEFINED_TYPE(u_int8_t, +sys/types.h, +[cat > "$1" <<EOF +/* This file is generated automatically by configure */ +#ifndef __STDINT_H +#define __STDINT_H +#include <sys/types.h> +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; +EOF + +AX_CHECK_DEFINED_TYPE(u_int64_t, +sys/types.h, +[cat >> "$1" <<EOF +typedef u_int64_t uint64_t; +#endif /*!__STDINT_H*/ +EOF], +[cat >> "$1" <<EOF +/* 64-bit types are not available on this system */ +/* typedef u_int64_t uint64_t; */ +#endif /*!__STDINT_H*/ +EOF]) + +], +[AC_MSG_WARN([I can't find size-specific integer definitions on this system]) +if test -e "$1" ; then + rm -f "$1" +fi +])])])])dnl +]) + +AC_DEFUN([AX_CHECK_DATA_MODEL],[ + AC_CHECK_SIZEOF(char) + AC_CHECK_SIZEOF(short) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(void*) + ac_cv_char_data_model="" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" + ac_cv_long_data_model="" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" + AC_MSG_CHECKING([data model]) + case "$ac_cv_char_data_model/$ac_cv_long_data_model" in + 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; + 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; + 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; + 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; + 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; + 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; + 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; + 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; + 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; + 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; + 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; + 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; + 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; + 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; + 222/*|333/*|444/*|666/*|888/*) : + ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; + *) ac_cv_data_model="none" ; n="very unusual model" ;; + esac + AC_MSG_RESULT([$ac_cv_data_model ($ac_cv_long_data_model, $n)]) +]) + +dnl AX_CHECK_HEADER_STDINT_X([HEADERLIST][,ACTION-IF]) +AC_DEFUN([AX_CHECK_HEADER_STDINT_X],[ +AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[ + ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[stdint.h inttypes.h sys/inttypes.h]) ; do + unset ac_cv_type_uintptr_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uintptr_t,[ac_cv_header_stdint_x=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + done + AC_MSG_CHECKING([for stdint uintptr_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_O],[ +AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ + ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[inttypes.h sys/inttypes.h stdint.h]) ; do + unset ac_cv_type_uint32_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + break; + done + AC_MSG_CHECKING([for stdint uint32_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_U],[ +AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ + ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[sys/types.h inttypes.h sys/inttypes.h]) ; do + unset ac_cv_type_u_int32_t + unset ac_cv_type_u_int64_t + AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + break; + done + AC_MSG_CHECKING([for stdint u_int32_t]) + ]) +]) + +AC_DEFUN([AX_CREATE_STDINT_H], +[# ------ AX CREATE STDINT H ------------------------------------- +AC_MSG_CHECKING([for stdint types]) +ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` +# try to shortcircuit - if the default include path of the compiler +# can find a "stdint.h" header then we assume that all compilers can. +AC_CACHE_VAL([ac_cv_header_stdint_t],[ +old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +old_CFLAGS="$CFLAGS" ; CFLAGS="" +AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;], +[ac_cv_stdint_result="(assuming C99 compatible system)" + ac_cv_header_stdint_t="stdint.h"; ], +[ac_cv_header_stdint_t=""]) +CXXFLAGS="$old_CXXFLAGS" +CPPFLAGS="$old_CPPFLAGS" +CFLAGS="$old_CFLAGS" ]) + +v="... $ac_cv_header_stdint_h" +if test "$ac_stdint_h" = "stdint.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) +elif test "$ac_stdint_h" = "inttypes.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) +elif test "_$ac_cv_header_stdint_t" = "_" ; then + AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) +else + ac_cv_header_stdint="$ac_cv_header_stdint_t" + AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) +fi + +if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. + +dnl .....intro message done, now do a few system checks..... +dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type, +dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW +dnl instead that is triggered with 3 or more arguments (see types.m4) + +inttype_headers=`echo $2 | sed -e 's/,/ /g'` + +ac_cv_stdint_result="(no helpful system typedefs seen)" +AX_CHECK_HEADER_STDINT_X(dnl + stdint.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen uintptr_t$and64 in $i)") + +if test "_$ac_cv_header_stdint_x" = "_" ; then +AX_CHECK_HEADER_STDINT_O(dnl, + inttypes.h sys/inttypes.h stdint.h $inttype_headers, + ac_cv_stdint_result="(seen uint32_t$and64 in $i)") +fi + +if test "_$ac_cv_header_stdint_x" = "_" ; then +if test "_$ac_cv_header_stdint_o" = "_" ; then +AX_CHECK_HEADER_STDINT_U(dnl, + sys/types.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen u_int32_t$and64 in $i)") +fi fi + +dnl if there was no good C99 header file, do some typedef checks... +if test "_$ac_cv_header_stdint_x" = "_" ; then + AC_MSG_CHECKING([for stdint datatype model]) + AC_MSG_RESULT([(..)]) + AX_CHECK_DATA_MODEL +fi + +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_x" +elif test "_$ac_cv_header_stdint_o" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_o" +elif test "_$ac_cv_header_stdint_u" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_u" +else + ac_cv_header_stdint="stddef.h" +fi + +AC_MSG_CHECKING([for extra inttypes in chosen header]) +AC_MSG_RESULT([($ac_cv_header_stdint)]) +dnl see if int_least and int_fast types are present in _this_ header. +unset ac_cv_type_int_least32_t +unset ac_cv_type_int_fast32_t +AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) +AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) +AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) + +fi # shortcircut to system "stdint.h" +# ------------------ PREPARE VARIABLES ------------------------------ +if test "$GCC" = "yes" ; then +ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` +else +ac_cv_stdint_message="using $CC" +fi + +AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl +$ac_cv_stdint_result]) + +dnl ----------------------------------------------------------------- +# ----------------- DONE inttypes.h checks START header ------------- +AC_CONFIG_COMMANDS([$ac_stdint_h],[ +AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) +ac_stdint=$tmp/_stdint.h + +echo "#ifndef" $_ac_stdint_h >$ac_stdint +echo "#define" $_ac_stdint_h "1" >>$ac_stdint +echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint +echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint +if test "_$ac_cv_header_stdint_t" != "_" ; then +echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint +echo "#include <stdint.h>" >>$ac_stdint +echo "#endif" >>$ac_stdint +echo "#endif" >>$ac_stdint +else + +cat >>$ac_stdint <<STDINT_EOF + +/* ................... shortcircuit part ........................... */ + +#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H +#include <stdint.h> +#else +#include <stddef.h> + +/* .................... configured part ............................ */ + +STDINT_EOF + +echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_header="$ac_cv_header_stdint_x" + echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint +fi + +echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_o" != "_" ; then + ac_header="$ac_cv_header_stdint_o" + echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint +fi + +echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint +if test "_$ac_cv_header_stdint_u" != "_" ; then + ac_header="$ac_cv_header_stdint_u" + echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint +fi + +echo "" >>$ac_stdint + +if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then + echo "#include <$ac_header>" >>$ac_stdint + echo "" >>$ac_stdint +fi fi + +echo "/* which 64bit typedef has been found */" >>$ac_stdint +if test "$ac_cv_type_uint64_t" = "yes" ; then +echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint +fi +if test "$ac_cv_type_u_int64_t" = "yes" ; then +echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* which type model has been detected */" >>$ac_stdint +if test "_$ac_cv_char_data_model" != "_" ; then +echo "#define _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint +echo "#define _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint +else +echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint +echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* whether int_least types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_least32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint +fi +echo "/* whether int_fast types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_fast32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint +fi +echo "/* whether intmax_t type was detected */" >>$ac_stdint +if test "$ac_cv_type_intmax_t" = "yes"; then +echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + + cat >>$ac_stdint <<STDINT_EOF +/* .................... detections part ............................ */ + +/* whether we need to define bitspecific types from compiler base types */ +#ifndef _STDINT_HEADER_INTPTR +#ifndef _STDINT_HEADER_UINT32 +#ifndef _STDINT_HEADER_U_INT32 +#define _STDINT_NEED_INT_MODEL_T +#else +#define _STDINT_HAVE_U_INT_TYPES +#endif +#endif +#endif + +#ifdef _STDINT_HAVE_U_INT_TYPES +#undef _STDINT_NEED_INT_MODEL_T +#endif + +#ifdef _STDINT_CHAR_MODEL +#if _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124 +#ifndef _STDINT_BYTE_MODEL +#define _STDINT_BYTE_MODEL 12 +#endif +#endif +#endif + +#ifndef _STDINT_HAVE_INT_LEAST32_T +#define _STDINT_NEED_INT_LEAST_T +#endif + +#ifndef _STDINT_HAVE_INT_FAST32_T +#define _STDINT_NEED_INT_FAST_T +#endif + +#ifndef _STDINT_HEADER_INTPTR +#define _STDINT_NEED_INTPTR_T +#ifndef _STDINT_HAVE_INTMAX_T +#define _STDINT_NEED_INTMAX_T +#endif +#endif + + +/* .................... definition part ............................ */ + +/* some system headers have good uint64_t */ +#ifndef _HAVE_UINT64_T +#if defined _STDINT_HAVE_UINT64_T || defined HAVE_UINT64_T +#define _HAVE_UINT64_T +#elif defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T +#define _HAVE_UINT64_T +typedef u_int64_t uint64_t; +#endif +#endif + +#ifndef _HAVE_UINT64_T +/* .. here are some common heuristics using compiler runtime specifics */ +#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; + +#elif !defined __STRICT_ANSI__ +#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ +#define _HAVE_UINT64_T +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ +/* note: all ELF-systems seem to have loff-support which needs 64-bit */ +#if !defined _NO_LONGLONG +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; +#endif + +#elif defined __alpha || (defined __mips && defined _ABIN32) +#if !defined _NO_LONGLONG +typedef long int64_t; +typedef unsigned long uint64_t; +#endif + /* compiler/cpu type to define int64_t */ +#endif +#endif +#endif + +#if defined _STDINT_HAVE_U_INT_TYPES +/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; + +/* glibc compatibility */ +#ifndef __int8_t_defined +#define __int8_t_defined +#endif +#endif + +#ifdef _STDINT_NEED_INT_MODEL_T +/* we must guess all the basic types. Apart from byte-adressable system, */ +/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ +/* (btw, those nibble-addressable systems are way off, or so we assume) */ + +dnl /* have a look at "64bit and data size neutrality" at */ +dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ +dnl /* (the shorthand "ILP" types always have a "P" part) */ + +#if defined _STDINT_BYTE_MODEL +#if _STDINT_LONG_MODEL+0 == 242 +/* 2:4:2 = IP16 = a normal 16-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef long int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 +/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ +/* 4:4:4 = ILP32 = a normal 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 +/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ +/* 4:8:8 = LP64 = a normal 64-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* this system has a "long" of 64bit */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +typedef unsigned long uint64_t; +typedef long int64_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 448 +/* LLP64 a 64-bit system derived from a 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* assuming the system has a "long long" */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef unsigned long long uint64_t; +typedef long long int64_t; +#endif +#else +#define _STDINT_NO_INT32_T +#endif +#else +#define _STDINT_NO_INT8_T +#define _STDINT_NO_INT32_T +#endif +#endif + +/* + * quote from SunOS-5.8 sys/inttypes.h: + * Use at your own risk. As of February 1996, the committee is squarely + * behind the fixed sized types; the "least" and "fast" types are still being + * discussed. The probability that the "fast" types may be removed before + * the standard is finalized is high enough that they are not currently + * implemented. + */ + +#if defined _STDINT_NEED_INT_LEAST_T +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_least64_t; +#endif + +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_least64_t; +#endif + /* least types */ +#endif + +#if defined _STDINT_NEED_INT_FAST_T +typedef int8_t int_fast8_t; +typedef int int_fast16_t; +typedef int32_t int_fast32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_fast64_t; +#endif + +typedef uint8_t uint_fast8_t; +typedef unsigned uint_fast16_t; +typedef uint32_t uint_fast32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_fast64_t; +#endif + /* fast types */ +#endif + +#ifdef _STDINT_NEED_INTMAX_T +#ifdef _HAVE_UINT64_T +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; +#else +typedef long intmax_t; +typedef unsigned long uintmax_t; +#endif +#endif + +#ifdef _STDINT_NEED_INTPTR_T +#ifndef __intptr_t_defined +#define __intptr_t_defined +/* we encourage using "long" to store pointer values, never use "int" ! */ +#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 +typedef unsinged int uintptr_t; +typedef int intptr_t; +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 +typedef unsigned long uintptr_t; +typedef long intptr_t; +#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ +typedef unsigned long uintptr_t; +typedef long intptr_t; +#endif +#endif +#endif + +/* The ISO C99 standard specifies that in C++ implementations these + should only be defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS +#ifndef UINT32_C + +/* Signed. */ +# define INT8_C(c) c +# define INT16_C(c) c +# define INT32_C(c) c +# ifdef _HAVE_LONGLONG_UINT64_T +# define INT64_C(c) c ## L +# else +# define INT64_C(c) c ## LL +# endif + +/* Unsigned. */ +# define UINT8_C(c) c ## U +# define UINT16_C(c) c ## U +# define UINT32_C(c) c ## U +# ifdef _HAVE_LONGLONG_UINT64_T +# define UINT64_C(c) c ## UL +# else +# define UINT64_C(c) c ## ULL +# endif + +/* Maximal type. */ +# ifdef _HAVE_LONGLONG_UINT64_T +# define INTMAX_C(c) c ## L +# define UINTMAX_C(c) c ## UL +# else +# define INTMAX_C(c) c ## LL +# define UINTMAX_C(c) c ## ULL +# endif + + /* literalnumbers */ +#endif +#endif + +/* These limits are merily those of a two complement byte-oriented system */ + +/* Minimum of signed integral types. */ +# define INT8_MIN (-128) +# define INT16_MIN (-32767-1) +# define INT32_MIN (-2147483647-1) +# define INT64_MIN (-__INT64_C(9223372036854775807)-1) +/* Maximum of signed integral types. */ +# define INT8_MAX (127) +# define INT16_MAX (32767) +# define INT32_MAX (2147483647) +# define INT64_MAX (__INT64_C(9223372036854775807)) + +/* Maximum of unsigned integral types. */ +# define UINT8_MAX (255) +# define UINT16_MAX (65535) +# define UINT32_MAX (4294967295U) +# define UINT64_MAX (__UINT64_C(18446744073709551615)) + +/* Minimum of signed integral types having a minimum size. */ +# define INT_LEAST8_MIN INT8_MIN +# define INT_LEAST16_MIN INT16_MIN +# define INT_LEAST32_MIN INT32_MIN +# define INT_LEAST64_MIN INT64_MIN +/* Maximum of signed integral types having a minimum size. */ +# define INT_LEAST8_MAX INT8_MAX +# define INT_LEAST16_MAX INT16_MAX +# define INT_LEAST32_MAX INT32_MAX +# define INT_LEAST64_MAX INT64_MAX + +/* Maximum of unsigned integral types having a minimum size. */ +# define UINT_LEAST8_MAX UINT8_MAX +# define UINT_LEAST16_MAX UINT16_MAX +# define UINT_LEAST32_MAX UINT32_MAX +# define UINT_LEAST64_MAX UINT64_MAX + + /* shortcircuit*/ +#endif + /* once */ +#endif +#endif +STDINT_EOF +fi + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then + AC_MSG_NOTICE([$ac_stdint_h is unchanged]) + else + ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` + AS_MKDIR_P(["$ac_dir"]) + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +],[# variables for create stdint.h replacement +PACKAGE="$PACKAGE" +VERSION="$VERSION" +ac_stdint_h="$ac_stdint_h" +_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) +ac_cv_stdint_message="$ac_cv_stdint_message" +ac_cv_header_stdint_t="$ac_cv_header_stdint_t" +ac_cv_header_stdint_x="$ac_cv_header_stdint_x" +ac_cv_header_stdint_o="$ac_cv_header_stdint_o" +ac_cv_header_stdint_u="$ac_cv_header_stdint_u" +ac_cv_type_uint64_t="$ac_cv_type_uint64_t" +ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" +ac_cv_char_data_model="$ac_cv_char_data_model" +ac_cv_long_data_model="$ac_cv_long_data_model" +ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" +ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" +ac_cv_type_intmax_t="$ac_cv_type_intmax_t" +]) +]) diff --git a/packages/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.19.bb index 4854f4d10c..95ce49ede0 100644 --- a/packages/sane/sane-backends_1.0.17.bb +++ b/packages/sane/sane-backends_1.0.19.bb @@ -1,18 +1,30 @@ DESCRIPTION = "Scanner drivers for SANE" -DEPENDS = "gphoto2 jpeg libusb" +DEPENDS = "hal gphoto2 jpeg libusb" LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ +SRC_URI = "http://alioth.debian.org/frs/download.php/2318/sane-backends-${PV}.tar.gz \ file://Makefile.in.patch;patch=1 \ file://saned.xinetd \ + file://byteorder.m4 \ + file://stdint.m4 \ + file://sane-symbols.diff;patch=1 \ " inherit autotools pkgconfig binconfig EXTRA_OECONF = "--disable-translations" +do_configure_prepend() { + mkdir -p ${S}/m4 + cp ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/m4/ + cp ${WORKDIR}/*.m4 ${S}/m4/ +} + +PARALLEL_MAKE = "" +do_compile_prepend() { + ln -sf ${S}/${TARGET_PREFIX}libtool ${S}/libtool +} + do_install_append() { install -d "${D}/${sysconfdir}/xinetd.d" install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" 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/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb index 18e95b1430..ff304f918e 100644 --- a/packages/telepathy/empathy_2.23.90.bb +++ b/packages/telepathy/empathy_2.23.90.bb @@ -8,6 +8,10 @@ RRECOMMENDS = "telepathy-gabble" inherit gnome PARALLEL_MAKE = "" +PR = "r1" + +PACKAGES =+ "empathy-scrollkeeper-junk" +FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ ${datadir}/dbus-1/services/*.service \ diff --git a/packages/tslib/tslib/om-gta01/ts.conf b/packages/tslib/tslib/om-gta01/ts.conf index 82f712ef41..1b0da937e8 100644 --- a/packages/tslib/tslib/om-gta01/ts.conf +++ b/packages/tslib/tslib/om-gta01/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=1 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/om-gta02/ts.conf b/packages/tslib/tslib/om-gta02/ts.conf index 82f712ef41..1b0da937e8 100644 --- a/packages/tslib/tslib/om-gta02/ts.conf +++ b/packages/tslib/tslib/om-gta02/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=1 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/ts.conf b/packages/tslib/tslib/ts.conf index 1abde2fc7f..1b0da937e8 100644 --- a/packages/tslib/tslib/ts.conf +++ b/packages/tslib/tslib/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=0 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/tslib-input_raw-grab_events.patch b/packages/tslib/tslib/tslib-input_raw-grab_events.patch deleted file mode 100644 index 4bd0a05531..0000000000 --- a/packages/tslib/tslib/tslib-input_raw-grab_events.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch adds support for "EVIOCGRAB" on the input device, which -tells the kernel _not_ to deliver events of the touchscreen to -/dev/input/mice. - -This is probably what most people want, since unprocessed raw touchscreen -events should not be converted to emulated PS/2 mouse movements. - -Signed-off-by: Harald Welte <laforge@openmoko.org> - -Index: a/plugins/input-raw.c -=================================================================== ---- a/plugins/input-raw.c (revision 49) -+++ b/plugins/input-raw.c (working copy) -@@ -18,6 +18,7 @@ - - #include <errno.h> - #include <stdio.h> -+#include <limits.h> - - #include <stdlib.h> - #ifdef HAVE_UNISTD_H -@@ -33,6 +34,9 @@ - - #include "tslib-private.h" - -+#define GRAB_EVENTS_WANTED 1 -+#define GRAB_EVENTS_ACTIVE 2 -+ - struct tslib_input { - struct tslib_module_info module; - -@@ -42,6 +46,7 @@ - - int sane_fd; - int using_syn; -+ int grab_events; - }; - - static int check_fd(struct tslib_input *i) -@@ -64,6 +69,14 @@ - - if (bit & (1 << EV_SYN)) - i->using_syn = 1; -+ -+ if (i->grab_events == GRAB_EVENTS_WANTED) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) { -+ fprintf(stderr, "Unable to grab selected input device\n"); -+ return -1; -+ } -+ i->grab_events = GRAB_EVENTS_ACTIVE; -+ } - - return 0; - } -@@ -222,6 +235,15 @@ - - static int ts_input_fini(struct tslib_module_info *inf) - { -+ struct tslib_input *i = (struct tslib_input *)inf; -+ struct tsdev *ts = inf->dev; -+ -+ if (i->grab_events == GRAB_EVENTS_ACTIVE) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) { -+ fprintf(stderr, "Unable to un-grab selected input device\n"); -+ } -+ } -+ - free(inf); - return 0; - } -@@ -231,6 +253,36 @@ - .fini = ts_input_fini, - }; - -+static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ unsigned long v; -+ int err = errno; -+ -+ v = strtoul(str, NULL, 0); -+ -+ if (v == ULONG_MAX && errno == ERANGE) -+ return -1; -+ -+ errno = err; -+ switch ((int)data) { -+ case 1: -+ if (v) -+ i->grab_events = GRAB_EVENTS_WANTED; -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static const struct tslib_vars raw_vars[] = -+{ -+ { "grab_events", (void *)1, parse_raw_grab }, -+}; -+ -+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) -+ - TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - { - struct tslib_input *i; -@@ -245,5 +297,12 @@ - i->current_p = 0; - i->sane_fd = 0; - i->using_syn = 0; -+ i->grab_events = 0; -+ -+ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { -+ free(i); -+ return NULL; -+ } -+ - return &(i->module); - } diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index 6fa0b3fccc..c707eecb27 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -3,18 +3,20 @@ HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" +PR = "r20" -PR = "r19" - -SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ - file://tslib-input_raw-grab_events.patch;patch=1 \ - file://fix_version.patch;patch=1 \ - file://ts.conf \ - file://ts.conf-simpad-2.4 \ - file://ts.conf-collie-2.4 \ - file://tslib.sh" -SRC_URI_append_mnci += " file://devfs.patch;patch=1" -SRC_URI_append_mnci += " file://event1.patch;patch=1" +SRC_URI = "\ + http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ + file://fix_version.patch;patch=1 \ + file://ts.conf \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh \ +" +SRC_URI_append_mnci += "\ + file://devfs.patch;patch=1 \ + file://event1.patch;patch=1 \ +" inherit autotools pkgconfig 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 +} + |