diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-20 02:05:09 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-20 02:05:09 +0000 |
| commit | 1df2b2b20438049c10588ebc28ca57b8a9bd7f9f (patch) | |
| tree | 8136ecadd0969b1aac18482a40d562dc41ef8243 | |
| parent | fd0389bfa4e929d119e4d0aada7d6016762b4835 (diff) | |
| parent | 11be4e50131c91525dcac42d8a1f3c12a217d1ac (diff) | |
merge of '574cd9ef25c6950932d71b09ba6baafa73d76c6b'
and '96853f8828d3f70854cfe9cd4fbf096e5a258e97'
72 files changed, 1022 insertions, 191 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 5641c8ee39..b8685a578e 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,7 +1,7 @@ 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_libtool = "1.5.10" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" diff --git a/packages/alsa/alsa-state/akita/asound.state b/packages/alsa/alsa-state/akita/asound.state index ee5ef519c3..d1bacfb708 100644 --- a/packages/alsa/alsa-state/akita/asound.state +++ b/packages/alsa/alsa-state/akita/asound.state @@ -6,8 +6,8 @@ state.Spitz { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 23 - value.1 23 + value.0 48 + value.1 48 } control.2 { comment.access 'read write' @@ -15,8 +15,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.3 { comment.access 'read write' @@ -24,8 +24,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.4 { comment.access 'read write' @@ -33,8 +33,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Headphone Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.5 { comment.access 'read write' @@ -42,8 +42,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Speaker Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.6 { comment.access 'read write' @@ -92,8 +92,8 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 220 + value.1 220 } control.11 { comment.access 'read write' @@ -122,7 +122,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Bass Volume' - value 11 + value 0 } control.14 { comment.access 'read write' @@ -131,7 +131,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 11 + value 0 } control.15 { comment.access 'read write' @@ -158,7 +158,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name '3D Volume' - value 9 + value 0 } control.18 { comment.access 'read write' @@ -226,7 +226,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ALC Capture ZC Switch' - value false + value true } control.25 { comment.access 'read write' @@ -235,7 +235,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 0 + value 9 } control.26 { comment.access 'read write' @@ -244,7 +244,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Decay Time' - value 3 + value 9 } control.27 { comment.access 'read write' @@ -253,7 +253,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 3 } control.28 { comment.access 'read write' @@ -298,7 +298,7 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'Right ADC Capture Volume' - value 0 + value 195 } control.33 { comment.access 'read write' @@ -306,7 +306,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ZC Timeout Switch' - value false + value true } control.34 { comment.access 'read write' @@ -331,8 +331,8 @@ state.Spitz { comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 0 - value.1 0 + value.0 3 + value.1 3 } control.37 { comment.access 'read write' @@ -379,8 +379,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' @@ -389,8 +389,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.43 { comment.access 'read write' @@ -411,7 +411,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value 'Mono (Left)' + value 'Digital Mono' } control.45 { comment.access 'read write' @@ -423,7 +423,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Left ADC Mux' - value 'Mono (Left)' + value 'Digital Mono' } control.46 { comment.access 'read write' @@ -458,7 +458,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Right Line Mux' - value 'Line 2' + value Differential } control.49 { comment.access 'read write' @@ -471,7 +471,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Left Line Mux' - value 'Line 1' + value Differential } control.50 { comment.access 'read write' @@ -483,7 +483,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Right PGA Mux' - value 'Line 2' + value Differential } control.51 { comment.access 'read write' @@ -495,7 +495,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Left PGA Mux' - value 'Line 1' + value Differential } control.52 { comment.access 'read write' diff --git a/packages/alsa/alsa-state/spitz/asound.state b/packages/alsa/alsa-state/spitz/asound.state index 81b6ed9814..d1bacfb708 100644 --- a/packages/alsa/alsa-state/spitz/asound.state +++ b/packages/alsa/alsa-state/spitz/asound.state @@ -6,8 +6,8 @@ state.Spitz { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 23 - value.1 23 + value.0 48 + value.1 48 } control.2 { comment.access 'read write' @@ -15,8 +15,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.3 { comment.access 'read write' @@ -24,8 +24,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.4 { comment.access 'read write' @@ -33,8 +33,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Headphone Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.5 { comment.access 'read write' @@ -42,8 +42,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Speaker Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.6 { comment.access 'read write' @@ -92,8 +92,8 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 220 + value.1 220 } control.11 { comment.access 'read write' @@ -131,7 +131,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 15 + value 0 } control.15 { comment.access 'read write' @@ -188,7 +188,7 @@ state.Spitz { comment.item.1 Playback iface MIXER name '3D Mode' - value Capture + value Playback } control.21 { comment.access 'read write' @@ -218,7 +218,7 @@ state.Spitz { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Off + value Left } control.24 { comment.access 'read write' @@ -226,7 +226,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ALC Capture ZC Switch' - value false + value true } control.25 { comment.access 'read write' @@ -235,7 +235,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 0 + value 9 } control.26 { comment.access 'read write' @@ -244,7 +244,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Decay Time' - value 3 + value 9 } control.27 { comment.access 'read write' @@ -253,7 +253,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 3 } control.28 { comment.access 'read write' @@ -306,7 +306,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ZC Timeout Switch' - value false + value true } control.34 { comment.access 'read write' @@ -322,7 +322,7 @@ state.Spitz { comment.count 1 iface MIXER name 'Right Speaker Playback Invert Switch' - value false + value true } control.36 { comment.access 'read write' @@ -331,8 +331,8 @@ state.Spitz { comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 0 - value.1 0 + value.0 3 + value.1 3 } control.37 { comment.access 'read write' @@ -341,8 +341,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Left Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.38 { comment.access 'read write' @@ -351,8 +351,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Right Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.39 { comment.access 'read write' @@ -361,8 +361,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Mono Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.40 { comment.access 'read write' @@ -379,8 +379,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' @@ -389,8 +389,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.43 { comment.access 'read write' @@ -399,7 +399,7 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 121 + value 0 } control.44 { comment.access 'read write' @@ -411,7 +411,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value Stereo + value 'Digital Mono' } control.45 { comment.access 'read write' @@ -423,7 +423,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Left ADC Mux' - value Stereo + value 'Digital Mono' } control.46 { comment.access 'read write' @@ -458,7 +458,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Right Line Mux' - value 'Line 1' + value Differential } control.49 { comment.access 'read write' @@ -471,7 +471,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Left Line Mux' - value 'Line 1' + value Differential } control.50 { comment.access 'read write' @@ -483,7 +483,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Right PGA Mux' - value 'Line 1' + value Differential } control.51 { comment.access 'read write' @@ -495,7 +495,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Left PGA Mux' - value 'Line 1' + value Differential } control.52 { comment.access 'read write' @@ -535,7 +535,7 @@ state.Spitz { comment.count 1 iface MIXER name 'Right Mixer Left Playback Switc' - value true + value false } control.57 { comment.access 'read write' diff --git a/packages/gaim/.mtn2git_empty b/packages/blackbox/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gaim/.mtn2git_empty +++ b/packages/blackbox/.mtn2git_empty diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb new file mode 100644 index 0000000000..50dc5a69c6 --- /dev/null +++ b/packages/blackbox/blackbox_0.70.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Blackbox Window Manager" +SECTION = "x11/wm" +LICENSE = "GPL" +DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \ + file://remove-host-includes.patch;patch=1" +S = "${WORKDIR}/blackbox-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus" + diff --git a/packages/gaim/files/.mtn2git_empty b/packages/blackbox/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gaim/files/.mtn2git_empty +++ b/packages/blackbox/files/.mtn2git_empty diff --git a/packages/blackbox/files/remove-host-includes.patch b/packages/blackbox/files/remove-host-includes.patch new file mode 100644 index 0000000000..bf557b51da --- /dev/null +++ b/packages/blackbox/files/remove-host-includes.patch @@ -0,0 +1,19 @@ +Index: blackbox-0.70.1/configure.ac +=================================================================== +--- blackbox-0.70.1.orig/configure.ac ++++ blackbox-0.70.1/configure.ac +@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc]) + dnl Determine default prefix + test "x$prefix" = "xNONE" && prefix="$ac_default_prefix" + +-dnl Look in the most logical places for external libraries +-CPPFLAGS="$CPPFLAGS -I$prefix/include" +-LDFLAGS="$LDFLAGS -L$prefix/lib" +-if test "x$prefix" != "x/usr/local"; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + dnl Locate required external software + AC_PROG_CC + diff --git a/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/packages/busybox/busybox-1.9.1/sort-z-nul.patch new file mode 100644 index 0000000000..55452a4524 --- /dev/null +++ b/packages/busybox/busybox-1.9.1/sort-z-nul.patch @@ -0,0 +1,50 @@ +Summary: 0001591: inconsistent behavior of sort -z + +URL: http://busybox.net/bugs/view.php?id=1591 +http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u + +Description: + +busybox sort -z does: +use NUL instead of EOL on input + +GNU sort -z does: +use NUL instead of EOL on input and output + +GNU sort -z documents: +use NUL instead of EOL on input + +Additional Information: + +Note that sort -z is not part of any standard. But several applications +(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior. + +GNU sort documentation bug was reported to coreutils maintainers. + +Notes: + +vda 02-13-08 06:30 (0004364) +Fixed in revision 21004. Thanks! + +--- busybox/coreutils/sort.c 2007/11/16 12:39:16 20435 ++++ busybox/coreutils/sort.c 2008/02/13 14:30:33 21004 +@@ -32,7 +32,7 @@ + FLAG_u = 8, /* Unique */ + FLAG_c = 0x10, /* Check: no output, exit(!ordered) */ + FLAG_s = 0x20, /* Stable sort, no ascii fallback at end */ +- FLAG_z = 0x40, /* Input is null terminated, not \n */ ++ FLAG_z = 0x40, /* Input and output is NUL terminated, not \n */ + /* These can be applied to search keys, the previous four can't */ + FLAG_b = 0x80, /* Ignore leading blanks */ + FLAG_r = 0x100, /* Reverse */ +@@ -396,8 +396,9 @@ + if (linecount) linecount = flag+1; + } + /* Print it */ ++ flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; + for (i = 0; i < linecount; i++) +- fprintf(outfile, "%s\n", lines[i]); ++ fprintf(outfile, "%s%c", lines[i], flag); + + fflush_stdout_and_exit(EXIT_SUCCESS); + } diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index 1626b1c6d2..3f8184fcc0 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ + file://sort-z-nul.patch;patch=1;status=upstream \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index b2ced23d99..ed0a0b3cf2 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -1,5 +1,6 @@ +DESCRIPTION = "A message bus system for inter-process communication" HOMEPAGE = "http://dbus.freedesktop.org" -DESCRIPTION = "Message bus system for applications to talk to one another" +SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" @@ -56,13 +57,20 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" grep -q netdev: /etc/group || addgroup netdev - +chmod u+s /usr/libexec/dbus-daemon-launch-helper } -EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ - --disable-checks --disable-xml-docs --disable-doxygen-docs \ - --with-xml=expat --without-x" - +EXTRA_OECONF = "\ + --disable-qt \ + --disable-qt3 \ + --disable-gtk \ + --disable-tests \ + --disable-checks \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --with-xml=expat \ + --without-x \ +" do_stage() { oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} @@ -76,4 +84,6 @@ do_stage() { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 + # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M: + install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/ } diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb index 8e3e329fde..7838e55ca1 100644 --- a/packages/dbus/dbus_1.1.4.bb +++ b/packages/dbus/dbus_1.1.4.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r1" +PR = "r2" diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb index 4a4dc3b7d4..98b9360c00 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_svn.bb @@ -5,13 +5,18 @@ SECTION = "console/network" DEPENDS = "intltool-native dbus" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" S = "${WORKDIR}/gsm0710muxd" inherit autotools +do_install_append() { + # temp hack + mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service +} + pkg_postinst_${PN}() { # can't do this offline if [ "x$D" != "x" ]; then diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb index 9d2a8db2c6..615042f3b8 100644 --- a/packages/images/openmoko-python-devel-image.bb +++ b/packages/images/openmoko-python-devel-image.bb @@ -2,5 +2,6 @@ require openmoko-image.bb IMAGE_INSTALL += "\ task-openmoko-python-devel \ + task-python-efl-examples \ + edje-viewer \ " - diff --git a/packages/gaim/pidgin/.mtn2git_empty b/packages/libjson/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gaim/pidgin/.mtn2git_empty +++ b/packages/libjson/.mtn2git_empty diff --git a/packages/libjson/libjson_0.6.bb b/packages/libjson/libjson_0.6.bb new file mode 100644 index 0000000000..4c93e82a0b --- /dev/null +++ b/packages/libjson/libjson_0.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A library for parsing and creating JSON files" +HOMEPAGE = "http://oss.metaparadigm.com/json-c/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz" +S = "${WORKDIR}/json-c-${PV}" + +inherit autotools + +do_stage() { + autotools_stage_all +} diff --git a/packages/obsolete/gaim/.mtn2git_empty b/packages/obsolete/gaim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/obsolete/gaim/.mtn2git_empty diff --git a/packages/obsolete/gaim/files/.mtn2git_empty b/packages/obsolete/gaim/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/obsolete/gaim/files/.mtn2git_empty diff --git a/packages/gaim/files/01-optional-icons-in-dialogs.patch b/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch index 260dcf364f..260dcf364f 100644 --- a/packages/gaim/files/01-optional-icons-in-dialogs.patch +++ b/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch diff --git a/packages/gaim/files/02-request-field-dialogs.patch b/packages/obsolete/gaim/files/02-request-field-dialogs.patch index 50529ca53e..50529ca53e 100644 --- a/packages/gaim/files/02-request-field-dialogs.patch +++ b/packages/obsolete/gaim/files/02-request-field-dialogs.patch diff --git a/packages/gaim/files/03-blist-dialogs.patch b/packages/obsolete/gaim/files/03-blist-dialogs.patch index 62d4710d46..62d4710d46 100644 --- a/packages/gaim/files/03-blist-dialogs.patch +++ b/packages/obsolete/gaim/files/03-blist-dialogs.patch diff --git a/packages/gaim/files/04-saved-status-dialogs.patch b/packages/obsolete/gaim/files/04-saved-status-dialogs.patch index 2cdf70c5c1..2cdf70c5c1 100644 --- a/packages/gaim/files/04-saved-status-dialogs.patch +++ b/packages/obsolete/gaim/files/04-saved-status-dialogs.patch diff --git a/packages/gaim/files/05-statusbox-icon-size.patch b/packages/obsolete/gaim/files/05-statusbox-icon-size.patch index e18f3b2bcb..e18f3b2bcb 100644 --- a/packages/gaim/files/05-statusbox-icon-size.patch +++ b/packages/obsolete/gaim/files/05-statusbox-icon-size.patch diff --git a/packages/gaim/files/06-account-dialogs.patch b/packages/obsolete/gaim/files/06-account-dialogs.patch index 9d2cb9acb0..9d2cb9acb0 100644 --- a/packages/gaim/files/06-account-dialogs.patch +++ b/packages/obsolete/gaim/files/06-account-dialogs.patch diff --git a/packages/gaim/files/07-roomlist-dialog.patch b/packages/obsolete/gaim/files/07-roomlist-dialog.patch index 2806c78fd4..2806c78fd4 100644 --- a/packages/gaim/files/07-roomlist-dialog.patch +++ b/packages/obsolete/gaim/files/07-roomlist-dialog.patch diff --git a/packages/gaim/files/08-prefs-dialog.patch b/packages/obsolete/gaim/files/08-prefs-dialog.patch index a8fcb89311..a8fcb89311 100644 --- a/packages/gaim/files/08-prefs-dialog.patch +++ b/packages/obsolete/gaim/files/08-prefs-dialog.patch diff --git a/packages/gaim/files/09-filetransfer-dialog.patch b/packages/obsolete/gaim/files/09-filetransfer-dialog.patch index c4fa3a0a6d..c4fa3a0a6d 100644 --- a/packages/gaim/files/09-filetransfer-dialog.patch +++ b/packages/obsolete/gaim/files/09-filetransfer-dialog.patch diff --git a/packages/gaim/files/10-pda-default-settings.patch b/packages/obsolete/gaim/files/10-pda-default-settings.patch index 953dc11612..953dc11612 100644 --- a/packages/gaim/files/10-pda-default-settings.patch +++ b/packages/obsolete/gaim/files/10-pda-default-settings.patch diff --git a/packages/gaim/files/define-pda-mode.patch b/packages/obsolete/gaim/files/define-pda-mode.patch index f1a368bc73..f1a368bc73 100644 --- a/packages/gaim/files/define-pda-mode.patch +++ b/packages/obsolete/gaim/files/define-pda-mode.patch diff --git a/packages/gaim/files/desktop-name-2.0.0.patch b/packages/obsolete/gaim/files/desktop-name-2.0.0.patch index c921619721..c921619721 100644 --- a/packages/gaim/files/desktop-name-2.0.0.patch +++ b/packages/obsolete/gaim/files/desktop-name-2.0.0.patch diff --git a/packages/gaim/files/desktop-name.patch b/packages/obsolete/gaim/files/desktop-name.patch index 6095a77e47..6095a77e47 100644 --- a/packages/gaim/files/desktop-name.patch +++ b/packages/obsolete/gaim/files/desktop-name.patch diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/obsolete/gaim/files/desktop-name_1.4.0.patch index 3cfaa5771e..3cfaa5771e 100644 --- a/packages/gaim/files/desktop-name_1.4.0.patch +++ b/packages/obsolete/gaim/files/desktop-name_1.4.0.patch diff --git a/packages/gaim/files/desktop-name_1.5.0.patch b/packages/obsolete/gaim/files/desktop-name_1.5.0.patch index 3cfaa5771e..3cfaa5771e 100644 --- a/packages/gaim/files/desktop-name_1.5.0.patch +++ b/packages/obsolete/gaim/files/desktop-name_1.5.0.patch diff --git a/packages/gaim/files/docklet-icon-size.patch b/packages/obsolete/gaim/files/docklet-icon-size.patch index 6b8047a30c..6b8047a30c 100644 --- a/packages/gaim/files/docklet-icon-size.patch +++ b/packages/obsolete/gaim/files/docklet-icon-size.patch diff --git a/packages/gaim/files/gaim-OE-branding.patch b/packages/obsolete/gaim/files/gaim-OE-branding.patch index d090899cac..d090899cac 100644 --- a/packages/gaim/files/gaim-OE-branding.patch +++ b/packages/obsolete/gaim/files/gaim-OE-branding.patch diff --git a/packages/gaim/files/gevolution-eds-dbus.patch b/packages/obsolete/gaim/files/gevolution-eds-dbus.patch index 0b7479d4f7..0b7479d4f7 100644 --- a/packages/gaim/files/gevolution-eds-dbus.patch +++ b/packages/obsolete/gaim/files/gevolution-eds-dbus.patch diff --git a/packages/gaim/files/gtk-deprecated-2.0.0.patch b/packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch index 04bb9244f0..04bb9244f0 100644 --- a/packages/gaim/files/gtk-deprecated-2.0.0.patch +++ b/packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch diff --git a/packages/gaim/files/no-superimposed-version-on-logo.patch b/packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch index 86809dfe98..86809dfe98 100644 --- a/packages/gaim/files/no-superimposed-version-on-logo.patch +++ b/packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch diff --git a/packages/gaim/files/series b/packages/obsolete/gaim/files/series index c7a16f71c1..c7a16f71c1 100644 --- a/packages/gaim/files/series +++ b/packages/obsolete/gaim/files/series diff --git a/packages/gaim/gaim.inc b/packages/obsolete/gaim/gaim.inc index d2fb38881a..d2fb38881a 100644 --- a/packages/gaim/gaim.inc +++ b/packages/obsolete/gaim/gaim.inc diff --git a/packages/gaim/gaim_1.0.3.bb b/packages/obsolete/gaim/gaim_1.0.3.bb index f833ddde28..f833ddde28 100644 --- a/packages/gaim/gaim_1.0.3.bb +++ b/packages/obsolete/gaim/gaim_1.0.3.bb diff --git a/packages/gaim/gaim_1.1.0.bb b/packages/obsolete/gaim/gaim_1.1.0.bb index f833ddde28..f833ddde28 100644 --- a/packages/gaim/gaim_1.1.0.bb +++ b/packages/obsolete/gaim/gaim_1.1.0.bb diff --git a/packages/gaim/gaim_1.1.1.bb b/packages/obsolete/gaim/gaim_1.1.1.bb index f833ddde28..f833ddde28 100644 --- a/packages/gaim/gaim_1.1.1.bb +++ b/packages/obsolete/gaim/gaim_1.1.1.bb diff --git a/packages/gaim/gaim_1.1.2.bb b/packages/obsolete/gaim/gaim_1.1.2.bb index 3bf9aeb3a7..3bf9aeb3a7 100644 --- a/packages/gaim/gaim_1.1.2.bb +++ b/packages/obsolete/gaim/gaim_1.1.2.bb diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/obsolete/gaim/gaim_1.4.0.bb index 1585229b14..1585229b14 100644 --- a/packages/gaim/gaim_1.4.0.bb +++ b/packages/obsolete/gaim/gaim_1.4.0.bb diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/obsolete/gaim/gaim_1.5.0.bb index 3bf9aeb3a7..3bf9aeb3a7 100644 --- a/packages/gaim/gaim_1.5.0.bb +++ b/packages/obsolete/gaim/gaim_1.5.0.bb diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb index bf8591920c..bf8591920c 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb diff --git a/packages/pidgin/.mtn2git_empty b/packages/pidgin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pidgin/.mtn2git_empty diff --git a/packages/gaim/pidgin.inc b/packages/pidgin/pidgin.inc index a2ef61a508..a2ef61a508 100644 --- a/packages/gaim/pidgin.inc +++ b/packages/pidgin/pidgin.inc diff --git a/packages/pidgin/pidgin/.mtn2git_empty b/packages/pidgin/pidgin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pidgin/pidgin/.mtn2git_empty diff --git a/packages/gaim/pidgin/gconf-no-errors.patch b/packages/pidgin/pidgin/gconf-no-errors.patch index 9a95175ac9..9a95175ac9 100644 --- a/packages/gaim/pidgin/gconf-no-errors.patch +++ b/packages/pidgin/pidgin/gconf-no-errors.patch diff --git a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch b/packages/pidgin/pidgin/pidgin.desktop-set-icon.patch index 05f76895ba..05f76895ba 100644 --- a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch +++ b/packages/pidgin/pidgin/pidgin.desktop-set-icon.patch diff --git a/packages/gaim/files/purple-OE-branding.patch b/packages/pidgin/pidgin/purple-OE-branding.patch index 99c61375ce..99c61375ce 100644 --- a/packages/gaim/files/purple-OE-branding.patch +++ b/packages/pidgin/pidgin/purple-OE-branding.patch diff --git a/packages/gaim/pidgin/sanitize-configure.ac.patch b/packages/pidgin/pidgin/sanitize-configure.ac.patch index a77d64f40b..a77d64f40b 100644 --- a/packages/gaim/pidgin/sanitize-configure.ac.patch +++ b/packages/pidgin/pidgin/sanitize-configure.ac.patch diff --git a/packages/gaim/pidgin_2.0.2.bb b/packages/pidgin/pidgin_2.0.2.bb index 2cc02c5072..2cc02c5072 100644 --- a/packages/gaim/pidgin_2.0.2.bb +++ b/packages/pidgin/pidgin_2.0.2.bb diff --git a/packages/gaim/pidgin_2.1.1.bb b/packages/pidgin/pidgin_2.1.1.bb index 5531880669..5531880669 100644 --- a/packages/gaim/pidgin_2.1.1.bb +++ b/packages/pidgin/pidgin_2.1.1.bb diff --git a/packages/gaim/pidgin_2.2.1.bb b/packages/pidgin/pidgin_2.2.1.bb index 5531880669..5531880669 100644 --- a/packages/gaim/pidgin_2.2.1.bb +++ b/packages/pidgin/pidgin_2.2.1.bb diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb index 0a4e32097f..e78a4cabae 100644 --- a/packages/tasks/task-python-efl-examples.bb +++ b/packages/tasks/task-python-efl-examples.bb @@ -2,9 +2,13 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" RDEPENDS = "\ - python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \ + task-python-efl \ + python-ecore-examples \ + python-emotion-examples \ + python-edje-examples \ + python-epsilon-examples \ python-math python-textutils \ " -PR = "ml2" +PR = "ml3" ALLOW_EMPTY = "1" diff --git a/packages/zaurusd/files/01-check-toggle-landscape b/packages/zaurusd/files/01-check-toggle-landscape new file mode 100644 index 0000000000..13ae9a4e68 --- /dev/null +++ b/packages/zaurusd/files/01-check-toggle-landscape @@ -0,0 +1,9 @@ +#!/bin/sh + +# Try to determine and ignore false rotation signals caused by +# headphones removal or remote removal remembering the old state. +# OE#3390 +if test "`cat /var/run/last-screen-rotation`" = landscape ; then + exit +fi +echo landscape > /var/run/last-screen-rotation diff --git a/packages/zaurusd/files/01-check-toggle-portait b/packages/zaurusd/files/01-check-toggle-portait new file mode 100644 index 0000000000..4c3b7f1291 --- /dev/null +++ b/packages/zaurusd/files/01-check-toggle-portait @@ -0,0 +1,9 @@ +#!/bin/sh + +# Try to determine and ignore false rotation signals caused by +# headphones removal or remote removal remembering the old state. +# OE#3390 +if test "`cat /var/run/last-screen-rotation`" = portait ; then + exit +fi +echo portait > /var/run/last-screen-rotation diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch index c3e234b534..b10e6c85dd 100644 --- a/packages/zaurusd/files/alsa-cxx00-default.state.patch +++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,64 +1,194 @@ ---- zaurusd/config/alsa/cxx00-default.state.orig 2006-06-28 08:45:07.000000000 +0000 -+++ zaurusd/config/alsa/cxx00-default.state 2007-05-21 21:40:50.000000000 +0000 -@@ -32,7 +32,7 @@ +http://bugs.openembedded.org/show_bug.cgi?id=2617 +- Fixes default ALSA state for SL-Cxx00. + * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). + * Increased Mic Levels and Boost. + * Enabled Capture Switch. + * Improved Headphones / Speaker volume balance. + * 3D Mode changed to "Playback" (still Off by default). + * Disabled all bypasses. + * All Mono signals decreased to 0 (not connected). + * Line Mux changed to differential, keeping PGA unused. + * Using Digital mono for recording (jack supports ony mono). + * Enabled Automatic Level Control, optimized for voice recording. + * Enabled Zero Cross volume changes. +- Do not alter incorrect mixer levels by zaurus-mixer-callback. + +Index: zaurusd/config/alsa/cxx00-default.state +=================================================================== +--- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000 ++++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000 +@@ -6,8 +6,8 @@ + comment.range '0 - 63' + iface MIXER + name 'Capture Volume' +- value.0 23 +- value.1 23 ++ value.0 48 ++ value.1 48 + } + control.2 { + comment.access 'read write' +@@ -15,8 +15,8 @@ + comment.count 2 + iface MIXER + name 'Capture ZC Switch' +- value.0 false +- value.1 false ++ value.0 true ++ value.1 true + } + control.3 { + comment.access 'read write' +@@ -24,26 +24,26 @@ + comment.count 2 + iface MIXER + name 'Capture Switch' +- value.0 false +- value.1 false ++ value.0 true ++ value.1 true + } + control.4 { + comment.access 'read write' comment.type BOOLEAN comment.count 2 iface MIXER - name 'Out1 Playback ZC Switch' +- value.0 false +- value.1 false + name 'Headphone Playback ZC Switch' - value.0 false - value.1 false ++ value.0 true ++ value.1 true } -@@ -41,7 +41,7 @@ + control.5 { + comment.access 'read write' comment.type BOOLEAN comment.count 2 iface MIXER - name 'Out2 Playback ZC Switch' +- value.0 false +- value.1 false + name 'Speaker Playback ZC Switch' - value.0 false - value.1 false ++ value.0 true ++ value.1 true + } + control.6 { + comment.access 'read write' +@@ -92,8 +92,8 @@ + comment.range '0 - 255' + iface MIXER + name 'PCM Volume' +- value.0 255 +- value.1 255 ++ value.0 220 ++ value.1 220 } -@@ -218,7 +218,7 @@ - comment.item.3 Stereo + control.11 { + comment.access 'read write' +@@ -131,7 +131,7 @@ + comment.range '0 - 15' + iface MIXER + name 'Treble Volume' +- value 15 ++ value 0 + } + control.15 { + comment.access 'read write' +@@ -188,7 +188,7 @@ + comment.item.1 Playback iface MIXER - name 'ALC Capture Function' -- value Left -+ value Off + name '3D Mode' +- value Capture ++ value Playback } - control.24 { + control.21 { comment.access 'read write' -@@ -321,8 +321,8 @@ +@@ -226,7 +226,7 @@ + comment.count 1 + iface MIXER + name 'ALC Capture ZC Switch' +- value false ++ value true + } + control.25 { + comment.access 'read write' +@@ -235,7 +235,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Hold Time' +- value 0 ++ value 9 + } + control.26 { + comment.access 'read write' +@@ -244,7 +244,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Decay Time' +- value 3 ++ value 9 + } + control.27 { + comment.access 'read write' +@@ -253,7 +253,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Attack Time' +- value 2 ++ value 3 + } + control.28 { + comment.access 'read write' +@@ -306,7 +306,7 @@ + comment.count 1 + iface MIXER + name 'ZC Timeout Switch' +- value false ++ value true + } + control.34 { + comment.access 'read write' +@@ -321,7 +321,7 @@ comment.type BOOLEAN comment.count 1 iface MIXER - name 'Right Out2 Playback Invert Switch' -- value true + name 'Right Speaker Playback Invert Switch' -+ value false + value true } control.36 { - comment.access 'read write' @@ -331,8 +331,8 @@ comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 2 - value.1 2 ++ value.0 3 ++ value.1 3 + } + control.37 { + comment.access 'read write' +@@ -341,8 +341,8 @@ + comment.range '0 - 7' + iface MIXER + name 'Bypass Left Playback Volume' +- value.0 2 +- value.1 2 + value.0 0 + value.1 0 } - control.37 { + control.38 { comment.access 'read write' -@@ -351,8 +351,8 @@ +@@ -361,8 +361,8 @@ comment.range '0 - 7' iface MIXER - name 'Bypass Right Playback Volume' -- value.0 0 -- value.1 0 -+ value.0 2 -+ value.1 2 + name 'Bypass Mono Playback Volume' +- value.0 2 +- value.1 2 ++ value.0 0 ++ value.1 0 } - control.39 { + control.40 { comment.access 'read write' @@ -378,9 +378,9 @@ comment.count 2 @@ -68,8 +198,8 @@ - value.0 120 - value.1 120 + name 'Headphone Playback Volume' -+ value.0 121 -+ value.1 121 ++ value.0 105 ++ value.1 105 } control.42 { comment.access 'read write' @@ -81,17 +211,26 @@ - value.0 119 - value.1 119 + name 'Speaker Playback Volume' -+ value.0 121 -+ value.1 121 ++ value.0 127 ++ value.1 127 } control.43 { comment.access 'read write' +@@ -399,7 +399,7 @@ + comment.range '0 - 127' + iface MIXER + name 'Mono Playback Volume' +- value 121 ++ value 0 + } + control.44 { + comment.access 'read write' @@ -411,7 +411,7 @@ comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value 'Mono (Left)' -+ value Stereo ++ value 'Digital Mono' } control.45 { comment.access 'read write' @@ -100,55 +239,19 @@ iface MIXER name 'Left ADC Mux' - value 'Mono (Left)' -+ value Stereo ++ value 'Digital Mono' } control.46 { comment.access 'read write' -@@ -458,7 +458,7 @@ - comment.item.4 Differential - iface MIXER - name 'Right Line Mux' -- value Differential -+ value 'Line 1' - } - control.49 { - comment.access 'read write' @@ -471,7 +471,7 @@ comment.item.4 Differential iface MIXER name 'Left Line Mux' - value PGA -+ value 'Line 1' ++ value Differential } control.50 { comment.access 'read write' -@@ -483,7 +483,7 @@ - comment.item.3 Differential - iface MIXER - name 'Right PGA Mux' -- value Differential -+ value 'Line 1' - } - control.51 { - comment.access 'read write' -@@ -495,7 +495,7 @@ - comment.item.3 Differential - iface MIXER - name 'Left PGA Mux' -- value Differential -+ value 'Line 1' - } - control.52 { - comment.access 'read write' -@@ -535,7 +535,7 @@ - comment.count 1 - iface MIXER - name 'Right Mixer Left Playback Switc' -- value false -+ value true - } - control.57 { - comment.access 'read write' @@ -610,9 +610,8 @@ comment.access 'read write' comment.type ENUMERATED @@ -161,3 +264,38 @@ iface MIXER name 'Speaker Function' value On +Index: zaurusd/scripts/zaurus-mixer-callback.in +=================================================================== +--- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000 ++++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000 +@@ -16,8 +16,6 @@ + JACK="$1" + SPK="$2" + LEFT="true" +-RLPLAYBACK="false" +-RLBYPASS="false" + + case $SPK in + "On") +@@ -37,8 +35,6 @@ + ;; + "Headset" | "Mic" | "Line") + LEFT="false" +- RLPLAYBACK="true" +- RLBYPASS="true" + SPK="Off" + ;; + *) +@@ -58,12 +54,6 @@ + }; /Speaker Function/ { + N + s:\(Speaker Function.*\n.*value \).*$:\1$SPK: +-}; /Right Mixer Left Playback/ { +-N +-s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK: +-}; /Right Mixer Left Bypass/ { +-N +-s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS: + }; /Left Mixer Playback/ { + N + s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT: diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in index f719ba3c76..9670e8803e 100644 --- a/packages/zaurusd/files/zaurus-hinge.in +++ b/packages/zaurusd/files/zaurus-hinge.in @@ -19,9 +19,12 @@ if [ -z "$1" ]; then exit 1 fi -panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" - +panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $1}'`" +# touch ~/.norot can disable rotation. +if test -f /home/$panel_user/.norot ; then + exit +fi STATE=$1 diff --git a/packages/zaurusd/files/zaurusd-mixer-callback.patch b/packages/zaurusd/files/zaurusd-mixer-callback.patch deleted file mode 100644 index 7c9455d042..0000000000 --- a/packages/zaurusd/files/zaurusd-mixer-callback.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zaurusd/scripts/zaurus-mixer-callback.in.orig 2007-06-05 03:15:30.000000000 +0000 -+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-06-05 03:14:53.000000000 +0000 -@@ -16,7 +16,7 @@ - JACK="$1" - SPK="$2" - LEFT="true" --RLPLAYBACK="false" -+RLPLAYBACK="true" - RLBYPASS="false" - - case $SPK in diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 3ea0d2b22f..be9379eced 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r16" +PR = "r17" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ @@ -14,10 +14,11 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://disable-alsa-handling.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ - file://zaurusd-mixer-callback.patch;patch=1 \ file://tslib-1.diff;patch=1 \ file://zaurus-hinge.bl-on \ - file://zaurus-hinge.bl-off" + file://zaurus-hinge.bl-off \ + file://01-check-toggle-landscape \ + file://01-check-toggle-portait" S = "${WORKDIR}/${PN}" @@ -39,6 +40,9 @@ do_install_append() { install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on" install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off" + install -m 0755 "${WORKDIR}/01-check-toggle-landscape" "${D}/etc/zaurusd/hinge-landscape.d/01-check-toggle" + install -m 0755 "${WORKDIR}/01-check-toggle-portait" "${D}/etc/zaurusd/hinge-portrait.d/01-check-toggle" + install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape" install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait" } diff --git a/packages/zziplib/files/.mtn2git_empty b/packages/zziplib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zziplib/files/.mtn2git_empty diff --git a/packages/zziplib/files/zip_c.patch b/packages/zziplib/files/zip_c.patch new file mode 100644 index 0000000000..fb23ce650e --- /dev/null +++ b/packages/zziplib/files/zip_c.patch @@ -0,0 +1,15 @@ +From zziplib Debian source package +--- a/zzip/zip.c 2007-03-19 02:27:49.000000000 +1100 ++++ b/zzip/zip.c 2007-11-07 17:40:52.985849197 +1100 +@@ -402,7 +402,10 @@ + uint16_t u_extras, u_comment, u_namlen; + + if (fd_map) +- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */ ++ { ++ d = &dirent; ++ memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */ ++ } + else + { + if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0) diff --git a/packages/zziplib/files/zziplib-autoconf.patch b/packages/zziplib/files/zziplib-autoconf.patch new file mode 100644 index 0000000000..6fc666f8f2 --- /dev/null +++ b/packages/zziplib/files/zziplib-autoconf.patch @@ -0,0 +1,509 @@ +Reworks zziplib's configure and top-level makefile considerably to make +this package compile in a cross-compilation environment. This has not +and will not be sent upstream because the author most likely wants it that +way (lots of MSVC crap). + +Index: zziplib-0.13.49/Makefile.am +=================================================================== +--- zziplib-0.13.49.orig/Makefile.am 2008-02-19 22:54:19.000000000 +0100 ++++ zziplib-0.13.49/Makefile.am 2008-02-19 23:37:40.000000000 +0100 +@@ -1,126 +1,10 @@ +-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2 + ACLOCAL_AMFLAGS = -I m4 +-WANT_AUTOMAKE = 1.7 +-WANT_AUTOCONF = 2.57 ++WANT_AUTOMAKE = 1.96 ++WANT_AUTOCONF = 2.61 + + DIST_SUBDIRS = zzip zzipwrap bins test docs SDL + SUBDIRS = zzip zzipwrap bins test docs @SDL@ + +-# see Makefile.mk for the "make rpm" target +-rpm2: dist-bzip2 $(PACKAGE).spec +- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2 +- +-indent-check: +- (cd zzip && $(MAKE) `basename $@`) +- +-doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \ +-man mans manpages htmpages unpack clean-unpack changes.htm pdfs \ +-omf install-omf install-doc install-docs install-sf install-man3 install-mans : +- (cd docs && $(MAKE) `basename $@`) +- +-sdl testsdl test-sdl install-sdl : +- (cd SDL && $(MAKE) `basename $@`) +- +-check-test0 check-test1 check-zzdir check-zzcat \ +-check-zzxor check-zzxordir check-zzxorcat \ +-check-sfx check-readme : \ +- (cd test && $(MAKE) `basename $@`) +- +-MSVC8 = msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \ +-msvc8/zzdir.vcproj msvc8/zzipself.vcproj msvc8/zzip.vcproj \ +-msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \ +-msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \ +-msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \ +-msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \ +-msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \ +- msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj +- +-MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \ +-msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \ +-msvc7/zziplib.sln msvc7/zzipsetstub.sln msvc7/zzobfuscated.sln \ +-msvc7/zziplib.vcproj msvc7/zzipsetstub.vcproj msvc7/zzobfuscated.vcproj \ +-msvc7/zzcat.sln msvc7/zzipself.bat msvc7/zzip.sln \ +-msvc7/zzcat.vcproj msvc7/zzipself.sln msvc7/zziptest.sln \ +-msvc7/zzdir.sln msvc7/zzipself.txt msvc7/zziptest.vcproj +- +-MSVC6 = \ +-msvc6/zzcat.dsp msvc6/zziplib.dsp msvc6/zzipwrap.dsp \ +-msvc6/zzdir.dsp msvc6/zziplib.dsw msvc6/zzobfuscated.dsp \ +-msvc6/zziptest.dsp msvc6/zzip.dsp +- + EXTRA_DIST = zziplib.spec zzipback.sed Makefile.mk \ +- $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps) +- +-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \ +- comp compats msvc6 msvc7 +-# ------------------------------------------------------------------------ +- +-test-comp: +- test ! -d testing || rm -r testing +- mkdir testing +- (cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz) +- (cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure) +- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" +- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" check +- +-clean-comp: +- test ! -d testing || rm -r testing +- +-msvc : +- mkdir bin +- mkdir lib +- mkdir include +- mkdir include/zzip +- cp $(srcdir)/msvc6/Release/*.exe bin/ +- cp $(srcdir)/msvc6/Release/*.dll bin/ +- cp $(srcdir)/msvc6/Release/*.lib lib/ +- cp $(srcdir)/zzip/*.h include/zzip/ +- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/ +- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/ +- rm -r bin lib include +- +-# ------------------------------------------------------------------ zzip64 +-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64 +-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64" ++ $(am__aclocal_m4_deps) + +-zzip64-setup: zzip64-setup.tmp +-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc +- - mkdir zzip64 +- cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/ +- date > zzip64.dir +-zzip64-build: zzip64-build.tmp +-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/* +- cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64) +-zzip64-install: zzip64-install.tmp +-zzip64-install.tmp : zzip64-build.tmp +- cd zzip64 && $(MAKE) install $(_RELEASEINFO64) +- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so +- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a +- cd $(DESTDIR)$(libdir) && \ +- sed -e 's/zzip.so/zzip64.so/' \ +- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la +- cd $(DESTDIR)$(libdir)/pkgconfig && \ +- sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \ +- -e 's/-lzzip/-lzzip64/' \ +- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc +-zzip32-postinstall: +- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so +- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a +- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so +- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a +- cd $(DESTDIR)$(libdir) && \ +- sed -e 's/zzip.so/zzip32.so/' \ +- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la +- cd $(DESTDIR)$(libdir)/pkgconfig && \ +- sed -e 's/-lzzip/-lzzip32/' \ +- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc +-zzip-postinstall: +- : "the 12.8x and 11.8x and 10.8x packages are all the same actually" +- cd $(DESTDIR)$(libdir) || exit 1 \ +- ; for i in libzzip*.so.1? ; do : \ +- ; v10=`echo $i | sed -e "s/.so.../.so.10/"` \ +- ; v11=`echo $i | sed -e "s/.so.../.so.11/"` \ +- ; v12=`echo $i | sed -e "s/.so.../.so.12/"` \ +- ; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \ +- ; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \ +- ; ln -s $v10 $v11 || true; done +Index: zziplib-0.13.49/configure.ac +=================================================================== +--- zziplib-0.13.49.orig/configure.ac 2008-02-15 21:56:37.000000000 +0100 ++++ zziplib-0.13.49/configure.ac 2008-02-19 23:43:05.000000000 +0100 +@@ -1,12 +1,12 @@ +-AC_INIT(zziplib.spec) +-AC_PREREQ(2.49) +-AC_COPYRIGHT([Guido Draheim <guido@gmx.de> for ZZipLib.SF.net]) ++AC_PREREQ(2.61) ++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido@gmx.de>]) ++AC_CANONICAL_TARGET ++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) ++ ++AC_CONFIG_SRCDIR([zzip/zip.c]) + AC_REVISION($Revision: 1.9 $) +-AC_CONFIG_AUX_DIR(uses) ++ + # ======================================================================= +-AC_CANONICAL_SYSTEM +-dnl AM_ENABLE_MULTILIB([Makefile],[$host]) +-AX_ENABLE_BUILDDIR_UNAME + AC_SET_DEFAULT_PATHS_SYSTEM + # ----------------------------------------------------------------------- + AC_ARG_ENABLE(thread-safe,AC_HELP_STRING( +@@ -61,8 +61,6 @@ + AC_SUBST(ZLIB_INCL) + AC_SUBST(ZLIB_LDIR) + # ----------------------------------------------------------------------- +-AX_SPEC_DEFAULTS +-AM_INIT_AUTOMAKE($PACKAGE,$VERSION) + dnl test ".$CFLAGS" = "." && CFLAGS="" + AC_PROG_CC + dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3" +@@ -77,7 +75,7 @@ + sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in + AC_CONFIG_HEADERS([config.h]) + AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h]) +-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in]) ++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in]) + AM_MAINTAINER_MODE + + AX_CREATE_PKGCONFIG_INFO(dnl +Index: zziplib-0.13.49/install-sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ zziplib-0.13.49/install-sh 2008-02-19 23:43:36.000000000 +0100 +@@ -0,0 +1,323 @@ ++#!/bin/sh ++# install - install a program, script, or datafile ++ ++scriptversion=2005-05-14.22 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. ++# ++# Calling this script install-sh is preferred over install.sh, to prevent ++# `make' implicit rules from creating a file called install from it ++# when there is no Makefile. ++# ++# This script is compatible with the BSD install script, but was written ++# from scratch. It can only install one file at a time, a restriction ++# shared with many OS's install programs. ++ ++# set DOITPROG to echo to test this script ++ ++# Don't use :- since 4.3BSD and earlier shells don't like it. ++doit="${DOITPROG-}" ++ ++# put in absolute paths if you don't have them in your path; or use env. vars. ++ ++mvprog="${MVPROG-mv}" ++cpprog="${CPPROG-cp}" ++chmodprog="${CHMODPROG-chmod}" ++chownprog="${CHOWNPROG-chown}" ++chgrpprog="${CHGRPPROG-chgrp}" ++stripprog="${STRIPPROG-strip}" ++rmprog="${RMPROG-rm}" ++mkdirprog="${MKDIRPROG-mkdir}" ++ ++chmodcmd="$chmodprog 0755" ++chowncmd= ++chgrpcmd= ++stripcmd= ++rmcmd="$rmprog -f" ++mvcmd="$mvprog" ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-c (ignored) ++-d create directories instead of installing files. ++-g GROUP $chgrpprog installed files to GROUP. ++-m MODE $chmodprog installed files to MODE. ++-o USER $chownprog installed files to USER. ++-s $stripprog installed files. ++-t DIRECTORY install into DIRECTORY. ++-T report an error if DSTFILE is a directory. ++--help display this help and exit. ++--version display version info and exit. ++ ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit $?;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; ++ ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; ++ ++ -T) no_target_directory=true ++ shift ++ continue;; ++ ++ --version) echo "$0 $scriptversion"; exit $?;; ++ ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac ++done ++ ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi ++ ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac ++ ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done ++ ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: diff --git a/packages/zziplib/zziplib-native_0.12.83.bb b/packages/zziplib/zziplib-native_0.12.83.bb new file mode 100644 index 0000000000..eb954f12c1 --- /dev/null +++ b/packages/zziplib/zziplib-native_0.12.83.bb @@ -0,0 +1,9 @@ +require zziplib_${PV}.bb + +DEPENDS = "zlib-native" + +inherit native + +S = "${WORKDIR}/zziplib-${PV}" + +PACKAGES = "" diff --git a/packages/zziplib/zziplib-native_0.13.49.bb b/packages/zziplib/zziplib-native_0.13.49.bb new file mode 100644 index 0000000000..eb954f12c1 --- /dev/null +++ b/packages/zziplib/zziplib-native_0.13.49.bb @@ -0,0 +1,9 @@ +require zziplib_${PV}.bb + +DEPENDS = "zlib-native" + +inherit native + +S = "${WORKDIR}/zziplib-${PV}" + +PACKAGES = "" diff --git a/packages/zziplib/zziplib.inc b/packages/zziplib/zziplib.inc new file mode 100644 index 0000000000..602eae6315 --- /dev/null +++ b/packages/zziplib/zziplib.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Support library for dealing with zip files" +SECTION = "libs" +PRIORITY = "optional" + +DEPENDS = "zlib python-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2" +LICENSE = "LGPL MPL" + +inherit autotools pkgconfig + +do_configure_append() { + # Fix some brokenness in the generated makefile. + sed -i \ + -e "s|tail -1|tail -n 1|" \ + -e "s|dist dist-all dist-all:|dist dist-all:|" \ + Makefile + + mkdir ${S}/build +} diff --git a/packages/zziplib/zziplib_0.10.82.bb b/packages/zziplib/zziplib_0.10.82.bb index 4fb129592e..676444c072 100644 --- a/packages/zziplib/zziplib_0.10.82.bb +++ b/packages/zziplib/zziplib_0.10.82.bb @@ -1,21 +1,3 @@ -DESCRIPTION = "Support library for dealing with zip files" -SECTION = "libs" -PRIORITY = "optional" +require zziplib.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2" -LICENSE = "LGPL MPL" -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C zzip libzzip ${STAGING_LIBDIR} - oe_libinstall -a -so -C zzipwrap libzzipwrap ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ${S}/bins/zziplib.m4 ${STAGING_DATADIR}/aclocal/ - for h in zzip.h zzipformat.h zzipwrap.h zziplib.h zzip-io.h; do - install -m 0644 ${S}/zziplib/$h ${STAGING_INCDIR}/ - done - install -d ${STAGING_INCDIR}/zzip - for h in lib.h format.h _msvc.h conf.h file.h stdint.h zzip.h _config.h plugin.h; do - install -m 0644 ${S}/zzip/$h ${STAGING_INCDIR}/zzip/ - done -} +PR = "r1" diff --git a/packages/zziplib/zziplib_0.12.83.bb b/packages/zziplib/zziplib_0.12.83.bb new file mode 100644 index 0000000000..c9078ac6b6 --- /dev/null +++ b/packages/zziplib/zziplib_0.12.83.bb @@ -0,0 +1,4 @@ +require zziplib.inc + +SRC_URI += "file://zziplib-buildfix.patch;patch=1" + diff --git a/packages/zziplib/zziplib_0.13.49.bb b/packages/zziplib/zziplib_0.13.49.bb new file mode 100644 index 0000000000..3a6c148dc5 --- /dev/null +++ b/packages/zziplib/zziplib_0.13.49.bb @@ -0,0 +1,12 @@ +require zziplib.inc + +SRC_URI += "\ + file://zip_c.patch;patch=1 \ + file://zziplib-autoconf.patch;patch=1 \ + " + +#EXTRA_OECONF = "--srcdir=${S} --enable-builddir=${S}/build" + +do_stage() { + autotools_stage_all +} |