diff options
Diffstat (limited to 'packages')
215 files changed, 4258 insertions, 894 deletions
diff --git a/packages/bison/bison-2.0/.mtn2git_empty b/packages/aufs/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/bison/bison-2.0/.mtn2git_empty +++ b/packages/aufs/.mtn2git_empty diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/aufs/aufs/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/sane/sane-backends-1.0.17/.mtn2git_empty +++ 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/bison/bison-native_2.3.bb b/packages/bison/bison-native_2.3.bb new file mode 100644 index 0000000000..ec2f269eec --- /dev/null +++ b/packages/bison/bison-native_2.3.bb @@ -0,0 +1,20 @@ +require bison_${PV}.bb +SECTION = "devel" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}" +S = "${WORKDIR}/bison-${PV}" + +inherit native autotools + +do_stage() { + rm -f ${STAGING_BINDIR}/yacc + rm -f ${STAGING_BINDIR}/bison + install -m 0755 src/bison ${STAGING_BINDIR}/ + cat >${STAGING_BINDIR}/yacc <<EOF +#!/bin/sh +exec ${STAGING_BINDIR}/bison -y "\$@" +EOF + chmod a+rx ${STAGING_BINDIR}/yacc + install -d ${STAGING_DATADIR}/bison/m4sugar + install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_DATADIR}/bison/ + install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/ +} diff --git a/packages/bison/bison_2.3.bb b/packages/bison/bison_2.3.bb new file mode 100644 index 0000000000..edf549f442 --- /dev/null +++ b/packages/bison/bison_2.3.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "GNU Project parser generator (yacc replacement)." +HOMEPAGE = "http://www.gnu.org/software/bison/" +LICENSE = "GPL" +SECTION = "devel" +PRIORITY = "optional" + +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ + file://m4.patch;patch=1" + +inherit autotools diff --git a/packages/bison/files/.mtn2git_empty b/packages/bison/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bison/files/.mtn2git_empty diff --git a/packages/bison/bison-2.0/m4.patch b/packages/bison/files/m4.patch index b62fe89d04..b62fe89d04 100644 --- a/packages/bison/bison-2.0/m4.patch +++ b/packages/bison/files/m4.patch diff --git a/packages/bluez/bluez-cups-backend_3.28.bb b/packages/bluez/bluez-cups-backend_3.33.bb index 40e099642a..40e099642a 100644 --- a/packages/bluez/bluez-cups-backend_3.28.bb +++ b/packages/bluez/bluez-cups-backend_3.33.bb diff --git a/packages/bluez/bluez-cups-backend_3.36.bb b/packages/bluez/bluez-cups-backend_3.36.bb new file mode 100644 index 0000000000..4bcb962f3c --- /dev/null +++ b/packages/bluez/bluez-cups-backend_3.36.bb @@ -0,0 +1,26 @@ +require bluez-utils3.inc + + +DEPENDS += "cups" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/cups/backend/bluetooth" +RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.28.bb b/packages/bluez/bluez-gstreamer-plugin_3.33.bb index 53b7eb86f2..53b7eb86f2 100644 --- a/packages/bluez/bluez-gstreamer-plugin_3.28.bb +++ b/packages/bluez/bluez-gstreamer-plugin_3.33.bb diff --git a/packages/bluez/bluez-gstreamer-plugin_3.36.bb b/packages/bluez/bluez-gstreamer-plugin_3.36.bb new file mode 100644 index 0000000000..facad9cedd --- /dev/null +++ b/packages/bluez/bluez-gstreamer-plugin_3.36.bb @@ -0,0 +1,26 @@ +require bluez-utils3.inc + + +DEPENDS += "gstreamer gst-plugins-base " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --enable-gstreamer \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-libs_3.36.bb b/packages/bluez/bluez-libs_3.36.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.36.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils-alsa_3.28.bb b/packages/bluez/bluez-utils-alsa_3.33.bb index a1e3e85818..a1e3e85818 100644 --- a/packages/bluez/bluez-utils-alsa_3.28.bb +++ b/packages/bluez/bluez-utils-alsa_3.33.bb diff --git a/packages/bluez/bluez-utils-alsa_3.36.bb b/packages/bluez/bluez-utils-alsa_3.36.bb new file mode 100644 index 0000000000..c35eec04e0 --- /dev/null +++ b/packages/bluez/bluez-utils-alsa_3.36.bb @@ -0,0 +1,24 @@ +require bluez-utils3.inc + + +DEPENDS += "alsa-lib" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils_3.33.bb b/packages/bluez/bluez-utils_3.33.bb index dc0ee8e739..314a83620d 100644 --- a/packages/bluez/bluez-utils_3.33.bb +++ b/packages/bluez/bluez-utils_3.33.bb @@ -1,12 +1,13 @@ require bluez-utils3.inc -PR = "r1" +PR = "r2" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ --enable-bccmd \ --enable-hid2hci \ - --disable-alsa \ + --enable-hidd \ + --disable-alsa \ --disable-cups \ --enable-glib \ --disable-sdpd \ diff --git a/packages/bluez/bluez-utils_3.36.bb b/packages/bluez/bluez-utils_3.36.bb new file mode 100644 index 0000000000..d2d60b3af2 --- /dev/null +++ b/packages/bluez/bluez-utils_3.36.bb @@ -0,0 +1,60 @@ +require bluez-utils3.inc + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-hidd \ + --disable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +PACKAGES =+ "bluez-audio" + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth/plugins/*.so \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_bluez-audio = " \ + ${libdir}/bluetooth/plugins/libaudio.so \ + ${libdir}/gstreamer-0.10/*.so \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/gstreamer-0.10/.debug \ + " + +FILES_${PN}-dev += " \ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/gstreamer-0.10/*.la \ + " diff --git a/packages/c-ares/c-ares_1.5.3.bb b/packages/c-ares/c-ares_1.5.3.bb new file mode 100644 index 0000000000..7375bda980 --- /dev/null +++ b/packages/c-ares/c-ares_1.5.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz" +LICENSE = "MIT" +S = "${WORKDIR}/c-ares-${PV}" +PR = "r1" + +inherit autotools + +EXTRA_OECONF = "--enable-shared" + +do_stage() { + oe_libinstall -C .libs -a -so libcares ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/ares + install -m 0644 ares*.h ${STAGING_INCDIR}/ares/ +} + diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb index 53a71f71df..9cac359636 100644 --- a/packages/cairo/cairo_1.6.4.bb +++ b/packages/cairo/cairo_1.6.4.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch;patch=1 " -PR = "r2" +PR = "r3" diff --git a/packages/chromium/.mtn2git_empty b/packages/chromium/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/chromium/.mtn2git_empty diff --git a/packages/chromium/chromium_svn.bb b/packages/chromium/chromium_svn.bb new file mode 100644 index 0000000000..98f4f10881 --- /dev/null +++ b/packages/chromium/chromium_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Google Chrome browser" +LICENSE = "BSD" + +DEPENDS = "perl-native python-native flex-native gperf-native" + +PV = "0.0+svnr${SRCREV}" + +SRCREV = "1665" +SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http" + +S = "${WORKDIR}/src/chrome" + +do_compile() { + cd ${S} + ../third_party/scons/scons.py Hammer +} diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-0.97.2/autotools.patch +++ b/packages/classpath/classpath-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch +++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-native-0.97.2/autotools.patch +++ b/packages/classpath/classpath-native-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch index baae366d5f..663c0340cd 100644 --- a/packages/classpath/files/autotools.patch +++ b/packages/classpath/files/autotools.patch @@ -22,16 +22,3 @@ Index: classpath-0.93/configure.ac # Handle -Werror default case. if test "$ENABLE_WERROR" = default; then -Index: classpath-0.93/Makefile.am -=================================================================== ---- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100 -+++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200 -@@ -4,7 +4,7 @@ - SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - --ACLOCAL_AMFLAGS = -I m4 -+ACLOCAL_AMFLAGS = -I m4 --install - - native: lib - diff --git a/packages/clutter/aaina.inc b/packages/clutter/aaina.inc new file mode 100644 index 0000000000..fbef34f563 --- /dev/null +++ b/packages/clutter/aaina.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Aaina Clutter Demo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPL" + +DEPENDS = "clutter libxml2 gtk+ neon" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb new file mode 100644 index 0000000000..52a2b3ae0e --- /dev/null +++ b/packages/clutter/aaina_svn.bb @@ -0,0 +1,7 @@ +require aaina.inc + +PV = "0.3.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http" + +S = "${WORKDIR}/aaina" diff --git a/packages/clutter/clutter-box2d.inc b/packages/clutter/clutter-box2d.inc new file mode 100644 index 0000000000..8189d12bbb --- /dev/null +++ b/packages/clutter/clutter-box2d.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter Box2D" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPLv2" + +DEPENDS = "clutter" + +# The main clutter lib is machine specific so we need to be too +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig gtk-doc + +do_stage () { + autotools_stage_all +} + +do_install_append () { + install -d ${D}${bindir} + install ${S}/examples/.libs/blockbox ${D}${bindir} +} diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb new file mode 100644 index 0000000000..f241622a50 --- /dev/null +++ b/packages/clutter/clutter-box2d_svn.bb @@ -0,0 +1,10 @@ +require clutter-box2d.inc + +PV = "0.0+svnr${SRCREV}" +PR = "r3" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-cairo.inc b/packages/clutter/clutter-cairo.inc new file mode 100644 index 0000000000..1095a7e8ef --- /dev/null +++ b/packages/clutter/clutter-cairo.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Clutter Cairo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter cairo" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-cairo/.mtn2git_empty b/packages/clutter/clutter-cairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter-cairo/.mtn2git_empty diff --git a/packages/clutter/clutter-cairo/enable_examples.patch b/packages/clutter/clutter-cairo/enable_examples.patch new file mode 100644 index 0000000000..c5ed63ff12 --- /dev/null +++ b/packages/clutter/clutter-cairo/enable_examples.patch @@ -0,0 +1,28 @@ +--- + examples/Makefile.am | 2 +- + examples/flowers.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-cairo/examples/Makefile.am +=================================================================== +--- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = clock flowers bubbles ++bin_PROGRAMS = clock flowers bubbles + + INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@ + AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la +Index: clutter-cairo/examples/flowers.c +=================================================================== +--- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100 +@@ -11,7 +11,7 @@ + + #define PETAL_MIN 20 + #define PETAL_VAR 40 +-#define N_FLOWERS 40 /* reduce if you have a small card */ ++#define N_FLOWERS 8 /* reduce if you have a small card */ + + typedef struct Flower + { diff --git a/packages/clutter/clutter-cairo_svn.bb b/packages/clutter/clutter-cairo_svn.bb new file mode 100644 index 0000000000..1084c1cc16 --- /dev/null +++ b/packages/clutter/clutter-cairo_svn.bb @@ -0,0 +1,10 @@ +require clutter-cairo.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://enable_examples.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-gst.inc b/packages/clutter/clutter-gst.inc new file mode 100644 index 0000000000..caaa7559b8 --- /dev/null +++ b/packages/clutter/clutter-gst.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter GStreamer" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter gstreamer gst-plugins-base" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" + +inherit autotools pkgconfig + +do_configure_prepend() { + touch ${S}/gtk-doc.make +} + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-gst/.mtn2git_empty b/packages/clutter/clutter-gst/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter-gst/.mtn2git_empty diff --git a/packages/clutter/clutter-gst/autofoo-0.4.patch b/packages/clutter/clutter-gst/autofoo-0.4.patch new file mode 100644 index 0000000000..54df63d297 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo-0.4.patch @@ -0,0 +1,15 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + diff --git a/packages/clutter/clutter-gst/autofoo.patch b/packages/clutter/clutter-gst/autofoo.patch new file mode 100644 index 0000000000..569b0d8be9 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo.patch @@ -0,0 +1,25 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + +Index: clutter-gst/doc/reference/Makefile.am +=================================================================== +--- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 ++++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 +@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in diff --git a/packages/clutter/clutter-gst_0.4svn.bb b/packages/clutter/clutter-gst_0.4svn.bb new file mode 100644 index 0000000000..1af797888c --- /dev/null +++ b/packages/clutter/clutter-gst_0.4svn.bb @@ -0,0 +1,9 @@ +require clutter-gst.inc + +PV = "0.4.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ + file://autofoo-0.4.patch;patch=1" + + +S = "${WORKDIR}/clutter-gst-0-4" diff --git a/packages/clutter/clutter-gst_svn.bb b/packages/clutter/clutter-gst_svn.bb new file mode 100644 index 0000000000..8ef87236f7 --- /dev/null +++ b/packages/clutter/clutter-gst_svn.bb @@ -0,0 +1,8 @@ +require clutter-gst.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/${PN}" diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc index b89070f3ea..63773ad530 100644 --- a/packages/clutter/clutter.inc +++ b/packages/clutter/clutter.inc @@ -2,20 +2,47 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+" +COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|beagleboard|overo|omap3evm)" -inherit autotools pkgconfig +STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" +BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" -EXTRA_OECONF = "--disable-gtk-doc " +DEPENDS = "${STDDEPENDS} mesa" +EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" + +DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" +EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}" +LDFLAGS_append_zylonite = " -lnws -lstdc++ " + +DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}" +LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ " + +DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" + +DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" + +DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" +LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " + +inherit autotools pkgconfig gtk-doc + +PACKAGES =+ "clutter-examples" +FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require clutter-fpu.inc -EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}" - #Fix up some weirdness in the docs do_configure_prepend() { - touch ${S}/gtk-doc.make sed -i s:doc/reference/Makefile::g ${S}/configure.ac sed -i s:doc::g ${S}/Makefile.am } @@ -23,4 +50,3 @@ do_configure_prepend() { do_stage () { autotools_stage_all } - diff --git a/packages/clutter/clutter/.mtn2git_empty b/packages/clutter/clutter/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/clutter/.mtn2git_empty diff --git a/packages/clutter/clutter/enable-tests-r2990.patch b/packages/clutter/clutter/enable-tests-r2990.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/packages/clutter/clutter/enable-tests-r2990.patch @@ -0,0 +1,50 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -17,8 +17,8 @@ + test-invariants + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap +-noinst_PROGRAMS += test-devices ++bin_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-devices + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter +@@ -73,4 +73,9 @@ + test_invariants_SOURCES = test-invariants.c + test_devices_SOURCES = test-devices.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 +@@ -195,7 +195,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/packages/clutter/clutter/enable_tests-0.4.patch b/packages/clutter/clutter/enable_tests-0.4.patch new file mode 100644 index 0000000000..3178a2cd6c --- /dev/null +++ b/packages/clutter/clutter/enable_tests-0.4.patch @@ -0,0 +1,52 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter-0-4/tests/Makefile.am +=================================================================== +--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-boxes test-perspective test-rotate test-depth \ + test-threads test-timeline +@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c + test_threads_SOURCES = test-threads.c + test_timeline_SOURCES = test-timeline.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png +Index: clutter-0-4/tests/test-actors.c +=================================================================== +--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000 +@@ -143,7 +143,7 @@ main (int argc, char *argv[]) + stage = clutter_stage_get_default (); + clutter_actor_set_size (stage, 800, 600); + +- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); ++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); + + if (!pixbuf) + g_error("pixbuf load failed"); +Index: clutter-0-4/tests/test-text.c +=================================================================== +--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000 +@@ -27,7 +27,7 @@ main (int argc, char *argv[]) + + stage = clutter_stage_get_default (); + +- if (!g_file_get_contents ("test-text.c", &text, &size, NULL)) ++ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL)) + g_error("g_file_get_contents() of test-text.c failed"); + + clutter_actor_set_size (stage, 800, 600); diff --git a/packages/clutter/clutter/enable_tests-0.6.patch b/packages/clutter/clutter/enable_tests-0.6.patch new file mode 100644 index 0000000000..544a7e588c --- /dev/null +++ b/packages/clutter/clutter/enable_tests-0.6.patch @@ -0,0 +1,40 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter-0-6/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000 ++++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-boxes test-perspective test-rotate test-depth \ + test-threads test-timeline test-score test-script +@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c + test_score_SOURCES = test-score.c + test_script_SOURCES = test-script.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter-0-6/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000 ++++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000 +@@ -143,7 +143,7 @@ main (int argc, char *argv[]) + stage = clutter_stage_get_default (); + clutter_actor_set_size (stage, 800, 600); + +- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); ++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); + + if (!pixbuf) + g_error("pixbuf load failed"); + diff --git a/packages/clutter/clutter/enable_tests.patch b/packages/clutter/clutter/enable_tests.patch new file mode 100644 index 0000000000..4a99968fa3 --- /dev/null +++ b/packages/clutter/clutter/enable_tests.patch @@ -0,0 +1,48 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -14,7 +14,7 @@ + test-cogl-tex-polygon test-stage-read-pixels + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-pixmap + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter +@@ -61,4 +61,9 @@ + test_cogl_offscreen_SOURCES = test-cogl-offscreen.c + test_stage_read_pixels_SOURCES = test-stage-read-pixels.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100 +@@ -184,7 +184,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/packages/clutter/clutter_0.4svn.bb b/packages/clutter/clutter_0.4svn.bb new file mode 100644 index 0000000000..fe1fbc29d3 --- /dev/null +++ b/packages/clutter/clutter_0.4svn.bb @@ -0,0 +1,13 @@ +require clutter.inc + +PV = "0.4.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ + file://enable_tests-0.4.patch;patch=1 " + +S = "${WORKDIR}/clutter-0-4" + +do_stage () { + cp ${S}/clutter.pc ${S}/clutter-0.4.pc + autotools_stage_all +} diff --git a/packages/clutter/clutter_0.6svn.bb b/packages/clutter/clutter_0.6svn.bb new file mode 100644 index 0000000000..79882d6ddf --- /dev/null +++ b/packages/clutter/clutter_0.6svn.bb @@ -0,0 +1,8 @@ +require clutter.inc + +PV = "0.6.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ + file://enable_tests-0.6.patch;patch=1 " + +S = "${WORKDIR}/clutter-0-6" diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb new file mode 100644 index 0000000000..cf88871ae0 --- /dev/null +++ b/packages/clutter/clutter_svn.bb @@ -0,0 +1,12 @@ +require clutter.inc + +PV = "0.8.0+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ + file://enable_tests.patch;patch=1;maxrev=2989 \ + file://enable-tests-r2990.patch;patch=1;minrev=2990" + +S = "${WORKDIR}/clutter" + + diff --git a/packages/clutter/moblin-proto/.mtn2git_empty b/packages/clutter/moblin-proto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/moblin-proto/.mtn2git_empty diff --git a/packages/clutter/moblin-proto/fix.patch b/packages/clutter/moblin-proto/fix.patch new file mode 100644 index 0000000000..8bde67762c --- /dev/null +++ b/packages/clutter/moblin-proto/fix.patch @@ -0,0 +1,22 @@ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100 ++++ git/Makefile 2008-08-12 12:16:52.000000000 +0100 +@@ -15,7 +15,7 @@ + + SCP_DESTINATION=pug.vpn:tmp + +-BINARY=$(shell basename `pwd`)# ++BINARY=moblin-proto + PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here + + #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d +@@ -61,7 +61,7 @@ + %.o: %.c $(HFILES) + $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@ + $(BINARY): $(OBJECTS) +- $(CC) -o $@ $(OBJECTS) $(LIBS) ++ $(CXX) -o $@ $(OBJECTS) $(LIBS) + + #$(BINARY): $(CFILES) + # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@ diff --git a/packages/clutter/moblin-proto/paths.patch b/packages/clutter/moblin-proto/paths.patch new file mode 100644 index 0000000000..d241c8ff71 --- /dev/null +++ b/packages/clutter/moblin-proto/paths.patch @@ -0,0 +1,15 @@ +diff --git a/moblin-desktop.h b/moblin-desktop.h +index 880a9ad..3d51a14 100644 +--- a/moblin-desktop.h ++++ b/moblin-desktop.h +@@ -29,8 +29,8 @@ + #define __MAIN_H__ + + +-#define ASSET_ROOT "./assets/" +-#define JSON_ROOT "./layouts/" ++#define ASSET_ROOT "/usr/share/moblin-proto/assets/" ++#define JSON_ROOT "/usr/share/moblin-proto/layouts/" + + typedef struct + { diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb new file mode 100644 index 0000000000..8ce97bbeab --- /dev/null +++ b/packages/clutter/moblin-proto_git.bb @@ -0,0 +1,18 @@ +DEPENDS = "clutter-box2d" + +PV = "0.0+git${SRCREV}" +PR = "r1" + +SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \ + file://paths.patch;patch=1" + +S = "${WORKDIR}/git" + +do_install () { + install -d ${D}${bindir} + install ${S}/moblin-proto ${D}${bindir} + + install -d ${D}${datadir}/moblin-proto/ + cp -a ${S}/assets ${D}${datadir}/moblin-proto/ + cp -a ${S}/layouts ${D}${datadir}/moblin-proto/ +} diff --git a/packages/clutter/table.inc b/packages/clutter/table.inc new file mode 100644 index 0000000000..6ee1672197 --- /dev/null +++ b/packages/clutter/table.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "Table Clutter Demo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter-gst gnome-vfs" + +inherit autotools pkgconfig + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/table ${D}${bindir}/table +} + +#do_stage () { +# autotools_stage_all +#} + diff --git a/packages/clutter/table/.mtn2git_empty b/packages/clutter/table/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/table/.mtn2git_empty diff --git a/packages/clutter/table/fixes.patch b/packages/clutter/table/fixes.patch new file mode 100644 index 0000000000..a7cdc43713 --- /dev/null +++ b/packages/clutter/table/fixes.patch @@ -0,0 +1,14 @@ +Index: table/Makefile +=================================================================== +--- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100 ++++ table/Makefile 2007-07-10 13:28:10.000000000 +0100 +@@ -8,7 +8,7 @@ all: table + + + table: table.o clutter-dominatrix.o clutter-video-player.o +- $(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) ++ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) + + clean: + rm -fr *.o table +\ No newline at end of file diff --git a/packages/clutter/table_svn.bb b/packages/clutter/table_svn.bb new file mode 100644 index 0000000000..168ea4dfba --- /dev/null +++ b/packages/clutter/table_svn.bb @@ -0,0 +1,10 @@ +require table.inc + +PV = "0.3.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \ + file://fixes.patch;patch=1" + +S = "${WORKDIR}/table" + + diff --git a/packages/clutter/tidy.inc b/packages/clutter/tidy.inc new file mode 100644 index 0000000000..bac910a4f4 --- /dev/null +++ b/packages/clutter/tidy.inc @@ -0,0 +1,24 @@ +DESCRIPTION = "Tidy library" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +STDDEPENDS = "clutter" +BASE_CONF = "--disable-gtk-doc" + +DEPENDS = "${STDDEPENDS}" +EXTRA_OECONF = "${BASE_CONF}" + +inherit autotools pkgconfig + +PACKAGES =+ "tidy-examples" +FILES_tidy-examples = "${bindir}/test-*" + +do_configure_prepend() { + touch ${S}/gtk-doc.make + sed -i s:docs/reference/Makefile::g ${S}/configure.ac + sed -i s:docs::g ${S}/Makefile.am +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/clutter/tidy/.mtn2git_empty b/packages/clutter/tidy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/tidy/.mtn2git_empty diff --git a/packages/clutter/tidy/autofoo.patch b/packages/clutter/tidy/autofoo.patch new file mode 100644 index 0000000000..7f54a3372a --- /dev/null +++ b/packages/clutter/tidy/autofoo.patch @@ -0,0 +1,11 @@ +Index: tidy/doc/reference/Makefile.am +=================================================================== +--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 ++++ tidy/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 +@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in + diff --git a/packages/clutter/tidy/tidy-enable-tests.patch b/packages/clutter/tidy/tidy-enable-tests.patch new file mode 100644 index 0000000000..c5e1660c54 --- /dev/null +++ b/packages/clutter/tidy/tidy-enable-tests.patch @@ -0,0 +1,20 @@ +Index: trunk/tests/Makefile.am +=================================================================== +--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000 ++++ trunk/tests/Makefile.am 2008-03-04 12:23:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + test-button \ + test-finger-scroll \ + test-list-view \ +@@ -14,6 +14,9 @@ + test-grow \ + test-viewport + ++test_texture_framedir = $(pkgdatadir) ++test_texture_frame_DATA = frame.png ++ + INCLUDES = -I$(top_srcdir) + LDADD = $(top_builddir)/tidy/libtidy-1.0.la + diff --git a/packages/clutter/tidy_svn.bb b/packages/clutter/tidy_svn.bb new file mode 100644 index 0000000000..348bba0a8e --- /dev/null +++ b/packages/clutter/tidy_svn.bb @@ -0,0 +1,10 @@ +require tidy.inc + +PV = "0.1.0+svnr${SRCREV}" +PR = "6" + +SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \ + file://tidy-enable-tests.patch;patch=1" + +S = "${WORKDIR}/trunk" + diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.8.bb index 62abe88bac..43fd451d79 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.8.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" -SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \ +SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2 \ file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl" +S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl" inherit native qmake qt3e diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.8.bb index d7a1c6e338..136deb1f42 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.8.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" -SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 " +SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2" #\ # file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp" +S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl2cpp" inherit native qmake qt3e 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/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch new file mode 100644 index 0000000000..3c3969de43 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch @@ -0,0 +1,13 @@ +--- /orig-Makefile 2008-07-17 00:29:01.000000000 +0300 ++++ /Makefile 2008-07-17 00:29:35.000000000 +0300 +@@ -58,6 +58,10 @@ + EXTRALIBS+=-lfaac + endif + ++ifeq ($(CONFIG_MP3LAME),yes) ++EXTRALIBS+=-lmp3lame ++endif ++ + ifeq ($(BUILD_VHOOK),yes) + VHOOK=videohook + INSTALLVHOOK=install-vhook diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch new file mode 100644 index 0000000000..d78ada9b36 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch @@ -0,0 +1,13 @@ +Index: ffmpeg-0.4.9-pre1/libavformat/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2008-08-30 11:35:09.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-08-30 11:35:34.000000000 +0200 +@@ -94,7 +94,7 @@ + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll + -lib /machine:i386 /def:$(@:.dll=.def) + else +- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) -Wl,-soname -Wl,libavformat.so.0 ++ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavformat.so.0 + endif + + depend: $(SRCS) diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch new file mode 100644 index 0000000000..6fbeb3eb88 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch @@ -0,0 +1,47 @@ +Index: ffmpeg-0.4.9-pre1/libavcodec/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2008-08-30 11:13:34.000000000 +0200 +@@ -267,10 +267,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 ++ install -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 + ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0 + ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so + ldconfig || true +Index: ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/libpostproc/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile 2008-08-30 11:13:40.000000000 +0200 +@@ -50,7 +50,7 @@ + install: all + ifeq ($(SHARED_PP),yes) + install -d $(prefix)/lib +- install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) ++ install -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) + ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) + ldconfig || true + mkdir -p $(prefix)/include/postproc +Index: ffmpeg-0.4.9-pre1/libavformat/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-08-30 11:13:46.000000000 +0200 +@@ -103,10 +103,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 ++ install -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 + ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0 + ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so + ldconfig || true diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index 6316b4e26e..44e00e6764 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "coreutils-native zlib libogg libvorbis faac faad2 liba52 lame" +DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame" RSUGGESTS = "mplayer" inherit autotools pkgconfig @@ -26,6 +26,49 @@ EXTRA_OECONF = "\ \ " +do_stage() { + for lib in libavcodec libavdevice libavformat \ + libavutil libpostproc libswscale + do + oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true + install -d ${STAGING_INCDIR}/$lib + done + + install -d ${STAGING_INCDIR}/ffmpeg + + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h + + install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h + + for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h + do + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h + done + + for h in adler32.h avstring.h avutil.h base64.h bswap.h \ + common.h crc.h fifo.h integer.h intfloat_readwrite.h \ + log.h lzo.h mathematics.h md5.h mem.h random.h \ + rational.h sha1.h + do + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h + done + + install -d ${STAGING_INCDIR}/libswscale/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ + + install -d ${STAGING_INCDIR}/libpostproc + install -d ${STAGING_INCDIR}/postproc + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h +} + + PACKAGES += "${PN}-vhook-dbg ${PN}-vhook" FILES_${PN} = "${bindir}" @@ -33,3 +76,36 @@ FILES_${PN}-dev = "${includedir}/${PN}" FILES_${PN}-vhook = "${libdir}/vhook" FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" + + +PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \ + libavdevice libavdevice-dev libavdevice-dbg \ + libavformat libavformat-dev libavformat-dbg \ + libavutil libavutil-dev libavutil-dbg \ + libpostproc libpostproc-dev libpostproc-dbg \ + libswscale libswscale-dev libswscale-dbg" + +FILES_${PN}-dev = "${includedir}" +FILES_libavcodec = "${libdir}/libavcodec*.so.*" +FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a" +FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*" + +FILES_libavdevice = "${libdir}/libavdevice*.so.*" +FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a" +FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*" + +FILES_libavformat = "${libdir}/libavformat*.so.*" +FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a" +FILES_libavformat-dbg += "${libdir}/.debug/libavformat*" + +FILES_libavutil = "${libdir}/libavutil*.so.*" +FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a" +FILES_libavutil-dbg += "${libdir}/.debug/libavutil*" + +FILES_libpostproc = "${libdir}/libpostproc*.so.*" +FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc" +FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*" + +FILES_libswscale = "${libdir}/libswscale*.so.*" +FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a" +FILES_libswscale-dbg += "${libdir}/.debug/libswscale*" diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index f2d5a928aa..3e05040854 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,13 +1,14 @@ require ffmpeg.inc -PR = "r5" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ - file://libavformat-makefile.patch;patch=1 \ - file://Makefile-lame.patch;patch=1 \ + file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \ + file://Makefile-add-liblame.patch;patch=1 \ + file://install-must-not-strip.patch;patch=1 \ " EXTRA_OECONF += " \ diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index b8bebebd0b..7f7b6cdba2 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,19 +3,20 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r29" +PR = "r31" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" DEFAULT_PREFERENCE_armv6 = "1" DEFAULT_PREFERENCE_armv7a = "1" +DEFAULT_PREFERENCE_avr32 = "1" FFBRANCH_arm = "arm" FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" -SRCREV_arm = "2a56b3705935a53fb48d605340095fb462d6acc5" +SRCREV = "b06c88bbec744970e023a03abed314f10d6936da" +SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " @@ -56,83 +57,10 @@ EXTRA_OECONF = " \ do_configure() { sed -i -e s:'check_cflags -std=c99'::g ${S}/configure - cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true + cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true mkdir -p ${B} cd ${B} ${S}/configure ${EXTRA_OECONF} sed -i -e s:Os:O4:g ${B}/config.h } -do_stage() { - for lib in libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale - do - oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true - install -d ${STAGING_INCDIR}/$lib - done - - install -d ${STAGING_INCDIR}/ffmpeg - - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h - - install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h - - for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h - do - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h - done - - for h in adler32.h avstring.h avutil.h base64.h bswap.h \ - common.h crc.h fifo.h integer.h intfloat_readwrite.h \ - log.h lzo.h mathematics.h md5.h mem.h random.h \ - rational.h sha1.h - do - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h - done - - install -d ${STAGING_INCDIR}/libswscale/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ - - install -d ${STAGING_INCDIR}/libpostproc - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - -PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \ - libavdevice libavdevice-dev libavdevice-dbg \ - libavformat libavformat-dev libavformat-dbg \ - libavutil libavutil-dev libavutil-dbg \ - libpostproc libpostproc-dev libpostproc-dbg \ - libswscale libswscale-dev libswscale-dbg" - -FILES_${PN}-dev = "${includedir}" -FILES_libavcodec = "${libdir}/libavcodec*.so.*" -FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a" -FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*" - -FILES_libavdevice = "${libdir}/libavdevice*.so.*" -FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a" -FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*" - -FILES_libavformat = "${libdir}/libavformat*.so.*" -FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a" -FILES_libavformat-dbg += "${libdir}/.debug/libavformat*" - -FILES_libavutil = "${libdir}/libavutil*.so.*" -FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a" -FILES_libavutil-dbg += "${libdir}/.debug/libavutil*" - -FILES_libpostproc = "${libdir}/libpostproc*.so.*" -FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc" -FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*" - -FILES_libswscale = "${libdir}/libswscale*.so.*" -FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a" -FILES_libswscale-dbg += "${libdir}/.debug/libswscale*" diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 52bd54a4f1..0532166748 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.2+gitr${SRCREV}" -PR = "r3" +PR = "r0" inherit distutils update-rc.d diff --git a/packages/freesmartphone/fso-sounds.bb b/packages/freesmartphone/fso-sounds.bb index 9c42ada539..5ee60e19d6 100644 --- a/packages/freesmartphone/fso-sounds.bb +++ b/packages/freesmartphone/fso-sounds.bb @@ -1,14 +1,18 @@ DESCRIPTION = "A set of notification sounds" LICENSE = "PD" SECTION = "multimedia" -PV = "0.0.0" +PV = "0.0.1+gitr${SRCREV}" PR = "r0" -SRC_URI = "http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid" +SRC_URI = "\ + http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \ + ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \ +" do_install() { install -d ${D}${datadir}/sounds/ install ${WORKDIR}/*.sid ${D}${datadir}/sounds/ + install ${WORKDIR}/git/sounds/*.mp3 ${D}${datadir}/sounds/ } FILES_${PN} = "${datadir}" diff --git a/packages/gnash/files/fix-trunc.diff b/packages/gnash/files/fix-trunc.diff new file mode 100644 index 0000000000..a01ca311d0 --- /dev/null +++ b/packages/gnash/files/fix-trunc.diff @@ -0,0 +1,13 @@ +--- /tmp/utility.h 2008-09-02 16:35:44.000000000 +0200 ++++ gnash/libbase/utility.h 2008-09-02 16:36:10.000000000 +0200 +@@ -327,6 +327,10 @@ + #endif + } + ++#ifndef HAVE_TRUNC ++inline double trunc(double x) { return (x < 0 ? -(std::floor(-x)) : std::floor(x)); } ++#endif ++ + #endif // UTILITY_H + + diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 2f2645a125..597f22bd70 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,8 +2,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" -RDEPENDS = "libltdl" +DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} @@ -28,27 +27,30 @@ EXTRA_OECONF="--enable-gui=gtk \ --disable-glext \ --disable-Xft \ --disable-expat \ - --disable-mad \ + --enable-mad \ --disable-gstreamer \ - --disable-cairo \ + --enable-media=ffmpeg \ --disable-plugin \ --disable-cygnal \ - --disable-testsuite \ + --disable-testsuite \ --enable-maintainer-mode \ --enable-fps-debug \ --enable-allstatic \ --with-top-level=${STAGING_DIR_HOST}/usr \ - " + --disable-ltdl-install \ + --without-included-ltdl \ +# --with-ltdl-include=${STAGING_INCDIR} \ +# --with-ltdl-lib=${STAGING_LIBDIR} \ +" # the test for error_t is wrong for uclibc, needs _GNU_SOURCE for correct # detection because uclibc does not have argz.h which enables error_t -CFLAGS += " -D_GNU_SOURCE " +CFLAGS += " -D_GNU_SOURCE -I${S}/libltdl -I${STAGING_INCDIR}/libltdl" -PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" +PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia" FILES_${PN}-dbg += "${libdir}/gnash/.debug" FILES_${PN}-dev += "${libdir}/gnash/*a" -FILES_libltdl = "${libdir}/gnash/libltdl*.so*" FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index b5a9ca35a9..1c6065e74e 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,3 +1,3 @@ require gnash-minimal.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb index 55748151c5..237097b94a 100644 --- a/packages/gnash/gnash-minimal_0.8.3.bb +++ b/packages/gnash/gnash-minimal_0.8.3.bb @@ -1,6 +1,6 @@ require gnash-minimal.inc -PR = "r7" +PR = "r8" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 73a7e8f9b2..992998bf55 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,6 +1,20 @@ require gnash-minimal.inc + +PR = "r1" + PV = "0.8.3+cvs${SRCDATE}" SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" +SRC_URI += "file://libtool-2.2.patch;patch=1 \ + file://libintl.patch;patch=1 \ + file://fix-trunc.diff;patch=1" + S = ${WORKDIR}/gnash + + +do_configure_prepend() { + sed -i -e 's:dnl AC_CHECK_LIB(m, trunc:AC_CHECK_LIB(m, trunc:g' ${S}/configure.ac +} + + diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index ce66beec45..60162ed1bd 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,8 +1,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" -PR = "r1" +DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" +PR = "r2" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " @@ -11,7 +11,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=none \ + --enable-media=ffmpeg \ --disable-klash \ --enable-z \ --enable-jpeg \ @@ -20,7 +20,7 @@ EXTRA_OECONF = "--enable-gui=gtk \ --enable-expat \ --enable-mad \ --enable-cairo \ - --disable-plugin \ + --enable-plugin \ --disable-cygnal \ --with-top-level=${STAGING_DIR_HOST}/usr \ " 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..b96d985387 --- /dev/null +++ b/packages/gnome/gnome-panel_2.22.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +DEPENDS = "librsvg 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/gnome-python-extras_2.19.1.bb b/packages/gnome/gnome-python-extras_2.19.1.bb new file mode 100644 index 0000000000..9d8e786241 --- /dev/null +++ b/packages/gnome/gnome-python-extras_2.19.1.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL/LGPL" +DEPENDS = "python-pygtk libwnck" + +inherit gnome distutils-base + +SRC_URI += "file://acinclude.m4" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_configure_prepend() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" +do_stage() { + autotools_stage_all +} + +FILES_${PN}-dev += "${datadir}/pygtk" 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/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index 3efccbc3af..f72772a61e 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" -PR = "r4" +PR = "r5" inherit autotools pkgconfig diff --git a/packages/gtk-webcore/midori_0.0.19.bb b/packages/gtk-webcore/midori_0.0.19.bb deleted file mode 100644 index ec81d7fd23..0000000000 --- a/packages/gtk-webcore/midori_0.0.19.bb +++ /dev/null @@ -1,5 +0,0 @@ -require midori.inc - -SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2" - - diff --git a/packages/gtk-webcore/midori_0.0.20.bb b/packages/gtk-webcore/midori_0.0.20.bb new file mode 100644 index 0000000000..e10d92bd78 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.20.bb @@ -0,0 +1,5 @@ +require midori.inc + +SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2" + + diff --git a/packages/hal/ohm/.mtn2git_empty b/packages/hal/ohm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hal/ohm/.mtn2git_empty diff --git a/packages/hal/ohm/fix_configure.patch b/packages/hal/ohm/fix_configure.patch new file mode 100644 index 0000000000..e4b774e785 --- /dev/null +++ b/packages/hal/ohm/fix_configure.patch @@ -0,0 +1,39 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2007-12-19 13:43:52.000000000 +0000 ++++ git/configure.in 2008-03-06 23:59:57.000000000 +0000 +@@ -201,9 +201,6 @@ + # Like AC_CHECK_HEADER, but it uses the already-computed -I directories. + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -211,9 +208,6 @@ + # Like AC_TRY_COMPILE, but it uses the already-computed -I directories. + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -224,14 +218,8 @@ + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- if test \! -z "$libdir" ; then +- LDFLAGS="$LDFLAGS -L$libdir" +- fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5]) diff --git a/packages/hal/ohm_git.bb b/packages/hal/ohm_git.bb index 11fbd1c929..a747c2ff1c 100644 --- a/packages/hal/ohm_git.bb +++ b/packages/hal/ohm_git.bb @@ -4,44 +4,41 @@ LICENSE = "LGPL" DEPENDS = "gtk+ dbus-glib intltool-native hal" RDEPENDS_${PN} += "udev hal-info" -SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" +SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ + file://fix_configure.patch;patch=1" -PV = "0.0+git${SRCDATE}" -PR = "r2" +SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e" +PV = "0.1.2+${PR}+git${SRCREV}" S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF = "--with-distro=debian --without-xauth" +EXTRA_OECONF = "--with-distro=debian \ + --without-xauth \ + --disable-gtk-doc \ + --disable-docbook-docs" do_configure_prepend() { touch gtk-doc.make } -do_configure_append() { - rm config.log -} - OE_LT_RPATH_ALLOW=":${libdir}/libohm:" OE_LT_RPATH_ALLOW[export]="1" PACKAGES =+ "libohm ohm-plugin-x11" -FILES_${PN}-dev += "${libdir}/ohm/*.la \ - ${libdir}/ohm/*.a " +FILES_${PN}-dev += "${libdir}/ohm/*.a" FILES_${PN} = "${sysconfdir} \ ${bindir}/* \ - ${sbindir}/* \ - ${libdir}/ohm/*.so \ - " + ${sbindir}/* \ + ${libdir}/ohm/*.so \ + " FILES_libohm = "${libdir}/libohm.so.*" FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \ ${libdir}/ohm/libohm_idle.so \ ${sysconfdir}/ohm/plugins.d/x* \ - ${sysconfdir}/ohm/plugins.d/idle* \ - " - - + ${sysconfdir}/ohm/plugins.d/idle* \ + " diff --git a/packages/initscripts/initscripts-1.0/slugos/mountall.sh b/packages/initscripts/initscripts-1.0/slugos/mountall.sh index 94ea8217fd..3a155d155b 100644 --- a/packages/initscripts/initscripts-1.0/slugos/mountall.sh +++ b/packages/initscripts/initscripts-1.0/slugos/mountall.sh @@ -5,6 +5,15 @@ # . /etc/default/rcS +# If the right stuff exists, attempt to automatically assemble any +# RAID devices that might be configured. +# +if test -x /sbin/mdadm +then + test "$VERBOSE" != no && echo "Assembling RAID devices..." + mdadm --assemble --scan --auto=md +fi + # # Mount local filesystems in /etc/fstab. For some reason, people # might want to mount "proc" several times, and mount -v complains diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index b742ad5071..18176ed4f8 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -16,7 +16,7 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.14" +PR := "${PR}.15" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/intltool/intltool-native_0.40.3.bb b/packages/intltool/intltool-native_0.40.3.bb index ca1c5ef5c9..a90b667d6d 100644 --- a/packages/intltool/intltool-native_0.40.3.bb +++ b/packages/intltool/intltool-native_0.40.3.bb @@ -1,6 +1,6 @@ require intltool_${PV}.bb -PR = "r1" +PR = "r2" inherit native DEPENDS = "libxml-parser-perl-native" @@ -13,3 +13,8 @@ do_configure_prepend() { sed -i -e s:-w::g $i done } + +do_configure_append() { + sed -i -e s:head\ -1:head\ -n1:g intltool.m4 +} + 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/citytime-path-2.patch b/packages/libqpe/libqpe-opie/citytime-path-2.patch new file mode 100644 index 0000000000..27cb9634c9 --- /dev/null +++ b/packages/libqpe/libqpe-opie/citytime-path-2.patch @@ -0,0 +1,11 @@ +--- library/tzselect.cpp 12 Jan 2008 10:14:42 -0000 1.13 ++++ library/tzselect.cpp 30 Aug 2008 15:32:13 -0000 +@@ -270,7 +270,7 @@ + void TimeZoneSelector::slotExecute( void ) + { + // execute the world time application... +- if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime")) ++ if (QFile::exists(OPIE_BINDIR "/citytime")) + Global::execute( "citytime" ); + else + QMessageBox::warning(this,tr("citytime executable not found"), 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 0085003303..7c69904cd2 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,12 +1,12 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ - file://citytime-path.patch;patch=1 \ + file://citytime-path-2.patch;patch=1 \ file://argv.patch;patch=1 \ " diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index b3ea5f9557..867b5b885c 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Mon Aug 11 16:37:34 2008 +# Wed Sep 3 15:38:48 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1412,7 +1412,10 @@ CONFIG_USB_MUSB_SOC=y CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y -CONFIG_MUSB_PIO_ONLY=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +CONFIG_MUSB_USE_SYSTEM_DMA_RX=y +# CONFIG_USB_TI_CPPI_DMA is not set CONFIG_USB_MUSB_LOGLEVEL=0 # @@ -1456,49 +1459,62 @@ CONFIG_USB_MON=y # USB port drivers # CONFIG_USB_SERIAL=m -# CONFIG_USB_EZUSB is not set -# CONFIG_USB_SERIAL_GENERIC is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP2101 is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MOTOROLA is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OPTION is not set -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index f032f076e8..5a8aeb16a0 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r61" +PR = "r62" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb deleted file mode 100644 index e099e7db95..0000000000 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ /dev/null @@ -1,71 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x kernel for FIC SmartPhones shipping w/ Openmoko" -VANILLA_VERSION = "2.6.22" -KERNEL_RELEASE = "2.6.22.5" - -# If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" - -PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r13" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ - svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http \ - file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ - file://fix-gta01-flowcontrol2-2.6.22.5.patch;patch=1 \ - file://gta02-sound.patch;patch=1 \ - file://soc-core-suspend.patch;patch=1 \ - file://iis-suspend.patch;patch=1 \ - file://s3c24xx-pcm-suspend.patch;patch=1 \ - file://gta-vibro-pwm-suspend.patch;patch=1 \ - file://defconfig-${KERNEL_RELEASE}" - -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'om-gta01|om-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" - -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch - diff --git a/packages/loudmouth/loudmouth_1.3.2.bb b/packages/loudmouth/loudmouth_1.3.2.bb new file mode 100644 index 0000000000..d8f519b611 --- /dev/null +++ b/packages/loudmouth/loudmouth_1.3.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." +HOMEPAGE = "http://www.loudmouth-project.org/" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 gnutls check" + +SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/mozilla/fennec/.mtn2git_empty b/packages/mozilla/fennec/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/fennec/.mtn2git_empty diff --git a/packages/mozilla/fennec/arm/.mtn2git_empty b/packages/mozilla/fennec/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/fennec/arm/.mtn2git_empty diff --git a/packages/mozilla/fennec/arm/mozconfig b/packages/mozilla/fennec/arm/mozconfig new file mode 100644 index 0000000000..0e25c7e248 --- /dev/null +++ b/packages/mozilla/fennec/arm/mozconfig @@ -0,0 +1,10 @@ +mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir +mk_add_options AUTOCONF=autoconf2.13 + +ac_add_options --disable-javaxpcom + +ac_add_app_options xulrunner --with-arm-kuser +ac_add_app_options xulrunner --enable-application=xulrunner + +ac_add_app_options mobile --enable-application=mobile diff --git a/packages/mozilla/fennec/mozconfig b/packages/mozilla/fennec/mozconfig new file mode 100644 index 0000000000..f4b2c5aa95 --- /dev/null +++ b/packages/mozilla/fennec/mozconfig @@ -0,0 +1,25 @@ +# Options for client.mk. +mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mobilebase + +# Global options +#ac_add_options --enable-debug +#ac_add_options --disable-optimize +#ac_add_options --enable-logging +#ac_cv_visibility_pragma=no + +#ac_add_options --enable-timeline + +# XULRunner options +ac_add_app_options xulrunner --enable-application=xulrunner +ac_add_app_options xulrunner --disable-javaxpcom + +# mobile options +ac_add_app_options mobile --enable-application=mobile +ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist + +# configure will be automatically generated using the 'autoconf-2.13' +# command. If autoconf-2.13 isn't the right name for your system, as +# is the case on OS X using MacPorts, use the real command name as +# demonstrated below. +mk_add_options AUTOCONF=autoconf2.13 diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb new file mode 100644 index 0000000000..8aeca90f6e --- /dev/null +++ b/packages/mozilla/fennec_hg.bb @@ -0,0 +1,42 @@ +DEPENDS += "cairo" + +PV = "0.0" + +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=d14db8996980 \ + hg://hg.mozilla.org/;module=mobile-browser;rev=60dd20721284 \ + file://jsautocfg.h \ +" + +S = "${WORKDIR}/mozilla-central" + +inherit mozilla +require firefox.inc + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_configure_prepend() { + if [ -e ${WORKDIR}/mobile-browser ] ; then + mv ${WORKDIR}/mobile-browser ${S}/mobile + fi + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + install -d ${STAGING_INCDIR}/fennec-${PV} + cd dist/sdk/include + rm -rf obsolete + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/fennec-${PV}/ + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/fennec-${PV}/nsIServiceManager.h +} + diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb index e50fa46eec..d086e9bcc1 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc2.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig DEPENDS_append_c7x0 = " libw100 " DEPENDS_append_hx4700 = " libw100 " -DEFAULT_PREFERENCE_avr32 = "-1" +DEFAULT_PREFERENCE_avr32 = "1" RDEPENDS = "mplayer-common" LICENSE = "GPL" 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/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb index 1e9eb4f217..ca9e4fbade 100644 --- a/packages/openmax/libomxil-bellagio_0.9.0.bb +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim LICENSE = "LGPLv2" DEPENDS = "libmad alsa-lib ffmpeg" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" 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/opie-cardapplet/opie-cardapplet.inc b/packages/opie-cardapplet/opie-cardapplet.inc index 848bfaa63a..a96f972423 100644 --- a/packages/opie-cardapplet/opie-cardapplet.inc +++ b/packages/opie-cardapplet/opie-cardapplet.inc @@ -13,22 +13,26 @@ inherit opie pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi if [ -n "$D" ]; then false; fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } -# FILES plugins/applets/libcardapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav +# FILES plugins/applets/libcardapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav etc/opie-pcmcia.* do_install() { install -d ${D}${palmtopdir}/pics/cardmon/ install -d ${D}${palmtopdir}/sounds/cardmon/ + install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/udev/scripts/ install -m 0644 ${WORKDIR}/pics/cardmon/*.png ${D}${palmtopdir}/pics/cardmon/ install -m 0644 ${WORKDIR}/sounds/cardmon/*.wav ${D}${palmtopdir}/sounds/cardmon/ + install -m 0644 ${WORKDIR}/etc/opie-pcmcia.rules ${D}${sysconfdir}/udev/rules.d/opie-pcmcia.rules + install -m 0755 ${WORKDIR}/etc/opie-pcmcia.sh ${D}${sysconfdir}/udev/scripts/opie-pcmcia.sh } diff --git a/packages/opie-cardapplet/opie-cardapplet_cvs.bb b/packages/opie-cardapplet/opie-cardapplet_cvs.bb index 0c5c645ad2..e791fe09fd 100644 --- a/packages/opie-cardapplet/opie-cardapplet_cvs.bb +++ b/packages/opie-cardapplet/opie-cardapplet_cvs.bb @@ -2,7 +2,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r2" + SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/cardapplet \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/sounds \ - ${HANDHELDS_CVS};module=opie/apps" + ${HANDHELDS_CVS};module=opie/apps \ + ${HANDHELDS_CVS};module=opie/etc" diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc index 238819c071..88e46808e3 100644 --- a/packages/opie-clockapplet/opie-clockapplet.inc +++ b/packages/opie-clockapplet/opie-clockapplet.inc @@ -27,3 +27,9 @@ ${bindir}/qcop QPE/TaskBar "reloadApplets()" do_install() { } +# FILES plugins/applets/libclockapplet.so* pics/clockapplet/*.png +do_install() { + install -d ${D}${palmtopdir}/pics/clockapplet/ + install -m 0644 ${WORKDIR}/pics/clockapplet/*.png ${D}${palmtopdir}/pics/clockapplet/ +} + diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb index cc1a2b5376..2785b7cd29 100644 --- a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb +++ b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 46a6d8c7e7..28ca4dac95 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-jumpx/opie-jumpx.inc b/packages/opie-jumpx/opie-jumpx.inc index 8448e9a03c..06f810a73c 100644 --- a/packages/opie-jumpx/opie-jumpx.inc +++ b/packages/opie-jumpx/opie-jumpx.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" + /usr/bin/qcop QPE/TaskBar "reloadInputMethods()" else exit 0 fi @@ -23,7 +23,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" +/usr/bin/qcop QPE/TaskBar "reloadInputMethods()" } # FILES plugins/inputmethods/libqjumpx.so* pics/jumpx diff --git a/packages/opie-jumpx/opie-jumpx_1.2.3.bb b/packages/opie-jumpx/opie-jumpx_1.2.3.bb index b1be4bf1a7..7e1de3b0ac 100644 --- a/packages/opie-jumpx/opie-jumpx_1.2.3.bb +++ b/packages/opie-jumpx/opie-jumpx_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kjumpx/opie-kjumpx.inc b/packages/opie-kjumpx/opie-kjumpx.inc index 631f2353b6..95644a5428 100644 --- a/packages/opie-kjumpx/opie-kjumpx.inc +++ b/packages/opie-kjumpx/opie-kjumpx.inc @@ -14,7 +14,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" + /usr/bin/qcop QPE/TaskBar "reloadInputMethods()" else exit 0 fi @@ -24,7 +24,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" +/usr/bin/qcop QPE/TaskBar "reloadInputMethods()" } # FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/* diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb index 0a13550770..587fa7924a 100644 --- a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb +++ b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb new file mode 100644 index 0000000000..78f0796834 --- /dev/null +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb new file mode 100644 index 0000000000..b40ab35295 --- /dev/null +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb new file mode 100644 index 0000000000..9b700fb85b --- /dev/null +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb new file mode 100644 index 0000000000..b40ab35295 --- /dev/null +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb new file mode 100644 index 0000000000..ca0beacb47 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1.inc new file mode 100644 index 0000000000..f60d7a55d9 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "The classic Opie media player (core+plugins)." +LICENSE = "GPL" +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "all" +RDEPENDS = "opie-mediaplayer1-core" +RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ +opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index 7739f3bb15..10510e5566 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,9 +1,2 @@ -DESCRIPTION = "The classic Opie media player (core+plugins)." -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" -RDEPENDS = "opie-mediaplayer1-core" -RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ -opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" +require ${PN}.inc -PR = "r2" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb new file mode 100644 index 0000000000..10510e5566 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb @@ -0,0 +1,2 @@ +require ${PN}.inc + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb new file mode 100644 index 0000000000..cf67d0c2e8 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb @@ -0,0 +1,4 @@ +require ${PN}.inc + +PV = "${OPIE_CVS_PV}" + diff --git a/packages/opie-networkapplet/opie-networkapplet.inc b/packages/opie-networkapplet/opie-networkapplet.inc index f67861e069..dcb5c930f1 100644 --- a/packages/opie-networkapplet/opie-networkapplet.inc +++ b/packages/opie-networkapplet/opie-networkapplet.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -22,7 +22,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } # FILES plugins/applets/libnetworkapplet.so* pics/networkapplet diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb index a965cbd2c0..0ee5f6a00d 100644 --- a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb +++ b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-notesapplet/opie-notesapplet.inc b/packages/opie-notesapplet/opie-notesapplet.inc index 9c167fd4cd..ca4cae9d65 100644 --- a/packages/opie-notesapplet/opie-notesapplet.inc +++ b/packages/opie-notesapplet/opie-notesapplet.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -22,7 +22,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } # FILES plugins/applets/libnotesapplet.so* diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb index 4bfd335611..95160df5cd 100644 --- a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb +++ b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb @@ -1,4 +1,5 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index 1bd67a8077..68dbcb930b 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -13,10 +13,12 @@ do_install() { install -d ${D}${palmtopdir}/pics/addressbook/ install -d ${D}${palmtopdir}/pics/datebook/ install -d ${D}${palmtopdir}/pics/todo/ + install -d ${D}${palmtopdir}/pics/opie/ install -m 0664 pics/*.png ${D}${palmtopdir}/pics/ install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/ install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/ install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/ + install -m 0664 pics/opie/*.png ${D}${palmtopdir}/pics/opie/ if [ "${SHIP_INLINE_PICS}" == "yes" ]; then install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/ diff --git a/packages/opie-pics/opie-pics_1.2.3.bb b/packages/opie-pics/opie-pics_1.2.3.bb index 5ca408ea5e..2c199b73fc 100644 --- a/packages/opie-pics/opie-pics_1.2.3.bb +++ b/packages/opie-pics/opie-pics_1.2.3.bb @@ -1,5 +1,7 @@ require ${PN}.inc +PR = "r1" + TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 78bce2c30a..08aa9ede5c 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc index 706fe4d434..cf83b28711 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc @@ -11,13 +11,13 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb index 56fe35ce52..8fa1eff6e3 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 43d8f431cc..8f8683175f 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,7 +1,19 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps" + +# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + + for icon in Security.png lock.png multiauth.png sync.png users.png ownerinfo.png; + do + install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/ + done +} + diff --git a/packages/opie-vmemo/opie-vmemo.inc b/packages/opie-vmemo/opie-vmemo.inc index d055034190..9b45eff34b 100644 --- a/packages/opie-vmemo/opie-vmemo.inc +++ b/packages/opie-vmemo/opie-vmemo.inc @@ -14,14 +14,14 @@ inherit opie pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi if [ -n "$D" ]; then exit 1; fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then exit 1; fi } diff --git a/packages/opie-vmemo/opie-vmemo_1.2.3.bb b/packages/opie-vmemo/opie-vmemo_1.2.3.bb index a7f91b1dee..096a162c0f 100644 --- a/packages/opie-vmemo/opie-vmemo_1.2.3.bb +++ b/packages/opie-vmemo/opie-vmemo_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet.inc b/packages/opie-wirelessapplet/opie-wirelessapplet.inc index 037afc7044..d96ed43e87 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet.inc +++ b/packages/opie-wirelessapplet/opie-wirelessapplet.inc @@ -14,7 +14,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -23,5 +23,5 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb index 1a1bf963fb..39ed06b51b 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb @@ -1,4 +1,5 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index 51aec57012..52f40c9cc2 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -6,7 +6,7 @@ and instant schema evolution." LICENSE = "MetaKit" HOMEPAGE = "http://www.equi4.com/metakit.html" -SRC_URI = "http://www.equi4.com/pub/mk/older/metakit-${PV}.tar.gz \ +SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \ file://metakit-2.4.9.3.patch;patch=1" PR = "r1" diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 9ae307e7a4..68fb934e54 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -264,9 +264,9 @@ RDEPENDS_python-debugger="python-core python-io python-lang python-re python-str FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml0" +PR_python-shell="ml1" RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " +FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" PR_python-bsddb="ml1" diff --git a/packages/python/python-numpy/.mtn2git_empty b/packages/python/python-numpy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-numpy/.mtn2git_empty 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/unbreak-assumptions.diff b/packages/python/python-numpy/unbreak-assumptions.diff new file mode 100644 index 0000000000..c5b448167f --- /dev/null +++ b/packages/python/python-numpy/unbreak-assumptions.diff @@ -0,0 +1,16 @@ +--- /tmp/system_info.py 2008-08-22 00:38:16.000000000 +0200 ++++ numpy-1.1.1/numpy/distutils/system_info.py 2008-08-22 00:40:33.013198000 +0200 +@@ -137,11 +137,8 @@ + default_x11_lib_dirs = [] + default_x11_include_dirs = [] + else: +- default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib', +- '/opt/local/lib', '/sw/lib'] +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- '/opt/local/include', '/sw/include'] ++ default_lib_dirs = ['/non-existant-dir'] ++ default_include_dirs = ['non-existant-dir'] + default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] + + try: diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index d688c93beb..157dadadaf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -5,12 +5,23 @@ LICENSE = "PSF" 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/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index c68f7d5e3b..e285575149 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml9" +PR = "ml10" PYTHON_MAJMIN = "2.5" diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb index a964f1feec..76f81a3d81 100644 --- a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb +++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb @@ -8,6 +8,8 @@ RDEPENDS = "qpealarmclock" RCONFLICTS = "opie-clockapplet" RREPLACES = "opie-clockapplet" +PR = "r1" + APPNAME = "qpealarmclockapplet" APPTYPE = "binary" @@ -23,13 +25,13 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } 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/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 63370ce340..34c002ba0b 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -24,9 +24,21 @@ then # waiting for disk if test "$sleep" -gt 0 then - echo "Waiting $sleep seconds for disk" + echo "boot: waiting $sleep seconds for disk" sleep "$sleep" fi + # Attempt to assemble the RAID if necessary + if (echo $device | grep -q "^/dev/md") + then + if test -n "$MDUUID" + then + echo "boot: assembling RAID array (UUID)" + mdadm -Acpartitions --auto=md --uuid="$MDUUID" $device + else + echo "boot: assembling RAID array (config file)" + mdadm -As --auto=md $device + fi + fi # # fire the boot echo "boot: rootfs: mount $* $device [$UUID]" diff --git a/packages/slugos-init/files/conffiles b/packages/slugos-init/files/conffiles index e1408a3227..668f7467a8 100644 --- a/packages/slugos-init/files/conffiles +++ b/packages/slugos-init/files/conffiles @@ -2,7 +2,7 @@ # Known SlugOS configuration files. These files are preserved on # a flash upgrade. Other configuration files, found from: # -# /usr/lib/ipkg/*.conffiles +# /usr/lib/opkg/*.conffiles # /etc/*.conf # # are preserved too with an operation of 'diff' if they have been diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index 5b6b40b091..253526995f 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -191,6 +191,7 @@ checkmount(){ minimaldevnodes(){ [ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1 [ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1 + [ -c "$1/dev/tty0" ] || mknod -m 644 "$1/dev/tty0" c 4 0 || return 1 return 0 } # diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 2bbc9024ef..51b801dfea 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -274,7 +274,13 @@ setup_dev() { # /dev/null # syslog, and maybe other things, only work if fd 1 is valid, therefore # we must create these devices here... - makedevs --root="$1" --devtable="$2" + # (if makedevs is a symlink, it's the busybox version, different syntax) + if [ -h /sbin/makedevs ] + then + makedevs -d "$2" "$1" + else + makedevs --root="$1" --devtable="$2" + fi :>"$1"/dev/.noram return 0 } @@ -290,7 +296,13 @@ setup_bootdev() { } # NOTE: this fails silently with 0 return code(!) when a directory # does not exist yet things are created within it. - makedevs -r "$1" -D "$2" + # (if makedevs is a symlink, it's the busybox version, different syntax) + if [ -h /sbin/makedevs ] + then + makedevs -d "$2" "$1" + else + makedevs -r "$1" -D "$2" + fi } # @@ -432,6 +444,7 @@ boot_rootfs() { sleep="$3" device="$4" uuid= + mduuid= # test this first as the test does not depend on the correctness # of the other arguments @@ -452,6 +465,11 @@ boot_rootfs() { return 1 } uuid="$3" + if (echo "$device" | grep -q '^/dev/md') + then + # FIXME: should use awk to do the below extraction + mduuid=`mdadm --detail --brief "$device" | sed 's/^.*UUID=//'` + fi shift 3;; nfs) shift 2;; flash) ;; @@ -493,6 +511,7 @@ boot_rootfs() { echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " + test -n "$mduuid" && echo -n "MDUUID='$mduuid' " echo -n "exec '/boot/$type' '$device'" for opt in "$@" do diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 9b7c2cd8d0..4babf89d61 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r1.2" +PR = "r2" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb index 3ef8091435..65b84bcf79 100644 --- a/packages/subapplet/subapplet_1.0.8.bb +++ b/packages/subapplet/subapplet_1.0.8.bb @@ -5,7 +5,7 @@ SECTION = "opie/applets" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/subapplet/" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \ file://toolbar-resize-fix.patch;patch=1" @@ -25,7 +25,7 @@ do_install() { pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -34,6 +34,6 @@ fi pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } 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 d7379381b4..0e616e72cc 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,10 +1,12 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r5" +PR = "r10" DEPENDS = "python-pygtk sugar-toolkit" -RDEPENDS = "hippo-canvas \ +RDEPENDS = "librsvg-gtk \ + ohm-plugin-x11 ohm \ + hippo-canvas \ python-datetime \ python-netclient \ python-pygtk \ @@ -12,7 +14,8 @@ RDEPENDS = "hippo-canvas \ python-logging \ python-dbus \ python-subprocess \ - telepathy-python \ + telepathy-gabble telepathy-salut telepathy-python \ + sugar-presence-service \ python-crypt \ python-numpy \ python-compression \ @@ -20,7 +23,11 @@ RDEPENDS = "hippo-canvas \ 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/sugar/sugar-presence-service_0.82.1.bb b/packages/sugar/sugar-presence-service_0.82.1.bb new file mode 100644 index 0000000000..67b96f7b20 --- /dev/null +++ b/packages/sugar/sugar-presence-service_0.82.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Sugar presence service" +LICENSE = "GPLv2" + +DEPENDS = "sugar-toolkit" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/${PN}/${PN}-${PV}.tar.bz2" + +inherit autotools distutils-base + +do_configure_prepend() { + mkdir -p ${S}/m4 +} + +FILES_${PN} += "${datadir}/${PN} \ + ${datadir}/mime \ + ${datadir}/xsessions \ + ${datadir}/dbus-1 \ + ${sysconfdir} \ + ${libdir}/python*/site-packages/" + +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug" + + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb index b72ca63358..cf505370e9 100644 --- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb +++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb @@ -4,6 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/subapplet/" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz" S = "${WORKDIR}/TaskList-1.0.5" @@ -21,7 +23,7 @@ do_install() { pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -30,6 +32,6 @@ fi pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index af2c85fb2c..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 = "r35" +PR = "r40" inherit task @@ -93,4 +93,12 @@ RDEPENDS_task-openmoko-feed = "\ irssi \ zsh \ fbreader \ + zip \ + firefox \ + tichy \ + pidgin \ + epdfview \ + midori \ + microcom \ + emacs \ " diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 0a0dd65496..e1092b68d9 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r20" +PR = "r21" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" ALLOW_EMPTY = "1" @@ -21,14 +21,10 @@ ALLOW_EMPTY = "1" SLUGOS_STANDARD_RDEPENDS = "" SLUGOS_STANDARD_RRECOMMENDS = "" -# diff, cpio and find are required for turnup and ipkg. +# The full cpio (non-busybox) is required for turnup and sysconfig. SLUGOS_STANDARD_RRECOMMENDS += "\ cpio \ " -## SlugOS 5.0 -- uses busybox diff & find; cpio still needs -p and ability to -## create CRC archives before we can use busybox cpio - MJW -#diffutils \ -#findutils \ # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux @@ -41,12 +37,6 @@ e2fsprogs-badblocks \ e2fsprogs-blkid \ " -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -## SlugOS 5.0 -- uses busybox rx command - MJW -#SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" - # Filesystem selection. Adding entries here adds the module to the # image. The module must be built as part of nslu2-kernel (i.e. it # must be specified as a module in the defconfig file). The NLS @@ -100,6 +90,15 @@ kernel-module-mii \ kernel-module-ixp4xx-mac \ kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ +kernel-module-netconsole \ +" + +# Add packages and modules required for RAID-1 support +# (temporary, intended only to facilitate testing - MJW) +SLUGOS_STANDARD_RRECOMMENDS += "\ +mdadm \ +kernel-module-md-mod \ +kernel-module-raid1 \ " # Other candidate packages that have been considered and @@ -110,10 +109,10 @@ kernel-module-via-velocity \ # kernel-module-isofs \ # kernel-module-udf \ # kernel-module-loop \ -# kernel-module-netconsole \ +# wireless-tools \ # wpa-supplicant \ # zd1211-firmware kernel-module-zd1211rw \ -# madwifi-ng-modules madwifi-ng-tools wireless-tools \ +# madwifi-ng-modules madwifi-ng-tools \ DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" diff --git a/packages/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb new file mode 100644 index 0000000000..ff304f918e --- /dev/null +++ b/packages/telepathy/empathy_2.23.90.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Empathy: a Telepathy based IM client" +HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" +LICENSE = "GPL" +DEPENDS = "python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" +RDEPENDS = "telepathy-mission-control" +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 \ + ${datadir}/telepathy/managers/*.chandler \ + ${datadir}/icons \ + ${libdir}/python*" + +FILES_${PN}-dbg += "${libdir}/python*/*/.debug" + diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb new file mode 100644 index 0000000000..d30b301d38 --- /dev/null +++ b/packages/telepathy/libtelepathy_0.3.3.bb @@ -0,0 +1,15 @@ +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty b/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty diff --git a/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager new file mode 100644 index 0000000000..d09b838090 --- /dev/null +++ b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager @@ -0,0 +1,32 @@ + +[ConnectionManager] +BusName=org.freedesktop.Telepathy.ConnectionManager.gabble +ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble + +[Protocol jabber] +param-account=s required register +param-password=s required register +param-server=s +param-resource=s +param-priority=n +param-port=q +param-old-ssl=b +param-require-encryption=b +param-register=b +param-low-bandwidth=b +param-https-proxy-server=s +param-https-proxy-port=q +param-fallback-conference-server=s +param-stun-server=s +param-stun-port=q +param-ignore-ssl-errors=b +param-alias=s +default-resource=Telepathy +default-priority=0 +default-old-ssl=false +default-require-encryption=false +default-register=false +default-low-bandwidth=false +default-https-proxy-port=443 +default-stun-port=3478 +default-ignore-ssl-errors=false diff --git a/packages/telepathy/telepathy-gabble_0.7.8.bb b/packages/telepathy/telepathy-gabble_0.7.8.bb new file mode 100644 index 0000000000..fbc209eeb5 --- /dev/null +++ b/packages/telepathy/telepathy-gabble_0.7.8.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Gabble: a Jabber/XMPP connection manager" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib" +LICENSE = "LGPL" + +# gabble.manager needs to get regenerated every release, so please don't copy it over blindly +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ + file://gabble.manager" + +inherit autotools pkgconfig + +do_compile_prepend() { + cp ${WORKDIR}/gabble.manager ${S}/data/ +} + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" diff --git a/packages/telepathy/telepathy-glib_0.7.14.bb b/packages/telepathy/telepathy-glib_0.7.14.bb new file mode 100644 index 0000000000..f6b6a6c6b3 --- /dev/null +++ b/packages/telepathy/telepathy-glib_0.7.14.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Telepathy framework - GLib library" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus python-native dbus-native" +LICENSE = "LGPL" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz " + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + # + # copied autotools_stage_all because telepathy-glib has one lib only built as static + # so it can not be oe_libinstalled + # + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + if [ -d ${STAGE_TEMP}/${includedir} ]; then + cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + fi + if [ -d ${STAGE_TEMP}/${libdir} ] + then + for i in ${STAGE_TEMP}/${libdir}/*.la + do + if [ ! -f "$i" ]; then + cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + break + fi + done + oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR} + fi + if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then + install -d ${STAGING_DATADIR}/aclocal + cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal + fi + rm -rf ${STAGE_TEMP} +} diff --git a/packages/telepathy/telepathy-mission-control_4.67.bb b/packages/telepathy/telepathy-mission-control_4.67.bb new file mode 100644 index 0000000000..418a265512 --- /dev/null +++ b/packages/telepathy/telepathy-mission-control_4.67.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Telepathy Mission Control" +HOMEPAGE = "http://mission-control.sourceforge.net/" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "libtelepathy dbus-glib gconf" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz" + +inherit autotools + +PACKAGES =+ " \ + libmissioncontrol \ + libmissioncontrol-config \ + libmissioncontrol-server \ + libmissioncontrol-dev \ + libmissioncontrol-config-dev \ + libmissioncontrol-server-dev \ + libmissioncontrol-dbg \ + libmissioncontrol-config-dbg \ + libmissioncontrol-server-dbg \ +" + +FILES_${PN} += "${datadir}/dbus*" + +FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" +FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" + +FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ + ${includedir}/libmissioncontrol/ \ + ${libdir}/pkgconfig/libmissioncontrol.pc" +FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" +FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" + +FILES_libmissioncontrol-dbg += "${libdir}/.debug/libmissioncontrol.so.*" +FILES_libmissioncontrol-config-dbg += "${libdir}/.debug/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server-dbg += "${libdir}/.debug/libmissioncontrol-server.so.*" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_compile_append() { + for i in ${S}/*.pc ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/telepathy/telepathy-python_0.15.1.bb b/packages/telepathy/telepathy-python_0.15.1.bb new file mode 100644 index 0000000000..0898b321eb --- /dev/null +++ b/packages/telepathy/telepathy-python_0.15.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Telepathy framework - Python package" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +LICENSE = "LGPL" +RDEPENDS_${PN} += "python-dbus" + +SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " + +inherit distutils diff --git a/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty b/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty diff --git a/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff new file mode 100644 index 0000000000..4c335e0c8b --- /dev/null +++ b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff @@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2008-08-31 15:37:45.000000000 +0200 ++++ telepathy-salut-0.3.4/data/Makefile.am 2008-08-31 15:38:09.163198000 +0200 +@@ -15,8 +15,4 @@ + + CLEANFILES = $(service_DATA) $(manager_DATA) + +-$(manager_DATA): always-build +- $(MAKE) -C ../src write-mgr-file +- ../src/write-mgr-file > $@ +- + .PHONY: always-build diff --git a/packages/telepathy/telepathy-salut-0.3.4/salut.manager b/packages/telepathy/telepathy-salut-0.3.4/salut.manager new file mode 100644 index 0000000000..8fd84d5877 --- /dev/null +++ b/packages/telepathy/telepathy-salut-0.3.4/salut.manager @@ -0,0 +1,13 @@ + +[ConnectionManager] +Name=Salut +BusName=org.freedesktop.Telepathy.ConnectionManager.salut +ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/salut + +[Protocol local-xmpp] +param-nickname=s +param-first-name=s required +param-last-name=s required +param-jid=s +param-email=s +param-published-name=s diff --git a/packages/telepathy/telepathy-salut_0.3.4.bb b/packages/telepathy/telepathy-salut_0.3.4.bb new file mode 100644 index 0000000000..c8b9edaee1 --- /dev/null +++ b/packages/telepathy/telepathy-salut_0.3.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Salut: Link-local XMPP connection manager for the Telepathy framework" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "telepathy-glib avahi telepathy-gabble" +LICENSE = "LGPL" + +#salut.manager changes every release, don't copy it over blindly! +SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \ + file://keep-manager-file.diff;patch=1 \ + file://salut.manager" + +inherit autotools pkgconfig + +do_compile_prepend() { + cp ${WORKDIR}/salut.manager ${S}/data/ +} + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" 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/udev/files/slugos/mount.sh b/packages/udev/files/slugos/mount.sh index 11714c1390..0990a7e85a 100644 --- a/packages/udev/files/slugos/mount.sh +++ b/packages/udev/files/slugos/mount.sh @@ -10,6 +10,12 @@ PMOUNT="/usr/bin/pmount" UMOUNT="/bin/umount" name="`basename "$DEVNAME"`" +if ( blkid "$DEVNAME" | grep -q 'TYPE="mdraid"' ) +then + logger "udev/mount.sh" "[$DEVNAME] is a member of an array, ignoring" + exit 0 +fi + for line in `cat /etc/udev/mount.blacklist | grep -v ^#` do if ( echo "$DEVNAME" | grep -q "$line" ) diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index c8840e1a8f..1cd3c41e82 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/vino/vino_2.22.2.bb b/packages/vino/vino_2.22.2.bb new file mode 100644 index 0000000000..0a077567ef --- /dev/null +++ b/packages/vino/vino_2.22.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Vino is an integrated VNC server for GNOME." +LICENSE = "GPLv2" + +DEPENDS = "libgnomeui libglade gnome-keyring esound dbus-glib libxml2 gnutls gnome-vfs" + +inherit gnome gconf + + diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.3.bb index 7714a4fffa..2e728ed2a9 100644 --- a/packages/vnc/x11vnc_0.9.3.bb +++ b/packages/vnc/x11vnc_0.9.3.bb @@ -5,7 +5,7 @@ AUTHOR = "Karl Runge" LICENSE = "GPL" DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" -SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" inherit autotools diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 9b2f06f88d..50149563ac 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -5,7 +5,6 @@ # _h_api = API headers that will be installed and included in the distribution # _cppflags = flags that will be passed to the C/CXX Preprocessor # _sources = sources that will be compiled and included in the distribution -# _headers = header files that will be part of the distribution # _built_sources = files that will be autogenerated by the build system and # will be part of the _SOURCES primary # _built_nosources = files that are autogenerated but are not part of the @@ -42,13 +41,12 @@ bin_PROGRAMS := noinst_PROGRAMS := +noinst_HEADERS := + lib_LIBRARIES := IDL_BINDINGS := -# Files that will be distributed -EXTRA_DIST := - # Global flags to CPP global_cppflags := @@ -96,6 +94,7 @@ javascriptcore_cppflags:= javascriptcore_sources := javascriptcore_built_sources := javascriptcore_built_nosources := +javascriptcore_dist := javascriptcore_cppflags += \ -I$(srcdir)/JavaScriptCore \ @@ -146,21 +145,18 @@ libJavaScriptCore_la_CPPFLAGS = \ # WebCore webcore_cppflags := webcore_sources := -webcore_headers := webcore_libadd := webcore_built_sources := webcore_built_nosources := +webcore_dist := webcoregtk_cppflags := webcoregtk_sources := -webcoregtk_headers := nodist_libWebCore_la_SOURCES = \ $(webcore_built_sources) libWebCore_la_SOURCES = \ - $(webcore_headers) \ $(webcore_sources) \ - $(webcoregtk_headers) \ $(webcoregtk_sources) libWebCore_la_CXXFLAGS = \ @@ -171,6 +167,7 @@ libWebCore_la_CXXFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -187,6 +184,7 @@ libWebCore_la_CFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -208,6 +206,7 @@ libWebCore_la_LIBADD = \ $(webcore_libadd) \ $(GLOBALDEPS_LIBS) \ $(WEBKITDEPS_LIBS) \ + $(XT_LIBS) \ $(LIBCURL_LIBS) \ $(LIBSOUP_LIBS) \ $(FREETYPE_LIBS) \ @@ -221,7 +220,6 @@ libWebCore_la_LIBADD = \ # WebKit webkitgtk_h_api := -webkitgtk_headers := webkitgtk_sources := webkitgtk_cppflags := webkitgtk_built_sources := @@ -237,7 +235,6 @@ libwebkit_1_0_la_HEADERS = \ WebKit/gtk/webkit/webkitenumtypes.h libwebkit_1_0_la_SOURCES = \ - $(webkitgtk_headers) \ $(webkitgtk_sources) libwebkit_1_0_la_CXXFLAGS = \ @@ -253,6 +250,7 @@ libwebkit_1_0_la_CPPFLAGS = \ libwebkit_1_0_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) \ -version-info @LIBWEBKITGTK_VERSION@ \ + -Wl,--version-script,$(srcdir)/symbols.filter \ $(no_undefined) libwebkit_1_0_la_LIBADD = \ @@ -272,7 +270,6 @@ endif if TARGET_X11 global_cppflags += -DXP_UNIX -webcore_libadd += -lXt endif if !ENABLE_DEBUG @@ -320,37 +317,35 @@ webkitgtk_h_api += \ WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - DerivedSources/webkitmarshal.h \ - DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitmarshal.cpp \ + DerivedSources/webkitmarshal.h \ WebKit/gtk/webkit/webkitenumtypes.h -webkitgtk_headers += \ - WebKit/gtk/webkit/webkitprivate.h \ +webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h - -webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitprivate.h \ WebKit/gtk/webkit/webkitversion.cpp \ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ WebKit/gtk/webkit/webkitwebframe.cpp \ WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ WebKit/gtk/webkit/webkitwebsettings.cpp \ - WebKit/gtk/webkit/webkitwebview.cpp \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/webkit/webkitwebview.cpp webkitgtk_cppflags += \ -DBUILDING_WEBKIT \ @@ -403,7 +398,7 @@ stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h @true -stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile +stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ @@ -425,7 +420,7 @@ stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile && rm -f xgen-gth \ && echo timestamp > $(@F) -DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile +DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#include <config.h>\n" \ @@ -449,6 +444,11 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile && rm -f xgen-gtc # END WEBKIT GTK+ +# +# Files that will be distributed +EXTRA_DIST = \ + $(javascriptcore_dist) \ + $(webcore_dist) # Files that will be cleaned MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) diff --git a/packages/webkit/webkit-gtk/WebKit.pri b/packages/webkit/webkit-gtk/WebKit.pri index d12423beb2..a869906288 100644 --- a/packages/webkit/webkit-gtk/WebKit.pri +++ b/packages/webkit/webkit-gtk/WebKit.pri @@ -6,102 +6,84 @@ isEmpty(OUTPUT_DIR) { CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug } -!gtk-port:CONFIG += qt-port -qt-port:DEFINES += BUILDING_QT__=1 -qt-port:!building-libs { +DEFINES += BUILDING_QT__=1 +building-libs { + win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 +} else { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit DEPENDPATH += $$PWD/WebKit/qt/Api } -gtk-port:!building-libs { - QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR - LIBS += -lWebKitGtk - DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit +DEFINES += USE_SYSTEM_MALLOC +CONFIG(release) { + DEFINES += NDEBUG } -gtk-port { - CONFIG += link_pkgconfig - - DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 - - # We use FreeType directly with Cairo - PKGCONFIG += cairo-ft - - directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 - else: PKGCONFIG += cairo gtk+-2.0 - - # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) - CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) - - # We use the curl http backend on all platforms - PKGCONFIG += libcurl - DEFINES += WTF_USE_CURL=1 +BASE_DIR = $$PWD +INCLUDEPATH += $$PWD/WebKit/qt/Api + +# +# For builds inside Qt we interpret the output rule and the input of each extra compiler manually +# and add the resulting sources to the SOURCES variable, because the build inside Qt contains already +# all the generated files. We do not need to generate any extra compiler rules in that case. +# +# In addition this function adds a new target called 'generated_files' that allows manually calling +# all the extra compilers to generate all the necessary files for the build using 'make generated_files' +# +defineTest(addExtraCompiler) { + CONFIG(QTDIR_build) { + outputRule = $$eval($${1}.output) + + input = $$eval($${1}.input) + input = $$eval($$input) + + for(file,input) { + base = $$basename(file) + base ~= s/\..+// + newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base) + SOURCES += $$newfile + } + + export(SOURCES) + } else { + QMAKE_EXTRA_COMPILERS += $$1 + generated_files.depends += compiler_$${1}_make_all + export(QMAKE_EXTRA_COMPILERS) + export(generated_files.depends) + } + return(true) +} - LIBS += -lWebKitGtk -ljpeg -lpng +defineTest(addExtraCompilerWithHeader) { + addExtraCompiler($$1) - QMAKE_CXXFLAGS += $$system(icu-config --cppflags) - QMAKE_LIBS += $$system(icu-config --ldflags) + eval(headerFile = $${2}) + isEmpty(headerFile) { + eval($${1}_header.output = $$eval($${1}.output)) + eval($${1}_header.output ~= s/\.cpp/.h/) + eval($${1}_header.output ~= s/\.c/.h/) + } else { + eval($${1}_header.output = $$headerFile) + } - # This set of warnings is borrowed from the Mac build - QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + eval($${1}_header.input = $$eval($${1}.input)) + eval($${1}_header.commands = @echo -n '') + eval($${1}_header.depends = compiler_$${1}_make_all) + eval($${1}_header.variable_out = GENERATED_FILES) - # These flags are based on optimization experience from the Mac port: - # Helps code size significantly and speed a little - QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + export($${1}_header.output) + export($${1}_header.input) + export($${1}_header.commands) + export($${1}_header.depends) + export($${1}_header.variable_out) - DEPENDPATH += $$PWD/JavaScriptCore/API - INCLUDEPATH += $$PWD -} + !CONFIG(QTDIR_build): QMAKE_EXTRA_COMPILERS += $${1}_header -DEFINES += USE_SYSTEM_MALLOC -CONFIG(release) { - DEFINES += NDEBUG -} + export(QMAKE_EXTRA_COMPILERS) + export(generated_files.depends) + export(SOURCES) -gtk-port:CONFIG(debug) { - DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED -# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE + return(true) } -BASE_DIR = $$PWD -qt-port:INCLUDEPATH += \ - $$PWD/WebKit/qt/Api -gtk-port:INCLUDEPATH += \ - $$BASE_DIR/WebCore/platform/gtk \ - $$BASE_DIR/WebCore/platform/network/curl \ - $$BASE_DIR/WebCore/platform/graphics/cairo \ - $$BASE_DIR/WebCore/loader/gtk \ - $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk \ - $$BASE_DIR/WebKit/gtk/WebCoreSupport \ - $$BASE_DIR/WebKit/gtk/webkit -INCLUDEPATH += \ - $$BASE_DIR/JavaScriptCore/ \ - $$BASE_DIR/JavaScriptCore/kjs \ - $$BASE_DIR/JavaScriptCore/bindings \ - $$BASE_DIR/JavaScriptCore/bindings/c \ - $$BASE_DIR/JavaScriptCore/wtf \ - $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ - $$BASE_DIR/WebCore \ - $$BASE_DIR/WebCore/ForwardingHeaders \ - $$BASE_DIR/WebCore/platform \ - $$BASE_DIR/WebCore/platform/network \ - $$BASE_DIR/WebCore/platform/graphics \ - $$BASE_DIR/WebCore/loader \ - $$BASE_DIR/WebCore/page \ - $$BASE_DIR/WebCore/css \ - $$BASE_DIR/WebCore/dom \ - $$BASE_DIR/WebCore/bridge \ - $$BASE_DIR/WebCore/editing \ - $$BASE_DIR/WebCore/rendering \ - $$BASE_DIR/WebCore/history \ - $$BASE_DIR/WebCore/xml \ - $$BASE_DIR/WebCore/html \ - $$BASE_DIR/WebCore/plugins - - -macx { - INCLUDEPATH += /usr/include/libxml2 - LIBS += -lxml2 -lxslt -} diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro index bc14feb5f6..035f73aa3f 100644 --- a/packages/webkit/webkit-gtk/WebKit.pro +++ b/packages/webkit/webkit-gtk/WebKit.pro @@ -1,21 +1,12 @@ TEMPLATE = subdirs CONFIG += ordered -!gtk-port:CONFIG += qt-port -qt-port { - lessThan(QT_MINOR_VERSION, 4) { - !win32-*:SUBDIRS += WebKit/qt/Plugins - } -} + SUBDIRS += \ + JavaScriptCore \ WebCore \ - JavaScriptCore/kjs/testkjs.pro - -qt-port { - SUBDIRS += WebKit/qt/QtLauncher + JavaScriptCore/kjs/jsc.pro \ + WebKit/qt/QtLauncher \ + WebKit/qt/tests - !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -} +!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher \ - WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk/acinclude.m4 b/packages/webkit/webkit-gtk/acinclude.m4 new file mode 100644 index 0000000000..e0083b9dd1 --- /dev/null +++ b/packages/webkit/webkit-gtk/acinclude.m4 @@ -0,0 +1,356 @@ +dnl dolt, a replacement for libtool +dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org> +dnl Copying and distribution of this file, with or without modification, +dnl are permitted in any medium without royalty provided the copyright +dnl notice and this notice are preserved. +dnl +dnl To use dolt, invoke the DOLT macro immediately after the libtool macros. +dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it +dnl installed when running autoconf on your project. + +AC_DEFUN([DOLT], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +# dolt, a replacement for libtool +# Josh Triplett <josh@freedesktop.org> +AC_PATH_PROG(DOLT_BASH, bash) +AC_MSG_CHECKING([if dolt supports this host]) +dolt_supported=yes +if test x$DOLT_BASH = x; then + dolt_supported=no +fi +if test x$GCC != xyes; then + dolt_supported=no +fi +case $host in +i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ +|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) + pic_options='-fPIC' + ;; +i?86-apple-darwin*) + pic_options='-fno-common' + ;; +*) + dolt_supported=no + ;; +esac +if test x$dolt_supported = xno ; then + AC_MSG_RESULT([no, falling back to libtool]) + LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' + LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' +else + AC_MSG_RESULT([yes, replacing libtool]) + +dnl Start writing out doltcompile. + cat <<__DOLTCOMPILE__EOF__ >doltcompile +#!$DOLT_BASH +__DOLTCOMPILE__EOF__ + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +args=("$[]@") +for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do + if test x"${args@<:@$arg@:>@}" = x-o ; then + objarg=$((arg+1)) + break + fi +done +if test x$objarg = x ; then + echo 'Error: no -o on compiler command line' 1>&2 + exit 1 +fi +lo="${args@<:@$objarg@:>@}" +obj="${lo%.lo}" +if test x"$lo" = x"$obj" ; then + echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 + exit 1 +fi +objbase="${obj##*/}" +__DOLTCOMPILE__EOF__ + +dnl Write out shared compilation code. + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +libobjdir="${obj%$objbase}.libs" +if test ! -d "$libobjdir" ; then + mkdir_out="$(mkdir "$libobjdir" 2>&1)" + mkdir_ret=$? + if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then + echo "$mkdir_out" 1>&2 + exit $mkdir_ret + fi +fi +pic_object="$libobjdir/$objbase.o" +args@<:@$objarg@:>@="$pic_object" +__DOLTCOMPILE__EOF__ + cat <<__DOLTCOMPILE__EOF__ >>doltcompile +"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$? +__DOLTCOMPILE__EOF__ + fi + +dnl Write out static compilation code. +dnl Avoid duplicate compiler output if also building shared objects. + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +non_pic_object="$obj.o" +args@<:@$objarg@:>@="$non_pic_object" +__DOLTCOMPILE__EOF__ + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $? +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args@<:@@@:>@}" || exit $? +__DOLTCOMPILE__EOF__ + fi + fi + +dnl Write out the code to write the .lo file. +dnl The second line of the .lo file must match "^# Generated by .*libtool" + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +{ +echo "# $lo - a libtool object file" +echo "# Generated by doltcompile, not libtool" +__DOLTCOMPILE__EOF__ + + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "pic_object='.libs/${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo pic_object=none +__DOLTCOMPILE__EOF__ + fi + + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "non_pic_object='${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo non_pic_object=none +__DOLTCOMPILE__EOF__ + fi + + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +} > "$lo" +__DOLTCOMPILE__EOF__ + +dnl Done writing out doltcompile; substitute it for libtool compilation. + chmod +x doltcompile + LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' + LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' + +dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for +dnl a target, so write out a libtool wrapper to handle that case. +dnl Note that doltlibtool does not handle inferred tags or option arguments +dnl without '=', because automake does not use them. + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool +#!$DOLT_BASH +__DOLTLIBTOOL__EOF__ + cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool +top_builddir_slash="${0%%doltlibtool}" +: ${top_builddir_slash:=./} +args=() +modeok=false +tagok=false +for arg in "$[]@"; do + case "$arg" in + --mode=compile) modeok=true ;; + --tag=CC|--tag=CXX) tagok=true ;; + *) args+=("$arg") + esac +done +if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" +else + exec ${top_builddir_slash}libtool "$[]@" +fi +__DOLTLIBTOOL__EOF__ + +dnl Done writing out doltlibtool; substitute it for libtool. + chmod +x doltlibtool + LIBTOOL='$(top_builddir)/doltlibtool' +fi +AC_SUBST(LTCOMPILE) +AC_SUBST(LTCXXCOMPILE) +# end dolt +]) + +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_PROG_AWK + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index 768ae9f9f2..21f72661ec 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -95,6 +95,10 @@ fi AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +else + FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'` + AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION], + AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly])) fi AC_PATH_PROG(GPERF, gperf) @@ -284,6 +288,26 @@ PKG_CHECK_MODULES([WEBKITDEPS], AC_SUBST([WEBKITDEPS_CFLAGS]) AC_SUBST([WEBKITDEPS_LIBS]) +# check for Xt if the target is X11 +if test "$with_target" = "x11"; then + PKG_CHECK_MODULES([XT], + [xt], + [xt_has_pkg_config=yes], + [xt_has_pkg_config=no]) + # some old versions of Xt do not provide xt.pc, so try to link against Xt + # and if it's installed fall back to just adding -lXt + if test "$xt_has_pkg_config" = "no"; then + # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as + # we don't care about the XtOpenDisplay symbol but only about the + # existence of libXt + AC_CHECK_LIB([Xt], [XtOpenDisplay], + [XT_CFLAGS=""; XT_LIBS="-lXt"], + [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])]) + fi + AC_SUBST([XT_CFLAGS]) + AC_SUBST([XT_LIBS]) +fi + # check whether to build with debugging enabled AC_MSG_CHECKING([whether to do a debug build]) AC_ARG_ENABLE(debug, diff --git a/packages/webkit/webkit-gtk/symbols.filter b/packages/webkit/webkit-gtk/symbols.filter new file mode 100644 index 0000000000..f5af6bac90 --- /dev/null +++ b/packages/webkit/webkit-gtk/symbols.filter @@ -0,0 +1,5 @@ +{ +local: +_ZSt*; +_ZNSt*; +}; diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 06f869ef48..b78844fc53 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "WebKit browser engine, GTK+ edition" -DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" +DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" @@ -19,6 +19,7 @@ SRC_URI = "\ file://Makefile.shared \ file://autogen.sh \ file://configure.ac \ + file://symbols.filter \ file://GNUmakefile.am \ " @@ -26,10 +27,12 @@ S = "${WORKDIR}/" inherit autotools pkgconfig lib_package +# FIXME: Segfaulting without --with-http-backend=curl EXTRA_OECONF = "\ --enable-debug=no \ --enable-svg \ --enable-icon-database=yes \ + --with-http-backend=curl \ " do_compile_prepend() { 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 +} + diff --git a/packages/xorg-lib/pixman/pixman-arm.patch b/packages/xorg-lib/pixman/pixman-arm.patch index 224b612548..6520a52d68 100644 --- a/packages/xorg-lib/pixman/pixman-arm.patch +++ b/packages/xorg-lib/pixman/pixman-arm.patch @@ -1,76 +1,97 @@ -commit 23a7d5dea599efec1f459bac64cf9edc4bd5ae11 -Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi> -Date: Thu Nov 29 12:29:59 2007 +0000 +commit 44d4231272bdf08fac077cdcaeaac1aec0dd1500 +Author: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Thu Aug 28 13:02:17 2008 -0400 - Implement ARM optimized version of fill routines. + arm-simd diff --git a/configure.ac b/configure.ac -index 22a91ef..3ac2a40 100644 +index 702bed0..7f24db5 100644 --- a/configure.ac +++ b/configure.ac -@@ -148,6 +148,32 @@ fi - AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes) +@@ -301,6 +301,44 @@ AC_SUBST(VMX_CFLAGS) - dnl ======================================================== -+ -+dnl Test for architechture specific optimizations for this platform + AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes) + ++dnl Check for ARM + -+AC_MSG_CHECKING(for architechture specific optimizations) ++have_armv5_simd=no ++AC_MSG_CHECKING(whether to use ARM assembler) ++xserver_save_CFLAGS=$CFLAGS ++CFLAGS="$CFLAGS $ARM_CFLAGS" ++AC_COMPILE_IFELSE([ ++int main () { ++ asm("uqadd8 r1, r1, r2"); ++ return 0; ++}], have_armv5_simd=yes) ++CFLAGS=$xserver_save_CFLAGS + -+use_arch_opts=no ++AC_ARG_ENABLE(arm, ++ [AC_HELP_STRING([--disable-arm], ++ [disable ARM fast paths])], ++ [enable_arm=$enableval], [enable_arm=auto]) + -+case "$host_cpu" in -+arm) -+ if test "$GCC" = "yes" ; then -+ use_arch_opts=yes -+ ARCH_OPT_SOURCES='pixman-arch-arm.lo' -+ fi -+ ;; -+esac ++if test $enable_arm = no ; then ++ have_armv5_simd=disabled ++fi + -+AC_MSG_RESULT($use_arch_opts) ++if test $have_armv5_simd = yes ; then ++ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics]) ++else ++ ARM_CFLAGS= ++fi + -+if test $use_arch_opts = yes ; then -+ AC_DEFINE(USE_ARCH_OPTS, 1, [use architechture specific optimizations]) ++AC_MSG_RESULT($have_armv5_simd) ++if test $enable_arm = yes && test $have_armv5_simd = no ; then ++ AC_MSG_ERROR([ARM intrinsics not detected]) +fi + -+AC_SUBST([ARCH_OPT_SOURCES]) -+AM_CONDITIONAL(USE_ARCH_OPTS, test $use_arch_opts = yes) ++AC_SUBST(ARM_CFLAGS) + -+dnl ======================================================== - AC_SUBST(MMX_CFLAGS) - - PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no]) ++AM_CONDITIONAL(USE_ARM, test $have_armv5_simd = yes) ++ ++ + AC_ARG_ENABLE(gtk, + [AC_HELP_STRING([--enable-gtk], + [enable tests using GTK+ [default=auto]])], diff --git a/pixman/Makefile.am b/pixman/Makefile.am -index 66283a2..dab6363 100644 +index 4f046f1..2cad71a 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am -@@ -20,6 +20,11 @@ libpixman_1_la_SOURCES = \ - libpixmanincludedir = $(includedir)/pixman-1/ - libpixmaninclude_HEADERS = pixman.h +@@ -77,3 +77,16 @@ libpixman_sse_la_LIBADD = $(DEP_LIBS) + libpixman_1_la_LIBADD += libpixman-sse.la + endif -+if USE_ARCH_OPTS -+libpixman_1_la_LIBADD += $(ARCH_OPT_SOURCES) -+libpixman_1_la_DEPENDENCIES = $(ARCH_OPT_SOURCES) ++# arm code ++if USE_ARM ++noinst_LTLIBRARIES += libpixman-arm.la ++libpixman_arm_la_SOURCES = \ ++ pixman-arm.c \ ++ pixman-arm.h \ ++ pixman-combine32.h ++libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS) ++libpixman_arm_la_LIBADD = $(DEP_LIBS) ++libpixman_1_la_LIBADD += libpixman-arm.la +endif + - # mmx code - if USE_MMX - noinst_LTLIBRARIES = libpixman-mmx.la -diff --git a/pixman/pixman-arch-arm.c b/pixman/pixman-arch-arm.c ++ +diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c new file mode 100644 -index 0000000..655092c +index 0000000..9750730 --- /dev/null -+++ b/pixman/pixman-arch-arm.c -@@ -0,0 +1,205 @@ ++++ b/pixman/pixman-arm.c +@@ -0,0 +1,312 @@ +/* -+ * Copyright © 2007 Movial Creative Technologies Inc ++ * Copyright © 2008 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting -+ * documentation. ++ * documentation, and that the name of Mozilla Corporation not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Mozilla Corporation makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -81,230 +102,423 @@ index 0000000..655092c + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * -+ * Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi> ++ * Author: Jeff Muizelaar (jeff@infidigm.net) ++ * + */ -+ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + -+#include "pixman.h" -+#include "pixman-private.h" ++#include "pixman-arm.h" ++#include "pixman-combine32.h" + -+static void -+pixman_fill8 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ int byte_stride = stride * sizeof (uint32_t); -+ uint8_t *dst = (uint8_t *) bits; -+ uint8_t v = xor & 0xff; -+ -+ xor = v | (v << 8); -+ xor |= xor << 16; ++ uint8_t *dstLine, *dst; ++ uint8_t *srcLine, *src; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint8_t s, d; ++ uint16_t t; + -+ dst = dst + y * byte_stride + x; ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); ++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + + while (height--) + { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #8\n" -+ " bcc 2f\n" -+ /* Output single pixels until aligned to word boundary */ -+ "1: tst %1, #3\n" -+ " strneb %4, [%1], #1\n" -+ " subne %0, %0, #1\n" -+ " bne 1b\n" -+ /* Output up to 16 pixels per iteration */ -+ "1: subs %0, %0, #8\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #8\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Finish up any remaining pixels */ -+ " and %0, %0, #7\n" -+ "2: subs %0, %0, #1\n" -+ " strcsb %4, [%1], #1\n" -+ " subcss %0, %0, #1\n" -+ " strcsb %4, [%1], #1\n" -+ " bcs 2b\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (dst), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ dst += byte_stride; -+ } -+} ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; + -+static void -+pixman_fill16 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) -+{ -+ int short_stride = (stride * sizeof (uint32_t)) / sizeof (uint16_t); -+ uint16_t *dst = (uint16_t *)bits; -+ uint16_t v = xor & 0xffff; ++ while (w && (unsigned long)dst & 3) ++ { ++ s = *src; ++ d = *dst; ++ t = d + s; ++ /* s = t | (0 - (t >> 8)); */ ++ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); ++ *dst = s; + -+ xor = v | v << 16; ++ dst++; ++ src++; ++ w--; ++ } + -+ dst = dst + y * short_stride + x; ++ while (w >= 4) ++ { ++ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst)); ++ dst += 4; ++ src += 4; ++ w -= 4; ++ } + -+ while (height--) -+ { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #4\n" -+ " bcc 2f\n" -+ /* Output single pixels until aligned to word boundary */ -+ "1: tst %1, #2\n" -+ " strneh %4, [%1], #2\n" -+ " subne %0, %0, #1\n" -+ " bne 1b\n" -+ /* Output up to 8 pixels per iteration */ -+ "1: subs %0, %0, #4\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #4\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Finish up any remaining pixels */ -+ " and %0, %0, #3\n" -+ "2: subs %0, %0, #1\n" -+ " strcsh %4, [%1], #2\n" -+ " bcs 2b\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (dst), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ dst += short_stride; ++ while (w) ++ { ++ s = *src; ++ d = *dst; ++ t = d + s; ++ /* s = t | (0 - (t >> 8)); */ ++ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); ++ *dst = s; ++ ++ dst++; ++ src++; ++ w--; ++ } + } ++ +} + -+static void -+pixman_fill32 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrc_8888x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ bits = bits + y * stride + x; -+ ++ uint32_t *dstLine, *dst; ++ uint32_t *srcLine, *src; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint32_t component_mask = 0xff00ff; ++ uint32_t component_half = 0x800080; ++ ++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ + while (height--) + { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #2\n" -+ " bcc 2f\n" -+ /* Output up to 4 pixels per iteration */ -+ "1: subs %0, %0, #2\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #2\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Output last pixel if necessary */ -+ "2: tst %0, #1\n" -+ " strne %4, [%1], #4\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (bits), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ bits += stride; ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++//#define inner_branch ++ asm volatile ( ++ "cmp %[w], #0\n\t" ++ "beq 2f\n\t" ++ "1:\n\t" ++ /* load dest */ ++ "ldr r5, [%[src]], #4\n\t" ++#ifdef inner_branch ++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff. ++ * The 0x0 case also allows us to avoid doing an unecessary data ++ * write which is more valuable so we only check for that */ ++ "cmp r5, #0x1000000\n\t" ++ "blt 3f\n\t" ++ ++ /* = 255 - alpha */ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++ ++ "ldr r4, [%[dest]] \n\t" ++ ++#else ++ "ldr r4, [%[dest]] \n\t" ++ ++ /* = 255 - alpha */ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++#endif ++ "and r6, %[component_mask], r4\n\t" ++ "and r7, %[component_mask], r4, lsr #8\n\t" ++ ++ /* multiply by 257 and divide by 65536 */ ++ "mla r6, r6, r8, %[component_half]\n\t" ++ "mla r7, r7, r8, %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r6, r6, r7, lsl #8\n\t" ++ ++ "uqadd8 r5, r6, r5\n\t" ++ ++#ifdef inner_branch ++ "3:\n\t" ++ ++#endif ++ "str r5, [%[dest]], #4\n\t" ++ /* increment counter and jmp to top */ ++ "subs %[w], %[w], #1\n\t" ++ "bne 1b\n\t" ++ "2:\n\t" ++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) ++ : [component_half] "r" (component_half), [component_mask] "r" (component_mask) ++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" ++ ); + } +} + -+pixman_bool_t -+pixman_fill (uint32_t *bits, -+ int stride, -+ int bpp, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrc_8888x8x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ switch (bpp) ++ uint32_t *dstLine, *dst; ++ uint32_t *srcLine, *src; ++ uint32_t mask; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint32_t component_mask = 0xff00ff; ++ uint32_t component_half = 0x800080; ++ ++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ ++ fbComposeGetSolid (pMask, mask, pDst->bits.format); ++ mask = (mask) >> 24; ++ ++ while (height--) + { -+ case 8: -+ pixman_fill8 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ case 16: -+ pixman_fill16 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ case 32: -+ pixman_fill32 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ default: -+ return FALSE; -+ break; ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++//#define inner_branch ++ asm volatile ( ++ "cmp %[w], #0\n\t" ++ "beq 2f\n\t" ++ "1:\n\t" ++ /* load dest */ ++ "ldr r5, [%[src]], #4\n\t" ++#ifdef inner_branch ++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff. ++ * The 0x0 case also allows us to avoid doing an unecessary data ++ * write which is more valuable so we only check for that */ ++ "cmp r5, #0x1000000\n\t" ++ "blt 3f\n\t" ++ ++#endif ++ "ldr r4, [%[dest]] \n\t" ++ ++ "and r6, %[component_mask], r5\n\t" ++ "and r7, %[component_mask], r5, lsr #8\n\t" ++ ++ /* multiply by alpha (r8) then by 257 and divide by 65536 */ ++ "mla r6, r6, %[mask_alpha], %[component_half]\n\t" ++ "mla r7, r7, %[mask_alpha], %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r5, r6, r7, lsl #8\n\t" ++ ++ "and r6, %[component_mask], r4\n\t" ++ "and r7, %[component_mask], r4, lsr #8\n\t" ++ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++ ++ /* multiply by alpha (r8) then by 257 and divide by 65536 */ ++ "mla r6, r6, r8, %[component_half]\n\t" ++ "mla r7, r7, r8, %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r6, r6, r7, lsl #8\n\t" ++ ++ "uqadd8 r5, r6, r5\n\t" ++ ++#ifdef inner_branch ++ "3:\n\t" ++ ++#endif ++ "str r5, [%[dest]], #4\n\t" ++ /* increment counter and jmp to top */ ++ "subs %[w], %[w], #1\n\t" ++ "bne 1b\n\t" ++ "2:\n\t" ++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) ++ : [component_half] "r" (component_half), [component_mask] "r" (component_mask), [mask_alpha] "r" (mask) ++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" ++ ); + } -+ -+ return TRUE; +} -diff --git a/pixman/pixman-arch.h b/pixman/pixman-arch.h ++ ++ +diff --git a/pixman/pixman-arm.h b/pixman/pixman-arm.h new file mode 100644 -index 0000000..1eee9d3 +index 0000000..06a3121 --- /dev/null -+++ b/pixman/pixman-arch.h -@@ -0,0 +1,7 @@ -+#ifdef USE_ARCH_OPTS ++++ b/pixman/pixman-arm.h +@@ -0,0 +1,80 @@ ++/* ++ * Copyright © 2008 Mozilla Corporation ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Mozilla Corporation not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Mozilla Corporation makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ * ++ * Author: Jeff Muizelaar (jeff@infidigm.net) ++ * ++ */ + -+#ifdef __arm__ -+#define USE_ARCH_FILL -+#endif ++#include "pixman-private.h" ++ ++#ifdef USE_ARM ++ ++static inline pixman_bool_t pixman_have_arm(void) { return TRUE; } + ++#else ++#define pixman_have_arm() FALSE +#endif ---- /tmp/pixman-utils.c 2008-08-14 12:38:44.000000000 +0200 -+++ pixman-0.11.8/pixman/pixman-utils.c 2008-08-14 12:40:03.503198000 +0200 -@@ -28,6 +28,7 @@ - #include <stdlib.h> - - #include "pixman-private.h" -+#include "pixman-arch.h" ++ ++#ifdef USE_ARM ++ ++void ++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++void ++fbCompositeSrc_8888x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++ ++void ++fbCompositeSrc_8888x8x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++ ++#endif /* USE_ARM */ +diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c +index b918219..05abc82 100644 +--- a/pixman/pixman-pict.c ++++ b/pixman/pixman-pict.c +@@ -34,6 +34,7 @@ #include "pixman-mmx.h" + #include "pixman-vmx.h" + #include "pixman-sse.h" ++#include "pixman-arm.h" + #include "pixman-combine32.h" - PIXMAN_EXPORT pixman_bool_t -@@ -84,6 +85,7 @@ - return FALSE; - } + #ifdef __GNUC__ +@@ -1479,6 +1480,18 @@ static const FastPathInfo vmx_fast_paths[] = + }; + #endif -+#ifndef USE_ARCH_FILL - static void - pixman_fill8 (uint32_t *bits, - int stride, -@@ -197,7 +199,7 @@ ++#ifdef USE_ARM ++static const FastPathInfo arm_fast_paths[] = ++{ ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 }, ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK }, ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK }, ++ ++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 }, ++ ++ { PIXMAN_OP_NONE }, ++}; ++#endif - return TRUE; - } -- + static const FastPathInfo c_fast_paths[] = + { +@@ -1829,6 +1842,12 @@ pixman_image_composite (pixman_op_t op, + if (!info && pixman_have_vmx()) + info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf); + #endif ++#ifdef USE_ARM ++ ++ if (!info && pixman_have_arm()) ++ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf); +#endif ++ + if (!info) + info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf); - /* - * Compute the smallest value no less than y which is on a diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index a6cc53dabb..6a4ce74d8f 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,6 +3,8 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" +PR = "r2" + SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 0b0f847dff..0a61cb2c7e 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r2" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 0a61cb2c7e..c9f6e3d29b 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r3" +PR = "r4" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb index 154ea8c313..098ac2b664 100644 --- a/packages/zshopi/zshopi_0.2.bb +++ b/packages/zshopi/zshopi_0.2.bb @@ -10,7 +10,7 @@ APPNAME = "zshopi" APPDESKTOP = "${WORKDIR}" PR = "r1" -SRC_URI = "http://www.lachner-net.de/Frames/Software/zshopi_0.2.tar.bz2 \ +SRC_URI = "http://www.lachner-net.de/old/Frames/Software/zshopi_0.2.tar.bz2 \ file://zshopi.desktop \ file://zshopi.png" |