diff options
40 files changed, 196 insertions, 258 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 2c2e0acb03..5641c8ee39 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1 +1,8 @@ +PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.2.14" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" + diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index aaf7b02a09..43ffa1de9f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,6 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a585fdeca6..4d92f48928 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -23,7 +23,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "606" +SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "73" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 92fd42f4f8..3fbe79e354 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/defconfig index 11ec1b8aa6..6cf2eb19ee 100644 --- a/packages/busybox/busybox-1.7.2/defconfig +++ b/packages/busybox/busybox-1.7.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.7.2 -# Mon Feb 4 10:11:39 2008 +# Wed Feb 13 13:31:37 2008 # CONFIG_HAVE_DOT_CONFIG=y @@ -73,7 +73,7 @@ CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_FANCY_KEYS=y +# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 CONFIG_FEATURE_EDITING_SAVEHISTORY=y @@ -143,7 +143,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_ISOFMT is not set CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -281,7 +281,7 @@ CONFIG_SETCONSOLE=y CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set # CONFIG_FEATURE_RUN_PARTS_FANCY is not set CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y @@ -370,29 +370,29 @@ CONFIG_XARGS=y # CONFIG_FEATURE_SHADOWPASSWDS is not set # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_ADDUSER=y +CONFIG_DELUSER=y +CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y # CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set +CONFIG_VLOCK=y # # Linux Ext2 FS Progs diff --git a/packages/opie-irc/files/.mtn2git_empty b/packages/busybox/busybox-1.9.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-irc/files/.mtn2git_empty +++ b/packages/busybox/busybox-1.9.1/.mtn2git_empty diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 285096ce43..75f59cf932 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r6" +PR = "r8" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb new file mode 100644 index 0000000000..85b2abbc5c --- /dev/null +++ b/packages/busybox/busybox_1.9.1.bb @@ -0,0 +1,112 @@ +require busybox.inc +PR = "r0" + +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://hwclock.sh \ + file://mount.busybox \ + file://syslog \ + file://syslog.conf \ + file://udhcpscript.patch;patch=1 \ + file://umount.busybox \ + file://run_parts.c \ + file://defconfig" + +EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" + +do_configure () { + cp ${WORKDIR}/run_parts.c ${S}/debianutils/ + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + cml1_do_configure +} + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + base_do_compile +} + +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links +} diff --git a/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/packages/gnome/gconf-dbus/gconf-dbus-update.patch deleted file mode 100644 index 9870078b86..0000000000 --- a/packages/gnome/gconf-dbus/gconf-dbus-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -? gconf/gconf.service -Index: gconf/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v -retrieving revision 1.78.4.8 -diff -u -r1.78.4.8 Makefile.am ---- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8 -+++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000 -@@ -155,6 +155,7 @@ - - libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined - libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS) -+libgconf_2_la_CFLAGS = $(AM_CFLAGS) - - if HAVE_DBUS - servicedir = $(DBUS_SERVICE_DIR) -Index: backends/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/backends/Makefile.am,v -retrieving revision 1.30 -diff -u -r1.30 Makefile.am ---- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30 -+++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000 -@@ -17,6 +17,7 @@ - - libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined - libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la -+libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS) - - libgconfbackend_xml_la_SOURCES = \ - markup-backend.c \ diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch deleted file mode 100644 index c195aad639..0000000000 --- a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800 -+++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800 -@@ -115,6 +115,13 @@ - - typedef struct _XMLSource XMLSource; - -+extern GConfLock* -+gconf_get_lock (const gchar *lock_directory, -+ GError **err); -+extern gboolean -+gconf_release_lock (GConfLock *lock, -+ GError **err); -+ - /* XMLSource **/ - - struct _XMLSource { diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch deleted file mode 100644 index 312a356c84..0000000000 --- a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800 -+++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800 -@@ -84,7 +84,7 @@ - xml_test_OBJECTS = $(am_xml_test_OBJECTS) - xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \ -- $(top_builddir)/backends/libgconfbackend-oldxml.la -+ libgconfbackend-oldxml.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb deleted file mode 100644 index 6128eac3e2..0000000000 --- a/packages/gnome/gconf-dbus_cvs.bb +++ /dev/null @@ -1,37 +0,0 @@ -SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt" -DESCRIPTION = "Settings daemon using DBUS for communication." -LICENSE = "GPL" -PROVIDES = "gconf" -RPROVIDES_${PN} = "gconf" -RPROVIDES_${PN}-dev = "gconf-dev" - -PV = "0.0+cvs${SRCDATE}" -PR = "r8" - -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ - file://gconf-dbus-update.patch;patch=1;pnum=0 \ - file://69gconfd-dbus" - -inherit pkgconfig autotools -S = "${WORKDIR}/gconf" - -FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" - -EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" - -HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" - -do_stage() { - oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gconf/2/gconf/ - ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) - install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 -} - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ - install -d ${D}/${datadir}/dbus-1.0/services/ - install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ -} diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index e7875dc72e..074b3015c2 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -1,39 +1,38 @@ -SECTION = "x11/utils" +DESCRIPTION = "The GNOME Settings daemon using DBUS for communication." DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native" -DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" +SECTION = "x11/utils" PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" - PV = "2.16.0+svnr${SRCREV}" -PR = "r5" +PR = "r0" -SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ - file://69gconfd-dbus" +inherit autotools pkgconfig -inherit pkgconfig autotools +SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ + file://69gconfd-dbus" S = "${WORKDIR}/trunk" PARALLEL_MAKE = "" -FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" -FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" -FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" - -EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" - +EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" do_configure_prepend() { - touch gtk-doc.make + touch gtk-doc.make } do_stage() { - autotools_stage_all - install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 + autotools_stage_all + install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 } -do_install_append () { +do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ } + +FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" +FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" + diff --git a/packages/tslib/tslib-1.0/bd-neon/.mtn2git_empty b/packages/gstreamer/gst-plugin-pulse/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib-1.0/bd-neon/.mtn2git_empty +++ b/packages/gstreamer/gst-plugin-pulse/.mtn2git_empty diff --git a/packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch b/packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch new file mode 100644 index 0000000000..377a4f9589 --- /dev/null +++ b/packages/gstreamer/gst-plugin-pulse/dont-overload-pulseaudio.patch @@ -0,0 +1,13 @@ +Index: gst-pulse-0.9.7/src/pulsesink.c +=================================================================== +--- gst-pulse-0.9.7.orig/src/pulsesink.c ++++ gst-pulse-0.9.7/src/pulsesink.c +@@ -477,6 +477,8 @@ static guint gst_pulsesink_write(GstAudi + length -= l; + + sum += l; ++ ++ usleep( 500 ); + } + + pa_threaded_mainloop_unlock(pulsesink->mainloop); diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb index a1e321c73e..5a83f3915b 100644 --- a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb +++ b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb @@ -2,11 +2,12 @@ DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source" HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/" LICENSE = "GPL" DEPENDS = "gstreamer pulseaudio" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \ + file://dont-overload-pulseaudio.patch;patch=1" S = "${WORKDIR}/gst-pulse-${PV}" inherit autotools diff --git a/packages/opie-irc/files/utf8-topic.patch b/packages/opie-irc/files/utf8-topic.patch deleted file mode 100644 index d8d9a52ca9..0000000000 --- a/packages/opie-irc/files/utf8-topic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/ircmessageparser.cpp b/ircmessageparser.cpp -index c449a65..ae47f69 100644 ---- a/ircmessageparser.cpp -+++ b/ircmessageparser.cpp -@@ -667,11 +667,11 @@ void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) { - void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { - IRCChannel *channel = m_session->getChannel(message->param(1).lower()); - if (channel) { -- IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); -+ IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + channel->channelname() + tr(" is \"") + message->param(2) + "\""); - output.addParam(channel); - emit outputReady(output); - } else { -- IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\"")); -+ IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + message->param(1) + tr(" is \"") + message->param(2) + "\""); - output.addParam(0); - emit outputReady(output); - } diff --git a/packages/opie-irc/files/utf8.patch b/packages/opie-irc/files/utf8.patch deleted file mode 100644 index cc562838a2..0000000000 --- a/packages/opie-irc/files/utf8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/ircconnection.cpp b/ircconnection.cpp -index 88e63f7..fb7e168 100644 ---- a/ircconnection.cpp -+++ b/ircconnection.cpp -@@ -29,7 +29,8 @@ void IRCConnection::sendLine(QString line) { - while((line.right(1) == "\n") || (line.right(1) == "\r")) - line = line.left(line.length() - 1); - line.append("\r\n"); -- m_socket->writeBlock(line, line.length()); -+ QCString uline = line.utf8(); -+ m_socket->writeBlock(uline, uline.length()); - } - - void IRCConnection::sendCTCPReply(const QString &nickname, const QString &type, const QString &args) { -@@ -77,7 +78,7 @@ void IRCConnection::login() { - /* Called when data arrives on the socket */ - void IRCConnection::dataReady() { - while(m_socket->canReadLine()) { -- IRCMessage message(m_socket->readLine()); -+ IRCMessage message(QString::fromUtf8(m_socket->readLine())); - if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) { - /* Now autojoin all channels specified inside the server profile */ - QStringList channels = QStringList::split(QChar(','), m_server->channels()); diff --git a/packages/opie-irc/opie-irc_1.2.3.bb b/packages/opie-irc/opie-irc_1.2.3.bb index 2f333d6a41..1166c07eef 100644 --- a/packages/opie-irc/opie-irc_1.2.3.bb +++ b/packages/opie-irc/opie-irc_1.2.3.bb @@ -1,10 +1,8 @@ require ${PN}.inc -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \ ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - file://utf8.patch;patch=1 \ - file://utf8-topic.patch;patch=1 " + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb index 63e70179a4..ecf7f645a5 100644 --- a/packages/opie-irc/opie-irc_cvs.bb +++ b/packages/opie-irc/opie-irc_cvs.bb @@ -1,11 +1,9 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \ ${HANDHELDS_CVS};module=opie/help \ ${HANDHELDS_CVS};module=opie/apps \ - ${HANDHELDS_CVS};module=opie/pics \ - file://utf8.patch;patch=1 \ - file://utf8-topic.patch;patch=1 " + ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 668c2a7833..5b15634dd0 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml8" +PR = "ml9" PYTHON_MAJMIN = "2.5" @@ -103,3 +103,5 @@ FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" PACKAGES += "python-man" FILES_python-man = "${datadir}/man" +PACKAGES_DYNAMIC += "python-ncurses" + diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb index 270cd0fbf8..051279e33f 100644 --- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb +++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb @@ -1,6 +1,8 @@ DESCRIPTION = "Precompiled SharpROM toolchain glue package" LICENSE = "GPL" SECTION = "base" +# see bug 2199 for the reason the following line is in here +DEPENDS = "virtual/linux-libc-headers" PROVIDES_sharprom-compatible = "\ virtual/arm-linux-gcc-2.95 \ virtual/arm-linux-libc-for-gcc \ diff --git a/packages/tslib/tslib-1.0/ts.conf b/packages/tslib/tslib-1.0/ts.conf deleted file mode 100644 index 1abde2fc7f..0000000000 --- a/packages/tslib/tslib-1.0/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=0 - -# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d -# module_raw collie - -# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 -# module_raw corgi - -# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface -# module_raw ucb1x00 - -# Uncomment if you're using an HP iPaq h3600 or similar -# module_raw h3600 - -# Uncomment if you're using a Hitachi Webpad -# module_raw mk712 - -# Uncomment if you're using an IBM Arctic II -# module_raw arctic2 - -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib-1.0/fic-gta01/.mtn2git_empty b/packages/tslib/tslib/bd-neon/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib-1.0/fic-gta01/.mtn2git_empty +++ b/packages/tslib/tslib/bd-neon/.mtn2git_empty diff --git a/packages/tslib/tslib-1.0/bd-neon/ts.conf b/packages/tslib/tslib/bd-neon/ts.conf index 15fe294ce6..15fe294ce6 100644 --- a/packages/tslib/tslib-1.0/bd-neon/ts.conf +++ b/packages/tslib/tslib/bd-neon/ts.conf diff --git a/packages/tslib/tslib-1.0/bd-neon/tslib.sh b/packages/tslib/tslib/bd-neon/tslib.sh index b5f1c906f3..b5f1c906f3 100644 --- a/packages/tslib/tslib-1.0/bd-neon/tslib.sh +++ b/packages/tslib/tslib/bd-neon/tslib.sh diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/tslib/tslib/fic-gta01/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-115/.mtn2git_empty +++ b/packages/tslib/tslib/fic-gta01/.mtn2git_empty diff --git a/packages/tslib/tslib-1.0/fic-gta01/ts.conf b/packages/tslib/tslib/fic-gta01/ts.conf index 82f712ef41..82f712ef41 100644 --- a/packages/tslib/tslib-1.0/fic-gta01/ts.conf +++ b/packages/tslib/tslib/fic-gta01/ts.conf diff --git a/packages/tslib/tslib/ts.conf b/packages/tslib/tslib/ts.conf index 1b0da937e8..1abde2fc7f 100644 --- a/packages/tslib/tslib/ts.conf +++ b/packages/tslib/tslib/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input +module_raw input grab_events=0 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch b/packages/tslib/tslib/tslib-input_raw-grab_events.patch index 4bd0a05531..4bd0a05531 100644 --- a/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch +++ b/packages/tslib/tslib/tslib-input_raw-grab_events.patch diff --git a/packages/udev/udev-115/noasmlinkage.patch b/packages/udev/udev-115/noasmlinkage.patch deleted file mode 100644 index 5824d29590..0000000000 --- a/packages/udev/udev-115/noasmlinkage.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - udevd.c | 2 +- - udevstart.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: udev-115/udevd.c -=================================================================== ---- udev-115.orig/udevd.c 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/udevd.c 2007-09-20 17:04:51.000000000 +0200 -@@ -767,7 +767,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGINT: -Index: udev-115/udevstart.c -=================================================================== ---- udev-115.orig/udevstart.c 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/udevstart.c 2007-09-20 17:04:51.000000000 +0200 -@@ -304,7 +304,7 @@ - } - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/packages/udev/udev-118/.mtn2git_empty b/packages/udev/udev-118/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-118/.mtn2git_empty diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-118/flags.patch index 13f20eb6a8..13f20eb6a8 100644 --- a/packages/udev/udev-115/flags.patch +++ b/packages/udev/udev-118/flags.patch diff --git a/packages/udev/udev-115/init b/packages/udev/udev-118/init index 73c655a0ee..73c655a0ee 100644 --- a/packages/udev/udev-115/init +++ b/packages/udev/udev-118/init diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-118/local.rules index 5b926018f5..5b926018f5 100644 --- a/packages/udev/udev-115/local.rules +++ b/packages/udev/udev-118/local.rules diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-118/permissions.rules index 99e03b1036..99e03b1036 100644 --- a/packages/udev/udev-115/permissions.rules +++ b/packages/udev/udev-118/permissions.rules diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-118/udev.rules index 72be706e84..72be706e84 100644 --- a/packages/udev/udev-115/udev.rules +++ b/packages/udev/udev-118/udev.rules diff --git a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch index 87cafcaa9d..87cafcaa9d 100644 --- a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch +++ b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch diff --git a/packages/udev/udev-115/vol_id_ld.patch b/packages/udev/udev-118/vol_id_ld.patch index 11126eef8d..11126eef8d 100644 --- a/packages/udev/udev-115/vol_id_ld.patch +++ b/packages/udev/udev-118/vol_id_ld.patch diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_118.bb index 9dd0bf2c8f..a4c12877f5 100644 --- a/packages/udev/udev_115.bb +++ b/packages/udev/udev_118.bb @@ -7,13 +7,13 @@ PR = "r0" DEFAULT_PREFERENCE = "-115" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://vol_id_ld.patch;patch=1 \ - file://udevtrigger_add_devname_filtering.patch;patch=1 \ - file://mount.blacklist \ - " +SRC_URI = "\ + http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://flags.patch;patch=1 \ + file://vol_id_ld.patch;patch=1 \ + file://udevtrigger_add_devname_filtering.patch;patch=1 \ + file://mount.blacklist \ +" require udev.inc @@ -24,6 +24,10 @@ FILES_${PN}-dbg += "${base_libdir}/udev/.debug" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" +do_compile_prepend() { + sed -i s,asmlinkage,, *.c +} + do_install () { install -d ${D}${usrsbindir} \ ${D}${sysconfdir} \ |