[oe-commits] org.oe.dev merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'
utx commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 23:16:25 UTC 2008
merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'
and 'cb1970d64a9cdb9559e137f509557905fbc174b5'
Author: utx at openembedded.org
Branch: org.openembedded.dev
Revision: 1b3281155a76e1b96f9c232d53e0b275b6f50ef2
ViewMTN: http://monotone.openembedded.org/revision/info/1b3281155a76e1b96f9c232d53e0b275b6f50ef2
Files:
1
packages/libpng/libpng-native_1.2.19.bb
packages/libpng/libpng_1.2.19.bb
packages/libsdl/libsdl-x11_1.2.7.bb
packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
packages/libsdl/files/explicit-extern-C.patch
packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch
packages/libsdl/files/fixlibs-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch
packages/libsdl/files/kill-stdc++-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch
packages/libsdl/files/pygame-1.2.9.patch
packages/libjson
packages/libjson/libjson_0.6.bb
packages/libsdl/files/pagesize.patch
packages/libsdl/libsdl.inc
packages/vnc/fbvncserver2_cvs.bb
conf/distro/colinuxoe.conf
conf/distro/generic-uclibc.conf
conf/distro/nylon.conf
packages/busybox/busybox_1.9.1.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.1.4.bb
packages/e17/e-wm_cvs.bb
packages/gammu/gammu_1.17.0.bb
packages/images/openmoko-python-devel-image.bb
packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libsdl/libsdl-directfb_1.2.9.bb
packages/libsdl/libsdl-qpe_1.2.9.bb
packages/libsdl/libsdl-x11_1.2.9.bb
packages/tasks/task-python-efl-examples.bb
packages/zaurusd/files/zaurusd-mixer-callback.patch
packages/busybox/busybox-1.9.1/sort-z-nul.patch
packages/zaurusd/files/01-check-toggle-landscape
packages/zaurusd/files/01-check-toggle-portait
packages/zaurusd/files/alsa-cxx00-default.state.patch
packages/zaurusd/files/zaurus-hinge.in
packages/zaurusd/zaurusd_svn.bb
Diffs:
#
# mt diff -r9a5df4f82194968b8ea8a94d7effc5bf61c1e650 -r1b3281155a76e1b96f9c232d53e0b275b6f50ef2
#
#
#
# delete "packages/libpng/libpng-native_1.2.19.bb"
#
# delete "packages/libpng/libpng_1.2.19.bb"
#
# delete "packages/libsdl/libsdl-x11_1.2.7.bb"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch"
# to "packages/libsdl/files/explicit-extern-C.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch"
# to "packages/libsdl/files/fixlibs-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch"
# to "packages/libsdl/files/kill-stdc++-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch"
# to "packages/libsdl/files/pygame-1.2.9.patch"
#
# add_dir "packages/libjson"
#
# add_file "packages/libjson/libjson_0.6.bb"
# content [57349c69fb7f4206bcae0906624bdedfd3f6a5b8]
#
# add_file "packages/libsdl/files/pagesize.patch"
# content [685e5e3d3f38aaf2558a01e5d26f04248d55e40f]
#
# add_file "packages/libsdl/libsdl.inc"
# content [50d941276aa6e48d473b59355b178be3c185f8c5]
#
# add_file "packages/vnc/fbvncserver2_cvs.bb"
# content [affb7e2986079e80ae14eba4279210b477c36c1b]
#
# patch "conf/distro/colinuxoe.conf"
# from [ccdddecbd8f6e1e25357bbf924e495e75a035370]
# to [4f165f8548d04da3291cbc867c1706b00ee32f28]
#
# patch "conf/distro/generic-uclibc.conf"
# from [2280bf1003490f3615211613df40817df22352d3]
# to [4b6c77936994e0b78819a2d3d1f6a9e68262429f]
#
# patch "conf/distro/nylon.conf"
# from [8023e0c2edd176168e71abdd5abe8904105e6ba7]
# to [55b55fd58b093f18dc69ad389287e77c548403ae]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [9b1391f5ce41a8420b8bff9c3d172cb52087d7c2]
# to [49749d22f545c3b4e7a19e560079375738c0afdb]
#
# patch "packages/dbus/dbus.inc"
# from [d2ebf6fc194524deeab9e6da2a97e839999171a9]
# to [afa9d185f101fddb15e7fc80aa75db16945c0520]
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [a941688e3a8621769a37bb46e79d4f2d5764966a]
# to [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [1bdace24c8d78006d562086cae87603c61046c8a]
# to [a08de1bb584a6652174d86c1429131d56738c3e9]
#
# patch "packages/gammu/gammu_1.17.0.bb"
# from [dbbfbd2cf47cb31eb603a90b621a074f7786c9f0]
# to [32f447033fd0c855eefaac567bda64e17b60b004]
#
# patch "packages/images/openmoko-python-devel-image.bb"
# from [314c670f5711b4e925e3261db65ca753dbbd5a78]
# to [1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b]
#
# patch "packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch"
# from [13aa70d3fb4af7f44dd20be52a40d70acc6420a6]
# to [e498b7488bf218d5d35c391cc4943458cff40181]
#
# patch "packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch"
# from [c624f83ac8b14092c184c051137a6dadd55508a6]
# to [ddbc1887bea6b823a043d3ded7f4d0e559b20437]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [9ec0920876981474a325a47766fa7d50bbb1cfd3]
# to [054d2acb3ff8284167043e5554633713ebdba2cf]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [f248fbf9a457e0555c36e5377bc412ced8f568db]
# to [53716efd0be08661e891166feef9298502f1ff73]
#
# patch "packages/libsdl/libsdl-directfb_1.2.9.bb"
# from [406ccc95e51fa48fbf7a3e05f121fb4c844235ca]
# to [7cee0ace7a8b1ca3181cb5a3db699dda21ececab]
#
# patch "packages/libsdl/libsdl-qpe_1.2.9.bb"
# from [1a41fea40fbd70743eb8fd8b3a7946b8d50acc6f]
# to [bc4c99538eb36cd779ec379046f207fb0223ad54]
#
# patch "packages/libsdl/libsdl-x11_1.2.9.bb"
# from [06aede1a5997211b6a86bab9b2462f2f8e4c0343]
# to [b8fbd61ef90fce1e7962217839c47f784d8f8cc6]
#
# patch "packages/tasks/task-python-efl-examples.bb"
# from [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
# to [c735dfada39bf25a56a17bd3b671cb79ea1e9ecf]
#
============================================================
--- packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
+++ packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
@@ -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
+}
============================================================
--- packages/libsdl/files/pagesize.patch 685e5e3d3f38aaf2558a01e5d26f04248d55e40f
+++ packages/libsdl/files/pagesize.patch 685e5e3d3f38aaf2558a01e5d26f04248d55e40f
@@ -0,0 +1,15 @@
+Remove obsolete non-portable macro.
+
+Index: SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+===================================================================
+--- SDL-1.2.9.orig/src/video/fbcon/SDL_fbvideo.c
++++ SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+@@ -405,7 +405,7 @@ static int FB_VideoInit(_THIS, SDL_Pixel
+
+ /* Memory map the device, compensating for buggy PPC mmap() */
+ mapped_offset = (((long)finfo.smem_start) -
+- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++ (((long)finfo.smem_start)&~(getpagesize()-1)));
+ mapped_memlen = finfo.smem_len+mapped_offset;
+ mapped_mem = mmap(NULL, mapped_memlen,
+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
============================================================
--- packages/libsdl/libsdl.inc 50d941276aa6e48d473b59355b178be3c185f8c5
+++ packages/libsdl/libsdl.inc 50d941276aa6e48d473b59355b178be3c185f8c5
@@ -0,0 +1,50 @@
+DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
+PROVIDES = "virtual/libsdl"
+LICENSE = "LGPL"
+PR = "r3"
+
+SRC_URI = "\
+ http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+ file://extra-keys.patch;patch=1 \
+ file://pagesize.patch;patch=1 \
+ file://acinclude.m4"
+S = "${WORKDIR}/SDL-${PV}"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "<overwrite me>"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/*config"
+
+do_configure_prepend() {
+ rm -f ${S}/acinclude.m4
+ cp ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_append () {
+ cd ${S}
+
+ # prevent libtool from linking libs against libstdc++, libgcc, ...
+ cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+ mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage() {
+ oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
+ rm ${STAGING_LIBDIR}/libSDL.la
+ ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
+ #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
+ install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/SDL
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/SDL/
+ done
+
+ install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
+}
============================================================
--- packages/vnc/fbvncserver2_cvs.bb affb7e2986079e80ae14eba4279210b477c36c1b
+++ packages/vnc/fbvncserver2_cvs.bb affb7e2986079e80ae14eba4279210b477c36c1b
@@ -0,0 +1,21 @@
+DESCRIPTION = "A Framebuffer VNC Server for PDA"
+AUTHOR = "Patrik Gfeller <gfellerpatrik at gmx.net>"
+HOMEPAGE = "http://fbvncserver.sourceforge.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "libvncserver jpeg zlib gmp tslib"
+RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev"
+RCONFLICTS = "fbvncserver, fbvncserver-kmodule"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg"
+S = "${WORKDIR}/ipkg/src/"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-debug"
+
+FILES_${PN} += "${datadir}"
+
============================================================
--- conf/distro/colinuxoe.conf ccdddecbd8f6e1e25357bbf924e495e75a035370
+++ conf/distro/colinuxoe.conf 4f165f8548d04da3291cbc867c1706b00ee32f28
@@ -1,7 +1,9 @@
#@TYPE: Distribution
#@NAME: coLinuxoe
#@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
+TARGET_OS = "linux"
+
INHERIT += "package_ipk debian"
# MACHINE decides that linux-colinux is the correct kernel.
============================================================
--- conf/distro/generic-uclibc.conf 2280bf1003490f3615211613df40817df22352d3
+++ conf/distro/generic-uclibc.conf 4b6c77936994e0b78819a2d3d1f6a9e68262429f
@@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/libintl = "li
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
PREFERRED_PROVIDER_virtual/libintl = "libintl"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+PREFERRED_VERSION_uclibc = "0.9.29"
+PREFERRED_VERSION_uclibc-initial = "0.9.29"
+
============================================================
--- conf/distro/nylon.conf 8023e0c2edd176168e71abdd5abe8904105e6ba7
+++ conf/distro/nylon.conf 55b55fd58b093f18dc69ad389287e77c548403ae
@@ -11,6 +11,8 @@
#
# Bruno Randolf <bruno.randolf at 4g-systems.biz>
+TARGET_OS = "linux"
+
INHERIT += "package_ipk debian nylon-mirrors"
INHERIT += "linux-kernel-base"
============================================================
--- packages/busybox/busybox_1.9.1.bb 9b1391f5ce41a8420b8bff9c3d172cb52087d7c2
+++ packages/busybox/busybox_1.9.1.bb 49749d22f545c3b4e7a19e560079375738c0afdb
@@ -1,7 +1,11 @@ SRC_URI = "http://www.busybox.net/downlo
require busybox.inc
PR = "r2"
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 \
@@ -10,17 +14,12 @@ SRC_URI = "http://www.busybox.net/downlo
file://mount.busybox \
file://syslog \
file://syslog.conf \
- file://udhcpscript.patch;patch=1 \
- file://adduser-longops.patch;patch=1 \
- file://sort-z-nul.patch;patch=1;status=upstream \
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
}
============================================================
--- packages/dbus/dbus.inc d2ebf6fc194524deeab9e6da2a97e839999171a9
+++ packages/dbus/dbus.inc afa9d185f101fddb15e7fc80aa75db16945c0520
@@ -25,7 +25,18 @@ PACKAGES += "${PN}-lib"
PACKAGES += "${PN}-lib"
-FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services"
+FILES_${PN} = "\
+${bindir}/dbus-daemon* \
+${bindir}/dbus-uuidgen \
+${bindir}/dbus-launch \
+${bindir}/dbus-cleanup-sockets \
+${bindir}/dbus-send \
+${bindir}/dbus-monitor \
+${libexecdir}/dbus* \
+${sysconfdir} \
+${datadir}/dbus-1/services \
+${datadir}/dbus-1/system-services \
+"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
============================================================
--- packages/dbus/dbus_1.1.4.bb a941688e3a8621769a37bb46e79d4f2d5764966a
+++ packages/dbus/dbus_1.1.4.bb 13d62bf774c4fbb379fe51e709aa9044ae5084e9
@@ -1,3 +1,3 @@ include dbus.inc
include dbus.inc
+PR = "r1"
-PR = "r0"
============================================================
--- packages/e17/e-wm_cvs.bb 1bdace24c8d78006d562086cae87603c61046c8a
+++ packages/e17/e-wm_cvs.bb a08de1bb584a6652174d86c1429131d56738c3e9
@@ -21,9 +21,7 @@ do_configure_prepend() {
"
do_configure_prepend() {
- install -m 0644 ${WORKDIR}/Makefile.in.in po/
- echo "install -d $*" >./mkinstalldirs
- chmod a+rx ./mkinstalldirs
+ autopoint
}
do_stage() {
============================================================
--- packages/gammu/gammu_1.17.0.bb dbbfbd2cf47cb31eb603a90b621a074f7786c9f0
+++ packages/gammu/gammu_1.17.0.bb 32f447033fd0c855eefaac567bda64e17b60b004
@@ -1,8 +1,9 @@ HOMEPAGE = "http://www.gammu.org/"
DESCRIPTION = "GNU All Mobile Managment Utilities"
SECTION = "console/network"
DEPENDS = "bluez-libs cmake-native"
LICENSE = "GPL"
HOMEPAGE = "http://www.gammu.org/"
+PR = "r1"
SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
@@ -25,6 +26,7 @@ do_stage() {
install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
+ rm -f ./build-configure/pkgconfig/gammu.pc
}
PACKAGES =+ "libgammu"
============================================================
--- packages/images/openmoko-python-devel-image.bb 314c670f5711b4e925e3261db65ca753dbbd5a78
+++ packages/images/openmoko-python-devel-image.bb 1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b
@@ -1,6 +1,7 @@ IMAGE_INSTALL += "\
require openmoko-image.bb
IMAGE_INSTALL += "\
task-openmoko-python-devel \
+ task-python-efl-examples \
+ edje-viewer \
"
-
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch 13aa70d3fb4af7f44dd20be52a40d70acc6420a6
+++ packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch e498b7488bf218d5d35c391cc4943458cff40181
@@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index
if opt_s:
sys.exit(0)
-@@ -154,7 +177,7 @@ if packages_filename:
- os.rename(tmp_packages_filename, packages_filename)
- os.rename(tmp_gzip_filename, gzip_filename)
-
--if verbose:
-+if verbose:
- sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch c624f83ac8b14092c184c051137a6dadd55508a6
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch ddbc1887bea6b823a043d3ded7f4d0e559b20437
@@ -1,13 +1,6 @@
----
- arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py | 106 ++++++++++++++++++++++++++---------------------------
- setup.py | 2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200
@@ -0,0 +1,124 @@
+"""
+arfile - A module to parse GNU ar archives.
@@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py
+
+ f2 = tarf.extractfile("control")
+ print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- platforms = 'POSIX',
- keywords = 'ipkg familiar',
- url = 'http://www.handhelds.org/sources.html/',
-- py_modules = [ 'ipkg' ],
-+ py_modules = [ 'ipkg', 'arfile' ],
- scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
- )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
import string
import commands
from stat import ST_SIZE
@@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py
class Version:
"""A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
self.section = None
self.filename_header = None
self.file_list = []
@@ -1%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rcb1970d64a9cdb9559e137f509557905fbc174b5 -r1b3281155a76e1b96f9c232d53e0b275b6f50ef2
#
#
#
# delete "packages/zaurusd/files/zaurusd-mixer-callback.patch"
#
# add_file "packages/busybox/busybox-1.9.1/sort-z-nul.patch"
# content [b88c15e782daa61e071866a288ff781d61417aea]
#
# add_file "packages/zaurusd/files/01-check-toggle-landscape"
# content [3d6f3e9114b1f3875520057e769b204608e3625b]
#
# add_file "packages/zaurusd/files/01-check-toggle-portait"
# content [4a37c39669043da2c5f372437f47d8cb8554b9bf]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [bc182dde57834bba53bbe9431d9fd0bba7e17521]
# to [49749d22f545c3b4e7a19e560079375738c0afdb]
#
# patch "packages/zaurusd/files/alsa-cxx00-default.state.patch"
# from [8639ceffa75b367727f4636524e4a663237a1b54]
# to [5134186c26707a1d7ee7b2e4904d429218a8a96a]
#
# patch "packages/zaurusd/files/zaurus-hinge.in"
# from [1bb4698a91427818aa3e890cfdcd325cc6bad931]
# to [f6b4edce33db19ac034adfd809c9caafb0ba5b15]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [251ee639b9428fa73f9f1acc8c9a5945caeb9204]
# to [40577598b1358856779c378866aef53c7d0af048]
#
============================================================
--- packages/busybox/busybox-1.9.1/sort-z-nul.patch b88c15e782daa61e071866a288ff781d61417aea
+++ packages/busybox/busybox-1.9.1/sort-z-nul.patch b88c15e782daa61e071866a288ff781d61417aea
@@ -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);
+ }
============================================================
--- packages/zaurusd/files/01-check-toggle-landscape 3d6f3e9114b1f3875520057e769b204608e3625b
+++ packages/zaurusd/files/01-check-toggle-landscape 3d6f3e9114b1f3875520057e769b204608e3625b
@@ -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
============================================================
--- packages/zaurusd/files/01-check-toggle-portait 4a37c39669043da2c5f372437f47d8cb8554b9bf
+++ packages/zaurusd/files/01-check-toggle-portait 4a37c39669043da2c5f372437f47d8cb8554b9bf
@@ -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
============================================================
--- packages/busybox/busybox_1.9.1.bb bc182dde57834bba53bbe9431d9fd0bba7e17521
+++ packages/busybox/busybox_1.9.1.bb 49749d22f545c3b4e7a19e560079375738c0afdb
@@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downlo
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 \
============================================================
--- packages/zaurusd/files/alsa-cxx00-default.state.patch 8639ceffa75b367727f4636524e4a663237a1b54
+++ packages/zaurusd/files/alsa-cxx00-default.state.patch 5134186c26707a1d7ee7b2e4904d429218a8a96a
@@ -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
}
-@@ -218,7 +218,7 @@
- comment.item.3 Stereo
+ control.6 {
+ comment.access 'read write'
+@@ -92,8 +92,8 @@
+ comment.range '0 - 255'
iface MIXER
- name 'ALC Capture Function'
-- value Left
-+ value Off
+ name 'PCM Volume'
+- value.0 255
+- value.1 255
++ value.0 220
++ value.1 220
}
- control.24 {
+ control.11 {
comment.access 'read write'
-@@ -321,8 +321,8 @@
+@@ -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 '3D Mode'
+- value Capture
++ value Playback
+ }
+ control.21 {
+ comment.access 'read write'
+@@ -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:
============================================================
--- packages/zaurusd/files/zaurus-hinge.in 1bb4698a91427818aa3e890cfdcd325cc6bad931
+++ packages/zaurusd/files/zaurus-hinge.in f6b4edce33db19ac034adfd809c9caafb0ba5b15
@@ -19,10 +19,13 @@ fi
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
if [ $STATE = "3" ]; then
============================================================
--- packages/zaurusd/zaurusd_svn.bb 251ee639b9428fa73f9f1acc8c9a5945caeb9204
+++ packages/zaurusd/zaurusd_svn.bb 40577598b1358856779c378866aef53c7d0af048
@@ -1,10 +1,10 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Daemon to handle device specifc features."
SECTION = "base"
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/mi
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"
}
More information about the Openembedded-commits
mailing list