diff options
Diffstat (limited to 'packages')
157 files changed, 3981 insertions, 1472 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 58c724f79c..ba030e4aab 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -4,15 +4,16 @@ # # Filename: alsa-state.bb -DESCRIPTION = "Default ALSA configuration" -LICENSE = "GPL" -PV = "0.1.0" -PR = "r18" +DESCRIPTION = "Alsa Scenario Files" +LICENSE = "MIT" +PV = "0.2.0" +PR = "r0" SRC_URI = "\ file://asound.conf \ file://asound.state \ file://alsa-state \ + file://*.state \ " inherit update-rc.d diff --git a/packages/alsa/alsa-state/a780/asound.state b/packages/alsa/alsa-state/a780/asound.state deleted file mode 100644 index eafd409857..0000000000 --- a/packages/alsa/alsa-state/a780/asound.state +++ /dev/null @@ -1,80 +0,0 @@ -state.EZX { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Output gain' - value 9 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Input gain' - value 14 - } - control.3 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Input Mixer A3 Switch' - value true - } - control.4 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Input Mixer A5 Switch' - value true - } - control.5 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Output Mixer A1 Switch' - value true - } - control.6 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Output Mixer A2 Switch' - value true - } - control.7 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Output Mixer AR Switch' - value true - } - control.8 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Output Mixer AL Switch' - value true - } - control.9 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2ch' - comment.item.1 '2->1ch' - comment.item.2 '2->1ch -3db' - comment.item.3 '2->1ch -6db' - iface MIXER - name Downmixer - value '2ch' - } -} diff --git a/packages/alsa/alsa-state/a780/gsmhandset.state b/packages/alsa/alsa-state/a780/gsmhandset.state new file mode 100644 index 0000000000..c9adfb3340 --- /dev/null +++ b/packages/alsa/alsa-state/a780/gsmhandset.state @@ -0,0 +1,55 @@ +state.EZX { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Master Playback Volume' + value 6 + } + control.2 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 Mono + comment.item.2 BP + iface MIXER + name 'DAI Select' + value BP + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + iface MIXER + name 'Capture Volume' + value 14 + } + control.4 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 '2->1ch' + comment.item.2 '2->1ch -3db' + comment.item.3 '2->1ch -6db' + iface MIXER + name Downmixer + value Off + } + control.5 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 Loudspeaker + comment.item.2 Earpiece + comment.item.3 Headset + iface MIXER + name 'Output mode' + value Earpiece + } +} diff --git a/packages/alsa/alsa-state/a780/gsmheadset.state b/packages/alsa/alsa-state/a780/gsmheadset.state new file mode 100644 index 0000000000..7b72789410 --- /dev/null +++ b/packages/alsa/alsa-state/a780/gsmheadset.state @@ -0,0 +1,55 @@ +state.EZX { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Master Playback Volume' + value 6 + } + control.2 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 Mono + comment.item.2 BP + iface MIXER + name 'DAI Select' + value BP + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + iface MIXER + name 'Capture Volume' + value 14 + } + control.4 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 '2->1ch' + comment.item.2 '2->1ch -3db' + comment.item.3 '2->1ch -6db' + iface MIXER + name Downmixer + value Off + } + control.5 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 Loudspeaker + comment.item.2 Earpiece + comment.item.3 Headset + iface MIXER + name 'Output mode' + value Headset + } +} diff --git a/packages/alsa/alsa-state/a780/stereoout.state b/packages/alsa/alsa-state/a780/stereoout.state new file mode 100644 index 0000000000..64b36a0572 --- /dev/null +++ b/packages/alsa/alsa-state/a780/stereoout.state @@ -0,0 +1,55 @@ +state.EZX { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Master Playback Volume' + value 6 + } + control.2 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 Mono + comment.item.2 BP + iface MIXER + name 'DAI Select' + value Stereo + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + iface MIXER + name 'Capture Volume' + value 14 + } + control.4 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 '2->1ch' + comment.item.2 '2->1ch -3db' + comment.item.3 '2->1ch -6db' + iface MIXER + name Downmixer + value Off + } + control.5 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 Loudspeaker + comment.item.2 Earpiece + comment.item.3 Headset + iface MIXER + name 'Output mode' + value Loudspeaker + } +} diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index ece77495b1..6f1043cec0 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,14 +1,18 @@ LICENSE = "MIT" PV = "${DISTRO_VERSION}" -PR = "r1" +PR = "r2" PE = "1" PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" +export METADATA_REVISION +export METADATA_BRANCH + do_install() { mkdir -p ${D}${sysconfdir} echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version - + echo "Built from branch: ${METADATA_BRANCH}" >> ${D}${sysconfdir}/angstrom-version + echo "Revision: ${METADATA_REVISION}" >> ${D}${sysconfdir}/angstrom-version } diff --git a/packages/apmd/apm-tosa-suspendfix_0.1.bb b/packages/apmd/apm-tosa-suspendfix_0.1.bb new file mode 100644 index 0000000000..ad223c1959 --- /dev/null +++ b/packages/apmd/apm-tosa-suspendfix_0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Workaround for bug 2134 (Tosa Angstrom x11 image suspend/resume failure)" +AUTHOR = "Dmitry Baryshkov" +PR = "r0" + +SRC_URI = "file://50-tmio-ohci-unbind" + +do_install() { + install -d ${D}${sysconfdir}/apm/event.d + install -m 0755 ${WORKDIR}/50-tmio-ohci-unbind ${D}${sysconfdir}/apm/event.d +} diff --git a/packages/apmd/files/50-tmio-ohci-unbind b/packages/apmd/files/50-tmio-ohci-unbind new file mode 100644 index 0000000000..f65e0b37d3 --- /dev/null +++ b/packages/apmd/files/50-tmio-ohci-unbind @@ -0,0 +1,19 @@ +#!/bin/sh + +TOPATH=/sys/bus/platform/drivers/tmio-ohci + +case "$1" in + suspend) + if [ -d $TOPATH ] + then + echo -n tmio-ohci > $TOPATH/unbind + fi + ;; + resume) + if [ -d $TOPATH ] + then + echo -n tmio-ohci > $TOPATH/bind + fi + ;; +esac + diff --git a/packages/bluez/bluez-gnome_0.26.bb b/packages/bluez/bluez-gnome_0.26.bb index 058798d5e0..135bb5ca40 100644 --- a/packages/bluez/bluez-gnome_0.26.bb +++ b/packages/bluez/bluez-gnome_0.26.bb @@ -4,7 +4,7 @@ LICENSE = "GPL+LGPL" DEPENDS = "dbus-glib gconf libnotify gtk+" RRECOMMENDS = "gnome-icon-theme" -PR = "r3" +PR = "r4" SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb index 7fb691f360..8a3978c5b5 100644 --- a/packages/boost/boost_1.34.1.bb +++ b/packages/boost/boost_1.34.1.bb @@ -10,7 +10,7 @@ LICENSE = "Boost Software License" DEPENDS = "python boost-jam-native zlib bzip2" -PR = "r2" +PR = "r3" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ @@ -50,6 +50,7 @@ do_configure() { echo "import toolset : using ;" > tools/build/v2/user-config.jam echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} $platform_config<linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam + echo "using python : 2.5 : : ${STAGING_INCDIR}/python2.5 : ${STAGING_LIBDIR}/python2.5 : : ; " >> tools/build/v2/user-config.jam } do_compile() { diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc new file mode 100644 index 0000000000..cbc4010c32 --- /dev/null +++ b/packages/connman/connman.inc @@ -0,0 +1,42 @@ +HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" +SUMMARY = "Moblin Connection Manager" +LICENSE = "GPL" + +DEPENDS = "dbus glib-2.0" +RDEPENDS = "dhcp-client wpa-supplicant resolvconf" + +EXTRA_OECONF += " \ + ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ + ac_cv_path_DHCLIENT=/sbin/dhclient " + +INITSCRIPT_NAME = "connman" +INITSCRIPT_PARAMS = "defaults 22" + +inherit autotools pkgconfig update-rc.d + +do_install_append() { + install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman +} + +PACKAGES_DYNAMIC = "${PN}-plugin-*" +PACKAGES += "${PN}-script-dhclient" +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ + ${datadir}/pixmaps ${datadir}/applications \ + ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ + ${libdir}/bonobo/servers \ + ${datadir}/dbus-1/system-services/*" +FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*" +FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ + ${libdir}/connman/scripts/.debug" + +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/connman/connman_0.1.bb b/packages/connman/connman_0.1.bb new file mode 100644 index 0000000000..8159b9410d --- /dev/null +++ b/packages/connman/connman_0.1.bb @@ -0,0 +1,11 @@ +require connman.inc +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +EXTRA_OECONF += " \ + --disable-gtk-doc " + +SRC_URI = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \ + file://connman " + diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb index bc5840fb4c..f22125e16e 100644 --- a/packages/connman/connman_git.bb +++ b/packages/connman/connman_git.bb @@ -1,50 +1,11 @@ -HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" -SUMMARY = "Moblin Connection Manager" +require connman.inc PV = "0.0+gitr${SRCREV}" PR = "r4.02" PE = "1" S = "${WORKDIR}/git" -LICENSE = "GPL" -DEPENDS = "libgdbus dbus glib-2.0 hal" -RDEPENDS = "dhcp-client wpa-supplicant resolvconf" - -EXTRA_OECONF += " \ - ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ - ac_cv_path_DHCLIENT=/sbin/dhclient " +DEPENDS += "libgdbus hal" SRC_URI = "git://git.moblin.org/repos/projects/connman.git;protocol=http \ file://use_nm_in_cross_compiling.patch;patch=1\ file://connman " - -INITSCRIPT_NAME = "connman" -INITSCRIPT_PARAMS = "defaults 22" - -inherit autotools pkgconfig update-rc.d - -do_install_append() { - install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman -} - -PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-script-dhclient" -FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers \ - ${datadir}/dbus-1/system-services/*" -FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*" -FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ - ${libdir}/connman/scripts/.debug" - -python populate_packages_prepend() { - plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) - plugin_name = bb.data.expand('${PN}-plugin-%s', d) - do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) -} - -do_stage() { - autotools_stage_all -} diff --git a/packages/coreutils/coreutils-6.0/futimens.patch b/packages/coreutils/coreutils-6.0/futimens.patch new file mode 100644 index 0000000000..b3089b1c05 --- /dev/null +++ b/packages/coreutils/coreutils-6.0/futimens.patch @@ -0,0 +1,57 @@ +Index: coreutils-6.0/lib/utimens.c +=================================================================== +--- coreutils-6.0.orig/lib/utimens.c 2006-06-11 09:14:31.000000000 +0200 ++++ coreutils-6.0/lib/utimens.c 2008-12-04 13:36:46.000000000 +0100 +@@ -75,8 +75,8 @@ + Return 0 on success, -1 (setting errno) on failure. */ + + int +-futimens (int fd ATTRIBUTE_UNUSED, +- char const *file, struct timespec const timespec[2]) ++gl_futimens (int fd ATTRIBUTE_UNUSED, ++ char const *file, struct timespec const timespec[2]) + { + /* There's currently no interface to set file timestamps with + nanosecond resolution, so do the best we can, discarding any +@@ -168,5 +168,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gl_futimens (-1, file, timespec); + } +Index: coreutils-6.0/lib/utimens.h +=================================================================== +--- coreutils-6.0.orig/lib/utimens.h 2004-11-23 21:41:51.000000000 +0100 ++++ coreutils-6.0/lib/utimens.h 2008-12-04 13:36:46.000000000 +0100 +@@ -1,3 +1,3 @@ + #include "timespec.h" +-int futimens (int, char const *, struct timespec const [2]); ++int gl_futimens (int, char const *, struct timespec const [2]); + int utimens (char const *, struct timespec const [2]); +Index: coreutils-6.0/src/touch.c +=================================================================== +--- coreutils-6.0.orig/src/touch.c 2005-11-02 11:01:07.000000000 +0100 ++++ coreutils-6.0/src/touch.c 2008-12-04 13:37:43.000000000 +0100 +@@ -182,7 +182,7 @@ + t = timespec; + } + +- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); ++ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); + + if (fd == STDIN_FILENO) + { +Index: coreutils-6.0/src/copy.c +=================================================================== +--- coreutils-6.0.orig/src/copy.c 2008-12-04 13:38:56.000000000 +0100 ++++ coreutils-6.0/src/copy.c 2008-12-04 13:39:01.000000000 +0100 +@@ -490,7 +490,7 @@ + timespec[0] = get_stat_atime (src_sb); + timespec[1] = get_stat_mtime (src_sb); + +- if (futimens (dest_desc, dst_name, timespec) != 0) ++ if (gl_futimens (dest_desc, dst_name, timespec) != 0) + { + error (0, errno, _("preserving times for %s"), quote (dst_name)); + if (x->require_preserve) diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb index 42ac2c15af..2a9b09196f 100644 --- a/packages/coreutils/coreutils_5.3.0.bb +++ b/packages/coreutils/coreutils_5.3.0.bb @@ -1,6 +1,6 @@ require coreutils.inc -PR = "r2" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ @@ -10,7 +10,7 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://futimens.patch;patch=1" # [ gets a special treatment and is not included in this -bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ +bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nice nl nohup od paste pathchk \ pinky pr printenv printf ptx readlink seq sha1sum shred sort \ diff --git a/packages/coreutils/coreutils_6.0.bb b/packages/coreutils/coreutils_6.0.bb index 59afd67bfb..02fc70efb5 100644 --- a/packages/coreutils/coreutils_6.0.bb +++ b/packages/coreutils/coreutils_6.0.bb @@ -1,14 +1,17 @@ require coreutils.inc +PR = "r2" + DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://man.patch;patch=1 \ file://oe-old-tools.patch;patch=1 \ + file://futimens.patch;patch=1 \ file://onceonly.m4" # [ gets a special treatment and is not included in this -bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ +bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nice nl nohup od paste pathchk \ pinky pr printenv printf ptx readlink seq sha1sum shred sort \ diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb deleted file mode 100644 index 8ed5c44d94..0000000000 --- a/packages/dbus-java/dbus-java_2.3.bb +++ /dev/null @@ -1,102 +0,0 @@ -DESCRIPTION = "A pure Java D-Bus Implementation" -DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" -DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" - -LICENSE = "GPLv2 AFL" -SECTION = "libs" -HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" -AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" - -PR = "r4" - -inherit java-library - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" - -S = "${WORKDIR}/dbus-java-${PV}" - -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RSUGGESTS_libdbus-java = "libunixsocket-java dbus" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" - -# jamvm-native unfortunately contains non-generificed java/lang/reflect classes -# which are accessed in this package. Work around this by setting the bootclasspath -# explicitly. -JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" - -do_compile () { - # run target .binclasses first to fix a brokenness in the Makefile - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - .binclasses - - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - all - - # Generated shell scripts will have staging paths inside them. - rm bin/* - - # Generate them again with target paths. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - all - - # Trigger generation of all documentation files to prevent this - # being happen at the target 'install-man' in do_install. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 -} - -do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar -} - -do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar - - install -d ${D}${bindir} - install bin/DBusViewer ${D}${bindir} - install bin/DBusCall ${D}${bindir} - install bin/CreateInterface ${D}${bindir} - install bin/ListDBus ${D}${bindir} - install bin/DBusDaemon ${D}${bindir} - - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - MANPREFIX=${D}${mandir} \ - DOCPREFIX=${D}${docdir}/${JPN} \ - install-man -} - -# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar -# and dbus-bin*.jar -PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" - -PACKAGE_ARCH = "all" - -FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" -FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" -FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb deleted file mode 100644 index 37c539b20e..0000000000 --- a/packages/dbus-java/dbus-java_2.4.bb +++ /dev/null @@ -1,92 +0,0 @@ -DESCRIPTION = "A pure Java D-Bus Implementation" -DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" -DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" -AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" -HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" -SECTION = "libs" -LICENSE = "GPLv2 AFL" -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" -RSUGGESTS_libdbus-java = "libunixsocket-java dbus" -PR = "r1" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" - -S = "${WORKDIR}/dbus-java-${PV}" - -inherit java-library - -# jamvm-native unfortunately contains non-generificed java/lang/reflect classes -# which are accessed in this package. Work around this by setting the bootclasspath -# explicitly. -JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" - -do_compile () { - # run target .binclasses first to fix a brokenness in the Makefile - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - .binclasses - oe_runmake \ - JCFLAGS="-source 1.5 ${JCFLAGS}" \ - JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR_JAVA}" \ - JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ - CLASSPATH="${S}/classes" \ - JAR="fastjar" \ - all - # Generated shell scripts will have staging paths inside them. - rm bin/* - # Generate them again with target paths. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - all - # Trigger generation of all documentation files to prevent this - # being happen at the target 'install-man' in do_install. - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir_java} \ - JAVAUNIXPATH=${datadir_java} \ - CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 -} - -do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar - install -d ${D}${bindir} - install bin/DBusViewer ${D}${bindir} - install bin/DBusCall ${D}${bindir} - install bin/CreateInterface ${D}${bindir} - install bin/ListDBus ${D}${bindir} - install bin/DBusDaemon ${D}${bindir} - oe_runmake \ - JAVAC="oefatal \"No Java compilation expected here.\"" \ - JAR="oefatal \"No jar invocation expected here.\"" \ - MANPREFIX=${D}${mandir} \ - DOCPREFIX=${D}${docdir}/${JPN} \ - install-man -} - -do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar -} - -PACKAGE_ARCH = "all" -# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar -# and dbus-bin*.jar -PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" - -FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" -FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" -FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.1.bb index a3ab37bd9e..23aa1f933c 100644 --- a/packages/dbus-java/dbus-java_2.5.bb +++ b/packages/dbus-java/dbus-java_2.5.1.bb @@ -5,11 +5,13 @@ AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" SECTION = "libs" LICENSE = "LGPLv2 AFL" + DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}" RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" RSUGGESTS_libdbus-java = "libunixsocket-java" -PR = "r1" + +PR = "r0" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" diff --git a/packages/djvulibre/djvulibre_3.5.21.bb b/packages/djvulibre/djvulibre_3.5.21.bb new file mode 100644 index 0000000000..b9460f62cc --- /dev/null +++ b/packages/djvulibre/djvulibre_3.5.21.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities." +LICENSE = "GPL" +DEPENDS = "jpeg libpng tiff" + +SRC_URI = "${SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \ + file://fix-cross-configure.patch;patch=1" + +inherit qt4x11 autotools pkgconfig + +#export QT_LIBS = "${OE_QMAKE_LIBS_QT}" +#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ " + +EXTRA_OECONF = " --enable-threads \ + --with-qt=${QTDIR} " + +do_configure() { + gnu-configize + autoreconf + oe_runconf + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:-L/usr/lib::g $i + done +} + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "libdjvulibre" +FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*" +FILES_${PN} += "${datadir}/djvu" diff --git a/packages/dsplink/dsplink-module_1.60.bb b/packages/dsplink/dsplink-module_1.60.bb index c1be8f90e3..4b9051a693 100644 --- a/packages/dsplink/dsplink-module_1.60.bb +++ b/packages/dsplink/dsplink-module_1.60.bb @@ -1,5 +1,5 @@ # The tconf tool breaks if there is a '.' in your pwd -PR = "r3" +PR = "r4" PE = "1" PV = "160" diff --git a/packages/dsplink/dsplink_1.60.bb b/packages/dsplink/dsplink_1.60.bb index 6c7da5b83d..290fa33e27 100644 --- a/packages/dsplink/dsplink_1.60.bb +++ b/packages/dsplink/dsplink_1.60.bb @@ -1,7 +1,7 @@ require dsplink.inc # The tconf tool breaks if there is a '.' in your pwd -PR = "r2" +PR = "r3" PE = "1" PV = "160" diff --git a/packages/dsplink/ti-cmemk-module_2.21.bb b/packages/dsplink/ti-cmemk-module_2.21.bb index d15accb3ae..dbd56da9b1 100644 --- a/packages/dsplink/ti-cmemk-module_2.21.bb +++ b/packages/dsplink/ti-cmemk-module_2.21.bb @@ -1,5 +1,5 @@ # tconf from xdctools dislikes '.' in pwd :/ -PR = "r2" +PR = "r3" PV = "221" # Get CE tarball from TI website, place in sources and calculate diff --git a/packages/dsplink/ti-lpm-module_2.21.bb b/packages/dsplink/ti-lpm-module_2.21.bb index 6a6945f710..b352b0eb09 100644 --- a/packages/dsplink/ti-lpm-module_2.21.bb +++ b/packages/dsplink/ti-lpm-module_2.21.bb @@ -1,5 +1,5 @@ # tconf from xdctools dislikes '.' in pwd :/ -PR = "r2" +PR = "r3" PV = "221" # Get CE tarball from TI website, place in sources and calculate diff --git a/packages/emacs/emacs.inc b/packages/emacs/emacs.inc index 95dd6e08e9..05acd828dc 100644 --- a/packages/emacs/emacs.inc +++ b/packages/emacs/emacs.inc @@ -17,7 +17,7 @@ FILES_${PN} += "${datadir}/emacs" FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug" # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "qemu-${TARGET_ARCH} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" do_compile_prepend() { sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` diff --git a/packages/evince/evince_2.24.1.bb b/packages/evince/evince_2.24.1.bb index 9dc61c35f7..02f8cd4233 100644 --- a/packages/evince/evince_2.24.1.bb +++ b/packages/evince/evince_2.24.1.bb @@ -1,18 +1,26 @@ DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." LICENSE = "GPL" SECTION = "x11/office" -DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +DEPENDS = "nautilus gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gconf libglade gnome-keyring " RDEPENDS = "espgs gnome-icon-theme" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" +PR = "r2" inherit gnome pkgconfig gtk-icon-cache SRC_URI += " file://no-help-dir.patch;patch=1" -EXTRA_OECONF = " --without-libgnome \ - --disable-thumbnailer \ - --disable-scrollkeeper \ - --enable-djvu \ +EXTRA_OECONF = " \ + --enable-thumbnailer \ + --enable-nautilus \ + --disable-scrollkeeper \ + --enable-djvu \ + --enable-pixbuf \ " -FILES_${PN}-dbg = "${libdir}/evince/backends/.debug" + +FILES_${PN}-dbg += "${libdir}/evince/backends/.debug" + +PACKAGES =+ "evince-nautilus-extension" + +FILES_evince-nautilus-extension = "${libdir}/nautilus/*/*so" + + diff --git a/packages/ezx/ezx-boot-usb-native.inc b/packages/ezx/ezx-boot-usb-native.inc deleted file mode 100644 index e2ebb52df4..0000000000 --- a/packages/ezx/ezx-boot-usb-native.inc +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage" -DEPENDS = "libusb-native" -SECTION = "devel" -AUTHOR = "Harald Welte <laforge@openezx.org>" -LICENSE = "GPL" - -SRC_URI = "\ - svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http \ - file://asm-arm \ -" -S = "${WORKDIR}/boot_usb" - -inherit native - -do_compile() { - ${CC} -I${WORKDIR} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c -} - -do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 ezx-boot-usb ${DEPLOY_DIR_TOOLS}/ezx-boot-usb-${PV} -} - -do_stage() { - : -} - -do_install() { - : -} - -addtask deploy before do_build after do_compile diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb deleted file mode 100644 index b70aca3709..0000000000 --- a/packages/ezx/ezx-boot-usb-native_0.1.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ezx-boot-usb-native.inc -PR = "r0" - -SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2" -S = "${WORKDIR}/boot_usb-${PV}" - -inherit native diff --git a/packages/ezx/ezx-boot-usb-native_0.2.0.bb b/packages/ezx/ezx-boot-usb-native_0.2.0.bb deleted file mode 100644 index 7c2883b5b7..0000000000 --- a/packages/ezx/ezx-boot-usb-native_0.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ezx-boot-usb-native.inc - -SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2 \ - file://asm-arm" -S = "${WORKDIR}/boot_usb-${PV}" diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index 6ab4263dba..a0a8affdc0 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -1,5 +1,28 @@ -require ezx-boot-usb-native.inc +DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage" +DEPENDS = "libusb-native virtual/kernel" +SECTION = "devel" +AUTHOR = "Team OpenEZX <openezx-devel@lists.openezx.org>" +LICENSE = "GPL" +PV = "0.2.0+svnr${SRCREV}" -DEFAULT_PREFERENCE = "-1" +SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" +S = "${WORKDIR}/boot_usb" -PV = "0.2.0+r${SRCREV}" +EXTRA_OECONF := '--with-kernel-dir="${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"' + +inherit autotools native + +do_deploy() { + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 boot_usb ${DEPLOY_DIR_TOOLS}/ezx-boot-usb-${PV} +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile diff --git a/packages/ezx/files/asm-arm/setup.h b/packages/ezx/files/asm-arm/setup.h deleted file mode 100644 index 7bbf105463..0000000000 --- a/packages/ezx/files/asm-arm/setup.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - * linux/include/asm/setup.h - * - * Copyright (C) 1997-1999 Russell King - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Structure passed to kernel to tell it about the - * hardware it's running on. See Documentation/arm/Setup - * for more info. - */ -#ifndef __ASMARM_SETUP_H -#define __ASMARM_SETUP_H - -#include <asm/types.h> - -#define COMMAND_LINE_SIZE 1024 - -/* The list ends with an ATAG_NONE node. */ -#define ATAG_NONE 0x00000000 - -struct tag_header { - __u32 size; - __u32 tag; -}; - -/* The list must start with an ATAG_CORE node */ -#define ATAG_CORE 0x54410001 - -struct tag_core { - __u32 flags; /* bit 0 = read-only */ - __u32 pagesize; - __u32 rootdev; -}; - -/* it is allowed to have multiple ATAG_MEM nodes */ -#define ATAG_MEM 0x54410002 - -struct tag_mem32 { - __u32 size; - __u32 start; /* physical start address */ -}; - -/* VGA text type displays */ -#define ATAG_VIDEOTEXT 0x54410003 - -struct tag_videotext { - __u8 x; - __u8 y; - __u16 video_page; - __u8 video_mode; - __u8 video_cols; - __u16 video_ega_bx; - __u8 video_lines; - __u8 video_isvga; - __u16 video_points; -}; - -/* describes how the ramdisk will be used in kernel */ -#define ATAG_RAMDISK 0x54410004 - -struct tag_ramdisk { - __u32 flags; /* bit 0 = load, bit 1 = prompt */ - __u32 size; /* decompressed ramdisk size in _kilo_ bytes */ - __u32 start; /* starting block of floppy-based RAM disk image */ -}; - -/* describes where the compressed ramdisk image lives (virtual address) */ -/* - * this one accidentally used virtual addresses - as such, - * it's deprecated. - */ -#define ATAG_INITRD 0x54410005 - -/* describes where the compressed ramdisk image lives (physical address) */ -#define ATAG_INITRD2 0x54420005 - -struct tag_initrd { - __u32 start; /* physical start address */ - __u32 size; /* size of compressed ramdisk image in bytes */ -}; - -/* board serial number. "64 bits should be enough for everybody" */ -#define ATAG_SERIAL 0x54410006 - -struct tag_serialnr { - __u32 low; - __u32 high; -}; - -/* board revision */ -#define ATAG_REVISION 0x54410007 - -struct tag_revision { - __u32 rev; -}; - -/* initial values for vesafb-type framebuffers. see struct screen_info - * in include/linux/tty.h - */ -#define ATAG_VIDEOLFB 0x54410008 - -struct tag_videolfb { - __u16 lfb_width; - __u16 lfb_height; - __u16 lfb_depth; - __u16 lfb_linelength; - __u32 lfb_base; - __u32 lfb_size; - __u8 red_size; - __u8 red_pos; - __u8 green_size; - __u8 green_pos; - __u8 blue_size; - __u8 blue_pos; - __u8 rsvd_size; - __u8 rsvd_pos; -}; - -/* command line: \0 terminated string */ -#define ATAG_CMDLINE 0x54410009 - -struct tag_cmdline { - char cmdline[1]; /* this is the minimum size */ -}; - -/* acorn RiscPC specific information */ -#define ATAG_ACORN 0x41000101 - -struct tag_acorn { - __u32 memc_control_reg; - __u32 vram_pages; - __u8 sounddefault; - __u8 adfsdrives; -}; - -/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */ -#define ATAG_MEMCLK 0x41000402 - -struct tag_memclk { - __u32 fmemclk; -}; - -struct tag { - struct tag_header hdr; - union { - struct tag_core core; - struct tag_mem32 mem; - struct tag_videotext videotext; - struct tag_ramdisk ramdisk; - struct tag_initrd initrd; - struct tag_serialnr serialnr; - struct tag_revision revision; - struct tag_videolfb videolfb; - struct tag_cmdline cmdline; - - /* - * Acorn specific - */ - struct tag_acorn acorn; - - /* - * DC21285 specific - */ - struct tag_memclk memclk; - } u; -}; - -struct tagtable { - __u32 tag; - int (*parse)(const struct tag *); -}; - -#define tag_member_present(tag,member) \ - ((unsigned long)(&((struct tag *)0L)->member + 1) \ - <= (tag)->hdr.size * 4) - -#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size)) -#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2) - -#define for_each_tag(t,base) \ - for (t = base; t->hdr.size; t = tag_next(t)) - -#ifdef __KERNEL__ - -#define __tag __used __attribute__((__section__(".taglist.init"))) -#define __tagtable(tag, fn) \ -static struct tagtable __tagtable_##fn __tag = { tag, fn } - -/* - * Memory map description - */ -#ifdef CONFIG_ARCH_LH7A40X -# define NR_BANKS 16 -#else -# define NR_BANKS 8 -#endif - -struct membank { - unsigned long start; - unsigned long size; - int node; -}; - -struct meminfo { - int nr_banks; - struct membank bank[NR_BANKS]; -}; - -/* - * Early command line parameters. - */ -struct early_params { - const char *arg; - void (*fn)(char **p); -}; - -#define __early_param(name,fn) \ -static struct early_params __early_##fn __used \ -__attribute__((__section__(".early_param.init"))) = { name, fn } - -#endif /* __KERNEL__ */ - -#endif diff --git a/packages/gamin/gamin_0.1.8.bb b/packages/gamin/gamin_0.1.8.bb index c4da068c34..754f47dc9e 100644 --- a/packages/gamin/gamin_0.1.8.bb +++ b/packages/gamin/gamin_0.1.8.bb @@ -4,6 +4,8 @@ LICENSE = "LGPL" SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ file://no-abstract-sockets.patch;patch=1" +EXTRA_OECONF = " --without-python " + inherit autotools pkgconfig do_stage() { diff --git a/packages/gcc/gcc-3.4.6.inc b/packages/gcc/gcc-3.4.6.inc index b1f686b365..a467860e9e 100644 --- a/packages/gcc/gcc-3.4.6.inc +++ b/packages/gcc/gcc-3.4.6.inc @@ -17,7 +17,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://gcc-posix.patch;patch=1 \ - file://gcc4-mtune-compat.patch;patch=1" + file://gcc4-mtune-compat.patch;patch=1 \ + file://O_CREAT-perms.patch;patch=1" SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" diff --git a/packages/gcc/gcc-3.4.6/O_CREAT-perms.patch b/packages/gcc/gcc-3.4.6/O_CREAT-perms.patch new file mode 100644 index 0000000000..1c3af2e021 --- /dev/null +++ b/packages/gcc/gcc-3.4.6/O_CREAT-perms.patch @@ -0,0 +1,11 @@ +--- gcc-3.4.6/gcc/collect2.c.orig 2008-10-20 14:47:56.000000000 +0200 ++++ gcc-3.4.6/gcc/collect2.c 2008-10-20 14:48:49.000000000 +0200 +@@ -1534,7 +1534,7 @@ + if (redir) + { + /* Open response file. */ +- redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT); ++ redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, 0644); + + /* Duplicate the stdout and stderr file handles + so they can be restored later. */ diff --git a/packages/gdal/gdal_1.5.2.bb b/packages/gdal/gdal_1.5.2.bb index 6874ddf35a..a92e40fadc 100644 --- a/packages/gdal/gdal_1.5.2.bb +++ b/packages/gdal/gdal_1.5.2.bb @@ -2,12 +2,14 @@ DESCRIPTION = "GDAL is a translator library for raster geospatial data formats" HOMEPAGE = "http://www.gdal.org/" LICENSE = "MIT" DEPENDS = "proj-4 sqlite3 zlib jpeg libpng tiff giflib curl jasper expat" -PR = "r1" +PR = "r2" SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz \ file://gdal_config.patch;patch=1 \ " +ARM_INSTRUCTION_SET = "arm" + inherit autotools binconfig EXTRA_OECONF = "--without-perl \ diff --git a/packages/gdb/gdb-6.8/gcc-4.3-build-error.patch b/packages/gdb/gdb-6.8/gcc-4.3-build-error.patch new file mode 100644 index 0000000000..36e501af1a --- /dev/null +++ b/packages/gdb/gdb-6.8/gcc-4.3-build-error.patch @@ -0,0 +1,129 @@ +http://patches.ubuntu.com/g/gdb/extracted/gcc-4.3-build-error.patch + +--- gdb/cli/cli-cmds.c~ 2008-06-24 16:07:25.000000000 +0200 ++++ gdb/cli/cli-cmds.c 2008-06-24 16:22:31.000000000 +0200 +@@ -323,7 +323,8 @@ + { + if (args) + error (_("The \"pwd\" command does not take an argument: %s"), args); +- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); ++ if (!getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) ++ error (_("Unable to determine current directory")); + + if (strcmp (gdb_dirbuf, current_directory) != 0) + printf_unfiltered (_("Working directory %s\n (canonically %s).\n"), +--- gdb/linux-nat.c~ 2008-01-29 23:47:20.000000000 +0100 ++++ gdb/linux-nat.c 2008-06-24 16:18:57.000000000 +0200 +@@ -2876,7 +2876,8 @@ + sprintf (fname1, "/proc/%lld/cmdline", pid); + if ((procfile = fopen (fname1, "r")) != NULL) + { +- fgets (buffer, sizeof (buffer), procfile); ++ if (!fgets (buffer, sizeof (buffer), procfile)) ++ error(_("Unable to read '%s'"), fname1); + printf_filtered ("cmdline = '%s'\n", buffer); + fclose (procfile); + } +--- gdb/inflow.c~ 2008-01-01 23:53:11.000000000 +0100 ++++ gdb/inflow.c 2008-06-24 16:32:10.000000000 +0200 +@@ -512,7 +512,7 @@ + void + new_tty (void) + { +- int tty; ++ int tty, rv; + + if (inferior_thisrun_terminal == 0) + return; +@@ -545,17 +545,17 @@ + if (tty != 0) + { + close (0); +- dup (tty); ++ rv = dup (tty); + } + if (tty != 1) + { + close (1); +- dup (tty); ++ rv = dup (tty); + } + if (tty != 2) + { + close (2); +- dup (tty); ++ rv = dup (tty); + } + if (tty > 2) + close (tty); +--- gdb/mi/mi-cmd-env.c~ 2008-01-01 23:53:14.000000000 +0100 ++++ gdb/mi/mi-cmd-env.c 2008-06-24 16:23:25.000000000 +0200 +@@ -78,7 +78,8 @@ + + /* Otherwise the mi level is 2 or higher. */ + +- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); ++ if (!getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) ++ error (_("Unable to determine current directory")); + ui_out_field_string (uiout, "cwd", gdb_dirbuf); + + return MI_CMD_DONE; +--- gdb/utils.c~ 2008-01-01 23:53:13.000000000 +0100 ++++ gdb/utils.c 2008-06-24 16:29:13.000000000 +0200 +@@ -688,6 +688,7 @@ + static int dejavu; + int quit_p; + int dump_core_p; ++ int rv; + char *reason; + + /* Don't allow infinite error/warning recursion. */ +@@ -704,7 +705,7 @@ + abort (); /* NOTE: GDB has only three calls to abort(). */ + default: + dejavu = 3; +- write (STDERR_FILENO, msg, sizeof (msg)); ++ rv = write (STDERR_FILENO, msg, sizeof (msg)); + exit (1); + } + } +--- gdb/top.c~ 2008-01-01 23:53:13.000000000 +0100 ++++ gdb/top.c 2008-06-24 16:26:51.000000000 +0200 +@@ -1628,7 +1628,8 @@ + + /* Run the init function of each source file */ + +- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); ++ if (!getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) ++ error (_("Unable to determine current directory")); + current_directory = gdb_dirbuf; + + #ifdef __MSDOS__ +--- gdb/ui-file.c~ 2008-01-01 23:53:13.000000000 +0100 ++++ gdb/ui-file.c 2008-06-24 16:30:16.000000000 +0200 +@@ -477,11 +477,12 @@ + static void + stdio_file_write (struct ui_file *file, const char *buf, long length_buf) + { ++ int rv; + struct stdio_file *stdio = ui_file_data (file); + if (stdio->magic != &stdio_file_magic) + internal_error (__FILE__, __LINE__, + _("stdio_file_write: bad magic number")); +- fwrite (buf, length_buf, 1, stdio->file); ++ rv = fwrite (buf, length_buf, 1, stdio->file); + } + + static void +--- gdb/main.c~ 2008-06-24 16:07:25.000000000 +0200 ++++ gdb/main.c 2008-06-24 16:25:05.000000000 +0200 +@@ -188,7 +188,8 @@ + line[0] = '\0'; /* Terminate saved (now empty) cmd line */ + instream = stdin; + +- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); ++ if (!getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) ++ error (_("Unable to determine current directory")); + current_directory = gdb_dirbuf; + + gdb_stdout = stdio_fileopen (stdout); diff --git a/packages/gdb/gdb-cross-sdk_6.8.bb b/packages/gdb/gdb-cross-sdk_6.8.bb index be5c4807d8..6aed03d639 100644 --- a/packages/gdb/gdb-cross-sdk_6.8.bb +++ b/packages/gdb/gdb-cross-sdk_6.8.bb @@ -1,22 +1,12 @@ require gdb-cross.inc +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" + DEPENDS = "ncurses-sdk" inherit sdk -PR = "r1" - -do_configure_prepend() { - for i in $(find ${S} -name "warning*m4") ; do - sed -i -e s:-Werror::g $i - done - for i in $(find ${S} -name "configure.ac") ; do - sed -i -e s:-Werror::g $i - done - for i in $(find ${S} -name "configure") ; do - sed -i -e s:-Werror::g $i - done -} +PR = "r2" do_stage() { : diff --git a/packages/gdb/gdb-cross_6.8.bb b/packages/gdb/gdb-cross_6.8.bb index f63f144d66..664ab5e323 100644 --- a/packages/gdb/gdb-cross_6.8.bb +++ b/packages/gdb/gdb-cross_6.8.bb @@ -1,4 +1,7 @@ require gdb-cross.inc + +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" + inherit cross -PR = "r2" +PR = "r3" diff --git a/packages/gdb/gdb_6.8.bb b/packages/gdb/gdb_6.8.bb index be40f3f12b..a969651c24 100644 --- a/packages/gdb/gdb_6.8.bb +++ b/packages/gdb/gdb_6.8.bb @@ -1,3 +1,5 @@ require gdb.inc -PR = "r2" +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" + +PR = "r3" diff --git a/packages/geda/geda-gattrib_1.4.1.bb b/packages/geda/geda-gattrib_1.4.1.bb index 463da2de99..af4ea94153 100644 --- a/packages/geda/geda-gattrib_1.4.1.bb +++ b/packages/geda/geda-gattrib_1.4.1.bb @@ -7,3 +7,5 @@ DEPENDS = "gtk+ libgeda" SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz" inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-update-desktop-database" diff --git a/packages/geda/geda-gschem_1.4.1.bb b/packages/geda/geda-gschem_1.4.1.bb index 2ed828c449..7613f3c6a5 100644 --- a/packages/geda/geda-gschem_1.4.1.bb +++ b/packages/geda/geda-gschem_1.4.1.bb @@ -8,3 +8,5 @@ SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz \ file://bad-include.patch;patch=1" inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-update-desktop-database" diff --git a/packages/geda/geda_1.4.1.bb b/packages/geda/geda_1.4.1.bb index b3c0e994b4..ee9394d9f2 100644 --- a/packages/geda/geda_1.4.1.bb +++ b/packages/geda/geda_1.4.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "GUI/Project Manager for teh gEDA suite" +DESCRIPTION = "Virtual package including the whole gEDA suite" LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" diff --git a/packages/geda/libgeda_1.4.1.bb b/packages/geda/libgeda_1.4.1.bb index f438f54553..a00a1d5cde 100644 --- a/packages/geda/libgeda_1.4.1.bb +++ b/packages/geda/libgeda_1.4.1.bb @@ -1,15 +1,15 @@ LICENSE = "GPLv2" HOMEPAGE = "http://geda.seul.org" -FILES_${PN} += "${datadir}/gEDA ${datadir}/icons ${datadir}/mime" -# NOTE: Old KDE integration ${datadir}/mimelnk/application/*.desktop are ignored intentionally (utx) +FILES_${PN} += "${datadir}/gEDA ${datadir}/icons ${datadir}/mime/packages" +# NOTE: Old KDE integration ${datadir}/mimelnk/application/*.desktop are ignored intentionally DEPENDS = "zlib gtk+ guile libpng" SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig mime -EXTRA_OECONF = "--disable-update-mime-database" +EXTRA_OECONF = "--disable-update-mime-database --disable-static" do_install_prepend() { sed -i 's:${STAGING_DIR_HOST}::g' libgeda.pc diff --git a/packages/gimp/gimp.inc b/packages/gimp/gimp.inc index e879a6ed0a..2894582a8e 100644 --- a/packages/gimp/gimp.inc +++ b/packages/gimp/gimp.inc @@ -8,7 +8,7 @@ DEPENDS = "sed-native gdk-pixbuf-csource-native libart-lgpl gtk+ jpeg libpng lib SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ file://configure-libwmf.patch;patch=1" -inherit autotools pkgconfig +inherit gnome FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \ ${libdir}/gimp/2.0/plug-ins/.debug" diff --git a/packages/gimp/gimp_2.6.3.bb b/packages/gimp/gimp_2.6.3.bb new file mode 100644 index 0000000000..8470b6d5a8 --- /dev/null +++ b/packages/gimp/gimp_2.6.3.bb @@ -0,0 +1,8 @@ +require gimp.inc + +DEPENDS += "lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \ + " + + diff --git a/packages/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch b/packages/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch new file mode 100644 index 0000000000..d7aa08821f --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch @@ -0,0 +1,42 @@ +# gatomic.c uses SWP, which doesn't work in Thumb mode. +# Put that source file into a separate convenience library which is always built as ARM. + +Index: glib-2.18.1/glib/Makefile.am +=================================================================== +--- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 ++++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 +@@ -80,6 +80,7 @@ + galiasdef.c + + lib_LTLIBRARIES = libglib-2.0.la ++noinst_LTLIBRARIES = libgatomic.la + + if OS_WIN32_AND_DLL_COMPILATION + if MS_LIB_AVAILABLE +@@ -96,10 +97,14 @@ + uninstall-ms-lib: + $(uninstall_ms_lib_cmd) + ++libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb ++ ++libgatomic_la_SOURCES = \ ++ gatomic.c ++ + libglib_2_0_la_SOURCES = \ + garray.c \ + gasyncqueue.c \ +- gatomic.c \ + gbacktrace.c \ + gbase64.c \ + gbookmarkfile.c \ +@@ -286,8 +291,8 @@ + pcre_inc = + endif + +-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) +-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) ++libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la ++libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la + + libglib_2_0_la_LDFLAGS = \ + $(glib_win32_res_ldflag) \ diff --git a/packages/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch @@ -0,0 +1,34 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1265,7 +1265,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/packages/glib-2.0/glib-2.0_2.18.3.bb b/packages/glib-2.0/glib-2.0_2.18.3.bb new file mode 100644 index 0000000000..1083ef4ba0 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.18.3.bb @@ -0,0 +1,12 @@ +require glib.inc + +# This version requires a newer libtool that isn't default yet +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1 \ + " +SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 7caf6a731c..89fbd1ca72 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -252,7 +252,7 @@ python package_do_split_gconvs () { if target_arch in ("i486", "i586", "i686"): target_arch = "i386" - qemu = "qemu-%s -r 2.6.16" % target_arch + qemu = "qemu-%s -s 1048576 -r 2.6.16" % target_arch pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb index 3b00d917cb..14e4a16678 100644 --- a/packages/gnome/gnome-cups-manager_0.31.bb +++ b/packages/gnome/gnome-cups-manager_0.31.bb @@ -1,5 +1,6 @@ DESCRIPTION="Gnome Cups Manager" LICENSE="GPLv2" + PR ="r0" DEPENDS="glib-2.0 gtk+ pango libgnomecups" @@ -9,9 +10,9 @@ inherit gnome pkgconfig FILES += "${datadir}/icons/hicolor/48x48/stock/data/emblem-*.png \ ${datadir}/icons/hicolor/48x48/devices/gnome-dev-printer-new.png" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.31/gnome-cups-manager-0.31.tar.bz2" +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/${PV}/gnome-cups-manager-${PV}.tar.bz2" do_stage() { -autotools_stage_all + autotools_stage_all } diff --git a/packages/gnome/gnome-cups-manager_0.33.bb b/packages/gnome/gnome-cups-manager_0.33.bb new file mode 100644 index 0000000000..e8e109e44f --- /dev/null +++ b/packages/gnome/gnome-cups-manager_0.33.bb @@ -0,0 +1,17 @@ +DESCRIPTION="Gnome Cups Manager" +LICENSE="GPLv2" + +PR ="r0" + +DEPENDS="glib-2.0 gtk+ pango libgnomecups" + +inherit gnome pkgconfig + +FILES_${PN} += "${datadir}/icons/" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/${PV}/gnome-cups-manager-${PV}.tar.bz2" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/gnome/gvfs_1.0.3.bb b/packages/gnome/gvfs_1.0.3.bb new file mode 100644 index 0000000000..c44ba1692f --- /dev/null +++ b/packages/gnome/gvfs_1.0.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 fuse" +PR = "r0" + +inherit gnome + +EXTRA_OECONF = "--disable-samba --with-archive-includes=${STAGING_INCDIR}" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb index 166161fdcd..f4cc7bd830 100644 --- a/packages/gnome/libgnomecups_0.2.2.bb +++ b/packages/gnome/libgnomecups_0.2.2.bb @@ -1,5 +1,6 @@ DESCRIPTION="Gnome Cups Manager" LICENSE="GPLv2" + PR ="r0" DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" @@ -12,6 +13,6 @@ do_compile_append () { } do_stage() { -autotools_stage_all + autotools_stage_all } diff --git a/packages/gnome/libgnomecups_0.2.3.bb b/packages/gnome/libgnomecups_0.2.3.bb new file mode 100644 index 0000000000..f4cc7bd830 --- /dev/null +++ b/packages/gnome/libgnomecups_0.2.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION="Gnome Cups Manager" +LICENSE="GPLv2" + +PR ="r0" + +DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" + +inherit gnome pkgconfig + +do_compile_append () { + cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc +} + +do_stage() { + autotools_stage_all +} + diff --git a/packages/gnome/orbit2_2.14.16.bb b/packages/gnome/orbit2_2.14.16.bb new file mode 100644 index 0000000000..5f6e6f6105 --- /dev/null +++ b/packages/gnome/orbit2_2.14.16.bb @@ -0,0 +1,46 @@ +LICENSE = "GPL" +DESCRIPTION = "CORBA ORB" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ + file://configure-lossage.patch;patch=1;pnum=1 \ + file://pkgconfig-fix.patch;patch=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl popt orbit2-native gtk-doc" +PARALLEL_MAKE = "" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la" +FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" + +S = "${WORKDIR}/ORBit2-${PV}" + +LEAD_SONAME = "libORBit-2.so" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +do_stage() { + oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} + install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ + + for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do + install -d ${STAGING_INCDIR}/orbit-2.0/$dir + ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done ) + done + + install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices + install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ +} diff --git a/packages/gparted/gparted_0.4.1.bb b/packages/gparted/gparted_0.4.1.bb new file mode 100644 index 0000000000..c95fb6471c --- /dev/null +++ b/packages/gparted/gparted_0.4.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "GNOME Partition Manager" +LICENSE = "GPL" +DEPENDS = "gtkmm parted" + +inherit gnome + +SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \ + file://cross.patch;patch=1 \ +" + +EXTRA_OECONF = " --disable-doc --disable-scrollkeeper " diff --git a/packages/gphoto2/files/gphoto-popt-fixup.patch b/packages/gphoto2/files/gphoto-popt-fixup.patch new file mode 100644 index 0000000000..66b6168e02 --- /dev/null +++ b/packages/gphoto2/files/gphoto-popt-fixup.patch @@ -0,0 +1,22 @@ +Index: gphoto2-2.4.2/m4m/gp-check-popt.m4 +=================================================================== +--- gphoto2-2.4.2.orig/m4m/gp-check-popt.m4 2008-12-04 01:46:40.000000000 +0300 ++++ gphoto2-2.4.2/m4m/gp-check-popt.m4 2008-12-04 01:47:03.000000000 +0300 +@@ -69,7 +69,7 @@ + if test -n "${popt_prefix}"; then + : + elif test -d "${popt_prefix}/include"; then +- CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}" ++ CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS_save}" + else + continue + fi +@@ -113,7 +113,7 @@ + if test "${popt_libdir}" = "/"; then + popt_libdir="" + elif test -d "${popt_libdir}"; then +- LDFLAGS="-L${popt_libdir} ${LDFLAGS}" ++ LDFLAGS="-L${popt_libdir} ${LDFLAGS_save}" + else + continue + fi diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb index 996edb25a0..ee4e9c614f 100644 --- a/packages/gphoto2/gphoto2_2.4.2.bb +++ b/packages/gphoto2/gphoto2_2.4.2.bb @@ -2,9 +2,10 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "libtool libgphoto2 popt" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\ + file://gphoto-popt-fixup.patch;patch=1" inherit autotools diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 82f541ea99..e4f5a9988b 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "dbus-glib ncurses python" -RDEPENDS_${PN} = "gpsd-conf gpsd-gpsctl" +PROVIDES = "virtual/gpsd" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -75,10 +75,13 @@ PACKAGES =+ "libgps python-pygps gpsd-conf gpsd-gpsctl gps-utils" PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}" +RDEPENDS_${PN} = "gpsd-conf gpsd-gpsctl" + FILES_libgps = "${libdir}/*.so.*" FILES_gpsd-conf = "${sysconfdir}" FILES_gpsd-gpsctl = "${bindir}/gpsctl" FILES_gps-utils = "${bindir}/*" + # might split them up even more fine granular RDEPENDS_gps-utils = "python-pygps" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb deleted file mode 100644 index d5a02e27b4..0000000000 --- a/packages/gpsd/gpsd_2.28.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gpsd.inc - -PR = "r9" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb deleted file mode 100644 index 4f4e3a3a78..0000000000 --- a/packages/gpsd/gpsd_2.34.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gpsd.inc - -PR = "r10" - diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb deleted file mode 100644 index b3cc2f1f19..0000000000 --- a/packages/gpsd/gpsd_2.36.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gpsd.inc - -PR = "r4" diff --git a/packages/gpsd/gpsd_2.37.bb b/packages/gpsd/gpsd_2.37.bb index 58e9ebeee2..885a41dbda 100644 --- a/packages/gpsd/gpsd_2.37.bb +++ b/packages/gpsd/gpsd_2.37.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r0" +PR = "r1" diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 3abe81207d..4007daec25 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -9,8 +9,6 @@ XSERVER ?= "xserver-xorg \ xf86-input-keyboard \ " -E_CONFIG ?= "e-wm-config-standard e-wm-config-default" - ANGSTROM_EXTRA_INSTALL ?= "" export IMAGE_BASENAME = "Beagleboard-demo-image" @@ -18,35 +16,9 @@ export IMAGE_BASENAME = "Beagleboard-demo-image" DEPENDS = "task-base" IMAGE_INSTALL = "\ ${XSERVER} \ - task-base-extended \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL} \ - angstrom-zeroconf-audio \ - angstrom-led-config \ - gpe-scap \ - psplash \ - e-wm ${E_CONFIG} exhibit \ - xterm xmms \ - epiphany firefox midori \ - swfdec-mozilla \ - hicolor-icon-theme gnome-icon-theme \ - jaaa nmap iperf gnuplot \ - abiword \ - gnumeric \ - gimp \ - powertop oprofile \ - pidgin \ -# irssi \ - mplayer omapfbplay \ - gnome-games \ - rt73-firmware zd1211-firmware \ - stalonetray \ - synergy \ - x11vnc \ - angstrom-gnome-icon-theme-enable \ -" + task-beagleboard-demo \ + " IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" diff --git a/packages/images/opie-xqtlauncher-image.bb b/packages/images/opie-xqtlauncher-image.bb new file mode 100644 index 0000000000..db32a1e893 --- /dev/null +++ b/packages/images/opie-xqtlauncher-image.bb @@ -0,0 +1,7 @@ +require opie-image.bb + +DEPENDS += "task-xqtlauncher" + +export IMAGE_BASENAME = "opie-xqtlauncher-image" + +IMAGE_INSTALL += "task-xqtlauncher task-xqtlauncher-blackbox" diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index cfac69b6d9..5cdbab5e0d 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -39,13 +39,15 @@ read_args() { done } +load_module() { + # Cannot redir to $CONSOLE here easily - may not be set yet + echo "initramfs: Loading $module module" + source $1 +} + load_modules() { for module in $MODULE_DIR/$1; do - if [ -e "$module" ]; then - # Cannot redir to $CONSOLE here easily - may not be set yet - echo "initramfs: Loading $module module" - source $module - fi + [ -e "$module" ] && load_module $module done } diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 5a042ab748..07e94f1dfc 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r9" +PR = "r10" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" diff --git a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig index ebe31315b5..930a1e15f9 100644 --- a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig +++ b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig @@ -845,7 +845,7 @@ CONFIG_USB_FUNCTION_ADB=y # CONFIG_USB_FUNCTION_UMS is not set CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_FUNCTION_DIAG=y -# CONFIG_USB_FUNCTION_ETHER is not set +CONFIG_USB_FUNCTION_ETHER=y CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y diff --git a/packages/linux/linux-msm7xxxx/htcraphael/defconfig b/packages/linux/linux-msm7xxxx/htcraphael/defconfig index ebe31315b5..930a1e15f9 100644 --- a/packages/linux/linux-msm7xxxx/htcraphael/defconfig +++ b/packages/linux/linux-msm7xxxx/htcraphael/defconfig @@ -845,7 +845,7 @@ CONFIG_USB_FUNCTION_ADB=y # CONFIG_USB_FUNCTION_UMS is not set CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_FUNCTION_DIAG=y -# CONFIG_USB_FUNCTION_ETHER is not set +CONFIG_USB_FUNCTION_ETHER=y CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y diff --git a/packages/linux/linux-msm7xxxx_git.bb b/packages/linux/linux-msm7xxxx_git.bb index 8600110e16..3c5996db33 100644 --- a/packages/linux/linux-msm7xxxx_git.bb +++ b/packages/linux/linux-msm7xxxx_git.bb @@ -10,9 +10,9 @@ COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcraphael|htcdiamond|htcvogue|htctit SRCREV_htckaiser = "1082670ccae30e6592311cc9dee93ba978382a25" SRCREV_htcpolaris = "1082670ccae30e6592311cc9dee93ba978382a25" -SRCREV_htcraphael = "6ec22f1385dcc2ca15d08361657a0b14821534b8" -SRCREV_htcdiamond = "6ec22f1385dcc2ca15d08361657a0b14821534b8" -SRCREV_htcvogue = "7904ce5c8b7da40548a159f5fe02d11fa3d3cb77" +SRCREV_htcraphael = "b72564e5359a9d3d232cabc385de4e95dfe7a042" +SRCREV_htcdiamond = "b72564e5359a9d3d232cabc385de4e95dfe7a042" +SRCREV_htcvogue = "e73c363e32f9fd9b1f4e11a8fec1dcc1fdd19ffc" SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm-2.6.25;protocol=git file://defconfig" SRC_URI_htckaiser = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git file://defconfig" diff --git a/packages/linux/linux-omap/0010-DSS-Support-for-OMAP3-SDP-board.patch b/packages/linux/linux-omap/0010-DSS-Support-for-OMAP3-SDP-board.patch deleted file mode 100644 index 707b6c4d66..0000000000 --- a/packages/linux/linux-omap/0010-DSS-Support-for-OMAP3-SDP-board.patch +++ /dev/null @@ -1,296 +0,0 @@ -From 06675e403dfe6fd9471513fb7db77db69c38c91d Mon Sep 17 00:00:00 2001 -From: Tomi Valkeinen <tomi.valkeinen@nokia.com> -Date: Fri, 14 Nov 2008 15:47:55 +0200 -Subject: [PATCH] DSS: Support for OMAP3 SDP board - -Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> ---- - arch/arm/mach-omap2/board-3430sdp.c | 234 +++++++++++++++++++++++++++++++++-- - 1 files changed, 223 insertions(+), 11 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c -index b7d2e92..ac4f806 100644 ---- a/arch/arm/mach-omap2/board-3430sdp.c -+++ b/arch/arm/mach-omap2/board-3430sdp.c -@@ -40,6 +40,8 @@ - #include <mach/keypad.h> - #include <mach/dma.h> - #include <mach/gpmc.h> -+#include <mach/omapfb.h> -+#include <mach/display.h> - - #include <asm/io.h> - #include <asm/delay.h> -@@ -240,14 +242,224 @@ static struct spi_board_info sdp3430_spi_board_info[] __initdata = { - }, - }; - --static struct platform_device sdp3430_lcd_device = { -- .name = "sdp2430_lcd", -- .id = -1, -+static struct omap_fbmem_config sdp3430_fbmem0_config = { -+ .size = 1024*768*4, -+ .start = OMAPFB_MEMTYPE_SDRAM, -+}; -+ -+static struct omap_fbmem_config sdp3430_fbmem1_config = { -+ .size = 640*480*4, -+ .start = OMAPFB_MEMTYPE_SDRAM, - }; - -+static struct omap_fbmem_config sdp3430_fbmem2_config = { -+ .size = 640*480*4, -+ .start = OMAPFB_MEMTYPE_SDRAM, -+}; -+ -+ -+#define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 -+#define SDP2430_LCD_PANEL_ENABLE_GPIO 154 -+#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 24 -+#define SDP3430_LCD_PANEL_ENABLE_GPIO 28 -+ -+#define PM_RECEIVER TWL4030_MODULE_PM_RECEIVER -+#define ENABLE_VAUX2_DEDICATED 0x09 -+#define ENABLE_VAUX2_DEV_GRP 0x20 -+#define ENABLE_VAUX3_DEDICATED 0x03 -+#define ENABLE_VAUX3_DEV_GRP 0x20 -+ -+#define ENABLE_VPLL2_DEDICATED 0x05 -+#define ENABLE_VPLL2_DEV_GRP 0xE0 -+#define TWL4030_VPLL2_DEV_GRP 0x33 -+#define TWL4030_VPLL2_DEDICATED 0x36 -+ -+#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v) -+ -+static unsigned backlight_gpio; -+static unsigned enable_gpio; -+static int lcd_enabled; -+static int dvi_enabled; -+ -+static void __init sdp3430_display_init(void) -+{ -+ int r; -+ -+ enable_gpio = SDP3430_LCD_PANEL_ENABLE_GPIO; -+ backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO; -+ -+ r = gpio_request(enable_gpio, "LCD reset"); -+ if (r) { -+ printk(KERN_ERR "failed to get LCD reset GPIO\n"); -+ goto err0; -+ } -+ -+ r = gpio_request(backlight_gpio, "LCD Backlight"); -+ if (r) { -+ printk(KERN_ERR "failed to get LCD backlight GPIO\n"); -+ goto err1; -+ } -+ -+ gpio_direction_output(enable_gpio, 0); -+ gpio_direction_output(backlight_gpio, 0); -+ -+ return; -+err1: -+ gpio_free(enable_gpio); -+err0: -+ return; -+} -+ -+ -+static int sdp3430_panel_enable_lcd(struct omap_display *display) -+{ -+ u8 ded_val, ded_reg; -+ u8 grp_val, grp_reg; -+ -+ if (dvi_enabled) { -+ printk(KERN_ERR "cannot enable LCD, DVI is enabled\n"); -+ return -EINVAL; -+ } -+ -+ if (omap_rev() > OMAP3430_REV_ES1_0) { -+ t2_out(PM_RECEIVER, ENABLE_VPLL2_DEDICATED, -+ TWL4030_VPLL2_DEDICATED); -+ t2_out(PM_RECEIVER, ENABLE_VPLL2_DEV_GRP, -+ TWL4030_VPLL2_DEV_GRP); -+ } -+ -+ ded_reg = TWL4030_VAUX3_DEDICATED; -+ ded_val = ENABLE_VAUX3_DEDICATED; -+ grp_reg = TWL4030_VAUX3_DEV_GRP; -+ grp_val = ENABLE_VAUX3_DEV_GRP; -+ -+ gpio_direction_output(enable_gpio, 1); -+ gpio_direction_output(backlight_gpio, 1); -+ -+ if (0 != t2_out(PM_RECEIVER, ded_val, ded_reg)) -+ return -EIO; -+ if (0 != t2_out(PM_RECEIVER, grp_val, grp_reg)) -+ return -EIO; -+ -+ lcd_enabled = 1; -+ -+ return 0; -+} -+ -+static void sdp3430_panel_disable_lcd(struct omap_display *display) -+{ -+ lcd_enabled = 0; -+ -+ gpio_direction_output(enable_gpio, 0); -+ gpio_direction_output(backlight_gpio, 0); -+ -+ if (omap_rev() > OMAP3430_REV_ES1_0) { -+ t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEDICATED); -+ t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEV_GRP); -+ mdelay(4); -+ } -+} -+ -+static struct omap_display_data sdp3430_display_data = { -+ .type = OMAP_DISPLAY_TYPE_DPI, -+ .name = "lcd", -+ .panel_name = "sharp-ls037v7dw01", -+ .u.dpi.data_lines = 16, -+ .panel_enable = sdp3430_panel_enable_lcd, -+ .panel_disable = sdp3430_panel_disable_lcd, -+}; -+ -+static int sdp3430_panel_enable_dvi(struct omap_display *display) -+{ -+ if (lcd_enabled) { -+ printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); -+ return -EINVAL; -+ } -+ -+ if (omap_rev() > OMAP3430_REV_ES1_0) { -+ t2_out(PM_RECEIVER, ENABLE_VPLL2_DEDICATED, -+ TWL4030_VPLL2_DEDICATED); -+ t2_out(PM_RECEIVER, ENABLE_VPLL2_DEV_GRP, -+ TWL4030_VPLL2_DEV_GRP); -+ } -+ -+ dvi_enabled = 1; -+ -+ return 0; -+} -+ -+static void sdp3430_panel_disable_dvi(struct omap_display *display) -+{ -+ dvi_enabled = 0; -+ -+ if (omap_rev() > OMAP3430_REV_ES1_0) { -+ t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEDICATED); -+ t2_out(PM_RECEIVER, 0x0, TWL4030_VPLL2_DEV_GRP); -+ mdelay(4); -+ } -+} -+ -+ -+static struct omap_display_data sdp3430_display_data_dvi = { -+ .type = OMAP_DISPLAY_TYPE_DPI, -+ .name = "dvi", -+ .panel_name = "panel-dvi", -+ .u.dpi.data_lines = 24, -+ .panel_enable = sdp3430_panel_enable_dvi, -+ .panel_disable = sdp3430_panel_disable_dvi, -+}; -+ -+static int sdp3430_panel_enable_tv(struct omap_display *display) -+{ -+#define ENABLE_VDAC_DEDICATED 0x03 -+#define ENABLE_VDAC_DEV_GRP 0x20 -+ -+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, -+ ENABLE_VDAC_DEDICATED, -+ TWL4030_VDAC_DEDICATED); -+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, -+ ENABLE_VDAC_DEV_GRP, TWL4030_VDAC_DEV_GRP); -+ -+ return 0; -+} -+ -+static void sdp3430_panel_disable_tv(struct omap_display *display) -+{ -+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, -+ TWL4030_VDAC_DEDICATED); -+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, -+ TWL4030_VDAC_DEV_GRP); -+} -+ -+static struct omap_display_data sdp3430_display_data_tv = { -+ .type = OMAP_DISPLAY_TYPE_VENC, -+ .name = "tv", -+ .u.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, -+ .panel_enable = sdp3430_panel_enable_tv, -+ .panel_disable = sdp3430_panel_disable_tv, -+}; -+ -+static struct omap_dss_platform_data sdp3430_dss_data = { -+ .num_displays = 3, -+ .displays = { -+ &sdp3430_display_data, -+ &sdp3430_display_data_dvi, -+ &sdp3430_display_data_tv, -+ } -+}; -+ -+static struct platform_device sdp3430_dss_device = { -+ .name = "omap-dss", -+ .id = -1, -+ .dev = { -+ .platform_data = &sdp3430_dss_data, -+ }, -+}; -+ -+ - static struct platform_device *sdp3430_devices[] __initdata = { - &sdp3430_smc91x_device, -- &sdp3430_lcd_device, -+ &sdp3430_dss_device, - }; - - static inline void __init sdp3430_init_smc91x(void) -@@ -294,13 +506,11 @@ static struct omap_uart_config sdp3430_uart_config __initdata = { - .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), - }; - --static struct omap_lcd_config sdp3430_lcd_config __initdata = { -- .ctrl_name = "internal", --}; -- - static struct omap_board_config_kernel sdp3430_config[] __initdata = { - { OMAP_TAG_UART, &sdp3430_uart_config }, -- { OMAP_TAG_LCD, &sdp3430_lcd_config }, -+ { OMAP_TAG_FBMEM, &sdp3430_fbmem0_config }, -+ { OMAP_TAG_FBMEM, &sdp3430_fbmem1_config }, -+ { OMAP_TAG_FBMEM, &sdp3430_fbmem2_config }, - }; - - static int sdp3430_batt_table[] = { -@@ -467,8 +677,6 @@ static void __init omap_3430sdp_init(void) - { - omap3430_i2c_init(); - platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); -- omap_board_config = sdp3430_config; -- omap_board_config_size = ARRAY_SIZE(sdp3430_config); - if (omap_rev() > OMAP3430_REV_ES1_0) - ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV2; - else -@@ -483,10 +691,14 @@ static void __init omap_3430sdp_init(void) - usb_musb_init(); - usb_ehci_init(); - hsmmc_init(mmc); -+ sdp3430_display_init(); - } - - static void __init omap_3430sdp_map_io(void) - { -+ omap_board_config = sdp3430_config; -+ omap_board_config_size = ARRAY_SIZE(sdp3430_config); -+ - omap2_set_globals_343x(); - omap2_map_common_io(); - } --- -1.5.6.3 - diff --git a/packages/linux/linux-omap/mru-add-clk-get-parent.diff b/packages/linux/linux-omap/mru-add-clk-get-parent.diff deleted file mode 100644 index 4488b311a0..0000000000 --- a/packages/linux/linux-omap/mru-add-clk-get-parent.diff +++ /dev/null @@ -1,68 +0,0 @@ -From 2414b5ac7596904dd8951619316b63d644f544db Mon Sep 17 00:00:00 2001 -From: Mans Rullgard <mans@mansr.com> -Date: Tue, 22 Jul 2008 01:58:18 +0100 -Subject: [PATCH] ARM: OMAP: add clk_get_parent() for OMAP2/3 - -Signed-off-by: Mans Rullgard <mans@mansr.com> ---- - arch/arm/mach-omap2/clock.c | 5 +++++ - arch/arm/mach-omap2/clock.h | 1 + - arch/arm/mach-omap2/clock24xx.c | 1 + - arch/arm/mach-omap2/clock34xx.c | 1 + - 4 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c -index c3af24e..9e502a0 100644 ---- a/arch/arm/mach-omap2/clock.c -+++ b/arch/arm/mach-omap2/clock.c -@@ -817,6 +817,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) - return 0; - } - -+struct clk *omap2_clk_get_parent(struct clk *clk) -+{ -+ return clk->parent; -+} -+ - /* DPLL rate rounding code */ - - /** -diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h -index bcb0c03..a5183d0 100644 ---- a/arch/arm/mach-omap2/clock.h -+++ b/arch/arm/mach-omap2/clock.h -@@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate); - int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent); - int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance); - long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate); -+struct clk *omap2_clk_get_parent(struct clk *clk); - - #ifdef CONFIG_OMAP_RESET_CLOCKS - void omap2_clk_disable_unused(struct clk *clk); -diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c -index a54f10f..4382e60 100644 ---- a/arch/arm/mach-omap2/clock24xx.c -+++ b/arch/arm/mach-omap2/clock24xx.c -@@ -416,6 +416,7 @@ static struct clk_functions omap2_clk_functions = { - .clk_round_rate = omap2_clk_round_rate, - .clk_set_rate = omap2_clk_set_rate, - .clk_set_parent = omap2_clk_set_parent, -+ .clk_get_parent = omap2_clk_get_parent, - .clk_disable_unused = omap2_clk_disable_unused, - #ifdef CONFIG_CPU_FREQ - .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table, -diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c -index cc43f4f..2a1a6b1 100644 ---- a/arch/arm/mach-omap2/clock34xx.c -+++ b/arch/arm/mach-omap2/clock34xx.c -@@ -635,6 +635,7 @@ static struct clk_functions omap2_clk_functions = { - .clk_round_rate = omap2_clk_round_rate, - .clk_set_rate = omap2_clk_set_rate, - .clk_set_parent = omap2_clk_set_parent, -+ .clk_get_parent = omap2_clk_get_parent, - .clk_disable_unused = omap2_clk_disable_unused, - }; - --- -1.5.6.3 - diff --git a/packages/linux/linux-omap/mru-make-dpll4-m4-ck-programmable.diff b/packages/linux/linux-omap/mru-make-dpll4-m4-ck-programmable.diff deleted file mode 100644 index 85f9cc3129..0000000000 --- a/packages/linux/linux-omap/mru-make-dpll4-m4-ck-programmable.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 38e48da3c27d38b05bed4572930240e73e4dfb22 Mon Sep 17 00:00:00 2001 -From: Mans Rullgard <mans@mansr.com> -Date: Tue, 22 Jul 2008 01:31:11 +0100 -Subject: [PATCH] ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate() - -Filling the set_rate and round_rate fields of dpll4_m4_ck makes -this clock programmable through clk_set_rate(). This is needed -to give omapfb control over the dss1_alwon_fck rate. ---- - arch/arm/mach-omap2/clock34xx.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h -index 08789c8..1032577 100644 ---- a/arch/arm/mach-omap2/clock34xx.h -+++ b/arch/arm/mach-omap2/clock34xx.h -@@ -821,6 +821,8 @@ static struct clk dpll4_m4_ck = { - PARENT_CONTROLS_CLOCK, - .clkdm = { .name = "dpll4_clkdm" }, - .recalc = &omap2_clksel_recalc, -+ .set_rate = &omap2_clksel_set_rate, -+ .round_rate = &omap2_clksel_round_rate, - }; - - /* The PWRDN bit is apparently only available on 3430ES2 and above */ --- -1.5.6.3 - diff --git a/packages/linux/linux-omap/twl-asoc-fix-record.diff b/packages/linux/linux-omap/twl-asoc-fix-record.diff new file mode 100644 index 0000000000..9c0ceaa2e0 --- /dev/null +++ b/packages/linux/linux-omap/twl-asoc-fix-record.diff @@ -0,0 +1,34 @@ +From linux-omap-owner@vger.kernel.org Sat Dec 06 02:14:21 2008 +Date: Fri, 5 Dec 2008 16:46:34 -0800 +From: "Steve Sakoman" <sakoman@gmail.com> +To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org> +Subject: [FYI PATCH] ASOC:TWL4030 Audio capture fix + +A couple of folks have noticed an issue with audio capture -- the +capture result is always silence. + +The patch below is a quick fix for those with this issue. There are +substantial changes to the codec driver that will be trickling down +from ASoC, and they deal with this issue differently. + +So consider this as a bandaid for those who don't want to wait for the +trickle down :-) + +Steve + + +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +index ee2f0d3..8b4aafb 100644 +--- a/sound/soc/codecs/twl4030.c ++++ b/sound/soc/codecs/twl4030.c +@@ -45,8 +45,8 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { + 0xc3, /* REG_OPTION (0x2) */ + 0x00, /* REG_UNKNOWN (0x3) */ + 0x00, /* REG_MICBIAS_CTL (0x4) */ +- 0x24, /* REG_ANAMICL (0x5) */ +- 0x04, /* REG_ANAMICR (0x6) */ ++ 0x34, /* REG_ANAMICL (0x5) */ ++ 0x14, /* REG_ANAMICR (0x6) */ + 0x0a, /* REG_AVADC_CTL (0x7) */ + 0x00, /* REG_ADCMICSEL (0x8) */ + 0x00, /* REG_DIGMIXING (0x9) */ diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 390199d43e..c0ec324ee8 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,11 +6,11 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "75b7ae0e97f0862a13df9a6ac036ad0865b6703d" +SRCREV = "014ba70469e889ebb74516052c43fd06a419b17b" -PV = "2.6.27+2.6.28-rc6+${PR}+gitr${SRCREV}" +PV = "2.6.27+2.6.28-rc7+${PR}+gitr${SRCREV}" #PV = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -23,8 +23,6 @@ SRC_URI_append = " \ file://musb-support-high-bandwidth.patch.eml;patch=1 \ file://mru-fix-timings.diff;patch=1 \ file://mru-fix-display-panning.diff;patch=1 \ - file://mru-make-dpll4-m4-ck-programmable.diff;patch=1 \ - file://mru-add-clk-get-parent.diff;patch=1 \ file://mru-improve-pixclock-config.diff;patch=1 \ file://mru-make-video-timings-selectable.diff;patch=1 \ file://mru-enable-overlay-optimalization.diff;patch=1 \ @@ -38,9 +36,9 @@ SRC_URI_append = " \ file://0007-DSS-support-for-Beagle-Board.patch;patch=1 \ file://0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch;patch=1 \ file://0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch;patch=1 \ - file://0010-DSS-Support-for-OMAP3-SDP-board.patch;patch=1 \ file://0011-DSS-Support-for-OMAP3-EVM-board.patch;patch=1 \ http://www.bat.org/~tomba/git/0001-DSS-OMAPFB-Check-that-var-pixclock-is-not-zero.patch;patch=1 \ + file://twl-asoc-fix-record.diff;patch=1 \ " diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index dac670abf9..73ce09a2ee 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -5,14 +5,19 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for the Openmoko Neo Smartphones DEFAULT_PREFERENCE = "-1" -KERNEL_RELEASE = "2.6.26" +KERNEL_RELEASE = "2.6.27" KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}" +OEV = "oe0" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" PR = "r0" SRC_URI = "\ - git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \ - file://defconfig-oe \ + git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \ " S = "${WORKDIR}/git" + +do_configure_prepend() { + install -m 644 cp ./arch/arm/configs/gta02_defconfig ${WORKDIR}/defconfig-oe +} + diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe index 4dd031ec8a..30cf97adc9 100644 --- a/packages/linux/linux-openmoko/defconfig-oe +++ b/packages/linux/linux-openmoko/defconfig-oe @@ -1430,7 +1430,8 @@ CONFIG_LEDS_NEO1973_GTA02=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_NETDEV=y CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y diff --git a/packages/linux/linux-openmoko/openwrt-ledtrig-netdev.patch b/packages/linux/linux-openmoko/openwrt-ledtrig-netdev.patch new file mode 100644 index 0000000000..668b940d86 --- /dev/null +++ b/packages/linux/linux-openmoko/openwrt-ledtrig-netdev.patch @@ -0,0 +1,473 @@ +Add a netdev LED trigger for all Blinkenlights lovers... +Originally taken from https://dev.openwrt.org/ticket/2776 +Slightly updated for 2.6.24 by Mickey <mickey@openmoko.org>. + +Index: git/drivers/leds/ledtrig-netdev.c +=================================================================== +--- /dev/null ++++ git/drivers/leds/ledtrig-netdev.c +@@ -0,0 +1,438 @@ ++/* ++ * LED Kernel Netdev Trigger ++ * ++ * Toggles the LED to reflect the link and traffic state of a named net device ++ * ++ * Copyright 2007 Oliver Jowett <oliver@opencloud.com> ++ * ++ * Derived from ledtrig-timer.c which is: ++ * Copyright 2005-2006 Openedhand Ltd. ++ * Author: Richard Purdie <rpurdie@openedhand.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include <linux/module.h> ++#include <linux/jiffies.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/list.h> ++#include <linux/spinlock.h> ++#include <linux/device.h> ++#include <linux/sysdev.h> ++#include <linux/netdevice.h> ++#include <linux/timer.h> ++#include <linux/ctype.h> ++#include <linux/leds.h> ++#include "leds.h" ++ ++/* ++ * Configurable sysfs attributes: ++ * ++ * device_name - network device name to monitor ++ * ++ * interval - duration of LED blink, in milliseconds ++ * ++ * mode - either "none" (LED is off) or a space separated list of one or more of: ++ * link: LED's normal state reflects whether the link is up (has carrier) or not ++ * tx: LED blinks on transmitted data ++ * rx: LED blinks on receive data ++ * ++ * Some suggestions: ++ * ++ * Simple link status LED: ++ * $ echo netdev >someled/trigger ++ * $ echo eth0 >someled/device_name ++ * $ echo link >someled/mode ++ * ++ * Ethernet-style link/activity LED: ++ * $ echo netdev >someled/trigger ++ * $ echo eth0 >someled/device_name ++ * $ echo "link tx rx" >someled/mode ++ * ++ * Modem-style tx/rx LEDs: ++ * $ echo netdev >led1/trigger ++ * $ echo ppp0 >led1/device_name ++ * $ echo tx >led1/mode ++ * $ echo netdev >led2/trigger ++ * $ echo ppp0 >led2/device_name ++ * $ echo rx >led2/mode ++ * ++ */ ++ ++#define MODE_LINK 1 ++#define MODE_TX 2 ++#define MODE_RX 4 ++ ++struct led_netdev_data { ++ rwlock_t lock; ++ ++ struct timer_list timer; ++ struct notifier_block notifier; ++ ++ struct led_classdev *led_cdev; ++ struct net_device *net_dev; ++ ++ char device_name[IFNAMSIZ]; ++ unsigned interval; ++ unsigned mode; ++ unsigned link_up; ++ unsigned last_activity; ++}; ++ ++static void set_baseline_state(struct led_netdev_data *trigger_data) ++{ ++ if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ++ led_set_brightness(trigger_data->led_cdev, LED_FULL); ++ else ++ led_set_brightness(trigger_data->led_cdev, LED_OFF); ++ ++ if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up) ++ mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); ++ else ++ del_timer(&trigger_data->timer); ++} ++ ++static ssize_t led_device_name_show(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ ++ read_lock(&trigger_data->lock); ++ sprintf(buf, "%s\n", trigger_data->device_name); ++ read_unlock(&trigger_data->lock); ++ ++ return strlen(buf) + 1; ++} ++ ++static ssize_t led_device_name_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t size) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ ++ if (size < 0 || size >= IFNAMSIZ) ++ return -EINVAL; ++ ++ write_lock(&trigger_data->lock); ++ ++ strcpy(trigger_data->device_name, buf); ++ if (size > 0 && trigger_data->device_name[size-1] == '\n') ++ trigger_data->device_name[size-1] = 0; ++ ++ if (trigger_data->device_name[0] != 0) { ++ /* check for existing device to update from */ ++ trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name); ++ if (trigger_data->net_dev != NULL) ++ trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0; ++ set_baseline_state(trigger_data); /* updates LEDs, may start timers */ ++ } ++ ++ write_unlock(&trigger_data->lock); ++ return size; ++} ++ ++static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store); ++ ++static ssize_t led_mode_show(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ ++ read_lock(&trigger_data->lock); ++ ++ if (trigger_data->mode == 0) { ++ strcpy(buf, "none\n"); ++ } else { ++ char *p = buf; ++ if (trigger_data->mode & MODE_LINK) ++ strcat(buf, "link "); ++ if (trigger_data->mode & MODE_TX) ++ strcat(buf, "tx "); ++ if (trigger_data->mode & MODE_RX) ++ strcat(buf, "rx "); ++ strcat(buf, "\n"); ++ } ++ ++ read_unlock(&trigger_data->lock); ++ ++ return strlen(buf)+1; ++} ++ ++static ssize_t led_mode_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t size) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ char copybuf[1024]; ++ int new_mode = -1; ++ char *p, *token; ++ ++ /* take a copy since we don't want to trash the inbound buffer when using strsep */ ++ strncpy(copybuf, buf, sizeof(copybuf)); ++ copybuf[1023] = 0; ++ p = copybuf; ++ ++ while ((token = strsep(&p, " \t\n")) != NULL) { ++ if (!*token) ++ continue; ++ ++ if (new_mode == -1) ++ new_mode = 0; ++ ++ if (!strcmp(token, "none")) ++ new_mode = 0; ++ else if (!strcmp(token, "tx")) ++ new_mode |= MODE_TX; ++ else if (!strcmp(token, "rx")) ++ new_mode |= MODE_RX; ++ else if (!strcmp(token, "link")) ++ new_mode |= MODE_LINK; ++ else ++ return -EINVAL; ++ } ++ ++ if (new_mode == -1) ++ return -EINVAL; ++ ++ write_lock(&trigger_data->lock); ++ trigger_data->mode = new_mode; ++ set_baseline_state(trigger_data); ++ write_unlock(&trigger_data->lock); ++ ++ return size; ++} ++ ++static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store); ++ ++static ssize_t led_interval_show(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ ++ read_lock(&trigger_data->lock); ++ sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval)); ++ read_unlock(&trigger_data->lock); ++ ++ return strlen(buf) + 1; ++} ++ ++static ssize_t led_interval_store(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t size) ++{ ++ struct led_classdev *led_cdev = dev_get_drvdata(dev); ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ int ret = -EINVAL; ++ char *after; ++ unsigned long value = simple_strtoul(buf, &after, 10); ++ size_t count = after - buf; ++ ++ if (*after && isspace(*after)) ++ count++; ++ ++ /* impose some basic bounds on the timer interval */ ++ if (count == size && value >= 5 && value <= 10000) { ++ write_lock(&trigger_data->lock); ++ trigger_data->interval = msecs_to_jiffies(value); ++ set_baseline_state(trigger_data); // resets timer ++ write_unlock(&trigger_data->lock); ++ ret = count; ++ } ++ ++ return ret; ++} ++ ++static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store); ++ ++static int netdev_trig_notify(struct notifier_block *nb, ++ unsigned long evt, ++ void *dv) ++{ ++ struct net_device *dev = dv; ++ struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier); ++ ++ if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) ++ return NOTIFY_DONE; ++ ++ write_lock(&trigger_data->lock); ++ ++ if (strcmp(dev->name, trigger_data->device_name)) ++ goto done; ++ ++ if (evt == NETDEV_REGISTER) { ++ if (trigger_data->net_dev != NULL) ++ dev_put(trigger_data->net_dev); ++ dev_hold(dev); ++ trigger_data->net_dev = dev; ++ trigger_data->link_up = 0; ++ goto done; ++ } ++ ++ if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) { ++ dev_put(trigger_data->net_dev); ++ trigger_data->net_dev = NULL; ++ goto done; ++ } ++ ++ /* UP / DOWN / CHANGE */ ++ ++ trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev)); ++ set_baseline_state(trigger_data); ++ ++done: ++ write_unlock(&trigger_data->lock); ++ return NOTIFY_DONE; ++} ++ ++/* here's the real work! */ ++static void netdev_trig_timer(unsigned long arg) ++{ ++ struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; ++ struct net_device_stats *dev_stats; ++ unsigned new_activity; ++ ++ write_lock(&trigger_data->lock); ++ ++ if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) { ++ /* we don't need to do timer work, just reflect link state. */ ++ led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); ++ goto no_restart; ++ } ++ ++ dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); ++ new_activity = ++ ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ++ ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ++ ++ if (trigger_data->mode & MODE_LINK) { ++ /* base state is ON (link present) */ ++ /* if there's no link, we don't get this far and the LED is off */ ++ ++ /* OFF -> ON always */ ++ /* ON -> OFF on activity */ ++ if (trigger_data->led_cdev->brightness == LED_OFF) { ++ led_set_brightness(trigger_data->led_cdev, LED_FULL); ++ } else if (trigger_data->last_activity != new_activity) { ++ led_set_brightness(trigger_data->led_cdev, LED_OFF); ++ } ++ } else { ++ /* base state is OFF */ ++ /* ON -> OFF always */ ++ /* OFF -> ON on activity */ ++ if (trigger_data->led_cdev->brightness == LED_FULL) { ++ led_set_brightness(trigger_data->led_cdev, LED_OFF); ++ } else if (trigger_data->last_activity != new_activity) { ++ led_set_brightness(trigger_data->led_cdev, LED_FULL); ++ } ++ } ++ ++ trigger_data->last_activity = new_activity; ++ mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); ++ ++no_restart: ++ write_unlock(&trigger_data->lock); ++} ++ ++static void netdev_trig_activate(struct led_classdev *led_cdev) ++{ ++ struct led_netdev_data *trigger_data; ++ int rc; ++ ++ trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL); ++ if (!trigger_data) ++ return; ++ ++ rwlock_init(&trigger_data->lock); ++ ++ trigger_data->notifier.notifier_call = netdev_trig_notify; ++ trigger_data->notifier.priority = 10; ++ ++ setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data); ++ ++ trigger_data->led_cdev = led_cdev; ++ trigger_data->net_dev = NULL; ++ trigger_data->device_name[0] = 0; ++ ++ trigger_data->mode = 0; ++ trigger_data->interval = msecs_to_jiffies(50); ++ trigger_data->link_up = 0; ++ trigger_data->last_activity = 0; ++ ++ led_cdev->trigger_data = trigger_data; ++ ++ rc = device_create_file(led_cdev->dev, &dev_attr_device_name); ++ if (rc) ++ goto err_out; ++ rc = device_create_file(led_cdev->dev, &dev_attr_mode); ++ if (rc) ++ goto err_out_device_name; ++ rc = device_create_file(led_cdev->dev, &dev_attr_interval); ++ if (rc) ++ goto err_out_mode; ++ ++ register_netdevice_notifier(&trigger_data->notifier); ++ return; ++ ++err_out_mode: ++ device_remove_file(led_cdev->dev, &dev_attr_mode); ++err_out_device_name: ++ device_remove_file(led_cdev->dev, &dev_attr_device_name); ++err_out: ++ led_cdev->trigger_data = NULL; ++ kfree(trigger_data); ++} ++ ++static void netdev_trig_deactivate(struct led_classdev *led_cdev) ++{ ++ struct led_netdev_data *trigger_data = led_cdev->trigger_data; ++ ++ if (trigger_data) { ++ unregister_netdevice_notifier(&trigger_data->notifier); ++ ++ device_remove_file(led_cdev->dev, &dev_attr_device_name); ++ device_remove_file(led_cdev->dev, &dev_attr_mode); ++ device_remove_file(led_cdev->dev, &dev_attr_interval); ++ ++ write_lock(&trigger_data->lock); ++ ++ if (trigger_data->net_dev) { ++ dev_put(trigger_data->net_dev); ++ trigger_data->net_dev = NULL; ++ } ++ ++ write_unlock(&trigger_data->lock); ++ ++ del_timer_sync(&trigger_data->timer); ++ ++ kfree(trigger_data); ++ } ++} ++ ++static struct led_trigger netdev_led_trigger = { ++ .name = "netdev", ++ .activate = netdev_trig_activate, ++ .deactivate = netdev_trig_deactivate, ++}; ++ ++static int __init netdev_trig_init(void) ++{ ++ return led_trigger_register(&netdev_led_trigger); ++} ++ ++static void __exit netdev_trig_exit(void) ++{ ++ led_trigger_unregister(&netdev_led_trigger); ++} ++ ++module_init(netdev_trig_init); ++module_exit(netdev_trig_exit); ++ ++MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>"); ++MODULE_DESCRIPTION("Netdev LED trigger"); ++MODULE_LICENSE("GPL"); +Index: git/drivers/leds/Makefile +=================================================================== +--- git.orig/drivers/leds/Makefile ++++ git/drivers/leds/Makefile +@@ -26,3 +26,5 @@ obj-$(CONFIG_LEDS_NEO1973_GTA02) += leds + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o + obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o + obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o ++obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ++ +Index: git/drivers/leds/Kconfig +=================================================================== +--- git.orig/drivers/leds/Kconfig ++++ git/drivers/leds/Kconfig +@@ -159,4 +159,11 @@ config LEDS_TRIGGER_HEARTBEAT + load average. + If unsure, say Y. + ++config LEDS_TRIGGER_NETDEV ++ tristate "LED Network Device Trigger" ++ depends on LEDS_TRIGGERS ++ help ++ This allows LEDs to be controlled by Network Device activity. ++ If unsure, say Y. ++ + endif # NEW_LEDS diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb index 9133688bf8..7e00f6ab18 100644 --- a/packages/linux/linux-openmoko_2.6.24+git.bb +++ b/packages/linux/linux-openmoko_2.6.24+git.bb @@ -1,13 +1,14 @@ require linux.inc require linux-openmoko.inc -DESCRIPTION = "The Linux kernel for Openmoko SmartPhones" +DESCRIPTION = "The Linux kernel for the Openmoko devices GTA01 (Neo1973) and GTA02 (Neo FreeRunner)" KERNEL_RELEASE = "2.6.24" KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" -PR = "r10" +OEV = "oe1" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PR = "r0" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \ @@ -18,6 +19,8 @@ SRC_URI = "\ file://0004-squashfs-Kconfig.patch;patch=1 \ file://0005-squashfs-Makefile.patch;patch=1 \ \ + file://openwrt-ledtrig-netdev.patch;patch=1 \ + \ file://defconfig-oe \ " S = "${WORKDIR}/git" diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa index db1aa16238..9c42d4bccb 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa @@ -822,7 +822,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set -# CONFIG_INPUT_POWER is not set +CONFIG_INPUT_POWER=y # # Input Device Drivers @@ -839,7 +839,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_SPITZ is not set CONFIG_KEYBOARD_TOSA=y # CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index d0a937aa8f..c4987088eb 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 1fa4cdb63e..2a59ba2208 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -2,8 +2,22 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native" +# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass +# will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which +# is computed in siteinfo.bbclass) in changing if the original HOST_ARCH +# endianess differs from the new HOST_ARCH endianess. SITEINFO_ENDIANNESS +# is used in a number of places, including the construction of the +# PACKAGE_EXTRA_ARCHS list for machines that are capable of running in +# either endianess. There may be better ways to fix this. + +# Save value of PACKAGE_ARCHS (note the ":=" syntax to force immediate eval) +REAL_PACKAGE_ARCHS := "${PACKAGE_ARCHS}" + inherit sdk meta +# Restore PACKAGE_ARCHS (sdk.bbclass may have caused it to change) +PACKAGE_ARCHS := "${REAL_PACKAGE_ARCHS}" + SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" SDK_OUTPUT2 = "${SDK_DIR}/image-extras" diff --git a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch deleted file mode 100644 index 7e763bd587..0000000000 --- a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch +++ /dev/null @@ -1,87 +0,0 @@ -Index: configuration/com/sun/midp/configuration/system_properties -=================================================================== ---- configuration/com/sun/midp/configuration/system_properties (Revision 290) -+++ configuration/com/sun/midp/configuration/system_properties (Revision 291) -@@ -1,47 +1,47 @@ - javax.microedition.io.Connector.protocolpath=com.sun.midp.io --microedition.profiles=MIDP-2.0 --microedition.configuration=CLDC-1.1 --microedition.locale=en-US -+microedition.profiles=MIDP-2.0 -+microedition.configuration=CLDC-1.1 -+microedition.locale=en-US - microedition.platform=j2me --microedition.encoding=ISO8859_1 --microedition.hostname=localhost -+microedition.encoding=ISO8859_1 -+microedition.hostname=localhost - microedition.commports= --microedition.jtwi.version=1.0 --microedition.media.version=1.1 --supports.mixing=true --supports.audio.capture=false --supports.video.capture=false --supports.recording=false -+microedition.jtwi.version=1.0 -+microedition.media.version=1.1 -+supports.mixing=true -+supports.audio.capture=false -+supports.video.capture=false -+supports.recording=false - audio.encodings=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg - video.snapshot.encodings=encoding=png encoding=image/png - video.encodings= --streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg --microedition.io.file.FileConnection.version=1.0 --Bluetooth.api.version=1.1 --obex.api.version=1.1 --bluetooth.l2cap.receiveMTU.max=1024 --bluetooth.master.switch=true --bluetooth.connected.devices.max=6 --bluetooth.sd.trans.max=8 --bluetooth.sd.attr.retrievable.max=16 --bluetooth.connected.inquiry=true --bluetooth.connected.inquiry.scan=true --bluetooth.connected.page=true --bluetooth.connected.page.scan=true --microedition.m3g.version=1.1 --microedition.location.version=1.1 --microedition.m2g.version=1.1 --microedition.m2g.svg.version=1.1 --microedition.m2g.svg.baseProfile=tiny --xml.jaxp.subset.version=1.0 --xml.rpc.subset.version=1.0 --wireless.messaging.version=2.0 --wireless.messaging.sms.smsc=+17815511212 --wireless.messaging.mms.mmsc=+17815511212 -+streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg -+microedition.io.file.FileConnection.version=1.0 -+Bluetooth.api.version=1.1 -+obex.api.version=1.1 -+bluetooth.l2cap.receiveMTU.max=1024 -+bluetooth.master.switch=true -+bluetooth.connected.devices.max=6 -+bluetooth.sd.trans.max=8 -+bluetooth.sd.attr.retrievable.max=16 -+bluetooth.connected.inquiry=true -+bluetooth.connected.inquiry.scan=true -+bluetooth.connected.page=true -+bluetooth.connected.page.scan=true -+microedition.m3g.version=1.1 -+microedition.location.version=1.1 -+microedition.m2g.version=1.1 -+microedition.m2g.svg.version=1.1 -+microedition.m2g.svg.baseProfile=tiny -+xml.jaxp.subset.version=1.0 -+xml.rpc.subset.version=1.0 -+wireless.messaging.version=2.0 -+wireless.messaging.sms.smsc=+17815511212 -+wireless.messaging.mms.mmsc=+17815511212 - - # microedition.pim.version= - # microedition.global.version= --# microedition.sip.version=1.0.1 -+# microedition.sip.version=1.0.1 - # - # com.sun.midp.io.http.proxy= - # com.sun.midp.io.http.force_non_persistent= diff --git a/packages/midpath/files/configuration_openmoko.cfg b/packages/midpath/files/configuration_openmoko.cfg index 0691dca561..bb413e4548 100644 --- a/packages/midpath/files/configuration_openmoko.cfg +++ b/packages/midpath/files/configuration_openmoko.cfg @@ -40,7 +40,7 @@ org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf # The virtual engine requires this hardware configuration: 16 bits, stereo, little endian org.thenesis.midpath.sound.engine:virtual # Possible sound backend values: NULL, ALSA, ESD, PulseAudio -org.thenesis.midpath.sound.backend:PulseAudio +org.thenesis.midpath.sound.backend:ALSA org.thenesis.midpath.sound.device:default org.thenesis.midpath.sound.sampleRate:44100 # Buffer size MUST be a power of two diff --git a/packages/midpath/files/fix-openfile.patch b/packages/midpath/files/fix-openfile.patch new file mode 100644 index 0000000000..392364b3e3 --- /dev/null +++ b/packages/midpath/files/fix-openfile.patch @@ -0,0 +1,22 @@ +Index: midpath-0.3rc2/components/core/src/org/thenesis/midpath/io/backend/j2se/FileHandlerImpl.java +=================================================================== +--- midpath-0.3rc2.orig/components/core/src/org/thenesis/midpath/io/backend/j2se/FileHandlerImpl.java 2008-12-04 21:10:39.000000000 +0100 ++++ midpath-0.3rc2/components/core/src/org/thenesis/midpath/io/backend/j2se/FileHandlerImpl.java 2008-12-05 12:29:47.000000000 +0100 +@@ -181,10 +181,13 @@ +
+ public void openForRead() throws IOException {
+ if (randomAccessFile == null) {
+- //stream = new FileRandomAccessStream(file);
+- randomAccessFile = new RandomAccessFile(file, "rws");
+- }
+- }
++ // Try to get maximum rights to avoid closing the stream if openForWrite is called next
++ if (file.canWrite()) {
++ randomAccessFile = new RandomAccessFile(file, "rws");
++ } else {
++ randomAccessFile = new RandomAccessFile(file, "r");
++ }
++ }
+
+ public void openForWrite() throws IOException {
+ if (randomAccessFile == null) {
diff --git a/packages/midpath/files/midpath-launcher-j2se b/packages/midpath/files/midpath-launcher-j2se index 22928a0e1e..49f074f7ab 100644 --- a/packages/midpath/files/midpath-launcher-j2se +++ b/packages/midpath/files/midpath-launcher-j2se @@ -1,7 +1,25 @@ #!/bin/sh if [ ! $LAUNCHER_CLASS ]; then - LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncher + if [ $# -lt 2 ]; then + echo "Usage :" + echo " $(basename $0) <classpath> <midlet-class> [midlet-name]" + echo " $(basename $0) -jar <jar-file>" + exit 1 + fi + + LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncherSE + + # Add the MIDlet jar to the classpath (must be loaded by the main classloader) + if [ $1 = "-jar" ]; then + CP=$2 + ARGS="$1 $2" + else + CP=$1 + ARGS="$2 $3" + fi +else + ARGS="$@" fi if [ ! $JAVA ]; then @@ -15,7 +33,7 @@ MIDPATH_HOME=/usr/share/midpath JLP=/usr/lib/jni # Set the classpath -CP=\ +CP=$CP:\ $MIDPATH_HOME/configuration:\ $MIDPATH_HOME/midpath.jar:\ $MIDPATH_HOME/microbackend.jar:\ @@ -25,6 +43,8 @@ $MIDPATH_HOME/jlayerme-cldc.jar:\ $MIDPATH_HOME/jorbis-cldc.jar:\ $MIDPATH_HOME/avetanabt-cldc.jar:\ $MIDPATH_HOME/jgl-cldc.jar:\ +$MIDPATH_HOME/jsr172-jaxp.jar:\ +$MIDPATH_HOME/jsr172-jaxrpc.jar:\ $MIDPATH_HOME/jsr239-opengles-jgl.jar:\ $MIDPATH_HOME/jsr239-opengles-core.jar:\ $MIDPATH_HOME/jsr239-opengles-nio.jar:\ @@ -43,8 +63,5 @@ then CP=$CP:$CLASSPATH fi -# Add the MIDlet jar to the classpath (must be loaded by the main classloader) -CP=$CP:$MIDPATH_HOME/repository/midpath-demos.jar - -$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS "$@" +$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS $ARGS diff --git a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-alsa_0.2+0.3rc2.bb index 664fb242e1..32b012b0c6 100644 --- a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-alsa_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath linux-libc-headers" diff --git a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-escher_0.2+0.3rc2.bb index 18f448c1ec..05ca8a078a 100644 --- a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-escher_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-cldc" diff --git a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-esd_0.2+0.3rc2.bb index 79994d1395..4e8a5a55a3 100644 --- a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-esd_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath esound" diff --git a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-fb_0.2+0.3rc2.bb index c2fd6376a3..d7b35f9867 100644 --- a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-fb_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath linux-libc-headers" diff --git a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc2.bb index 2e7c8bb53b..4da2822a8e 100644 --- a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-backend-gtk_${PV}.bb PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" PROVIDES = "midpath-backend-gtk" diff --git a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk_0.2+0.3rc2.bb index 619f56ffa7..fa09f77d15 100644 --- a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-gtk_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath gtk+" diff --git a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc2.bb index 9f169c652e..890bcd9152 100644 --- a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath pulseaudio" diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb index 1d79379863..88f046708b 100644 --- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qte" diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc2.bb index f26ea4eac5..f900c0ed75 100644 --- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath qte-mt" diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc2.bb index 6d7cb9dba7..e8e5ab29b6 100644 --- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qt3" diff --git a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-sdl_0.2+0.3rc2.bb index 723fd41e43..220f9d50d9 100644 --- a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-sdl_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-cldc virtual/libsdl libsdl-mixer libsdl-ttf libsdl-image libsdl-gfx" diff --git a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb b/packages/midpath/midpath-cldc_0.2+0.3rc2.bb index f8dd8e6e22..e93bcbb3e0 100644 --- a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-cldc_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DESCRIPTION = "Implementation of the CLDC profile for use in the MIDPath library" RPROVIDES = "midpath-cldc java-cldc1.1" diff --git a/packages/midpath/midpath-core_0.2+0.3rc1.bb b/packages/midpath/midpath-core_0.2+0.3rc2.bb index d0ba53bfbd..ec3291ce32 100644 --- a/packages/midpath/midpath-core_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-core_0.2+0.3rc2.bb @@ -1,14 +1,15 @@ DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" -PR = "r0" +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" require midpath-common.inc SRC_URI += "\ + file://fix-openfile.patch;patch=1 \ file://midpath-suitemanager \ file://midpath-launcher-j2se \ file://midpath-suitemanager.desktop \ diff --git a/packages/midpath/midpath-demos_0.2+0.3rc1.bb b/packages/midpath/midpath-demos_0.2+0.3rc2.bb index 1a2f690bf1..ebf260d7fe 100644 --- a/packages/midpath/midpath-demos_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-demos_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "midpath-core midpath-location midpath-messaging midpath-svg midpath-opengles midpath-m3g" RDEPENDS = "midpath midpath-location midpath-messaging midpath-svg-midp midpath-opengles midpath-m3g" diff --git a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb b/packages/midpath/midpath-jgl_0.2+0.3rc2.bb index e003fe9bdb..c969452c5c 100644 --- a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-jgl_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core" diff --git a/packages/midpath/midpath-location_0.2+0.3rc1.bb b/packages/midpath/midpath-location_0.2+0.3rc2.bb index 349356fa65..54d1ea7907 100644 --- a/packages/midpath/midpath-location_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-location_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DESCRIPTION = "Implementation of the JSR179 Location API for use in the MIDPath library" diff --git a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb b/packages/midpath/midpath-m3g_0.2+0.3rc2.bb index a0a1c42dd4..0d618021e1 100644 --- a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-m3g_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core midpath-opengles" diff --git a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb b/packages/midpath/midpath-maemo_0.2+0.3rc2.bb index 10fcf6681d..35a97c7e6d 100644 --- a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-maemo_0.2+0.3rc2.bb @@ -4,11 +4,10 @@ PR = "r0" # The patch fixes the system_properties file only deployed in this recipe. SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \ - file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \ + ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \ " -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" PR = "r0" diff --git a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb b/packages/midpath/midpath-messaging_0.2+0.3rc2.bb index 554f864491..880b948b24 100644 --- a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-messaging_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core" diff --git a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb b/packages/midpath/midpath-opengles_0.2+0.3rc2.bb index b5b7d67954..fbfe719b57 100644 --- a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-opengles_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core midpath-jgl" RDEPENDS_${PN} = "midpath-core midpath-jgl ${PN}-core ${PN}-nio" diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb deleted file mode 100644 index edb20af441..0000000000 --- a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb +++ /dev/null @@ -1,19 +0,0 @@ -require midpath.inc - -PR = "r0" - -# The patch fixes the system_properties file only deployed in this recipe. -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \ - file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \ - " - -S = "${WORKDIR}/midpath-0.3rc1" - -PR = "r0" - -SRC_URI += "file://configuration_openmoko.cfg" - -RDEPENDS += "java2-runtime midpath-backend-pulseaudio libswt3.4-gtk-java midpath-core-bluetooth" - -CONFIGURATION = "configuration_openmoko.cfg" diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb new file mode 100644 index 0000000000..b64cb455dd --- /dev/null +++ b/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb @@ -0,0 +1,18 @@ +require midpath.inc + +PR = "r0" + +# The patch fixes the system_properties file only deployed in this recipe. +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \ + " + +S = "${WORKDIR}/midpath-0.3rc2" + +PR = "r0" + +SRC_URI += "file://configuration_openmoko.cfg" + +RDEPENDS += "java2-runtime midpath-backend-alsa libswt3.4-gtk-java midpath-core-bluetooth" + +CONFIGURATION = "configuration_openmoko.cfg" diff --git a/packages/midpath/midpath-svg_0.2+0.3rc1.bb b/packages/midpath/midpath-svg_0.2+0.3rc2.bb index d63caa5363..7f332ff30f 100644 --- a/packages/midpath/midpath-svg_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-svg_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core midpath-webservices" RDEPENDS_${PN}-midp = "${PN}" diff --git a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb b/packages/midpath/midpath-webservices_0.2+0.3rc2.bb index 7f2f197cc1..bc221286f0 100644 --- a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-webservices_0.2+0.3rc2.bb @@ -2,9 +2,9 @@ require midpath-common.inc PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" -S = "${WORKDIR}/midpath-0.3rc1" +S = "${WORKDIR}/midpath-0.3rc2" DEPENDS += "midpath-core" RSUGGESTS_${PN} = "${PN}-jaxp" diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc index 703d9bdd3c..19b4179536 100644 --- a/packages/midpath/midpath.inc +++ b/packages/midpath/midpath.inc @@ -5,7 +5,7 @@ # RDEPENDS. require midpath-common.inc -RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg midpath-core-mp3" +RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'midpath-core-mp3', d)}" PROVIDES = "midpath" RPROVIDES = "midpath" diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb index f5ebfb650d..badcf03547 100644 --- a/packages/mime-support/mime-support_3.28.bb +++ b/packages/mime-support/mime-support_3.28.bb @@ -1,17 +1,17 @@ SECTION = "base" DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs" +LICENSE = "PD" DEPENDS = "file" RRECOMMENDS = "file" -LICENSE = "PD" -PACKAGE_ARCH = "all" -PR = "r2" + +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" S = "${WORKDIR}/${PN}" -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc" FILES_${PN} += " ${libdir}/mime" +PACKAGE_ARCH = "all" docdir_append = "/${PN}" diff --git a/packages/mime-support/mime-support_3.44.bb b/packages/mime-support/mime-support_3.44.bb new file mode 100644 index 0000000000..bcf62eec33 --- /dev/null +++ b/packages/mime-support/mime-support_3.44.bb @@ -0,0 +1,54 @@ +SECTION = "base" +DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs" +LICENSE = "PD" + +DEPENDS = "file" +RRECOMMENDS = "file" + +SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" +S = "${WORKDIR}/${PN}" + +FILES_${PN} += " ${libdir}/mime" +PACKAGE_ARCH = "all" + +docdir_append = "/${PN}" + +do_install () { + install -d ${D}${sysconfdir} + install -d ${D}${libdir}/mime/packages + install -d ${D}${docdir} + install -d ${D}${sbindir} + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + install -d ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 + install -m 644 mime.types ${D}${sysconfdir}/ + install -m 644 mailcap ${D}${libdir}/mime/ + install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 755 update-mime ${D}${sbindir}/ + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 755 run-mailcap ${D}${bindir}/ + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/README ${D}${docdir}/copyright + install -m 755 debian-view ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playdsp ${D}${libdir}/mime/ + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + cd ${D}${mandir}; gzip -9fv */* + cd ${D}${docdir}; gzip -9v * + cd ${D}${docdir}; gunzip copyright.gz + cd ${D}${bindir}; ln -s run-mailcap see + cd ${D}${bindir}; ln -s run-mailcap edit + cd ${D}${bindir}; ln -s run-mailcap compose + cd ${D}${bindir}; ln -s run-mailcap print + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz +} diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc index 9d0ebd9f0e..6777db2202 100644 --- a/packages/mythtv/mythtv.inc +++ b/packages/mythtv/mythtv.inc @@ -8,6 +8,7 @@ DEPENDS = "jack alsa-lib libxinerama libxv libxxf86vm libxvmc lirc \ SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2" +ARM_INSTRUCTION_SET = "arm" QMAKE_PROFILES = "mythtv.pro" diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb index 4f533b03e8..17395969da 100644 --- a/packages/mythtv/mythtv_0.21.bb +++ b/packages/mythtv/mythtv_0.21.bb @@ -2,7 +2,7 @@ require mythtv.inc inherit qmake qt3x11 -PR = "${SRCREV}+r3" +PR = "${SRCREV}+r4" REALPV = "0.21" SRCREV = "17789" diff --git a/packages/nautilus/nautilus_2.24.1.bb b/packages/nautilus/nautilus_2.24.1.bb index 50653dc85c..4e0f33282d 100644 --- a/packages/nautilus/nautilus_2.24.1.bb +++ b/packages/nautilus/nautilus_2.24.1.bb @@ -2,15 +2,14 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -PR = "r2" +PR = "r4" inherit gnome LICENSE="GPL" -DEPENDS = "librsvg libexif eel esound gnome-desktop" -RRECOMMENDS = "shared-mime-info" +DEPENDS += " tracker librsvg libexif eel esound gnome-desktop" -EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " PACKAGES += " libnautilus" diff --git a/packages/nautilus/nautilus_2.24.2.bb b/packages/nautilus/nautilus_2.24.2.bb new file mode 100644 index 0000000000..83b6d89da2 --- /dev/null +++ b/packages/nautilus/nautilus_2.24.2.bb @@ -0,0 +1,22 @@ +# nautilus OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +inherit gnome + +LICENSE="GPL" + +DEPENDS += " gvfs tracker librsvg libexif eel esound gnome-desktop" +RDEPENDS = "gvfs" + +EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " + +PACKAGES += " libnautilus" + +FILES_${PN} += "${datadir}/icons /usr/libexec/ " +FILES_libnautilus = "/usr/lib/*.so*" +FILES_${PN}-dbg += "/usr/libexec/.debug" + +do_stage() { + autotools_stage_all +} diff --git a/packages/openttd/files/openttd_0.6.2-buildfix.patch b/packages/openttd/files/openttd_0.6.3-buildfix.patch index 483ff492a9..c0ac8f1945 100644 --- a/packages/openttd/files/openttd_0.6.2-buildfix.patch +++ b/packages/openttd/files/openttd_0.6.3-buildfix.patch @@ -1,8 +1,8 @@ -Index: openttd-0.6.2/config.lib +Index: openttd-0.6.3/config.lib =================================================================== ---- openttd-0.6.2.orig/config.lib 2008-08-02 01:52:22.000000000 +0200 -+++ openttd-0.6.2/config.lib 2008-09-23 08:57:53.000000000 +0200 -@@ -1247,7 +1247,7 @@ +--- openttd-0.6.3.orig/config.lib 2008-10-01 19:00:50.000000000 +0200 ++++ openttd-0.6.3/config.lib 2008-12-04 19:04:29.000000000 +0100 +@@ -1341,7 +1341,7 @@ if [ -z "$6" ]; then compiler="$3" else @@ -11,7 +11,7 @@ Index: openttd-0.6.2/config.lib fi machine=`eval $compiler $9 2>/dev/null` ret=$? -@@ -1263,11 +1263,6 @@ +@@ -1357,11 +1357,6 @@ exit 1 fi diff --git a/packages/openttd/openttd_0.6.2.bb b/packages/openttd/openttd_0.6.3.bb index a8a06738f4..a8a06738f4 100644 --- a/packages/openttd/openttd_0.6.2.bb +++ b/packages/openttd/openttd_0.6.3.bb diff --git a/packages/oprofile/oprofile.inc b/packages/oprofile/oprofile.inc new file mode 100644 index 0000000000..a55c223219 --- /dev/null +++ b/packages/oprofile/oprofile.inc @@ -0,0 +1,41 @@ +SECTION = "devel" +DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ +of profiling all running code at low overhead." +LICENSE = "GPL" +DEPENDS = "popt binutils" + +S = "${WORKDIR}/oprofile-${PV}" + +inherit autotools + +# NOTE: this disables the build of the kernel modules. +# Should add the oprofile kernel modules, for those with 2.4 +# kernels, as a seperate .oe file. +EXTRA_OECONF = "--with-kernel-support \ + --without-x \ + --disable-werror " + +do_configure () { + cp ${WORKDIR}/acinclude.m4 ${S}/ + autotools_do_configure +} +# Available config options +# --enable-abi enable abi portability code (default is disabled) +# --enable-pch enable precompiled header (default is disabled) +# --enable-gcov enable option for gcov coverage testing (default is disabled) +# --disable-werror disable -Werror flag (default is enabled for non-release) +# --disable-optimization disable optimization flags (default is enabled) +# --with-kernel-support Use 2.6 kernel (no kernel source tree required) +# --with-linux=dir Path to Linux source tree +# --with-module-dir=dir Path to module installation directory +# --with-extra-includes=DIR add extra include paths +# --with-extra-libs=DIR add extra library paths +# --with-x use the X Window System +# --with-qt-dir where the root of Qt is installed +# --with-qt-includes where the Qt includes are. +# --with-qt-libraries where the Qt library is installed. + +OPROFILE_ARCH = "${TARGET_ARCH}" +OPROFILE_ARCH_i586 = "i386" + +FILES_${PN} = "${bindir} ${datadir}/oprofile/rtc ${datadir}/oprofile/stl.pat ${datadir}/oprofile/${OPROFILE_ARCH}" diff --git a/packages/oprofile/oprofile_0.9.2.bb b/packages/oprofile/oprofile_0.9.2.bb index e64aa10d49..c7e6040a56 100644 --- a/packages/oprofile/oprofile_0.9.2.bb +++ b/packages/oprofile/oprofile_0.9.2.bb @@ -1,39 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -LICENSE = "GPL" -DEPENDS = "popt binutils" +require oprofile.inc + +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://no_arm_mapping_syms.patch;patch=1 \ file://opcontrol_bashisms.patch;patch=1 \ file://acinclude.m4" -S = "${WORKDIR}/oprofile-${PV}" - -inherit autotools - -# NOTE: this disables the build of the kernel modules. -# Should add the oprofile kernel modules, for those with 2.4 -# kernels, as a seperate .oe file. -EXTRA_OECONF = "--with-kernel-support \ - --without-x" - -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} -# Available config options -# --enable-abi enable abi portability code (default is disabled) -# --enable-pch enable precompiled header (default is disabled) -# --enable-gcov enable option for gcov coverage testing (default is disabled) -# --disable-werror disable -Werror flag (default is enabled for non-release) -# --disable-optimization disable optimization flags (default is enabled) -# --with-kernel-support Use 2.6 kernel (no kernel source tree required) -# --with-linux=dir Path to Linux source tree -# --with-module-dir=dir Path to module installation directory -# --with-extra-includes=DIR add extra include paths -# --with-extra-libs=DIR add extra library paths -# --with-x use the X Window System -# --with-qt-dir where the root of Qt is installed -# --with-qt-includes where the Qt includes are. -# --with-qt-libraries where the Qt library is installed. diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb index 7ffcec3b99..e15384d8e9 100644 --- a/packages/oprofile/oprofile_0.9.3.bb +++ b/packages/oprofile/oprofile_0.9.3.bb @@ -1,11 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -LICENSE = "GPL" -DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" -PR = "r8" +require oprofile.inc + +RDEPENDS += "binutils-symlinks" +RRECOMMENDS += "kernel-vmlinux" +PR = "r10" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://armv6_fix.patch;patch=1 \ @@ -16,33 +13,3 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://gcc43x-fix.patch;patch=1 \ file://armv7a.diff;patch=1 \ file://acinclude.m4" - -S = "${WORKDIR}/oprofile-${PV}" - -inherit autotools - -# NOTE: this disables the build of the kernel modules. -# Should add the oprofile kernel modules, for those with 2.4 -# kernels, as a seperate .oe file. -EXTRA_OECONF = "--with-kernel-support \ - --without-x" - -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} -# Available config options -# --enable-abi enable abi portability code (default is disabled) -# --enable-pch enable precompiled header (default is disabled) -# --enable-gcov enable option for gcov coverage testing (default is disabled) -# --disable-werror disable -Werror flag (default is enabled for non-release) -# --disable-optimization disable optimization flags (default is enabled) -# --with-kernel-support Use 2.6 kernel (no kernel source tree required) -# --with-linux=dir Path to Linux source tree -# --with-module-dir=dir Path to module installation directory -# --with-extra-includes=DIR add extra include paths -# --with-extra-libs=DIR add extra library paths -# --with-x use the X Window System -# --with-qt-dir where the root of Qt is installed -# --with-qt-includes where the Qt includes are. -# --with-qt-libraries where the Qt library is installed. diff --git a/packages/oprofile/oprofile_0.9.4.bb b/packages/oprofile/oprofile_0.9.4.bb index f8fb744fcc..1626fe4835 100644 --- a/packages/oprofile/oprofile_0.9.4.bb +++ b/packages/oprofile/oprofile_0.9.4.bb @@ -1,11 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -LICENSE = "GPL" -DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" -PR = "r0" +require oprofile.inc + +RDEPENDS += "binutils-symlinks" +RRECOMMENDS += "kernel-vmlinux" +PR = "r2" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ @@ -14,18 +11,6 @@ SRC_URI = "\ file://acinclude.m4 \ " -inherit autotools - -EXTRA_OECONF = " \ - --with-kernel-support \ - --without-x \ - " - -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} - do_stage () { # As of 0.9.4 there is a libopagent library to compile and link against. autotools_stage_all diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb index 786e7046de..37bf32471d 100644 --- a/packages/oprofile/oprofile_cvs.bb +++ b/packages/oprofile/oprofile_cvs.bb @@ -1,44 +1,14 @@ +require oprofile.inc + PV = "0.9.3+cvs${SRCDATE}" -PR = "r0" -SECTION = "devel" -DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ -of profiling all running code at low overhead." -LICENSE = "GPL" -DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" +PR = "r2" + +RDEPENDS += "binutils-symlinks" DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ file://opstart.patch;patch=1 \ file://acinclude.m4" -S = "${WORKDIR}/oprofile" -inherit autotools - -# NOTE: this disables the build of the kernel modules. -# Should add the oprofile kernel modules, for those with 2.4 -# kernels, as a seperate .oe file. -EXTRA_OECONF = "--with-kernel-support \ - --without-x \ - --disable-werror " - -do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ - autotools_do_configure -} -# Available config options -# --enable-abi enable abi portability code (default is disabled) -# --enable-pch enable precompiled header (default is disabled) -# --enable-gcov enable option for gcov coverage testing (default is disabled) -# --disable-werror disable -Werror flag (default is enabled for non-release) -# --disable-optimization disable optimization flags (default is enabled) -# --with-kernel-support Use 2.6 kernel (no kernel source tree required) -# --with-linux=dir Path to Linux source tree -# --with-module-dir=dir Path to module installation directory -# --with-extra-includes=DIR add extra include paths -# --with-extra-libs=DIR add extra library paths -# --with-x use the X Window System -# --with-qt-dir where the root of Qt is installed -# --with-qt-includes where the Qt includes are. -# --with-qt-libraries where the Qt library is installed. +S = "${WORKDIR}/oprofile" diff --git a/packages/parted/parted_1.8.8.bb b/packages/parted/parted_1.8.8.bb new file mode 100644 index 0000000000..d1b5cbe5b3 --- /dev/null +++ b/packages/parted/parted_1.8.8.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv3" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" + +PR = "r1" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ + file://syscalls.h \ + file://syscalls.patch;patch=1 \ +" + +EXTRA_OECONF = "--disable-Werror ac_cv_func_calloc_0_nonnull=yes" + +inherit autotools pkgconfig + +do_configure_prepend() { + cp ${WORKDIR}/syscalls.h ${S}/libparted/arch/ +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/policykit/policykit_0.9.bb b/packages/policykit/policykit_0.9.bb index d8648ea63f..c7ba718105 100644 --- a/packages/policykit/policykit_0.9.bb +++ b/packages/policykit/policykit_0.9.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://www.packagekit.org/" DEPENDS = "libpam expat dbus-glib" -PR = "r2" +PR = "r3" SRC_URI = "http://hal.freedesktop.org/releases/PolicyKit-${PV}.tar.gz" @@ -24,7 +24,8 @@ pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then exit 1 fi - grep "^polkituser:" /etc/group > /dev/null || addgroup polkituser grep "^polkituser:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/polkit polkituser --ingroup polkituser -g polkituser + grep "^polkituser:" /etc/group > /dev/null || addgroup polkituser + grep "^polkituser:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/polkit polkituser --ingroup polkituser -g polkituser DBUSPID=`pidof dbus-daemon` if [ "x$DBUSPID" != "x" ]; then /etc/init.d/dbus-1 force-reload diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 6c4440877f..615a8976bd 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,12 +1,12 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: './generate-manifest-2.5.py' Version 20081102 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# Generator: 'generate-manifest-2.5.py' Version 20081102 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules" DESCRIPTION_python-profile="Python Basic Profiling Support" PR_python-profile="ml0" @@ -318,5 +318,8 @@ PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " +DESCRIPTION_python-modules="All Python modules" +RDEPENDS_python-modules="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +ALLOW_EMPTY_python-modules = "1" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index b402b974f1..a943f6a1ac 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 = "ml16" +PR = "ml17" PYTHON_MAJMIN = "2.5" diff --git a/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch b/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch new file mode 100644 index 0000000000..a2eb438ed9 --- /dev/null +++ b/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch @@ -0,0 +1,30 @@ +Index: trunk/hw/baum.c +=================================================================== +--- trunk.orig/hw/baum.c 2008-11-29 05:12:40.418390606 +0300 ++++ trunk/hw/baum.c 2008-11-29 05:13:11.498378426 +0300 +@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void) + CharDriverState *chr; + brlapi_handle_t *handle; + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + SDL_SysWMinfo info; + #endif ++#endif + int tty; + + baum = qemu_mallocz(sizeof(BaumDriverState)); +@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void) + } + + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + memset(&info, 0, sizeof(info)); + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) + tty = info.info.x11.wmwindow; + else + #endif ++#endif + tty = BRLAPI_TTY_DEFAULT; + + if (brlapi__enterTtyMode(handle, tty, NULL) == -1) { diff --git a/packages/qemu/qemu_svn.bb b/packages/qemu/qemu_svn.bb index e8d9883c74..b4acae7cda 100644 --- a/packages/qemu/qemu_svn.bb +++ b/packages/qemu/qemu_svn.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DEPENDS = "zlib" PV = "0.9.1+svnr${SRCREV}" -PR = "r13" +PR = "r14" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/" @@ -34,6 +34,7 @@ SRC_URI = "\ file://fix_protection_bits.patch;patch=1 \ file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \ file://qemu-n800-support.patch;patch=1 \ + file://fix_baum_c_compilation.patch;patch=1 \ file://fix_dirent_h_include.patch;patch=1" S = "${WORKDIR}/trunk" diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb index a2f5c0bcbf..7e430c8024 100644 --- a/packages/qt/qt-x11-free_3.3.7.bb +++ b/packages/qt/qt-x11-free_3.3.7.bb @@ -1,6 +1,6 @@ DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa" PROVIDES = "qt3x11" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/packages/qtnx/files/qtnx.desktop b/packages/qtnx/files/qtnx.desktop new file mode 100644 index 0000000000..3e09a0a8fa --- /dev/null +++ b/packages/qtnx/files/qtnx.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=QTNX +Name[en_GB]=QTNX +Comment=Client for NX remote desktop +Comment[en_GB]=Client for NX remote desktop +Exec=/usr/bin/qtnx +Terminal=false +Type=Application +Categories=Network;Qt;RemoteAccess; diff --git a/packages/qtnx/qtnx.inc b/packages/qtnx/qtnx.inc index 8380d2b685..d5bf8424ed 100644 --- a/packages/qtnx/qtnx.inc +++ b/packages/qtnx/qtnx.inc @@ -2,11 +2,12 @@ DESCRIPTION = "This a the freesource nx client, build with qt" HOMEPAGE = "http://freenx.berlios.de/" SECTION = "libs" LICENSE = "GPL" -PR = "r2" +PR = "r4" DEPENDS = "libnxcl" SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \ + file://qtnx.desktop \ file://pro.patch;patch=1 \ file://id-path.patch;patch=1 \ file://scroll.patch;patch=1 \ @@ -30,7 +31,9 @@ do_configure_prepend () { do_install () { install -d ${D}${bindir}/ install -s -m 0755 qtnx ${D}${bindir}/ - install -d ${D}${datadir}/ - install -m 0644 id.key ${D}${datadir}/ + install -d ${D}${datadir}/qtnx + install -m 0644 id.key ${D}${datadir}/qtnx + install -d ${D}${datadir}/applications + install -m 0644 qtnx.desktop ${D}${datadir}/applications } diff --git a/packages/readline/readline-5.2/acinclude.m4 b/packages/readline/readline-5.2/acinclude.m4 new file mode 100644 index 0000000000..8a45f99084 --- /dev/null +++ b/packages/readline/readline-5.2/acinclude.m4 @@ -0,0 +1,1815 @@ +dnl +dnl Bash specific tests +dnl +dnl Some derived from PDKSH 5.1.3 autoconf tests +dnl + +AC_DEFUN([BASH_C_LONG_LONG], +[AC_CACHE_CHECK(for long long, ac_cv_c_long_long, +[if test "$GCC" = yes; then + ac_cv_c_long_long=yes +else +AC_TRY_RUN([ +int +main() +{ +long long foo = 0; +exit(sizeof(long long) < sizeof(long)); +} +], ac_cv_c_long_long=yes, ac_cv_c_long_long=no) +fi]) +if test $ac_cv_c_long_long = yes; then + AC_DEFINE(HAVE_LONG_LONG, 1, [Define if the `long long' type works.]) +fi +]) + +dnl +dnl This is very similar to AC_C_LONG_DOUBLE, with the fix for IRIX +dnl (< changed to <=) added. +dnl +AC_DEFUN([BASH_C_LONG_DOUBLE], +[AC_CACHE_CHECK(for long double, ac_cv_c_long_double, +[if test "$GCC" = yes; then + ac_cv_c_long_double=yes +else +AC_TRY_RUN([ +int +main() +{ + /* The Stardent Vistra knows sizeof(long double), but does not + support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + /* On IRIX 5.3, the compiler converts long double to double with a warning, + but compiles this successfully. */ + exit(sizeof(long double) <= sizeof(double)); +} +], ac_cv_c_long_double=yes, ac_cv_c_long_double=no) +fi]) +if test $ac_cv_c_long_double = yes; then + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if the `long double' type works.]) +fi +]) + +dnl +dnl Check for <inttypes.h>. This is separated out so that it can be +dnl AC_REQUIREd. +dnl +dnl BASH_HEADER_INTTYPES +AC_DEFUN([BASH_HEADER_INTTYPES], +[ + AC_CHECK_HEADERS(inttypes.h) +]) + +dnl +dnl check for typedef'd symbols in header files, but allow the caller to +dnl specify the include files to be checked in addition to the default +dnl +dnl BASH_CHECK_TYPE(TYPE, HEADERS, DEFAULT[, VALUE-IF-FOUND]) +AC_DEFUN([BASH_CHECK_TYPE], +[ +AC_REQUIRE([AC_HEADER_STDC])dnl +AC_REQUIRE([BASH_HEADER_INTTYPES]) +AC_MSG_CHECKING(for $1) +AC_CACHE_VAL(bash_cv_type_$1, +[AC_EGREP_CPP($1, [#include <sys/types.h> +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +#if HAVE_INTTYPES_H +#include <inttypes.h> +#endif +$2 +], bash_cv_type_$1=yes, bash_cv_type_$1=no)]) +AC_MSG_RESULT($bash_cv_type_$1) +ifelse($#, 4, [if test $bash_cv_type_$1 = yes; then + AC_DEFINE($4) + fi]) +if test $bash_cv_type_$1 = no; then + AC_DEFINE_UNQUOTED($1, $3) +fi +]) + +dnl +dnl BASH_CHECK_DECL(FUNC) +dnl +dnl Check for a declaration of FUNC in stdlib.h and inttypes.h like +dnl AC_CHECK_DECL +dnl +AC_DEFUN([BASH_CHECK_DECL], +[ +AC_REQUIRE([AC_HEADER_STDC]) +AC_REQUIRE([BASH_HEADER_INTTYPES]) +AC_CACHE_CHECK([for declaration of $1], bash_cv_decl_$1, +[AC_TRY_LINK( +[ +#if STDC_HEADERS +# include <stdlib.h> +#endif +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif +], +[return !$1;], +bash_cv_decl_$1=yes, bash_cv_decl_$1=no)]) +bash_tr_func=HAVE_DECL_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +if test $bash_cv_decl_$1 = yes; then + AC_DEFINE_UNQUOTED($bash_tr_func, 1) +else + AC_DEFINE_UNQUOTED($bash_tr_func, 0) +fi +]) + +AC_DEFUN([BASH_DECL_PRINTF], +[AC_MSG_CHECKING(for declaration of printf in <stdio.h>) +AC_CACHE_VAL(bash_cv_printf_declared, +[AC_TRY_RUN([ +#include <stdio.h> +#ifdef __STDC__ +typedef int (*_bashfunc)(const char *, ...); +#else +typedef int (*_bashfunc)(); +#endif +main() +{ +_bashfunc pf; +pf = (_bashfunc) printf; +exit(pf == 0); +} +], bash_cv_printf_declared=yes, bash_cv_printf_declared=no, + [AC_MSG_WARN(cannot check printf declaration if cross compiling -- defaulting to yes) + bash_cv_printf_declared=yes] +)]) +AC_MSG_RESULT($bash_cv_printf_declared) +if test $bash_cv_printf_declared = yes; then +AC_DEFINE(PRINTF_DECLARED) +fi +]) + +AC_DEFUN([BASH_DECL_SBRK], +[AC_MSG_CHECKING(for declaration of sbrk in <unistd.h>) +AC_CACHE_VAL(bash_cv_sbrk_declared, +[AC_EGREP_HEADER(sbrk, unistd.h, + bash_cv_sbrk_declared=yes, bash_cv_sbrk_declared=no)]) +AC_MSG_RESULT($bash_cv_sbrk_declared) +if test $bash_cv_sbrk_declared = yes; then +AC_DEFINE(SBRK_DECLARED) +fi +]) + +dnl +dnl Check for sys_siglist[] or _sys_siglist[] +dnl +AC_DEFUN([BASH_DECL_UNDER_SYS_SIGLIST], +[AC_MSG_CHECKING([for _sys_siglist in signal.h or unistd.h]) +AC_CACHE_VAL(bash_cv_decl_under_sys_siglist, +[AC_TRY_COMPILE([ +#include <sys/types.h> +#include <signal.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif], [ char *msg = _sys_siglist[2]; ], + bash_cv_decl_under_sys_siglist=yes, bash_cv_decl_under_sys_siglist=no, + [AC_MSG_WARN(cannot check for _sys_siglist[] if cross compiling -- defaulting to no)])])dnl +AC_MSG_RESULT($bash_cv_decl_under_sys_siglist) +if test $bash_cv_decl_under_sys_siglist = yes; then +AC_DEFINE(UNDER_SYS_SIGLIST_DECLARED) +fi +]) + +AC_DEFUN([BASH_UNDER_SYS_SIGLIST], +[AC_REQUIRE([BASH_DECL_UNDER_SYS_SIGLIST]) +AC_MSG_CHECKING([for _sys_siglist in system C library]) +AC_CACHE_VAL(bash_cv_under_sys_siglist, +[AC_TRY_RUN([ +#include <sys/types.h> +#include <signal.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifndef UNDER_SYS_SIGLIST_DECLARED +extern char *_sys_siglist[]; +#endif +main() +{ +char *msg = (char *)_sys_siglist[2]; +exit(msg == 0); +}], + bash_cv_under_sys_siglist=yes, bash_cv_under_sys_siglist=no, + [AC_MSG_WARN(cannot check for _sys_siglist[] if cross compiling -- defaulting to no) + bash_cv_under_sys_siglist=no])]) +AC_MSG_RESULT($bash_cv_under_sys_siglist) +if test $bash_cv_under_sys_siglist = yes; then +AC_DEFINE(HAVE_UNDER_SYS_SIGLIST) +fi +]) + +AC_DEFUN([BASH_SYS_SIGLIST], +[ +AC_CHECK_DECLS([sys_siglist]) +AC_MSG_CHECKING([for sys_siglist in system C library]) +AC_CACHE_VAL(bash_cv_sys_siglist, +[AC_TRY_RUN([ +#include <sys/types.h> +#include <signal.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifndef HAVE_DECL_SYS_SIGLIST +extern char *sys_siglist[]; +#endif +main() +{ +char *msg = sys_siglist[2]; +exit(msg == 0); +}], + bash_cv_sys_siglist=yes, bash_cv_sys_siglist=no, + [AC_MSG_WARN(cannot check for sys_siglist if cross compiling -- defaulting to no) + bash_cv_sys_siglist=no])]) +AC_MSG_RESULT($bash_cv_sys_siglist) +if test $bash_cv_sys_siglist = yes; then +AC_DEFINE(HAVE_SYS_SIGLIST) +fi +]) + +dnl Check for the various permutations of sys_siglist and make sure we +dnl compile in siglist.o if they're not defined +AC_DEFUN([BASH_CHECK_SYS_SIGLIST], [ +AC_REQUIRE([BASH_SYS_SIGLIST]) +AC_REQUIRE([BASH_DECL_UNDER_SYS_SIGLIST]) +AC_REQUIRE([BASH_FUNC_STRSIGNAL]) +if test "$bash_cv_sys_siglist" = no && test "$bash_cv_under_sys_siglist" = no && test "$bash_cv_have_strsignal" = no; then + SIGLIST_O=siglist.o +else + SIGLIST_O= +fi +AC_SUBST([SIGLIST_O]) +]) + +dnl Check for sys_errlist[] and sys_nerr, check for declaration +AC_DEFUN([BASH_SYS_ERRLIST], +[AC_MSG_CHECKING([for sys_errlist and sys_nerr]) +AC_CACHE_VAL(bash_cv_sys_errlist, +[AC_TRY_LINK([#include <errno.h>], +[extern char *sys_errlist[]; + extern int sys_nerr; + char *msg = sys_errlist[sys_nerr - 1];], + bash_cv_sys_errlist=yes, bash_cv_sys_errlist=no)])dnl +AC_MSG_RESULT($bash_cv_sys_errlist) +if test $bash_cv_sys_errlist = yes; then +AC_DEFINE(HAVE_SYS_ERRLIST) +fi +]) + +dnl +dnl Check if dup2() does not clear the close on exec flag +dnl +AC_DEFUN([BASH_FUNC_DUP2_CLOEXEC_CHECK], +[AC_MSG_CHECKING(if dup2 fails to clear the close-on-exec flag) +AC_CACHE_VAL(bash_cv_dup2_broken, +[AC_TRY_RUN([ +#include <sys/types.h> +#include <fcntl.h> +main() +{ + int fd1, fd2, fl; + fd1 = open("/dev/null", 2); + if (fcntl(fd1, 2, 1) < 0) + exit(1); + fd2 = dup2(fd1, 1); + if (fd2 < 0) + exit(2); + fl = fcntl(fd2, 1, 0); + /* fl will be 1 if dup2 did not reset the close-on-exec flag. */ + exit(fl != 1); +} +], bash_cv_dup2_broken=yes, bash_cv_dup2_broken=no, + [AC_MSG_WARN(cannot check dup2 if cross compiling -- defaulting to no) + bash_cv_dup2_broken=no]) +]) +AC_MSG_RESULT($bash_cv_dup2_broken) +if test $bash_cv_dup2_broken = yes; then +AC_DEFINE(DUP2_BROKEN) +fi +]) + +AC_DEFUN([BASH_FUNC_STRSIGNAL], +[AC_MSG_CHECKING([for the existence of strsignal]) +AC_CACHE_VAL(bash_cv_have_strsignal, +[AC_TRY_LINK([#include <sys/types.h> +#include <signal.h>], +[char *s = (char *)strsignal(2);], + bash_cv_have_strsignal=yes, bash_cv_have_strsignal=no)]) +AC_MSG_RESULT($bash_cv_have_strsignal) +if test $bash_cv_have_strsignal = yes; then +AC_DEFINE(HAVE_STRSIGNAL) +fi +]) + +dnl Check to see if opendir will open non-directories (not a nice thing) +AC_DEFUN([BASH_FUNC_OPENDIR_CHECK], +[AC_REQUIRE([AC_HEADER_DIRENT])dnl +AC_MSG_CHECKING(if opendir() opens non-directories) +AC_CACHE_VAL(bash_cv_opendir_not_robust, +[AC_TRY_RUN([ +#include <stdio.h> +#include <sys/types.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include <dirent.h> +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include <ndir.h> +# endif +#endif /* HAVE_DIRENT_H */ +main() +{ +DIR *dir; +int fd, err; +err = mkdir("/tmp/bash-aclocal", 0700); +if (err < 0) { + perror("mkdir"); + exit(1); +} +unlink("/tmp/bash-aclocal/not_a_directory"); +fd = open("/tmp/bash-aclocal/not_a_directory", O_WRONLY|O_CREAT|O_EXCL, 0666); +write(fd, "\n", 1); +close(fd); +dir = opendir("/tmp/bash-aclocal/not_a_directory"); +unlink("/tmp/bash-aclocal/not_a_directory"); +rmdir("/tmp/bash-aclocal"); +exit (dir == 0); +}], bash_cv_opendir_not_robust=yes,bash_cv_opendir_not_robust=no, + [AC_MSG_WARN(cannot check opendir if cross compiling -- defaulting to no) + bash_cv_opendir_not_robust=no] +)]) +AC_MSG_RESULT($bash_cv_opendir_not_robust) +if test $bash_cv_opendir_not_robust = yes; then +AC_DEFINE(OPENDIR_NOT_ROBUST) +fi +]) + +dnl +AH_TEMPLATE([VOID_SIGHANDLER], [Define if signal handlers return type void]) +AC_DEFUN([BASH_TYPE_SIGHANDLER], +[AC_MSG_CHECKING([whether signal handlers are of type void]) +AC_CACHE_VAL(bash_cv_void_sighandler, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <signal.h> +#ifdef signal +#undef signal +#endif +#ifdef __cplusplus +extern "C" +#endif +void (*signal ()) ();], +[int i;], bash_cv_void_sighandler=yes, bash_cv_void_sighandler=no)])dnl +AC_MSG_RESULT($bash_cv_void_sighandler) +if test $bash_cv_void_sighandler = yes; then +AC_DEFINE(VOID_SIGHANDLER) +fi +]) + +dnl +dnl A signed 16-bit integer quantity +dnl +AC_DEFUN([BASH_TYPE_BITS16_T], +[ +if test "$ac_cv_sizeof_short" = 2; then + AC_CHECK_TYPE(bits16_t, short) +elif test "$ac_cv_sizeof_char" = 2; then + AC_CHECK_TYPE(bits16_t, char) +else + AC_CHECK_TYPE(bits16_t, short) +fi +]) + +dnl +dnl An unsigned 16-bit integer quantity +dnl +AC_DEFUN([BASH_TYPE_U_BITS16_T], +[ +if test "$ac_cv_sizeof_short" = 2; then + AC_CHECK_TYPE(u_bits16_t, unsigned short) +elif test "$ac_cv_sizeof_char" = 2; then + AC_CHECK_TYPE(u_bits16_t, unsigned char) +else + AC_CHECK_TYPE(u_bits16_t, unsigned short) +fi +]) + +dnl +dnl A signed 32-bit integer quantity +dnl +AC_DEFUN([BASH_TYPE_BITS32_T], +[ +if test "$ac_cv_sizeof_int" = 4; then + AC_CHECK_TYPE(bits32_t, int) +elif test "$ac_cv_sizeof_long" = 4; then + AC_CHECK_TYPE(bits32_t, long) +else + AC_CHECK_TYPE(bits32_t, int) +fi +]) + +dnl +dnl An unsigned 32-bit integer quantity +dnl +AC_DEFUN([BASH_TYPE_U_BITS32_T], +[ +if test "$ac_cv_sizeof_int" = 4; then + AC_CHECK_TYPE(u_bits32_t, unsigned int) +elif test "$ac_cv_sizeof_long" = 4; then + AC_CHECK_TYPE(u_bits32_t, unsigned long) +else + AC_CHECK_TYPE(u_bits32_t, unsigned int) +fi +]) + +AC_DEFUN([BASH_TYPE_PTRDIFF_T], +[ +if test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_char_p"; then + AC_CHECK_TYPE(ptrdiff_t, int) +elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_char_p"; then + AC_CHECK_TYPE(ptrdiff_t, long) +elif test "$ac_cv_type_long_long" = yes && test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_char_p"; then + AC_CHECK_TYPE(ptrdiff_t, [long long]) +else + AC_CHECK_TYPE(ptrdiff_t, int) +fi +]) + +dnl +dnl A signed 64-bit quantity +dnl +AC_DEFUN([BASH_TYPE_BITS64_T], +[ +if test "$ac_cv_sizeof_char_p" = 8; then + AC_CHECK_TYPE(bits64_t, char *) +elif test "$ac_cv_sizeof_double" = 8; then + AC_CHECK_TYPE(bits64_t, double) +elif test -n "$ac_cv_type_long_long" && test "$ac_cv_sizeof_long_long" = 8; then + AC_CHECK_TYPE(bits64_t, [long long]) +elif test "$ac_cv_sizeof_long" = 8; then + AC_CHECK_TYPE(bits64_t, long) +else + AC_CHECK_TYPE(bits64_t, double) +fi +]) + +AC_DEFUN([BASH_TYPE_LONG_LONG], +[ +AC_CACHE_CHECK([for long long], bash_cv_type_long_long, +[AC_TRY_LINK([ +long long ll = 1; int i = 63;], +[ +long long llm = (long long) -1; +return ll << i | ll >> i | llm / ll | llm % ll; +], bash_cv_type_long_long='long long', bash_cv_type_long_long='long')]) +if test "$bash_cv_type_long_long" = 'long long'; then + AC_DEFINE(HAVE_LONG_LONG, 1) +fi +]) + +AC_DEFUN([BASH_TYPE_UNSIGNED_LONG_LONG], +[ +AC_CACHE_CHECK([for unsigned long long], bash_cv_type_unsigned_long_long, +[AC_TRY_LINK([ +unsigned long long ull = 1; int i = 63;], +[ +unsigned long long ullmax = (unsigned long long) -1; +return ull << i | ull >> i | ullmax / ull | ullmax % ull; +], bash_cv_type_unsigned_long_long='unsigned long long', + bash_cv_type_unsigned_long_long='unsigned long')]) +if test "$bash_cv_type_unsigned_long_long" = 'unsigned long long'; then + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1) +fi +]) + +dnl +dnl Type of struct rlimit fields: some systems (OSF/1, NetBSD, RISC/os 5.0) +dnl have a rlim_t, others (4.4BSD based systems) use quad_t, others use +dnl long and still others use int (HP-UX 9.01, SunOS 4.1.3). To simplify +dnl matters, this just checks for rlim_t, quad_t, or long. +dnl +AC_DEFUN([BASH_TYPE_RLIMIT], +[AC_MSG_CHECKING(for size and type of struct rlimit fields) +AC_CACHE_VAL(bash_cv_type_rlimit, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/resource.h>], +[rlim_t xxx;], bash_cv_type_rlimit=rlim_t,[ +AC_TRY_RUN([ +#include <sys/types.h> +#include <sys/time.h> +#include <sys/resource.h> +main() +{ +#ifdef HAVE_QUAD_T + struct rlimit rl; + if (sizeof(rl.rlim_cur) == sizeof(quad_t)) + exit(0); +#endif + exit(1); +}], bash_cv_type_rlimit=quad_t, bash_cv_type_rlimit=long, + [AC_MSG_WARN(cannot check quad_t if cross compiling -- defaulting to long) + bash_cv_type_rlimit=long])]) +]) +AC_MSG_RESULT($bash_cv_type_rlimit) +if test $bash_cv_type_rlimit = quad_t; then +AC_DEFINE(RLIMTYPE, quad_t) +elif test $bash_cv_type_rlimit = rlim_t; then +AC_DEFINE(RLIMTYPE, rlim_t) +fi +]) + +AC_DEFUN([BASH_FUNC_LSTAT], +[dnl Cannot use AC_CHECK_FUNCS(lstat) because Linux defines lstat() as an +dnl inline function in <sys/stat.h>. +AC_CACHE_CHECK([for lstat], bash_cv_func_lstat, +[AC_TRY_LINK([ +#include <sys/types.h> +#include <sys/stat.h> +],[ lstat(".",(struct stat *)0); ], +bash_cv_func_lstat=yes, bash_cv_func_lstat=no)]) +if test $bash_cv_func_lstat = yes; then + AC_DEFINE(HAVE_LSTAT) +fi +]) + +AC_DEFUN([BASH_FUNC_INET_ATON], +[ +AC_CACHE_CHECK([for inet_aton], bash_cv_func_inet_aton, +[AC_TRY_LINK([ +#include <sys/types.h> +#include <netinet/in.h> +#include <arpa/inet.h> +struct in_addr ap;], [ inet_aton("127.0.0.1", &ap); ], +bash_cv_func_inet_aton=yes, bash_cv_func_inet_aton=no)]) +if test $bash_cv_func_inet_aton = yes; then + AC_DEFINE(HAVE_INET_ATON) +else + AC_LIBOBJ(inet_aton) +fi +]) + +AC_DEFUN([BASH_FUNC_GETENV], +[AC_MSG_CHECKING(to see if getenv can be redefined) +AC_CACHE_VAL(bash_cv_getenv_redef, +[AC_TRY_RUN([ +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifndef __STDC__ +# ifndef const +# define const +# endif +#endif +char * +getenv (name) +#if defined (__linux__) || defined (__bsdi__) || defined (convex) + const char *name; +#else + char const *name; +#endif /* !__linux__ && !__bsdi__ && !convex */ +{ +return "42"; +} +main() +{ +char *s; +/* The next allows this program to run, but does not allow bash to link + when it redefines getenv. I'm not really interested in figuring out + why not. */ +#if defined (NeXT) +exit(1); +#endif +s = getenv("ABCDE"); +exit(s == 0); /* force optimizer to leave getenv in */ +} +], bash_cv_getenv_redef=yes, bash_cv_getenv_redef=no, + [AC_MSG_WARN(cannot check getenv redefinition if cross compiling -- defaulting to yes) + bash_cv_getenv_redef=yes] +)]) +AC_MSG_RESULT($bash_cv_getenv_redef) +if test $bash_cv_getenv_redef = yes; then +AC_DEFINE(CAN_REDEFINE_GETENV) +fi +]) + +# We should check for putenv before calling this +AC_DEFUN([BASH_FUNC_STD_PUTENV], +[ +AC_REQUIRE([AC_HEADER_STDC]) +AC_REQUIRE([AC_C_PROTOTYPES]) +AC_CACHE_CHECK([for standard-conformant putenv declaration], bash_cv_std_putenv, +[AC_TRY_LINK([ +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +#ifndef __STDC__ +# ifndef const +# define const +# endif +#endif +#ifdef PROTOTYPES +extern int putenv (char *); +#else +extern int putenv (); +#endif +], +[return (putenv == 0);], +bash_cv_std_putenv=yes, bash_cv_std_putenv=no +)]) +if test $bash_cv_std_putenv = yes; then +AC_DEFINE(HAVE_STD_PUTENV) +fi +]) + +# We should check for unsetenv before calling this +AC_DEFUN([BASH_FUNC_STD_UNSETENV], +[ +AC_REQUIRE([AC_HEADER_STDC]) +AC_REQUIRE([AC_C_PROTOTYPES]) +AC_CACHE_CHECK([for standard-conformant unsetenv declaration], bash_cv_std_unsetenv, +[AC_TRY_LINK([ +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +#ifndef __STDC__ +# ifndef const +# define const +# endif +#endif +#ifdef PROTOTYPES +extern int unsetenv (const char *); +#else +extern int unsetenv (); +#endif +], +[return (unsetenv == 0);], +bash_cv_std_unsetenv=yes, bash_cv_std_unsetenv=no +)]) +if test $bash_cv_std_unsetenv = yes; then +AC_DEFINE(HAVE_STD_UNSETENV) +fi +]) + +AC_DEFUN([BASH_FUNC_ULIMIT_MAXFDS], +[AC_MSG_CHECKING(whether ulimit can substitute for getdtablesize) +AC_CACHE_VAL(bash_cv_ulimit_maxfds, +[AC_TRY_RUN([ +main() +{ +long maxfds = ulimit(4, 0L); +exit (maxfds == -1L); +} +], bash_cv_ulimit_maxfds=yes, bash_cv_ulimit_maxfds=no, + [AC_MSG_WARN(cannot check ulimit if cross compiling -- defaulting to no) + bash_cv_ulimit_maxfds=no] +)]) +AC_MSG_RESULT($bash_cv_ulimit_maxfds) +if test $bash_cv_ulimit_maxfds = yes; then +AC_DEFINE(ULIMIT_MAXFDS) +fi +]) + +AC_DEFUN([BASH_FUNC_GETCWD], +[AC_MSG_CHECKING([if getcwd() calls popen()]) +AC_CACHE_VAL(bash_cv_getcwd_calls_popen, +[AC_TRY_RUN([ +#include <stdio.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#ifndef __STDC__ +#ifndef const +#define const +#endif +#endif + +int popen_called; + +FILE * +popen(command, type) + const char *command; + const char *type; +{ + popen_called = 1; + return (FILE *)NULL; +} + +FILE *_popen(command, type) + const char *command; + const char *type; +{ + return (popen (command, type)); +} + +int +pclose(stream) +FILE *stream; +{ + return 0; +} + +int +_pclose(stream) +FILE *stream; +{ + return 0; +} + +main() +{ + char lbuf[32]; + popen_called = 0; + getcwd(lbuf, 32); + exit (popen_called); +} +], bash_cv_getcwd_calls_popen=no, bash_cv_getcwd_calls_popen=yes, + [AC_MSG_WARN(cannot check whether getcwd calls popen if cross compiling -- defaulting to no) + bash_cv_getcwd_calls_popen=no] +)]) +AC_MSG_RESULT($bash_cv_getcwd_calls_popen) +if test $bash_cv_getcwd_calls_popen = yes; then +AC_DEFINE(GETCWD_BROKEN) +AC_LIBOBJ(getcwd) +fi +]) + +dnl +dnl This needs BASH_CHECK_SOCKLIB, but since that's not called on every +dnl system, we can't use AC_PREREQ +dnl +AC_DEFUN([BASH_FUNC_GETHOSTBYNAME], +[if test "X$bash_cv_have_gethostbyname" = "X"; then +_bash_needmsg=yes +else +AC_MSG_CHECKING(for gethostbyname in socket library) +_bash_needmsg= +fi +AC_CACHE_VAL(bash_cv_have_gethostbyname, +[AC_TRY_LINK([#include <netdb.h>], +[ struct hostent *hp; + hp = gethostbyname("localhost"); +], bash_cv_have_gethostbyname=yes, bash_cv_have_gethostbyname=no)] +) +if test "X$_bash_needmsg" = Xyes; then + AC_MSG_CHECKING(for gethostbyname in socket library) +fi +AC_MSG_RESULT($bash_cv_have_gethostbyname) +if test "$bash_cv_have_gethostbyname" = yes; then +AC_DEFINE(HAVE_GETHOSTBYNAME) +fi +]) + +AC_DEFUN([BASH_FUNC_FNMATCH_EXTMATCH], +[AC_MSG_CHECKING(if fnmatch does extended pattern matching with FNM_EXTMATCH) +AC_CACHE_VAL(bash_cv_fnm_extmatch, +[AC_TRY_RUN([ +#include <fnmatch.h> + +main() +{ +#ifdef FNM_EXTMATCH + exit (0); +#else + exit (1); +#endif +} +], bash_cv_fnm_extmatch=yes, bash_cv_fnm_extmatch=no, + [AC_MSG_WARN(cannot check FNM_EXTMATCH if cross compiling -- defaulting to no) + bash_cv_fnm_extmatch=no]) +]) +AC_MSG_RESULT($bash_cv_fnm_extmatch) +if test $bash_cv_fnm_extmatch = yes; then +AC_DEFINE(HAVE_LIBC_FNM_EXTMATCH) +fi +]) + +AH_TEMPLATE([HAVE_POSIX_SIGSETJMP], [Define if we POSIX-style sigsetjmp/siglongjmp are available]) +AC_DEFUN([BASH_FUNC_POSIX_SETJMP], +[AC_REQUIRE([BASH_SYS_SIGNAL_VINTAGE]) +AC_MSG_CHECKING(for presence of POSIX-style sigsetjmp/siglongjmp) +AC_CACHE_VAL(bash_cv_func_sigsetjmp, +[AC_TRY_RUN([ +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <sys/types.h> +#include <signal.h> +#include <setjmp.h> + +main() +{ +#if !defined (_POSIX_VERSION) || !defined (HAVE_POSIX_SIGNALS) +exit (1); +#else + +int code; +sigset_t set, oset; +sigjmp_buf xx; + +/* get the mask */ +sigemptyset(&set); +sigemptyset(&oset); +sigprocmask(SIG_BLOCK, (sigset_t *)NULL, &set); +sigprocmask(SIG_BLOCK, (sigset_t *)NULL, &oset); + +/* save it */ +code = sigsetjmp(xx, 1); +if (code) + exit(0); /* could get sigmask and compare to oset here. */ + +/* change it */ +sigaddset(&set, SIGINT); +sigprocmask(SIG_BLOCK, &set, (sigset_t *)NULL); + +/* and siglongjmp */ +siglongjmp(xx, 10); +exit(1); +#endif +}], bash_cv_func_sigsetjmp=present, bash_cv_func_sigsetjmp=missing, + [AC_MSG_WARN(cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing) + bash_cv_func_sigsetjmp=missing] +)]) +AC_MSG_RESULT($bash_cv_func_sigsetjmp) +if test $bash_cv_func_sigsetjmp = present; then +AC_DEFINE(HAVE_POSIX_SIGSETJMP) +fi +]) + +AH_TEMPLATE([STRCOLL_BROKEN], [Define if strcoll is broken with respect to strcmp in the default locale.]) +AC_DEFUN([BASH_FUNC_STRCOLL], +[ +AC_MSG_CHECKING(whether or not strcoll and strcmp differ) +AC_CACHE_VAL(bash_cv_func_strcoll_broken, +[AC_TRY_RUN([ +#include <stdio.h> +#if defined (HAVE_LOCALE_H) +#include <locale.h> +#endif + +main(c, v) +int c; +char *v[]; +{ + int r1, r2; + char *deflocale, *defcoll; + +#ifdef HAVE_SETLOCALE + deflocale = setlocale(LC_ALL, ""); + defcoll = setlocale(LC_COLLATE, ""); +#endif + +#ifdef HAVE_STRCOLL + /* These two values are taken from tests/glob-test. */ + r1 = strcoll("abd", "aXd"); +#else + r1 = 0; +#endif + r2 = strcmp("abd", "aXd"); + + /* These two should both be greater than 0. It is permissible for + a system to return different values, as long as the sign is the + same. */ + + /* Exit with 1 (failure) if these two values are both > 0, since + this tests whether strcoll(3) is broken with respect to strcmp(3) + in the default locale. */ + exit (r1 > 0 && r2 > 0); +} +], bash_cv_func_strcoll_broken=yes, bash_cv_func_strcoll_broken=no, + [AC_MSG_WARN(cannot check strcoll if cross compiling -- defaulting to no) + bash_cv_func_strcoll_broken=no] +)]) +AC_MSG_RESULT($bash_cv_func_strcoll_broken) +if test $bash_cv_func_strcoll_broken = yes; then +AC_DEFINE(STRCOLL_BROKEN) +fi +]) + +AC_DEFUN([BASH_FUNC_PRINTF_A_FORMAT], +[AC_MSG_CHECKING([for printf floating point output in hex notation]) +AC_CACHE_VAL(bash_cv_printf_a_format, +[AC_TRY_RUN([ +#include <stdio.h> +#include <string.h> + +int +main() +{ + double y = 0.0; + char abuf[1024]; + + sprintf(abuf, "%A", y); + exit(strchr(abuf, 'P') == (char *)0); +} +], bash_cv_printf_a_format=yes, bash_cv_printf_a_format=no, + [AC_MSG_WARN(cannot check printf if cross compiling -- defaulting to no) + bash_cv_printf_a_format=no] +)]) +AC_MSG_RESULT($bash_cv_printf_a_format) +if test $bash_cv_printf_a_format = yes; then +AC_DEFINE(HAVE_PRINTF_A_FORMAT) +fi +]) + +AC_DEFUN([BASH_STRUCT_TERMIOS_LDISC], +[ +AC_CHECK_MEMBER(struct termios.c_line, AC_DEFINE(TERMIOS_LDISC), ,[ +#include <sys/types.h> +#include <termios.h> +]) +]) + +AC_DEFUN([BASH_STRUCT_TERMIO_LDISC], +[ +AC_CHECK_MEMBER(struct termio.c_line, AC_DEFINE(TERMIO_LDISC), ,[ +#include <sys/types.h> +#include <termio.h> +]) +]) + +dnl +dnl Like AC_STRUCT_ST_BLOCKS, but doesn't muck with LIBOBJS +dnl +dnl sets bash_cv_struct_stat_st_blocks +dnl +dnl unused for now; we'll see how AC_CHECK_MEMBERS works +dnl +AC_DEFUN([BASH_STRUCT_ST_BLOCKS], +[ +AC_MSG_CHECKING([for struct stat.st_blocks]) +AC_CACHE_VAL(bash_cv_struct_stat_st_blocks, +[AC_TRY_COMPILE( +[ +#include <sys/types.h> +#include <sys/stat.h> +], +[ +main() +{ +static struct stat a; +if (a.st_blocks) return 0; +return 0; +} +], bash_cv_struct_stat_st_blocks=yes, bash_cv_struct_stat_st_blocks=no) +]) +AC_MSG_RESULT($bash_cv_struct_stat_st_blocks) +if test "$bash_cv_struct_stat_st_blocks" = "yes"; then +AC_DEFINE(HAVE_STRUCT_STAT_ST_BLOCKS) +fi +]) + +AC_DEFUN([BASH_CHECK_LIB_TERMCAP], +[ +if test "X$bash_cv_termcap_lib" = "X"; then +_bash_needmsg=yes +else +AC_MSG_CHECKING(which library has the termcap functions) +_bash_needmsg= +fi +AC_CACHE_VAL(bash_cv_termcap_lib, +[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, + [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo, + [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses, + [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses, + bash_cv_termcap_lib=gnutermcap)])])])]) +if test "X$_bash_needmsg" = "Xyes"; then +AC_MSG_CHECKING(which library has the termcap functions) +fi +AC_MSG_RESULT(using $bash_cv_termcap_lib) +if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then +LDFLAGS="$LDFLAGS -L./lib/termcap" +TERMCAP_LIB="./lib/termcap/libtermcap.a" +TERMCAP_DEP="./lib/termcap/libtermcap.a" +elif test $bash_cv_termcap_lib = libtermcap && test -z "$prefer_curses"; then +TERMCAP_LIB=-ltermcap +TERMCAP_DEP= +elif test $bash_cv_termcap_lib = libtinfo; then +TERMCAP_LIB=-ltinfo +TERMCAP_DEP= +elif test $bash_cv_termcap_lib = libncurses; then +TERMCAP_LIB=-lncurses +TERMCAP_DEP= +else +TERMCAP_LIB=-lcurses +TERMCAP_DEP= +fi +]) + +dnl +dnl Check for the presence of getpeername in libsocket. +dnl If libsocket is present, check for libnsl and add it to LIBS if +dnl it's there, since most systems with libsocket require linking +dnl with libnsl as well. This should only be called if getpeername +dnl was not found in libc. +dnl +dnl NOTE: IF WE FIND GETPEERNAME, WE ASSUME THAT WE HAVE BIND/CONNECT +dnl AS WELL +dnl +AC_DEFUN([BASH_CHECK_LIB_SOCKET], +[ +if test "X$bash_cv_have_socklib" = "X"; then +_bash_needmsg= +else +AC_MSG_CHECKING(for socket library) +_bash_needmsg=yes +fi +AC_CACHE_VAL(bash_cv_have_socklib, +[AC_CHECK_LIB(socket, getpeername, + bash_cv_have_socklib=yes, bash_cv_have_socklib=no, -lnsl)]) +if test "X$_bash_needmsg" = Xyes; then + AC_MSG_RESULT($bash_cv_have_socklib) + _bash_needmsg= +fi +if test $bash_cv_have_socklib = yes; then + # check for libnsl, add it to LIBS if present + if test "X$bash_cv_have_libnsl" = "X"; then + _bash_needmsg= + else + AC_MSG_CHECKING(for libnsl) + _bash_needmsg=yes + fi + AC_CACHE_VAL(bash_cv_have_libnsl, + [AC_CHECK_LIB(nsl, t_open, + bash_cv_have_libnsl=yes, bash_cv_have_libnsl=no)]) + if test "X$_bash_needmsg" = Xyes; then + AC_MSG_RESULT($bash_cv_have_libnsl) + _bash_needmsg= + fi + if test $bash_cv_have_libnsl = yes; then + LIBS="-lsocket -lnsl $LIBS" + else + LIBS="-lsocket $LIBS" + fi + AC_DEFINE(HAVE_LIBSOCKET) + AC_DEFINE(HAVE_GETPEERNAME) +fi +]) + +AH_TEMPLATE([STRUCT_DIRENT_HAS_D_INO], [Define if struct dirent has a d_ino member]) +AC_DEFUN([BASH_STRUCT_DIRENT_D_INO], +[AC_REQUIRE([AC_HEADER_DIRENT]) +AC_MSG_CHECKING(if struct dirent has a d_ino member) +AC_CACHE_VAL(bash_cv_dirent_has_dino, +[AC_TRY_COMPILE([ +#include <stdio.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include <dirent.h> +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include <ndir.h> +# endif +#endif /* HAVE_DIRENT_H */ +],[ +struct dirent d; int z; z = d.d_ino; +], bash_cv_dirent_has_dino=yes, bash_cv_dirent_has_dino=no)]) +AC_MSG_RESULT($bash_cv_dirent_has_dino) +if test $bash_cv_dirent_has_dino = yes; then +AC_DEFINE(STRUCT_DIRENT_HAS_D_INO) +fi +]) + +AH_TEMPLATE([STRUCT_DIRENT_HAS_D_FILENO], [Define if struct dirent has a d_fileno member]) +AC_DEFUN([BASH_STRUCT_DIRENT_D_FILENO], +[AC_REQUIRE([AC_HEADER_DIRENT]) +AC_MSG_CHECKING(if struct dirent has a d_fileno member) +AC_CACHE_VAL(bash_cv_dirent_has_d_fileno, +[AC_TRY_COMPILE([ +#include <stdio.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include <dirent.h> +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include <ndir.h> +# endif +#endif /* HAVE_DIRENT_H */ +],[ +struct dirent d; int z; z = d.d_fileno; +], bash_cv_dirent_has_d_fileno=yes, bash_cv_dirent_has_d_fileno=no)]) +AC_MSG_RESULT($bash_cv_dirent_has_d_fileno) +if test $bash_cv_dirent_has_d_fileno = yes; then +AC_DEFINE(STRUCT_DIRENT_HAS_D_FILENO) +fi +]) + +AC_DEFUN([BASH_STRUCT_TIMEVAL], +[AC_MSG_CHECKING(for struct timeval in sys/time.h and time.h) +AC_CACHE_VAL(bash_cv_struct_timeval, +[ +AC_EGREP_HEADER(struct timeval, sys/time.h, + bash_cv_struct_timeval=yes, + AC_EGREP_HEADER(struct timeval, time.h, + bash_cv_struct_timeval=yes, + bash_cv_struct_timeval=no)) +]) +AC_MSG_RESULT($bash_cv_struct_timeval) +if test $bash_cv_struct_timeval = yes; then + AC_DEFINE(HAVE_TIMEVAL) +fi +]) + +AH_TEMPLATE([STRUCT_WINSIZE_IN_SYS_IOCTL], [Define if struct winsize is in sys/ioctl.h]) +AH_TEMPLATE([STRUCT_WINSIZE_IN_TERMIOS], [Define if struct winsize is in termios.h]) +AC_DEFUN([BASH_STRUCT_WINSIZE], +[AC_MSG_CHECKING(for struct winsize in sys/ioctl.h and termios.h) +AC_CACHE_VAL(bash_cv_struct_winsize_header, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/ioctl.h>], [struct winsize x;], + bash_cv_struct_winsize_header=ioctl_h, + [AC_TRY_COMPILE([#include <sys/types.h> +#include <termios.h>], [struct winsize x;], + bash_cv_struct_winsize_header=termios_h, bash_cv_struct_winsize_header=other) +])]) +if test $bash_cv_struct_winsize_header = ioctl_h; then + AC_MSG_RESULT(sys/ioctl.h) + AC_DEFINE(STRUCT_WINSIZE_IN_SYS_IOCTL) +elif test $bash_cv_struct_winsize_header = termios_h; then + AC_MSG_RESULT(termios.h) + AC_DEFINE(STRUCT_WINSIZE_IN_TERMIOS) +else + AC_MSG_RESULT(not found) +fi +]) + +dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7) +AH_TEMPLATE([HAVE_POSIX_SIGNALS], [Define if we have the POSIX signal routines]) +AH_TEMPLATE([HAVE_BSD_SIGNALS], [Define if we have the BSD signal routines]) +AH_TEMPLATE([HAVE_USG_SIGHOLD], [Define if we have the USG signal routines]) +AC_DEFUN([BASH_SYS_SIGNAL_VINTAGE], +[AC_REQUIRE([AC_TYPE_SIGNAL]) +AC_MSG_CHECKING(for type of signal functions) +AC_CACHE_VAL(bash_cv_signal_vintage, +[ + AC_MSG_WARN([checking for posix...]) + AC_TRY_LINK([#include <signal.h>],[ + sigset_t ss; + struct sigaction sa; + sigemptyset(&ss); sigsuspend(&ss); + sigaction(SIGINT, &sa, (struct sigaction *) 0); + sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0); + ], bash_cv_signal_vintage="posix", + [ + AC_MSG_WARN([checking for 4.2bsd...]) + AC_TRY_LINK([#include <signal.h>], [ + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); + ], bash_cv_signal_vintage="4.2bsd", + [ + AC_MSG_WARN([checking for svr3...]) + AC_TRY_LINK([ + #include <signal.h> + RETSIGTYPE foo() { }], [ + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); + ], bash_cv_signal_vintage="svr3", bash_cv_signal_vintage="v7" + )] + )] +) +]) +AC_MSG_RESULT($bash_cv_signal_vintage) +if test "$bash_cv_signal_vintage" = "posix"; then +AC_DEFINE(HAVE_POSIX_SIGNALS) +elif test "$bash_cv_signal_vintage" = "4.2bsd"; then +AC_DEFINE(HAVE_BSD_SIGNALS) +elif test "$bash_cv_signal_vintage" = "svr3"; then +AC_DEFINE(HAVE_USG_SIGHOLD) +fi +]) + +dnl Check if the pgrp of setpgrp() can't be the pid of a zombie process. +AC_DEFUN([BASH_SYS_PGRP_SYNC], +[AC_REQUIRE([AC_FUNC_GETPGRP]) +AC_MSG_CHECKING(whether pgrps need synchronization) +AC_CACHE_VAL(bash_cv_pgrp_pipe, +[AC_TRY_RUN([ +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +main() +{ +# ifdef GETPGRP_VOID +# define getpgID() getpgrp() +# else +# define getpgID() getpgrp(0) +# define setpgid(x,y) setpgrp(x,y) +# endif + int pid1, pid2, fds[2]; + int status; + char ok; + + switch (pid1 = fork()) { + case -1: + exit(1); + case 0: + setpgid(0, getpid()); + exit(0); + } + setpgid(pid1, pid1); + + sleep(2); /* let first child die */ + + if (pipe(fds) < 0) + exit(2); + + switch (pid2 = fork()) { + case -1: + exit(3); + case 0: + setpgid(0, pid1); + ok = getpgID() == pid1; + write(fds[1], &ok, 1); + exit(0); + } + setpgid(pid2, pid1); + + close(fds[1]); + if (read(fds[0], &ok, 1) != 1) + exit(4); + wait(&status); + wait(&status); + exit(ok ? 0 : 5); +} +], bash_cv_pgrp_pipe=no,bash_cv_pgrp_pipe=yes, + [AC_MSG_WARN(cannot check pgrp synchronization if cross compiling -- defaulting to no) + bash_cv_pgrp_pipe=no]) +]) +AC_MSG_RESULT($bash_cv_pgrp_pipe) +if test $bash_cv_pgrp_pipe = yes; then +AC_DEFINE(PGRP_PIPE) +fi +]) + +AH_TEMPLATE([MUST_REINSTALL_SIGHANDLERS], [Define if signal handlers must be reinstalled when invoked.]) +AC_DEFUN([BASH_SYS_REINSTALL_SIGHANDLERS], +[AC_REQUIRE([AC_TYPE_SIGNAL]) +AC_REQUIRE([BASH_SYS_SIGNAL_VINTAGE]) +AC_MSG_CHECKING([if signal handlers must be reinstalled when invoked]) +AC_CACHE_VAL(bash_cv_must_reinstall_sighandlers, +[AC_TRY_RUN([ +#include <signal.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +typedef RETSIGTYPE sigfunc(); + +int nsigint; + +#ifdef HAVE_POSIX_SIGNALS +sigfunc * +set_signal_handler(sig, handler) + int sig; + sigfunc *handler; +{ + struct sigaction act, oact; + act.sa_handler = handler; + act.sa_flags = 0; + sigemptyset (&act.sa_mask); + sigemptyset (&oact.sa_mask); + sigaction (sig, &act, &oact); + return (oact.sa_handler); +} +#else +#define set_signal_handler(s, h) signal(s, h) +#endif + +RETSIGTYPE +sigint(s) +int s; +{ + nsigint++; +} + +main() +{ + nsigint = 0; + set_signal_handler(SIGINT, sigint); + kill((int)getpid(), SIGINT); + kill((int)getpid(), SIGINT); + exit(nsigint != 2); +} +], bash_cv_must_reinstall_sighandlers=no, bash_cv_must_reinstall_sighandlers=yes, + [AC_MSG_WARN(cannot check signal handling if cross compiling -- defaulting to no) + bash_cv_must_reinstall_sighandlers=no] +)]) +AC_MSG_RESULT($bash_cv_must_reinstall_sighandlers) +if test $bash_cv_must_reinstall_sighandlers = yes; then +AC_DEFINE(MUST_REINSTALL_SIGHANDLERS) +fi +]) + +dnl check that some necessary job control definitions are present +AC_DEFUN([BASH_SYS_JOB_CONTROL_MISSING], +[AC_REQUIRE([BASH_SYS_SIGNAL_VINTAGE]) +AC_MSG_CHECKING(for presence of necessary job control definitions) +AC_CACHE_VAL(bash_cv_job_control_missing, +[AC_TRY_RUN([ +#include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <signal.h> + +/* Add more tests in here as appropriate. */ +main() +{ +/* signal type */ +#if !defined (HAVE_POSIX_SIGNALS) && !defined (HAVE_BSD_SIGNALS) +exit(1); +#endif + +/* signals and tty control. */ +#if !defined (SIGTSTP) || !defined (SIGSTOP) || !defined (SIGCONT) +exit (1); +#endif + +/* process control */ +#if !defined (WNOHANG) || !defined (WUNTRACED) +exit(1); +#endif + +/* Posix systems have tcgetpgrp and waitpid. */ +#if defined (_POSIX_VERSION) && !defined (HAVE_TCGETPGRP) +exit(1); +#endif + +#if defined (_POSIX_VERSION) && !defined (HAVE_WAITPID) +exit(1); +#endif + +/* Other systems have TIOCSPGRP/TIOCGPRGP and wait3. */ +#if !defined (_POSIX_VERSION) && !defined (HAVE_WAIT3) +exit(1); +#endif + +exit(0); +}], bash_cv_job_control_missing=present, bash_cv_job_control_missing=missing, + [AC_MSG_WARN(cannot check job control if cross-compiling -- defaulting to missing) + bash_cv_job_control_missing=missing] +)]) +AC_MSG_RESULT($bash_cv_job_control_missing) +if test $bash_cv_job_control_missing = missing; then +AC_DEFINE(JOB_CONTROL_MISSING) +fi +]) + +dnl check whether named pipes are present +dnl this requires a previous check for mkfifo, but that is awkward to specify +AC_DEFUN([BASH_SYS_NAMED_PIPES], +[AC_MSG_CHECKING(for presence of named pipes) +AC_CACHE_VAL(bash_cv_sys_named_pipes, +[AC_TRY_RUN([ +#include <sys/types.h> +#include <sys/stat.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +/* Add more tests in here as appropriate. */ +main() +{ +int fd, err; + +#if defined (HAVE_MKFIFO) +exit (0); +#endif + +#if !defined (S_IFIFO) && (defined (_POSIX_VERSION) && !defined (S_ISFIFO)) +exit (1); +#endif + +#if defined (NeXT) +exit (1); +#endif +err = mkdir("/tmp/bash-aclocal", 0700); +if (err < 0) { + perror ("mkdir"); + exit(1); +} +fd = mknod ("/tmp/bash-aclocal/sh-np-autoconf", 0666 | S_IFIFO, 0); +if (fd == -1) { + rmdir ("/tmp/bash-aclocal"); + exit (1); +} +close(fd); +unlink ("/tmp/bash-aclocal/sh-np-autoconf"); +rmdir ("/tmp/bash-aclocal"); +exit(0); +}], bash_cv_sys_named_pipes=present, bash_cv_sys_named_pipes=missing, + [AC_MSG_WARN(cannot check for named pipes if cross-compiling -- defaulting to missing) + bash_cv_sys_named_pipes=missing] +)]) +AC_MSG_RESULT($bash_cv_sys_named_pipes) +if test $bash_cv_sys_named_pipes = missing; then +AC_DEFINE(NAMED_PIPES_MISSING) +fi +]) + +AC_DEFUN([BASH_SYS_DEFAULT_MAIL_DIR], +[AC_MSG_CHECKING(for default mail directory) +AC_CACHE_VAL(bash_cv_mail_dir, +[if test -d /var/mail; then + bash_cv_mail_dir=/var/mail + elif test -d /var/spool/mail; then + bash_cv_mail_dir=/var/spool/mail + elif test -d /usr/mail; then + bash_cv_mail_dir=/usr/mail + elif test -d /usr/spool/mail; then + bash_cv_mail_dir=/usr/spool/mail + else + bash_cv_mail_dir=unknown + fi +]) +AC_MSG_RESULT($bash_cv_mail_dir) +AC_DEFINE_UNQUOTED(DEFAULT_MAIL_DIRECTORY, "$bash_cv_mail_dir") +]) + +AC_DEFUN([BASH_HAVE_TIOCGWINSZ], +[AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h) +AC_CACHE_VAL(bash_cv_tiocgwinsz_in_ioctl, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/ioctl.h>], [int x = TIOCGWINSZ;], + bash_cv_tiocgwinsz_in_ioctl=yes,bash_cv_tiocgwinsz_in_ioctl=no)]) +AC_MSG_RESULT($bash_cv_tiocgwinsz_in_ioctl) +if test $bash_cv_tiocgwinsz_in_ioctl = yes; then +AC_DEFINE(GWINSZ_IN_SYS_IOCTL) +fi +]) + +AH_TEMPLATE([TIOCSTAT_IN_SYS_IOCTL], [Define if TIOCSTAT is in sys/ioctl.h]) +AC_DEFUN([BASH_HAVE_TIOCSTAT], +[AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h) +AC_CACHE_VAL(bash_cv_tiocstat_in_ioctl, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/ioctl.h>], [int x = TIOCSTAT;], + bash_cv_tiocstat_in_ioctl=yes,bash_cv_tiocstat_in_ioctl=no)]) +AC_MSG_RESULT($bash_cv_tiocstat_in_ioctl) +if test $bash_cv_tiocstat_in_ioctl = yes; then +AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL) +fi +]) + +AH_TEMPLATE([FIONREAD_IN_SYS_IOCTL], [Define if FIONREAD is in sys/ioctl.h]) +AC_DEFUN([BASH_HAVE_FIONREAD], +[AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h) +AC_CACHE_VAL(bash_cv_fionread_in_ioctl, +[AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/ioctl.h>], [int x = FIONREAD;], + bash_cv_fionread_in_ioctl=yes,bash_cv_fionread_in_ioctl=no)]) +AC_MSG_RESULT($bash_cv_fionread_in_ioctl) +if test $bash_cv_fionread_in_ioctl = yes; then +AC_DEFINE(FIONREAD_IN_SYS_IOCTL) +fi +]) + +dnl +dnl See if speed_t is declared in <sys/types.h>. Some versions of linux +dnl require a definition of speed_t each time <termcap.h> is included, +dnl but you can only get speed_t if you include <termios.h> (on some +dnl versions) or <sys/types.h> (on others). +dnl +AH_TEMPLATE([SPEED_T_IN_SYS_TYPES], [Define if speed_t is in sys/types.h]) +AC_DEFUN([BASH_CHECK_SPEED_T], +[AC_MSG_CHECKING(for speed_t in sys/types.h) +AC_CACHE_VAL(bash_cv_speed_t_in_sys_types, +[AC_TRY_COMPILE([#include <sys/types.h>], [speed_t x;], + bash_cv_speed_t_in_sys_types=yes,bash_cv_speed_t_in_sys_types=no)]) +AC_MSG_RESULT($bash_cv_speed_t_in_sys_types) +if test $bash_cv_speed_t_in_sys_types = yes; then +AC_DEFINE(SPEED_T_IN_SYS_TYPES) +fi +]) + +AH_TEMPLATE([HAVE_GETPW_DECLS], [Define if getpw functions are declared in pwd.h]) +AC_DEFUN([BASH_CHECK_GETPW_FUNCS], +[AC_MSG_CHECKING(whether getpw functions are declared in pwd.h) +AC_CACHE_VAL(bash_cv_getpw_declared, +[AC_EGREP_CPP(getpwuid, +[ +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <pwd.h> +], +bash_cv_getpw_declared=yes,bash_cv_getpw_declared=no)]) +AC_MSG_RESULT($bash_cv_getpw_declared) +if test $bash_cv_getpw_declared = yes; then +AC_DEFINE(HAVE_GETPW_DECLS) +fi +]) + +AC_DEFUN([BASH_CHECK_DEV_FD], +[AC_MSG_CHECKING(whether /dev/fd is available) +AC_CACHE_VAL(bash_cv_dev_fd, +[if test -d /dev/fd && test -r /dev/fd/0; then + bash_cv_dev_fd=standard + elif test -d /proc/self/fd && test -r /proc/self/fd/0; then + bash_cv_dev_fd=whacky + else + bash_cv_dev_fd=absent + fi +]) +AC_MSG_RESULT($bash_cv_dev_fd) +if test $bash_cv_dev_fd = "standard"; then + AC_DEFINE(HAVE_DEV_FD) + AC_DEFINE(DEV_FD_PREFIX, "/dev/fd/") +elif test $bash_cv_dev_fd = "whacky"; then + AC_DEFINE(HAVE_DEV_FD) + AC_DEFINE(DEV_FD_PREFIX, "/proc/self/fd/") +fi +]) + +AC_DEFUN([BASH_CHECK_DEV_STDIN], +[AC_MSG_CHECKING(whether /dev/stdin stdout stderr are available) +AC_CACHE_VAL(bash_cv_dev_stdin, +[if test -d /dev/fd && test -r /dev/stdin; then + bash_cv_dev_stdin=present + elif test -d /proc/self/fd && test -r /dev/stdin; then + bash_cv_dev_stdin=present + else + bash_cv_dev_stdin=absent + fi +]) +AC_MSG_RESULT($bash_cv_dev_stdin) +if test $bash_cv_dev_stdin = "present"; then + AC_DEFINE(HAVE_DEV_STDIN) +fi +]) + +dnl +dnl Check if HPUX needs _KERNEL defined for RLIMIT_* definitions +dnl +AC_DEFUN([BASH_CHECK_KERNEL_RLIMIT], +[AC_MSG_CHECKING([whether $host_os needs _KERNEL for RLIMIT defines]) +AC_CACHE_VAL(bash_cv_kernel_rlimit, +[AC_TRY_COMPILE([ +#include <sys/types.h> +#include <sys/resource.h> +], +[ + int f; + f = RLIMIT_DATA; +], bash_cv_kernel_rlimit=no, +[AC_TRY_COMPILE([ +#include <sys/types.h> +#define _KERNEL +#include <sys/resource.h> +#undef _KERNEL +], +[ + int f; + f = RLIMIT_DATA; +], bash_cv_kernel_rlimit=yes, bash_cv_kernel_rlimit=no)] +)]) +AC_MSG_RESULT($bash_cv_kernel_rlimit) +if test $bash_cv_kernel_rlimit = yes; then +AC_DEFINE(RLIMIT_NEEDS_KERNEL) +fi +]) + +dnl +dnl Check for 64-bit off_t -- used for malloc alignment +dnl +dnl C does not allow duplicate case labels, so the compile will fail if +dnl sizeof(off_t) is > 4. +dnl +AC_DEFUN([BASH_CHECK_OFF_T_64], +[AC_CACHE_CHECK(for 64-bit off_t, bash_cv_off_t_64, +AC_TRY_COMPILE([ +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <sys/types.h> +],[ +switch (0) case 0: case (sizeof (off_t) <= 4):; +], bash_cv_off_t_64=no, bash_cv_off_t_64=yes)) +if test $bash_cv_off_t_64 = yes; then + AC_DEFINE(HAVE_OFF_T_64) +fi]) + +AC_DEFUN([BASH_CHECK_RTSIGS], +[AC_MSG_CHECKING(for unusable real-time signals due to large values) +AC_CACHE_VAL(bash_cv_unusable_rtsigs, +[AC_TRY_RUN([ +#include <sys/types.h> +#include <signal.h> + +#ifndef NSIG +# define NSIG 64 +#endif + +main () +{ + int n_sigs = 2 * NSIG; +#ifdef SIGRTMIN + int rtmin = SIGRTMIN; +#else + int rtmin = 0; +#endif + + exit(rtmin < n_sigs); +}], bash_cv_unusable_rtsigs=yes, bash_cv_unusable_rtsigs=no, + [AC_MSG_WARN(cannot check real-time signals if cross compiling -- defaulting to yes) + bash_cv_unusable_rtsigs=yes] +)]) +AC_MSG_RESULT($bash_cv_unusable_rtsigs) +if test $bash_cv_unusable_rtsigs = yes; then +AC_DEFINE(UNUSABLE_RT_SIGNALS) +fi +]) + +dnl +dnl check for availability of multibyte characters and functions +dnl +AH_TEMPLATE([HAVE_MBSRTOWCS], [Define if we have the mbsrtowcs function]) +AH_TEMPLATE([HAVE_WCWIDTH], [Define if we have the wcwidth function]) +AH_TEMPLATE([HAVE_MBSTATE_T], [Define if we have mbstate_t]) +AH_TEMPLATE([HAVE_LANGINFO_CODESET], [Define if we have nl_langinfo and CODESET]) +AC_DEFUN([BASH_CHECK_MULTIBYTE], +[ +AC_CHECK_HEADERS(wctype.h) +AC_CHECK_HEADERS(wchar.h) +AC_CHECK_HEADERS(langinfo.h) + +AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) +AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) + +AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, +[AC_TRY_RUN([ +#include <wchar.h> +int +main () +{ + mbstate_t ps; + return 0; +}], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) +if test $bash_cv_have_mbstate_t = yes; then + AC_DEFINE(HAVE_MBSTATE_T) +fi + +AC_CACHE_CHECK([for nl_langinfo and CODESET], bash_cv_langinfo_codeset, +[AC_TRY_LINK( +[#include <langinfo.h>], +[char* cs = nl_langinfo(CODESET);], +bash_cv_langinfo_codeset=yes, bash_cv_langinfo_codeset=no)]) +if test $bash_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET) +fi + +]) + +dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB +dnl require: +dnl AC_PROG_CC +dnl BASH_CHECK_LIB_TERMCAP + +AC_DEFUN([RL_LIB_READLINE_VERSION], +[ +AC_REQUIRE([BASH_CHECK_LIB_TERMCAP]) + +AC_MSG_CHECKING([version of installed readline library]) + +# What a pain in the ass this is. + +# save cpp and ld options +_save_CFLAGS="$CFLAGS" +_save_LDFLAGS="$LDFLAGS" +_save_LIBS="$LIBS" + +# Don't set ac_cv_rl_prefix if the caller has already assigned a value. This +# allows the caller to do something like $_rl_prefix=$withval if the user +# specifies --with-installed-readline=PREFIX as an argument to configure + +if test -z "$ac_cv_rl_prefix"; then +test "x$prefix" = xNONE && ac_cv_rl_prefix=$ac_default_prefix || ac_cv_rl_prefix=${prefix} +fi + +eval ac_cv_rl_includedir=${ac_cv_rl_prefix}/include +eval ac_cv_rl_libdir=${ac_cv_rl_prefix}/lib + +LIBS="$LIBS -lreadline ${TERMCAP_LIB}" +CFLAGS="$CFLAGS -I${ac_cv_rl_includedir}" +LDFLAGS="$LDFLAGS -L${ac_cv_rl_libdir}" + +AC_TRY_RUN([ +#include <stdio.h> +#include <readline/readline.h> + +main() +{ + FILE *fp; + fp = fopen("conftest.rlv", "w"); + if (fp == 0) exit(1); + fprintf(fp, "%s\n", rl_library_version ? rl_library_version : "0.0"); + fclose(fp); + exit(0); +} +], +ac_cv_rl_version=`cat conftest.rlv`, +ac_cv_rl_version='0.0', +ac_cv_rl_version='4.2') + +CFLAGS="$_save_CFLAGS" +LDFLAGS="$_save_LDFLAGS" +LIBS="$_save_LIBS" + +RL_MAJOR=0 +RL_MINOR=0 + +# ( +case "$ac_cv_rl_version" in +2*|3*|4*|5*|6*|7*|8*|9*) + RL_MAJOR=`echo $ac_cv_rl_version | sed 's:\..*$::'` + RL_MINOR=`echo $ac_cv_rl_version | sed -e 's:^.*\.::' -e 's:[[a-zA-Z]]*$::'` + ;; +esac + +# ((( +case $RL_MAJOR in +[[0-9][0-9]]) _RL_MAJOR=$RL_MAJOR ;; +[[0-9]]) _RL_MAJOR=0$RL_MAJOR ;; +*) _RL_MAJOR=00 ;; +esac + +# ((( +case $RL_MINOR in +[[0-9][0-9]]) _RL_MINOR=$RL_MINOR ;; +[[0-9]]) _RL_MINOR=0$RL_MINOR ;; +*) _RL_MINOR=00 ;; +esac + +RL_VERSION="0x${_RL_MAJOR}${_RL_MINOR}" + +# Readline versions greater than 4.2 have these defines in readline.h + +if test $ac_cv_rl_version = '0.0' ; then + AC_MSG_WARN([Could not test version of installed readline library.]) +elif test $RL_MAJOR -gt 4 || { test $RL_MAJOR = 4 && test $RL_MINOR -gt 2 ; } ; then + # set these for use by the caller + RL_PREFIX=$ac_cv_rl_prefix + RL_LIBDIR=$ac_cv_rl_libdir + RL_INCLUDEDIR=$ac_cv_rl_includedir + AC_MSG_RESULT($ac_cv_rl_version) +else + +AC_DEFINE_UNQUOTED(RL_READLINE_VERSION, $RL_VERSION, [encoded version of the installed readline library]) +AC_DEFINE_UNQUOTED(RL_VERSION_MAJOR, $RL_MAJOR, [major version of installed readline library]) +AC_DEFINE_UNQUOTED(RL_VERSION_MINOR, $RL_MINOR, [minor version of installed readline library]) + +AC_SUBST(RL_VERSION) +AC_SUBST(RL_MAJOR) +AC_SUBST(RL_MINOR) + +# set these for use by the caller +RL_PREFIX=$ac_cv_rl_prefix +RL_LIBDIR=$ac_cv_rl_libdir +RL_INCLUDEDIR=$ac_cv_rl_includedir + +AC_MSG_RESULT($ac_cv_rl_version) + +fi +]) diff --git a/packages/readline/readline-5.2/configure_fix.patch b/packages/readline/readline-5.2/configure_fix.patch new file mode 100644 index 0000000000..4100fe42a7 --- /dev/null +++ b/packages/readline/readline-5.2/configure_fix.patch @@ -0,0 +1,24 @@ +Without this it fails to link against libtermcap causing various missing symbols +issues. + +RP - 8/10/08 + +Index: readline-5.2/configure.in +=================================================================== +--- readline-5.2.orig/configure.in 2008-10-08 09:58:52.000000000 +0100 ++++ readline-5.2/configure.in 2008-10-08 09:59:03.000000000 +0100 +@@ -211,10 +211,10 @@ + AC_MSG_CHECKING(configuration for building shared libraries) + eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` + +-# case "$SHLIB_LIBS" in +-# *curses*|*termcap*|*termlib*) ;; +-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; +-# esac ++ case "$SHLIB_LIBS" in ++ *curses*|*termcap*|*termlib*) ;; ++ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; ++ esac + + AC_SUBST(SHOBJ_CC) + AC_SUBST(SHOBJ_CFLAGS) diff --git a/packages/readline/readline-native_5.2.bb b/packages/readline/readline-native_5.2.bb new file mode 100644 index 0000000000..c3ce970b4c --- /dev/null +++ b/packages/readline/readline-native_5.2.bb @@ -0,0 +1,4 @@ +require readline_${PV}.bb +inherit native +DEPENDS = "ncurses-native" +FILESPATH = "${FILE_DIRNAME}/readline-${PV}:${FILE_DIRNAME}/readline:${FILE_DIRNAME}/files:${FILE_DIRNAME}" diff --git a/packages/readline/readline_5.2.bb b/packages/readline/readline_5.2.bb new file mode 100644 index 0000000000..a7dc818790 --- /dev/null +++ b/packages/readline/readline_5.2.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The GNU Readline library provides a set of functions for use by applications that allow users to edit \ +command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes \ +additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those \ +lines, and perform csh-like history expansion on previous commands." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS += "ncurses" +RPROVIDES_${PN} += "readline" +LEAD_SONAME = "libreadline.so" +PR = "r4" + +SRC_URI = "ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \ + file://configure_fix.patch;patch=1 \ + file://acinclude.m4" + +S = "${WORKDIR}/readline-${PV}" + +inherit autotools + +do_configure () { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + autotools_do_configure +} + +do_stage() { + autotools_stage_all +} + +do_install () { + autotools_do_install + # Make install doesn't properly install these + oe_libinstall -so -C shlib libhistory ${D}${libdir} + oe_libinstall -so -C shlib libreadline ${D}${libdir} +} diff --git a/packages/shared-mime-info/shared-mime-info_0.51.bb b/packages/shared-mime-info/shared-mime-info_0.51.bb index c8e475af56..31a7df1862 100644 --- a/packages/shared-mime-info/shared-mime-info_0.51.bb +++ b/packages/shared-mime-info/shared-mime-info_0.51.bb @@ -1,11 +1,15 @@ require shared-mime-info.inc DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" -PR = "r1" +PR = "r2" do_install_append() { update-mime-database ${D}${datadir}/mime - - # we do not need it on device and it is huge - rm ${D}${datadir}/mime/packages/freedesktop.org.xml } + +# freedesktop.org.xml is huge and only needed when updating the db +# mime.bbclass will add the dependency on it automagically +PACKAGES =+ "freedesktop-mime-info" +FILES_freedesktop-mime-info = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS_freedesktop-mime-info = "shared-mime-info" + diff --git a/packages/sylpheed/claws-mail_3.6.1.bb b/packages/sylpheed/claws-mail_3.6.1.bb index ac0ff1bd26..a2d7101ece 100644 --- a/packages/sylpheed/claws-mail_3.6.1.bb +++ b/packages/sylpheed/claws-mail_3.6.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ libetpan openssl aspell" LICENSE = "GPL" -PR = "r0" +PR = "r1" inherit autotools pkgconfig @@ -49,3 +49,7 @@ do_install_append() { install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/ sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop } + +do_stage() { + autotools_stage_includes +} diff --git a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb index cfa26a464e..621fbb4fdf 100644 --- a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb +++ b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb @@ -2,19 +2,14 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent plugins" DEPENDS = "claws-mail" LICENSE = "GPL" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz" +SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\ + file://claws-plugin-mailmbox-fixup.patch;patch=1" inherit autotools pkgconfig S = "${WORKDIR}/mailmbox-${PV}" -do_configure() { - gnu-configize - libtoolize --force - oe_runconf -} - FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug" diff --git a/packages/sylpheed/claws-plugin-rssyl_0.18.bb b/packages/sylpheed/claws-plugin-rssyl_0.18.bb index 29fc245ac4..fd30e81ef6 100644 --- a/packages/sylpheed/claws-plugin-rssyl_0.18.bb +++ b/packages/sylpheed/claws-plugin-rssyl_0.18.bb @@ -2,7 +2,7 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent plugins" DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz" @@ -10,11 +10,5 @@ inherit autotools pkgconfig S = "${WORKDIR}/rssyl-${PV}" -do_configure() { - gnu-configize - libtoolize --force - oe_runconf -} - FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" - +FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug" diff --git a/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch b/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch new file mode 100644 index 0000000000..f8cce25225 --- /dev/null +++ b/packages/sylpheed/files/claws-plugin-mailmbox-fixup.patch @@ -0,0 +1,218 @@ +Index: mailmbox-1.14/src/plugin_gtk.c +=================================================================== +--- mailmbox-1.14.orig/src/plugin_gtk.c 2008-12-04 06:18:50.000000000 +0300 ++++ mailmbox-1.14/src/plugin_gtk.c 2008-12-04 06:49:40.000000000 +0300 +@@ -35,39 +35,41 @@ + + #include "pluginconfig.h" + +-static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget); +-static void add_mailbox(gpointer callback_data, guint callback_action, GtkWidget *widget); +- +-static GtkItemFactoryEntry claws_mailmbox_popup_entries[] = +-{ +- {N_("/Create _new folder..."), NULL, new_folder_cb, 0, NULL}, +- {N_("/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_Rename folder..."), NULL, rename_folder_cb, 0, NULL}, +- {N_("/M_ove folder..."), NULL, move_folder_cb, 0, NULL}, +- {N_("/Cop_y folder..."), NULL, move_folder_cb, 1, NULL}, +- {N_("/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_Delete folder"), NULL, delete_folder_cb, 0, NULL}, +- {N_("/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_Check for new messages"), NULL, update_tree_cb, 0, NULL}, +- {N_("/C_heck for new folders"), NULL, update_tree_cb, 1, NULL}, +- {N_("/R_ebuild folder tree"), NULL, update_tree_cb, 2, NULL}, +- {N_("/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/Remove _mailbox"), NULL, remove_mailbox_cb, 0, NULL}, +- {N_("/---"), NULL, NULL, 0, "<Separator>"}, ++static void new_folder_cb(GtkAction *action, gpointer data); ++static void delete_folder_cb(GtkAction *action, gpointer data); ++static void rename_folder_cb(GtkAction *action, gpointer data); ++static void move_folder_cb(GtkAction *action, gpointer data); ++static void update_tree_cb(GtkAction *action, gpointer data); ++static void remove_mailbox_cb(GtkAction *action, gpointer data); ++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data); ++ ++static GtkActionEntry claws_mailmbox_popup_entries[] = ++{ ++ {"FolderViewPopup/CreateNewFolder", NULL, N_("/Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) }, ++ {"FolderViewPopup/---", NULL, N_("/---") }, ++ {"FolderViewPopup/RenameFolder", NULL, N_("/_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) }, ++ {"FolderViewPopup/MoveFolder", NULL, N_("/M_ove folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) }, ++ {"FolderViewPopup/CopyFolder", NULL, N_("/Cop_y folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) }, ++ {"FolderViewPopup/---", NULL, N_("/---") }, ++ {"FolderViewPopup/DeleteFolder", NULL, N_("/_Delete folder"), NULL, NULL, G_CALLBACK(delete_folder_cb) }, ++ {"FolderViewPopup/---", NULL, N_("/---") }, ++ {"FolderViewPopup/CheckNewMessages", NULL, N_("/_Check for new messages"), NULL, NULL, G_CALLBACK(update_tree_cb) }, ++ {"FolderViewPopup/CheckNewFolders", NULL, N_("/C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) }, ++ {"FolderViewPopup/RebuildfTree", NULL, N_("/R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) }, ++ {"FolderViewPopup/---", NULL, N_("/---") }, ++ {"FolderViewPopup/RemoveMailbox", NULL, N_("/Remove _mailbox"), NULL, NULL, G_CALLBACK(remove_mailbox_cb) }, + }; + +-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item); ++static void set_sensitivity(GtkUIManager *factory, FolderItem *item); + + static FolderViewPopup claws_mailmbox_popup = + { + "mailmbox", + "<MailmboxFolder>", +- NULL, ++ claws_mailmbox_popup_entries, ++ G_N_ELEMENTS(claws_mailmbox_popup_entries), ++ NULL, 0, ++ NULL, 0, 0, NULL, NULL, + set_sensitivity + }; + +@@ -85,11 +87,6 @@ + GtkItemFactory *ifactory; + MainWindow *mainwin = mainwindow_get_mainwindow(); + +- n_entries = sizeof(claws_mailmbox_popup_entries) / +- sizeof(claws_mailmbox_popup_entries[0]); +- for (i = 0; i < n_entries; i++) +- claws_mailmbox_popup.entries = g_slist_append(claws_mailmbox_popup.entries, &claws_mailmbox_popup_entries[i]); +- + folderview_register_popup(&claws_mailmbox_popup); + + ifactory = gtk_item_factory_from_widget(mainwin->menubar); +@@ -115,7 +112,7 @@ + gtk_item_factory_delete_item(ifactory, mainwindow_add_mailbox.path); + } + +-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item) ++static void set_sensitivity(GtkUIManager *factory, FolderItem *item) + { + #define SET_SENS(name, sens) \ + menu_set_sensitive(factory, name, sens) +@@ -132,10 +129,13 @@ + #undef SET_SENS + } + +-static void update_tree_cb(FolderView *folderview, guint action, +- GtkWidget *widget) ++#define DO_ACTION(name, act) { if (!strcmp(a_name, name)) act; } ++ ++static void update_tree_cb(GtkAction *action, gpointer data) + { ++ FolderView *folderview = (FolderView *)data; + FolderItem *item; ++ const gchar *a_name = gtk_action_get_name(action); + + item = folderview_get_selected_item(folderview); + g_return_if_fail(item != NULL); +@@ -144,16 +144,12 @@ + + g_return_if_fail(item->folder != NULL); + +- if (action == 0) +- folderview_check_new(item->folder); +- else if (action == 1) +- folderview_rescan_tree(item->folder, FALSE); +- else if (action == 2) +- folderview_rescan_tree(item->folder, TRUE); ++ DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder)); ++ DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE)); ++ DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, FALSE)); + } + +-static void add_mailbox(gpointer callback_data, guint callback_action, +- GtkWidget *widget) ++static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data) + { + MainWindow *mainwin = (MainWindow *) callback_data; + gchar *path, *basename; +@@ -193,10 +189,10 @@ + return; + } + +-static void new_folder_cb(FolderView *folderview, guint action, +- GtkWidget *widget) ++static void new_folder_cb(GtkAction *action, gpointer data) + { +- GtkCTree *ctree = GTK_CTREE(folderview->ctree); ++ FolderView *folderview = (FolderView *)data; ++ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree); + FolderItem *item; + FolderItem *new_item; + gchar *new_folder; +@@ -245,9 +241,10 @@ + folder_write_list(); + } + +-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget) ++static void remove_mailbox_cb(GtkAction *action, gpointer data) + { +- GtkCTree *ctree = GTK_CTREE(folderview->ctree); ++ FolderView *folderview = (FolderView *)data; ++ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree); + GtkCTreeNode *node; + FolderItem *item; + gchar *name; +@@ -276,10 +273,10 @@ + folder_destroy(item->folder); + } + +-static void delete_folder_cb(FolderView *folderview, guint action, +- GtkWidget *widget) ++static void delete_folder_cb(GtkAction *action, gpointer data) + { +- GtkCTree *ctree = GTK_CTREE(folderview->ctree); ++ FolderView *folderview = (FolderView *)data; ++ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree); + FolderItem *item; + gchar *message, *name; + AlertValue avalue; +@@ -329,24 +326,41 @@ + + } + +-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget) ++static void move_folder_cb(GtkAction *action, gpointer data) ++{ ++ FolderView *folderview = (FolderView *)data; ++ FolderItem *from_folder = NULL, *to_folder = NULL; ++ ++ from_folder = folderview_get_selected_item(folderview); ++ if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class()) ++ return; ++ ++ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE); ++ if (!to_folder) ++ return; ++ ++ folderview_move_folder(folderview, from_folder, to_folder, 0); ++} ++ ++static void copy_folder_cb(GtkAction *action, gpointer data) + { ++ FolderView *folderview = (FolderView *)data; + FolderItem *from_folder = NULL, *to_folder = NULL; + + from_folder = folderview_get_selected_item(folderview); + if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class()) + return; + +- to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL); ++ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE); + if (!to_folder) + return; + +- folderview_move_folder(folderview, from_folder, to_folder, action); ++ folderview_move_folder(folderview, from_folder, to_folder, 1); + } + +-static void rename_folder_cb(FolderView *folderview, guint action, +- GtkWidget *widget) ++static void rename_folder_cb(GtkAction *action, gpointer data) + { ++ FolderView *folderview = (FolderView *)data; + FolderItem *item, *parent; + gchar *new_folder; + gchar *name; diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 9d3bc8ebdd..c973661ef3 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r74" +PR = "r75" inherit task diff --git a/packages/tasks/task-beagleboard-demo.bb b/packages/tasks/task-beagleboard-demo.bb new file mode 100644 index 0000000000..1d1a0a6bcf --- /dev/null +++ b/packages/tasks/task-beagleboard-demo.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Task for Beagleboard-demo-image" + +PR = "r0" + +inherit task + +ECONFIG ?= "e-wm-config-standard e-wm-config-default" + +RDEPENDS_${PN} = "\ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-zeroconf-audio \ + angstrom-led-config \ + gpe-scap \ + psplash \ + mime-support e-wm ${ECONFIG} exhibit \ + xterm xmms \ + epiphany firefox midori \ + swfdec-mozilla \ + hicolor-icon-theme gnome-icon-theme \ + jaaa nmap iperf gnuplot \ + abiword \ + gnumeric \ + gimp \ + powertop oprofile \ + pidgin \ +# irssi \ + mplayer omapfbplay \ + gnome-games \ + rt73-firmware zd1211-firmware \ + stalonetray \ + synergy \ + x11vnc \ + angstrom-gnome-icon-theme-enable \ + openssh-scp openssh-ssh \ +" diff --git a/packages/tasks/task-xqtlauncher.bb b/packages/tasks/task-xqtlauncher.bb index 3d9029e5d1..690d0dfd19 100644 --- a/packages/tasks/task-xqtlauncher.bb +++ b/packages/tasks/task-xqtlauncher.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Tasks for xqtlauncher stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
inherit task
@@ -9,8 +9,8 @@ PACKAGES = "task-xqtlauncher task-xqtlauncher-blackbox" #xkbd is currently needed becuse of a bug at xqt2
RDEPENDS_task-xqtlauncher = "xqtlauncher \
- xqtlauncher-xkbd-desktop \
- "
+ xkbd \
+ "
#
# xqtlauncher with blackbox as wm
diff --git a/packages/toscoterm/toscoterm_git.bb b/packages/toscoterm/toscoterm_git.bb new file mode 100644 index 0000000000..fd9181d0a0 --- /dev/null +++ b/packages/toscoterm/toscoterm_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A very small and simple terminal emulator" +SECTION = "x11/applications" +LICENSE = "GPLv3" +DEPENDS = "vte" +HOMEPAGE = "https://projetos.ossystems.com.br/projects/show/toscoterm" +PV = "0.0+gitr${SRCREV}" +PR = "r2" + +SRC_URI = "git://projetos.ossystems.com.br/git/toscoterm.git;protocol=git" +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake \ + CC="${CC}" \ + CFLAGS="${CFLAGS} `pkg-config --cflags gtk-2.0` `pkg-config --cflags vte`" \ + LDFLAGS="${LDFLAGS} `pkg-config --libs gtk+-2.0` `pkg-config --libs vte`" +} diff --git a/packages/tracker/tracker_0.5.4.bb b/packages/tracker/tracker_0.5.4.bb index e9a7c79a80..1bbd89e628 100644 --- a/packages/tracker/tracker_0.5.4.bb +++ b/packages/tracker/tracker_0.5.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata ab LICENSE = "GPLv2" DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf" -PR = "r1" +PR = "r2" SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \ file://no-ioprio.patch;patch=1" @@ -10,7 +10,11 @@ SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \ inherit autotools pkgconfig do_install_append() { - cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ + cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true +} + +do_stage() { + autotools_stage_all } FILES_${PN} += "${datadir}/dbus-1/" diff --git a/packages/wesnoth/wesnoth_1.4.5.bb b/packages/wesnoth/wesnoth_1.4.6.bb index 2c08a89bee..8b80d71c43 100644 --- a/packages/wesnoth/wesnoth_1.4.5.bb +++ b/packages/wesnoth/wesnoth_1.4.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native" -PR = "r2" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2" diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index cd304509bb..ddf8089587 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -38,8 +38,9 @@ PACKAGES =+ "xserver-security-policy" FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf" -PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr" +PACKAGES =+ "${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr" +FILES_${PN}-fbdev = "${bindir}/Xfbdev" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb index 92ef22fd63..378f5a1e20 100644 --- a/packages/xorg-xserver/xserver-xorg_1.5.3.bb +++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb @@ -2,7 +2,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" -PE = "1" +PE = "2" PR = "r1" SRC_URI += "file://drmfix.patch;patch=1 \ diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb b/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb deleted file mode 100644 index 17ba103d20..0000000000 --- a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" -HOMEPAGE = "http://angstrom-distribution.org/" -LICENSE = "GPL" -PR = "r0" - -RDEPENDS = "xkbd xqtlauncher" - -SRC_URI = "file://xkbd.desktop" - -do_install() { - cd ${WORKDIR} - install -d ${D}${bindir} - install -d ${D}${palmtopdir}/apps/XQt2/ - install -m 0644 xkbd.desktop ${D}${palmtopdir}/apps/XQt2 - ln -sf ${bindir}/xqtlauncher ${D}${bindir}/runxkbd -} - -FILES_${PN} += "${palmtopdir}/apps/XQt2 \ - ${palmtopdir}/apps/XQt2/xkbd.desktop " diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop b/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop deleted file mode 100644 index 78decbfda0..0000000000 --- a/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Exec=runxkbd xkbd -Icon=Xqt.png -Type=Application -Name=X/Qt2 with xkbd diff --git a/packages/xqtlauncher/xqtlauncher.bb b/packages/xqtlauncher/xqtlauncher.bb index 0897ddb862..043ee566e3 100644 --- a/packages/xqtlauncher/xqtlauncher.bb +++ b/packages/xqtlauncher/xqtlauncher.bb @@ -1,13 +1,17 @@ DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" HOMEPAGE = "http://angstrom-distribution.org/" LICENSE = "GPL" -PR = "r0" +PR = "r1" RDEPENDS = "xqt2 xorg-minimal-fonts" SRC_URI = "file://dot.directory \ file://startxqt \ file://startxqt-wrapper \ + file://xqtlauncher-convert.sh \ + file://xqtlauncher-cleanup.sh \ + file://convert.desktop \ + file://cleanup.desktop \ file://xqtlauncher " do_install() { @@ -15,8 +19,16 @@ do_install() { install -d ${D}${bindir} install -m 0755 startxqt startxqt-wrapper xqtlauncher ${D}${bindir} install -d ${D}${palmtopdir}/apps/XQt2/ - install -m 0644 dot.directory ${D}${palmtopdir}/apps/XQt2 + install -m 0644 dot.directory ${D}${palmtopdir}/apps/XQt2/.directory + install -m 0644 convert.desktop cleanup.desktop ${D}${palmtopdir}/apps/XQt2/ + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 startxqt startxqt-wrapper xqtlauncher xqtlauncher-cleanup.sh xqtlauncher-convert.sh ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/rc5.d/ + ln -sf ../init.d/xqtlauncher-convert.sh ${D}${sysconfdir}/rc5.d/S98xqtlauncher-convert + ln -sf ../init.d/xqtlauncher-cleanup.sh ${D}${sysconfdir}/rc5.d/S98xqtlauncher-cleanup } FILES_${PN} += "${palmtopdir}/apps/XQt2 \ + ${palmtopdir}/apps/XQt2/convert.desktop \ + ${palmtopdir}/apps/XQt2/cleanup.desktop \ ${palmtopdir}/apps/XQt2/.directory " diff --git a/packages/xqtlauncher/xqtlauncher/cleanup.desktop b/packages/xqtlauncher/xqtlauncher/cleanup.desktop new file mode 100644 index 0000000000..d0436178ad --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/cleanup.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Exec=/etc/init.d/xqtlauncher-cleanup.sh +Icon=Xqt.png +Type=Application +Name=Cleanup Icons diff --git a/packages/xqtlauncher/xqtlauncher/convert.desktop b/packages/xqtlauncher/xqtlauncher/convert.desktop new file mode 100644 index 0000000000..ca70c43bdb --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/convert.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Exec=/etc/init.d/xqtlauncher-convert.sh +Icon=Xqt.png +Type=Application +Name=Create Icons diff --git a/packages/xqtlauncher/xqtlauncher/xqtlauncher-cleanup.sh b/packages/xqtlauncher/xqtlauncher/xqtlauncher-cleanup.sh new file mode 100755 index 0000000000..3ccf333237 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/xqtlauncher-cleanup.sh @@ -0,0 +1,21 @@ +#!/bin/ash +#This program cleans up the mess which convert.sh leaves if you remove a package +for i in `find /usr/lib/opie/apps/XQt2 -name *.desktop`; do + export name=$(echo $i | awk 'BEGIN {FS="."} {gsub("/",".")} {print $(NF-1)}') + #don't delete convert and cleanup icons + if [ $i != "/usr/lib/opie/apps/XQt2/convert.desktop" ] && [ $i != "/usr/lib/opie/apps/XQt2/cleanup.desktop" ] ; then + newfile=$(find /usr/share/applications/ -name $name.desktop) + else + newfile="donotdelete" + fi + if [ -z $newfile ] ; then + echo $name + echo $i + icon=$(cat $i | awk 'BEGIN {FS="="} {if ($1 == "Icon") {print $2} }') + rm -f /usr/lib/opie/bin/run$name + find /usr/lib/opie/pics/ -name $icon.* -exec rm -f {} \; + rm -f $i + fi +done +#update the icons +/usr/bin/icon-reload.sh diff --git a/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh b/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh new file mode 100755 index 0000000000..0356d332ff --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh @@ -0,0 +1,23 @@ +#!/bin/ash +#This program converts /usr/share/applications/*.desktop in /usr/lib/opie/apps/XQt2/*.desktop files. +for i in `find /usr/share/applications -name *.desktop`; do + export name=$(echo $i | awk 'BEGIN {FS="."} {gsub("/",".")} {print $(NF-1)}') + newfile=/usr/lib/opie/apps/XQt2/$name.desktop + if [ ! -f $newfile ] ; then + #cat $i | awk 'BEGIN {FS="="} {if ($1 == "Exec") {print "Exec=run"ENVIRON["name"]" " $2} else if ($1 == "Icon") {print "Icon=/usr/share/pixmaps/"$2} else {print $0} }' > $newfile + cat $i | awk 'BEGIN {FS="="} {if ($1 == "Exec") {print "Exec=run"ENVIRON["name"]" " $2} else {print $0} }' > $newfile + icon=$(cat $i | awk 'BEGIN {FS="="} {if ($1 == "Icon") {print $2} }') + ln -sf /usr/bin/xqtlauncher /usr/lib/opie/bin/run$name + #We need to make symlinks for the pics because opie can not handle pics with paths :( + #Check if it has a leading /! + if expr $icon : />/dev/null ; then + echo $icon + ln -sf $icon /usr/lib/opie/pics/$(echo $icon | awk 'BEGIN {FS="/"} {print $NF}') + else + echo $icon + ln -sf $(find /usr/share/pixmaps -name $icon) /usr/lib/opie/pics/$(echo $icon | awk 'BEGIN {FS="/"} {print $NF}') + fi + fi +done +#update the icons +/usr/bin/icon-reload.sh |