From c6dd6e16041dbf49eb1bbe1ee77efbd47a141f29 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 26 Mar 2006 15:28:47 +0000 Subject: Update several DEPENDS to match recent xlibs renaming --- packages/gtk+/gtk+_2.8.16.bb | 2 +- packages/pango/pango_1.12.0.bb | 2 +- packages/xlibs/libx11-native_6.2.1.bb | 2 +- packages/xlibs/libx11-native_cvs.bb | 2 +- packages/xlibs/libxext-native_cvs.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index 5f96cd2c3a..474858856c 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell " -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index 4b6459e034..e06e659b7b 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb index b1fd2aa0db..f27ab343a4 100644 --- a/packages/xlibs/libx11-native_6.2.1.bb +++ b/packages/xlibs/libx11-native_6.2.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" include libx11_${PV}.bb inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xlibs/libx11-native_cvs.bb index 161c070899..5b221122d3 100644 --- a/packages/xlibs/libx11-native_cvs.bb +++ b/packages/xlibs/libx11-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" include libx11_cvs.bb inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb index 296a741ebf..295bae2584 100644 --- a/packages/xlibs/libxext-native_cvs.bb +++ b/packages/xlibs/libxext-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "unknown" include libxext_${PV}.bb inherit native -DEPENDS = "x11-native xextensions-native" +DEPENDS = "libx11-native xextensions-native" PROVIDES = "" -- cgit v1.2.3 From 94b6e37d579793c54f2dfe66ee0cd050b16f4e36 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 26 Mar 2006 16:13:04 +0000 Subject: mplayer: Add mplayer-common, ported from 3.5.4.1 --- packages/mplayer/mplayer-atty_1.1.5.bb | 5 +++-- packages/mplayer/mplayer-common.bb | 31 ++++++++++++++++++++++++++ packages/mplayer/mplayer-common/.mtn2git_empty | 0 packages/mplayer/mplayer-common/mplayer.conf | 15 +++++++++++++ packages/mplayer/mplayer_1.0pre7.bb | 5 +++-- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 packages/mplayer/mplayer-common.bb create mode 100644 packages/mplayer/mplayer-common/.mtn2git_empty create mode 100644 packages/mplayer/mplayer-common/mplayer.conf (limited to 'packages') diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb index 5a8194b388..cfc8c7a40a 100644 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ b/packages/mplayer/mplayer-atty_1.1.5.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib" +DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory " -PR = "r4" +PR = "r5" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb new file mode 100644 index 0000000000..93ddc975b9 --- /dev/null +++ b/packages/mplayer/mplayer-common.bb @@ -0,0 +1,31 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: mplayer-common.bb +# Date: 26-Mar-06 + +DESCRIPTION = "Preconfigured mplayer preferences" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PV = "0.0.1" +PR = "r0" + +###################################################################################### + +SRC_URI = "file://mplayer.conf" + +###################################################################################### + +FILES_${PN} = "/usr/etc/mplayer" + +###################################################################################### + +do_install() { + install -d "${D}/usr/etc/mplayer" + + install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer" +} diff --git a/packages/mplayer/mplayer-common/.mtn2git_empty b/packages/mplayer/mplayer-common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-common/mplayer.conf b/packages/mplayer/mplayer-common/mplayer.conf new file mode 100644 index 0000000000..92aeb15f3b --- /dev/null +++ b/packages/mplayer/mplayer-common/mplayer.conf @@ -0,0 +1,15 @@ + +# You probably shouldn't touch these +ac=mad, +ao=oss, + +# Required on SL-Cxxxx for correct rotation in the *VT*, +# breaks rotation in X! +# vf=rotate=1 + +# Enable fullscreen display by default +# fs=true + +# Drop frames to keep audio and video in sync +framedrop=true + diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index bb9f540ab5..5413ab214c 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" +DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=1 \ @@ -14,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" -PR = "r2" +PR = "3" PARALLEL_MAKE = "" -- cgit v1.2.3 From 2e800e9a80e955eef6ce9cd1c37eff28477acc8d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 26 Mar 2006 17:00:17 +0000 Subject: libupnp: add 1.3.1 --- packages/upnp/.mtn2git_empty | 0 packages/upnp/libupnp_1.3.1.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/upnp/.mtn2git_empty create mode 100644 packages/upnp/libupnp_1.3.1.bb (limited to 'packages') diff --git a/packages/upnp/.mtn2git_empty b/packages/upnp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/upnp/libupnp_1.3.1.bb b/packages/upnp/libupnp_1.3.1.bb new file mode 100644 index 0000000000..80f0999dd6 --- /dev/null +++ b/packages/upnp/libupnp_1.3.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The Linux* SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification." +HOMEPAGE = "http://upnp.sourceforge.net/" +MAINTAINER = "Koen Kooi " +LICENSE = "BSD" + +LEAD_SONAME = "libupnp" +SRC_URI = "${SOURCEFORGE_MIRROR}/upnp/${P}.tar.gz" +inherit autotools pkgconfig + + + +do_stage() { +autotools_stage_all +} + + -- cgit v1.2.3 From 1ef446cdda1c68095abca7a730c906305bfc20c7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 26 Mar 2006 17:32:25 +0000 Subject: libetpan: add 0.43, remove 0.36 --- packages/libetpan/files/.mtn2git_empty | 0 packages/libetpan/files/etpan_suffix.patch | 16 ++ packages/libetpan/libetpan-0.36/.mtn2git_empty | 0 .../libetpan/libetpan-0.36/etpan_configure.patch | 55 ------ packages/libetpan/libetpan-0.36/gnutls.patch | 214 --------------------- packages/libetpan/libetpan-0.36/reentrant.patch | 63 ------ packages/libetpan/libetpan-0.38/.mtn2git_empty | 0 packages/libetpan/libetpan-0.38/etpan_suffix.patch | 16 -- packages/libetpan/libetpan_0.36.bb | 24 --- packages/libetpan/libetpan_0.43.bb | 21 ++ 10 files changed, 37 insertions(+), 372 deletions(-) create mode 100644 packages/libetpan/files/.mtn2git_empty create mode 100644 packages/libetpan/files/etpan_suffix.patch delete mode 100644 packages/libetpan/libetpan-0.36/.mtn2git_empty delete mode 100644 packages/libetpan/libetpan-0.36/etpan_configure.patch delete mode 100644 packages/libetpan/libetpan-0.36/gnutls.patch delete mode 100644 packages/libetpan/libetpan-0.36/reentrant.patch delete mode 100644 packages/libetpan/libetpan-0.38/.mtn2git_empty delete mode 100644 packages/libetpan/libetpan-0.38/etpan_suffix.patch delete mode 100644 packages/libetpan/libetpan_0.36.bb create mode 100644 packages/libetpan/libetpan_0.43.bb (limited to 'packages') diff --git a/packages/libetpan/files/.mtn2git_empty b/packages/libetpan/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch new file mode 100644 index 0000000000..901615c416 --- /dev/null +++ b/packages/libetpan/files/etpan_suffix.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libetpan/configure.in~etpan_suffix ++++ libetpan/configure.in +@@ -371,7 +371,7 @@ + REENTRANT=1 + else + REENTRANT=0 +- LIBSUFFIX=-no-mt ++ LIBSUFFIX= + fi + AC_SUBST(LIBSUFFIX) + AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan-0.36/.mtn2git_empty b/packages/libetpan/libetpan-0.36/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libetpan/libetpan-0.36/etpan_configure.patch b/packages/libetpan/libetpan-0.36/etpan_configure.patch deleted file mode 100644 index 3572339010..0000000000 --- a/packages/libetpan/libetpan-0.36/etpan_configure.patch +++ /dev/null @@ -1,55 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/configure.in~etpan_configure 2005-03-10 10:11:29.000000000 +0100 -+++ libetpan/configure.in 2005-03-11 13:57:00.232491234 +0100 -@@ -76,6 +76,38 @@ - esac - fi - -+dnl GNUTLS -+AC_ARG_WITH(gnutls, [ --with-gnutls[=DIR] include GnuTLS support (default=no)], -+ [], [with_gnutls=no]) -+if test "x$with_gnutls" != "xno"; then -+ OCPPFLAGS="$CPPFLAGS" -+ OLDFLAGS="$LDFLAGS" -+ if test "x$with_gnutls" != "xyes" ; then -+ CPPFLAGS="CRPPFLAGS -I$with_gnutls/include" -+ LDFLAGS="$LDFLAGS -L$with_gnutls/lib" -+ fi -+ GNUTLSLIBS="" -+ AC_CHECK_HEADER(gnutls/gnutls.h, [ -+ AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes,[GNUTLSLIBS="-lgnutls -lgnutls-openssl"]) -+ ]) -+ if test "x$with_gnutls" != "xyes"; then -+ CPPFLAGS="$OCPPFLAGS" -+ LDFLAGS="$OLDFLAGS" -+ else -+ with_openssl="no" -+ fi -+fi -+ -+if test "x$with_gnutls" = "xyes"; then -+ AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS]) -+ AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL]) -+ GNUTLSLIBS="-lgnutls -lgnutls-openssl" -+else -+ AC_MSG_WARN([GnuTLS support disabled.]) -+ GNUTLSLIBS="" -+fi -+AC_SUBST(GNUTLSLIBS) -+ - dnl OpenSSL -- very primitive right now - AC_ARG_WITH(openssl, [ --with-openssl[=DIR] include OpenSSL support (default=auto)], - [], [with_openssl=yes]) -@@ -336,7 +368,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan-0.36/gnutls.patch b/packages/libetpan/libetpan-0.36/gnutls.patch deleted file mode 100644 index d2ccdcf9d0..0000000000 --- a/packages/libetpan/libetpan-0.36/gnutls.patch +++ /dev/null @@ -1,214 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/src/Makefile.in~gnutls 2005-03-10 10:11:30.000000000 +0100 -+++ libetpan/src/Makefile.in 2005-03-11 21:43:10.975597607 +0100 -@@ -15,7 +15,7 @@ - - VERSINFO = @API_VERSION@ - CC = @CC@ --LDFLAGS = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ -+LDFLAGS = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIBS@ - - SUBLIBS = data-types/libdata-types.la \ - low-level/liblow-level.la \ ---- libetpan/src/data-types/mailstream_ssl.c~gnutls 2005-03-10 10:11:30.000000000 +0100 -+++ libetpan/src/data-types/mailstream_ssl.c 2005-03-11 21:44:56.373673788 +0100 -@@ -61,7 +61,12 @@ - /* mailstream_low, ssl */ - - #ifdef USE_SSL -+#ifndef USE_GNUTLS - #include -+#else -+#include -+#include -+#endif - #ifdef LIBETPAN_REENTRANT - #include - #endif -@@ -85,9 +90,9 @@ - #ifdef USE_SSL - static int mailstream_low_ssl_close(mailstream_low * s); - static ssize_t mailstream_low_ssl_read(mailstream_low * s, -- void * buf, size_t count); -+ void * buf, size_t count); - static ssize_t mailstream_low_ssl_write(mailstream_low * s, -- const void * buf, size_t count); -+ const void * buf, size_t count); - static void mailstream_low_ssl_free(mailstream_low * s); - static int mailstream_low_ssl_get_fd(mailstream_low * s); - -@@ -113,10 +118,10 @@ - SSL_CTX * tmp_ctx; - int fd_flags; - int old_fd_flags; -- -+ - #ifdef LIBETPAN_REENTRANT - pthread_mutex_lock(&ssl_lock); --#endif -+#endif - if (!ssl_init_done) { - SSL_library_init(); - ssl_init_done = 1; -@@ -124,35 +129,37 @@ - #ifdef LIBETPAN_REENTRANT - pthread_mutex_unlock(&ssl_lock); - #endif -- -+ - tmp_ctx = SSL_CTX_new(TLSv1_client_method()); - if (tmp_ctx == NULL) - goto err; -- -+ - ssl_conn = (SSL *) SSL_new(tmp_ctx); - if (ssl_conn == NULL) - goto free_ctx; -- -+ - if (SSL_set_fd(ssl_conn, fd) == 0) - goto free_ssl_conn; -- -+ -+#ifndef USE_GNUTLS - SSL_set_read_ahead(ssl_conn, 1); -- -+#endif -+ - r = SSL_connect(ssl_conn); - if (r <= 0) - goto free_ssl_conn; -- -+ - fd_flags = fcntl(fd, F_GETFL, 0); - old_fd_flags = fd_flags; - fd_flags |= O_NDELAY; - r = fcntl(fd, F_SETFL, fd_flags); - if (r < 0) - goto free_ssl_conn; -- -+ - ssl_data = malloc(sizeof(* ssl_data)); - if (ssl_data == NULL) - goto reset_fd_flags; -- -+ - ssl_data->fd = fd; - ssl_data->ssl_conn = ssl_conn; - ssl_data->ssl_ctx = tmp_ctx; -@@ -241,52 +248,101 @@ - } - - static ssize_t mailstream_low_ssl_read(mailstream_low * s, -- void * buf, size_t count) -+ void * buf, size_t count) - { - struct mailstream_ssl_data * ssl_data; - int r; - - ssl_data = (struct mailstream_ssl_data *) s->data; -- -+ - while (1) { - int ssl_r; - fd_set fds_read; -+#ifndef USE_GNUTLS - struct timeval timeout; -- -+#else -+ fd_set fds_excp; -+ -+ { -+ struct timeval timeout2; -+ timeout2 = mailstream_network_delay; -+ -+ FD_ZERO(&fds_read); -+ FD_SET(ssl_data->fd, &fds_read); -+ FD_ZERO(&fds_excp); -+ FD_SET(ssl_data->fd, &fds_excp); -+ r = select(ssl_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout2); -+ if (r==0) { -+ return -1; -+ } -+ if (FD_ISSET(ssl_data->fd, &fds_excp)) -+ return -1; -+ if (!FD_ISSET(ssl_data->fd, &fds_read)) -+ return 0; -+ } -+#endif - r = SSL_read(ssl_data->ssl_conn, buf, count); -- if (r > 0) -+ if (r > 0) { - return r; -- -+ } -+#ifdef USE_GNUTLS -+ if (errno!=EAGAIN&&errno!=EWOULDBLOCK) { -+ return r; -+ } -+#else - ssl_r = SSL_get_error(ssl_data->ssl_conn, r); - switch (ssl_r) { - case SSL_ERROR_NONE: - return r; -- -+ - case SSL_ERROR_ZERO_RETURN: - return r; -- -+ - case SSL_ERROR_WANT_READ: - timeout = mailstream_network_delay; -- -+ - FD_ZERO(&fds_read); - FD_SET(ssl_data->fd, &fds_read); - r = select(ssl_data->fd + 1, &fds_read, NULL, NULL, &timeout); - if (r == 0) - return -1; - break; -- -+ - default: - return r; - } -+#endif - } - } - - static ssize_t mailstream_low_ssl_write(mailstream_low * s, -- const void * buf, size_t count) -+ const void * buf, size_t count) - { - struct mailstream_ssl_data * ssl_data; - - ssl_data = (struct mailstream_ssl_data *) s->data; -+#ifdef USE_GNUTLS -+ { -+ fd_set fds_write; -+ fd_set fds_excp; -+ struct timeval timeout; -+ int r; -+ -+ timeout = mailstream_network_delay; -+ -+ FD_ZERO(&fds_write); -+ FD_SET(ssl_data->fd, &fds_write); -+ FD_ZERO(&fds_excp); -+ FD_SET(ssl_data->fd, &fds_excp); -+ r = select(ssl_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout); -+ if (r == 0) -+ return -1; -+ if (FD_ISSET(ssl_data->fd, &fds_excp)) -+ return -1; -+ if (!FD_ISSET(ssl_data->fd, &fds_write)) -+ return 0; -+ } -+#endif - return SSL_write(ssl_data->ssl_conn, buf, count); - } - #endif diff --git a/packages/libetpan/libetpan-0.36/reentrant.patch b/packages/libetpan/libetpan-0.36/reentrant.patch deleted file mode 100644 index eaf1edfe22..0000000000 --- a/packages/libetpan/libetpan-0.36/reentrant.patch +++ /dev/null @@ -1,63 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/src/data-types/mailsem.c~reentrant 2005-01-28 02:43:11.000000000 +0100 -+++ libetpan/src/data-types/mailsem.c 2005-03-10 14:32:31.717000768 +0100 -@@ -34,7 +34,9 @@ - */ - - #include "mailsem.h" -+#ifdef LIBETPAN_REENTRANT - #include -+#endif - #include - #include - #include -@@ -50,6 +52,7 @@ - - struct mailsem * mailsem_new(void) - { -+#ifdef LIBETPAN_REENTRANT - struct mailsem * sem; - int r; - -@@ -82,11 +85,13 @@ - return sem; - - err: -+#endif - return NULL; - } - - void mailsem_free(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - if (sem->sem_kind == SEMKIND_SEMOPEN) { - char name[SEMNAME_LEN]; - -@@ -101,14 +106,23 @@ - free(sem->sem_sem); - } - free(sem); -+#endif - } - - int mailsem_up(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - return sem_wait((sem_t *) sem->sem_sem); -+#else -+ return 0; -+#endif - } - - int mailsem_down(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - return sem_post((sem_t *) sem->sem_sem); -+#else -+ return 0; -+#endif - } diff --git a/packages/libetpan/libetpan-0.38/.mtn2git_empty b/packages/libetpan/libetpan-0.38/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libetpan/libetpan-0.38/etpan_suffix.patch b/packages/libetpan/libetpan-0.38/etpan_suffix.patch deleted file mode 100644 index 901615c416..0000000000 --- a/packages/libetpan/libetpan-0.38/etpan_suffix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libetpan/configure.in~etpan_suffix -+++ libetpan/configure.in -@@ -371,7 +371,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan_0.36.bb b/packages/libetpan/libetpan_0.36.bb deleted file mode 100644 index 1a6c989d5a..0000000000 --- a/packages/libetpan/libetpan_0.36.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \ -SMTP, POP, IMAP and NNTP" -SECTION = "libs" -DEPENDS = "openssl" -PV = "0.36" -PR = "r3" -S = "${WORKDIR}/libetpan" -TAG="rel-0-36" -LICENSE = "BSD" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/libetpan;tag=${TAG};module=libetpan \ - file://etpan_configure.patch;patch=1 \ - file://reentrant.patch;patch=1 \ - file://gnutls.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db --disable-threads" - -do_stage () { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb new file mode 100644 index 0000000000..51757a7265 --- /dev/null +++ b/packages/libetpan/libetpan_0.43.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ +It supports the protocols SMTP, POP3, IMAP and NNTP." +HOMEPAGE = "http://www.etpan.org" +SECTION = "libs" +DEPENDS = "gnutls" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ + file://etpan_suffix.patch;patch=1 " + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" + +do_stage() { + oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" -- cgit v1.2.3 From 2189026ab46306001c2f809c3f4c504dea11394c Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Sun, 26 Mar 2006 19:04:11 +0000 Subject: Add a couple of 64-bit buildhost cleanup patches to the tree, but do not use them yet. These need to be further tested by devs with ia32 buildhost, and activated by uicmoc maintainer. Thanks to Darren Edmundson for patches (OE bugs #345, #535). --- .../uicmoc-native-2.3.10/use_stdint_types.patch | 226 +++++++++++++++++++++ .../uicmoc3-native-3.3.5/use_stdint_types.patch | 147 ++++++++++++++ 2 files changed, 373 insertions(+) create mode 100644 packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch (limited to 'packages') diff --git a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch new file mode 100644 index 0000000000..3cca3e0d1d --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + #if defined(QT_POSIX_QSHM) + #include +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include ++ + #ifndef QT_H + #include + #include +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch new file mode 100644 index 0000000000..17836802a6 --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch @@ -0,0 +1,147 @@ +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 +@@ -176,7 +176,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -737,7 +737,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +@@ -31,6 +31,7 @@ + **********************************************************************/ + + #include "qsharedmemory_p.h" ++#include + + #if !defined(QT_QWS_NO_SHM) + +@@ -132,7 +133,7 @@ + shmId = shmget (key, shmSize, 0); + + shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ if ((intptr_t) shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +@@ -107,6 +107,7 @@ + #include + #include + #include ++#include + + #if defined(Q_OS_QNX) + #include +@@ -1879,7 +1880,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -1898,11 +1899,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2130,7 +2131,7 @@ + } + if ( !qws_overrideCursor ) { + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +@@ -49,6 +49,7 @@ + #include "qgfx_qws.h" + #include "qtextengine_p.h" + #include "qfontengine_p.h" ++#include + + QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; + +@@ -133,7 +134,7 @@ + req.pointSize = req.pixelSize*10; + + if ( ! engineData ) { +- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); ++ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); + + // look for the requested font in the engine data cache + engineData = QFontCache::instance->findEngineData( key ); +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -288,7 +289,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +@@ -53,6 +53,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -631,7 +632,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1845,7 +1846,7 @@ + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif -- cgit v1.2.3 From df2a64dbc7fe5e334cac55a628a2785280eb90de Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Sun, 26 Mar 2006 19:10:26 +0000 Subject: disapproval of revision '028a611cef6b234bc056ae3e11b0b983d6762f4e' --- .../uicmoc-native-2.3.10/use_stdint_types.patch | 226 --------------------- .../uicmoc3-native-3.3.5/use_stdint_types.patch | 147 -------------- 2 files changed, 373 deletions(-) delete mode 100644 packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch delete mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch (limited to 'packages') diff --git a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch deleted file mode 100644 index 3cca3e0d1d..0000000000 --- a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch +++ /dev/null @@ -1,226 +0,0 @@ ---- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 -+++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 -@@ -36,6 +36,7 @@ - - #include - #include -+#include - - #if defined(QT_POSIX_QSHM) - #include -@@ -122,8 +123,8 @@ - if (shmId == -1) - shmId = shmget (key, shmSize, 0); - -- shmBase = shmat (shmId, 0, 0); -- if ((int) shmBase == -1 || shmBase == 0) -+ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); -+ if (shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; ---- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 -+++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 -@@ -87,6 +87,7 @@ - #include - #include - #include -+#include - #endif - - #include -@@ -2041,7 +2042,7 @@ - w = widgetAt(*qt_last_x, *qt_last_y, FALSE); - if ( !w ) - w = desktop(); -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - - void QApplication::restoreOverrideCursor() -@@ -2060,11 +2061,11 @@ - cursorStack = 0; - qws_overrideCursor = FALSE; - if ( w->testWState(WState_OwnCursor) ) -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); - } else { -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - } - #endif// QT_NO_CURSOR -@@ -2635,7 +2636,7 @@ - } - if ( !qws_overrideCursor ) { // is override cursor active? - if (curs) -- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); - } ---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include "qgfxlinuxfb_qws.h" - #include "qwindowsystem_qws.h" -@@ -164,7 +165,7 @@ - MAP_SHARED, fd, 0); - data += dataoffset; - -- if ((int)data == -1) { -+ if ((intptr_t)data == -1) { - perror("mapping /dev/fb0"); - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; -@@ -703,7 +704,7 @@ - psize += 8; // for alignment - psize &= ~0x7; // align - -- unsigned int pos=(unsigned int)data; -+ uintptr_t pos=(uintptr_t)data; - pos += psize; - entryp = ((int *)pos); - lowest = ((unsigned int *)pos)+1; ---- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 -@@ -33,6 +33,9 @@ - #ifndef QMEMORYMANAGER_H - #define QMEMORYMANAGER_H - -+/* Needed for uintptr_t to allow 64bit clean pointer handling */ -+#include -+ - #ifndef QT_H - #include - #include -@@ -126,8 +129,8 @@ - // constructs from a memory ptr to where the data after the item starts - QSMCacheItemPtr(void *data) { - char *ptr = (char*)data; -- if ( (int)ptr != (((int)ptr+3)&~3) ) -- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); -+ if (intptr_t(data)&3!=0) -+ qDebug("err, passed a non-aligned data ptr %p", ptr); - d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); - } - // returns a pointer to the data after the item ---- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 -@@ -32,6 +32,7 @@ - #include "qwsdisplay_qws.h" - #include "qwsregionmanager_qws.h" - #include -+#include - - #ifndef QT_NO_QWS_MULTIPROCESS - #include -@@ -286,7 +287,7 @@ - data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); - } - -- return ( shmId != -1 && (int)data != -1 ); -+ return ( shmId != -1 && (intptr_t)data != -1 ); - #else - int dataSize = sizeof(QWSRegionHeader) // header - + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 -+++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 -@@ -38,6 +38,7 @@ - #include "qpixmapcache.h" - #include "qcache.h" - #include "qobject.h" -+#include - - - // REVISED: paul -@@ -519,7 +520,7 @@ - #endif // DEBUG_SHARED_MEMORY_CACHE - } - -- if ( shmId == -1 || (int)shm == -1 ) -+ if ( shmId == -1 || (intptr_t)shm == -1 ) - qFatal("Cannot attach to shared memory"); - - qt_sharedMemoryData = shm->data; -@@ -536,8 +537,8 @@ - shm->tail.setFree(false); - shm->tail.setNextFree(QSMemPtr()); - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; - if ( freePagesLength ) { - # ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Initially marking free pages as not needed"); -@@ -770,8 +771,8 @@ - node = newFreeNode->next(); - - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; - if ( freePagesLength ) { - #ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Marking pages not needed"); ---- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 -@@ -50,6 +50,7 @@ - #include "qwsmanager_qws.h" - #include "qwsregionmanager_qws.h" - #include "qinputcontext_p.h" -+#include - - void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp - int qt_sip_count( QWidget* ); // --- "" --- -@@ -633,7 +634,7 @@ - qt_mouseGrb->releaseMouse(); - - qwsDisplay()->grabMouse(this,TRUE); -- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); -+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); - qt_mouseGrb = this; - qt_pressGrab = 0; - } -@@ -1840,11 +1841,11 @@ - void QWidget::updateCursor( const QRegion &r ) const - { - if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && -- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { -+ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { - QSize s( qt_screen->width(), qt_screen->height() ); - QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); - if ( r.contains(pos) ) -- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); -+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); - } - } - #endif ---- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 -+++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - - QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, -@@ -136,7 +137,7 @@ - data = (unsigned char *)shmat( shmId, 0, 0 ); - } - -- if ( (int)data == -1 ){ -+ if ( (intptr_t)data == -1 ){ - ::close(mouseFd); - ::close(keyboardFd); - qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch deleted file mode 100644 index 17836802a6..0000000000 --- a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 -@@ -176,7 +176,7 @@ - MAP_SHARED, fd, 0); - data += dataoffset; - -- if ((int)data == -1) { -+ if ((intptr_t)data == -1) { - perror("mapping /dev/fb0"); - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; -@@ -737,7 +737,7 @@ - psize += 8; // for alignment - psize &= ~0x7; // align - -- unsigned int pos=(unsigned int)data; -+ uintptr_t pos=(uintptr_t)data; - pos += psize; - entryp = ((int *)pos); - lowest = ((unsigned int *)pos)+1; ---- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 -@@ -31,6 +31,7 @@ - **********************************************************************/ - - #include "qsharedmemory_p.h" -+#include - - #if !defined(QT_QWS_NO_SHM) - -@@ -132,7 +133,7 @@ - shmId = shmget (key, shmSize, 0); - - shmBase = shmat (shmId, 0, 0); -- if ((int) shmBase == -1 || shmBase == 0) -+ if ((intptr_t) shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; ---- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 -@@ -107,6 +107,7 @@ - #include - #include - #include -+#include - - #if defined(Q_OS_QNX) - #include -@@ -1879,7 +1880,7 @@ - w = widgetAt(*qt_last_x, *qt_last_y, FALSE); - if ( !w ) - w = desktop(); -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - - void QApplication::restoreOverrideCursor() -@@ -1898,11 +1899,11 @@ - cursorStack = 0; - qws_overrideCursor = FALSE; - if ( w->testWState(WState_OwnCursor) ) -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); - } else { -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - } - #endif// QT_NO_CURSOR -@@ -2130,7 +2131,7 @@ - } - if ( !qws_overrideCursor ) { - if (curs) -- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); - } ---- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 -@@ -49,6 +49,7 @@ - #include "qgfx_qws.h" - #include "qtextengine_p.h" - #include "qfontengine_p.h" -+#include - - QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; - -@@ -133,7 +134,7 @@ - req.pointSize = req.pixelSize*10; - - if ( ! engineData ) { -- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); -+ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); - - // look for the requested font in the engine data cache - engineData = QFontCache::instance->findEngineData( key ); ---- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 -@@ -32,6 +32,7 @@ - #include "qwsdisplay_qws.h" - #include "qwsregionmanager_qws.h" - #include -+#include - - #ifndef QT_NO_QWS_MULTIPROCESS - #include -@@ -288,7 +289,7 @@ - data = (unsigned char *)shmat( shmId, 0, 0 ); - } - -- return ( shmId != -1 && (int)data != -1 ); -+ return ( shmId != -1 && (intptr_t)data != -1 ); - #else - int dataSize = sizeof(QWSRegionHeader) // header - + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 -@@ -53,6 +53,7 @@ - #include "qwsmanager_qws.h" - #include "qwsregionmanager_qws.h" - #include "qinputcontext_p.h" -+#include - - void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp - int qt_sip_count( QWidget* ); // --- "" --- -@@ -631,7 +632,7 @@ - qt_mouseGrb->releaseMouse(); - - qwsDisplay()->grabMouse(this,TRUE); -- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); -+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); - qt_mouseGrb = this; - qt_pressGrab = 0; - } -@@ -1845,7 +1846,7 @@ - QSize s( qt_screen->width(), qt_screen->height() ); - QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); - if ( r.contains(pos) ) -- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); -+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); - } - } - #endif -- cgit v1.2.3 From f6f3d654a28cd012fbf275f7b74e8d6c94846c96 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 26 Mar 2006 21:12:29 +0000 Subject: mplayer: fix a typo in PR --- packages/mplayer/mplayer_1.0pre7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index 5413ab214c..25194beec9 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -15,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" -PR = "3" +PR = "r3" PARALLEL_MAKE = "" -- cgit v1.2.3 From ff114b4703f7797dcc965d29e10ea33098b4acc1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Mar 2006 10:46:01 +0000 Subject: libschedule: Add 0.16, remove 0.13. --- packages/libschedule/libschedule_0.13.bb | 25 ------------------------- packages/libschedule/libschedule_0.16.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 packages/libschedule/libschedule_0.13.bb create mode 100644 packages/libschedule/libschedule_0.16.bb (limited to 'packages') diff --git a/packages/libschedule/libschedule_0.13.bb b/packages/libschedule/libschedule_0.13.bb deleted file mode 100644 index feba11c9df..0000000000 --- a/packages/libschedule/libschedule_0.13.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "LGPL" -PR = "r1" -DESCRIPTION = "RTC alarm handling library for GPE" -SECTION = "gpe/libs" -PRIORITY = "optional" -MAINTAINER = "Philip Blundell " -DEPENDS = "glib-2.0" - -inherit pkgconfig gpe - -headers = "schedule.h" - -do_stage () { - oe_libinstall -so libschedule ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done -} - -do_install () { - gpe_do_install - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel -} diff --git a/packages/libschedule/libschedule_0.16.bb b/packages/libschedule/libschedule_0.16.bb new file mode 100644 index 0000000000..ab71dd4521 --- /dev/null +++ b/packages/libschedule/libschedule_0.16.bb @@ -0,0 +1,15 @@ +LICENSE = "LGPL" +PR = "r0" +DESCRIPTION = "RTC alarm handling library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 sqlite" +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools pkgconfig gpe + + +do_stage () { +autotools_stage_all +} + -- cgit v1.2.3 From c061cac00b68cb66701fba06f2eb3380dd24f4cc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 27 Mar 2006 13:06:57 +0000 Subject: wxbase: add 2.6.2 and 2.7+cvs, partially fixes OE bug #716 --- packages/wxbase/.mtn2git_empty | 0 packages/wxbase/wxbase_2.6.2.bb | 54 +++++++++++++++++++++++++++++++++++++++ packages/wxbase/wxbase_2.7+cvs.bb | 53 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 packages/wxbase/.mtn2git_empty create mode 100644 packages/wxbase/wxbase_2.6.2.bb create mode 100644 packages/wxbase/wxbase_2.7+cvs.bb (limited to 'packages') diff --git a/packages/wxbase/.mtn2git_empty b/packages/wxbase/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb new file mode 100644 index 0000000000..2a41fdfa65 --- /dev/null +++ b/packages/wxbase/wxbase_2.6.2.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "wxBase is a library for programming \ +non-GUI (console) applications using the base wxWidgets functionality." +HOMEPAGE = "http://www.wxwidgets.org/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "jpeg libpng zlib" + + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" + +S = "${WORKDIR}/wxBase-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-largefile" + +LEAD_SONAME = "libwx_base-2.6.so*" + +do_configure() { + oe_runconf +} + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.6/wx + cp -pr include/wx ${STAGING_INCDIR}/wx-2.6 + cp -pr lib/libwx* ${STAGING_LIBDIR} + cp -pr lib/wx ${STAGING_LIBDIR} + cp -pr build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pr wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 +} + +FILES_${PN} += " \ + ${libdir}/wx/config" + +FILES_${PN}-dev += " \ + ${libdir}/wx/include \ + ${datadir}/bakefile" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config + install -d ${D}${docdir}/${PN}-${PV} + install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV} + install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV} +} diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb new file mode 100644 index 0000000000..efc04b6f8c --- /dev/null +++ b/packages/wxbase/wxbase_2.7+cvs.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "wxBase is a library for programming \ +non-GUI (console) applications using the base wxWidgets functionality." +HOMEPAGE = "http://www.wxwidgets.org/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "jpeg libpng zlib" + + +SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/wx-cvs-Gtk.tar.bz2" +#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" + +S = "${WORKDIR}/wxGTK" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gui --enable-largefile" + +LEAD_SONAME = "libwx_base-2.7*" + +do_configure() { + oe_runconf +} + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.7/wx + cp -pr include/wx ${STAGING_INCDIR}/wx-2.7 + cp -pr lib/libwx* ${STAGING_LIBDIR} + cp -pr lib/wx ${STAGING_LIBDIR} + cp -pr build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pr wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 +} + +FILES_${PN} += " \ + ${libdir}/wx/config" + +FILES_${PN}-dev += " \ + ${libdir}/wx/include \ + ${datadir}/bakefile" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config + install -d ${D}${docdir}/${PN}-${PV} + install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} +} -- cgit v1.2.3 From 7946db6bacf66b8632151912347e5f6e3018f1b1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:22:30 +0000 Subject: openobex: add version 1.2, remove version 1.0.1 openobex-apps has been integrated into openobex --- packages/openobex-apps/.mtn2git_empty | 0 .../openobex-apps-1.0.0/.mtn2git_empty | 0 .../openobex-apps/openobex-apps-1.0.0/gcc34.patch | 260 --------------------- .../openobex-apps/openobex-apps-1.0.0/m4.patch | 64 ----- packages/openobex-apps/openobex-apps_1.0.0.bb | 14 -- packages/openobex/files/.mtn2git_empty | 0 packages/openobex/files/disable-cable-test.patch | 16 ++ packages/openobex/openobex-1.0.1/.mtn2git_empty | 0 packages/openobex/openobex-1.0.1/syms.patch | 44 ---- packages/openobex/openobex_1.0.1.bb | 24 -- packages/openobex/openobex_1.2.bb | 29 +++ 11 files changed, 45 insertions(+), 406 deletions(-) delete mode 100644 packages/openobex-apps/.mtn2git_empty delete mode 100644 packages/openobex-apps/openobex-apps-1.0.0/.mtn2git_empty delete mode 100644 packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch delete mode 100644 packages/openobex-apps/openobex-apps-1.0.0/m4.patch delete mode 100644 packages/openobex-apps/openobex-apps_1.0.0.bb create mode 100644 packages/openobex/files/.mtn2git_empty create mode 100644 packages/openobex/files/disable-cable-test.patch delete mode 100644 packages/openobex/openobex-1.0.1/.mtn2git_empty delete mode 100644 packages/openobex/openobex-1.0.1/syms.patch delete mode 100644 packages/openobex/openobex_1.0.1.bb create mode 100644 packages/openobex/openobex_1.2.bb (limited to 'packages') diff --git a/packages/openobex-apps/.mtn2git_empty b/packages/openobex-apps/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openobex-apps/openobex-apps-1.0.0/.mtn2git_empty b/packages/openobex-apps/openobex-apps-1.0.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch b/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch deleted file mode 100644 index 6dac1725b6..0000000000 --- a/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch +++ /dev/null @@ -1,260 +0,0 @@ -diff -Naur openobex-apps-1.0.0-clean/src/obex_put_common.c openobex-apps-1.0.0/src/obex_put_common.c ---- openobex-apps-1.0.0-clean/src/obex_put_common.c 2002-12-01 18:34:41.000000000 +0100 -+++ openobex-apps-1.0.0/src/obex_put_common.c 2004-05-12 12:57:37.000000000 +0200 -@@ -82,7 +82,7 @@ - break; - - default: -- printf(__FUNCTION__ "() Skipped header %02x\n", hi); -+ printf("%s() Skipped header %02x\n", __func__, hi); - } - } - if(!body) { -@@ -123,7 +123,7 @@ - OBEX_ObjectSetRsp(object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); - break; - default: -- printf(__FUNCTION__ "() Denied %02x request\n", cmd); -+ printf("%s() Denied %02x request\n", __func__, cmd); - OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED); - break; - } -diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h openobex-apps-1.0.0/src/obex_test_cable.h ---- openobex-apps-1.0.0-clean/src/obex_test_cable.h 2002-12-01 18:34:41.000000000 +0100 -+++ openobex-apps-1.0.0/src/obex_test_cable.h 2004-05-12 13:23:11.000000000 +0200 -@@ -1,16 +1,16 @@ - /********************************************************************* -- * -+ * - * Filename: obex_test_cable.h -- * Version: -- * Description: -+ * Version: -+ * Description: - * Status: Experimental. - * Author: Pontus Fuchs - * Created at: Wed Nov 17 22:05:16 1999 - * Modified at: Sun Aug 13 10:55:20 PM CEST 2000 - * Modified by: Pontus Fuchs -- * -+ * - * Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved. -- * -+ * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either -@@ -23,9 +23,9 @@ - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA -- * -+ * - ********************************************************************/ - - #ifndef OBEX_TEST_CABLE_H -@@ -38,7 +38,7 @@ - #include - - #ifdef CABLE_DEBUG --#define CDEBUG(args...) printf(__FUNCTION__ "() " args) -+#define CDEBUG(args...) printf("%s() ", __func__, args) - #else - #define CDEBUG(args...) - #endif -diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h~ openobex-apps-1.0.0/src/obex_test_cable.h~ ---- openobex-apps-1.0.0-clean/src/obex_test_cable.h~ 1970-01-01 01:00:00.000000000 +0100 -+++ openobex-apps-1.0.0/src/obex_test_cable.h~ 2004-05-12 13:22:48.000000000 +0200 -@@ -0,0 +1,66 @@ -+/********************************************************************* -+ * -+ * Filename: obex_test_cable.h -+ * Version: -+ * Description: -+ * Status: Experimental. -+ * Author: Pontus Fuchs -+ * Created at: Wed Nov 17 22:05:16 1999 -+ * Modified at: Sun Aug 13 10:55:20 PM CEST 2000 -+ * Modified by: Pontus Fuchs -+ * -+ * Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ ********************************************************************/ -+ -+#ifndef OBEX_TEST_CABLE_H -+#define OBEX_TEST_CABLE_H -+ -+#define CABLE_DEBUG 1 -+ -+ -+#include -+#include -+ -+#ifdef CABLE_DEBUG -+#define CDEBUG(args...) printf("%s() " __func__, args) -+#else -+#define CDEBUG(args...) -+#endif -+ -+struct cobex_context -+{ -+ const char *portname; -+ int ttyfd; -+ char inputbuf[500]; -+ struct termios oldtio, newtio; -+ int r320; -+}; -+ -+/* User function */ -+struct cobex_context *cobex_open(const char *port, int r320); -+void cobex_close(struct cobex_context *gt); -+int cobex_do_at_cmd(struct cobex_context *gt, char *cmd, char *rspbuf, int rspbuflen, int timeout); -+ -+/* Callbacks */ -+int cobex_handle_input(obex_t *handle, void * userdata, int timeout); -+int cobex_write(obex_t *self, void * userdata, uint8_t *buffer, int length); -+int cobex_connect(obex_t *handle, void * userdata); -+int cobex_disconnect(obex_t *handle, void * userdata); -+ -+#endif -diff -Naur openobex-apps-1.0.0-clean/src/obex_test_client.c openobex-apps-1.0.0/src/obex_test_client.c ---- openobex-apps-1.0.0-clean/src/obex_test_client.c 2002-12-01 18:34:41.000000000 +0100 -+++ openobex-apps-1.0.0/src/obex_test_client.c 2004-05-12 13:07:24.000000000 +0200 -@@ -370,13 +370,13 @@ - - while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) { - if(hi == OBEX_HDR_BODY) { -- printf(__FUNCTION__ "() Found body\n"); -+ printf("%s() Found body\n", __func__); - body = hv.bs; - body_len = hlen; - break; - } - else { -- printf(__FUNCTION__ "() Skipped header %02x\n", hi); -+ printf("%s() Skipped header %02x\n", __func__, hi); - } - } - -diff -Naur openobex-apps-1.0.0-clean/src/obex_test_server.c openobex-apps-1.0.0/src/obex_test_server.c ---- openobex-apps-1.0.0-clean/src/obex_test_server.c 2002-12-01 18:34:41.000000000 +0100 -+++ openobex-apps-1.0.0/src/obex_test_server.c 2004-05-12 13:07:33.000000000 +0200 -@@ -54,17 +54,17 @@ - char *name = NULL; - char *namebuf = NULL; - -- printf(__FUNCTION__ "()\n"); -+ printf("%s()\n", __func__); - - while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) { - switch(hi) { - case OBEX_HDR_BODY: -- printf(__FUNCTION__ "() Found body\n"); -+ printf("%s() Found body\n", __func__); - body = hv.bs; - body_len = hlen; - break; - case OBEX_HDR_NAME: -- printf(__FUNCTION__ "() Found name\n"); -+ printf("%s() Found name\n", __func__); - if( (namebuf = malloc(hlen / 2))) { - OBEX_UnicodeToChar(namebuf, hv.bs, hlen); - name = namebuf; -@@ -72,7 +72,7 @@ - break; - - default: -- printf(__FUNCTION__ "() Skipped header %02x\n", hi); -+ printf("%s() Skipped header %02x\n", __func__, hi); - } - } - if(!body) { -@@ -103,12 +103,12 @@ - char *name = NULL; - char *namebuf = NULL; - -- printf(__FUNCTION__ "()\n"); -+ printf("%s()\n", __func__); - - while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) { - switch(hi) { - case OBEX_HDR_NAME: -- printf(__FUNCTION__ "() Found name\n"); -+ printf("%s() Found name\n", __func__); - if( (namebuf = malloc(hlen / 2))) { - OBEX_UnicodeToChar(namebuf, hv.bs, hlen); - name = namebuf; -@@ -116,16 +116,16 @@ - break; - - default: -- printf(__FUNCTION__ "() Skipped header %02x\n", hi); -+ printf("%s() Skipped header %02x\n", __func__, hi); - } - } - - if(!name) { -- printf(__FUNCTION__ "() Got a GET without a name-header!\n"); -+ printf("%s() Got a GET without a name-header!\n", __func__); - OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_FOUND, OBEX_RSP_NOT_FOUND); - return; - } -- printf(__FUNCTION__ "() Got a request for %s\n", name); -+ printf("%s() Got a request for %s\n", __func__, name); - - buf = easy_readfile(name, &file_size); - if(buf == NULL) { -@@ -154,7 +154,7 @@ - - const uint8_t *who = NULL; - int who_len = 0; -- printf(__FUNCTION__ "()\n"); -+ printf("%s()\n", __func__); - - while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) { - if(hi == OBEX_HDR_WHO) { -@@ -162,7 +162,7 @@ - who_len = hlen; - } - else { -- printf(__FUNCTION__ "() Skipped header %02x\n", hi); -+ printf("%s() Skipped header %02x\n", __func__, hi); - } - } - if (who_len == 6) { -@@ -199,7 +199,7 @@ - OBEX_ObjectSetRsp(object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); - break; - default: -- printf(__FUNCTION__ "() Denied %02x request\n", cmd); -+ printf("%s() Denied %02x request\n", __func__, cmd); - OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED); - break; - } -@@ -224,7 +224,7 @@ - break; - - default: -- printf(__FUNCTION__ "() Command (%02x) has now finished\n", obex_cmd); -+ printf("%s() Command (%02x) has now finished\n", __func__, obex_cmd); - break; - } - } diff --git a/packages/openobex-apps/openobex-apps-1.0.0/m4.patch b/packages/openobex-apps/openobex-apps-1.0.0/m4.patch deleted file mode 100644 index 249074bf60..0000000000 --- a/packages/openobex-apps/openobex-apps-1.0.0/m4.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ openobex-apps-1.0.0/m4/openobex.m4 2004-01-26 18:48:04.000000000 -0500 -@@ -0,0 +1,56 @@ -+dnl Check for openobex library -+dnl Written by Pontus Fuchs 2000-08-18 -+dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17 -+ -+AC_DEFUN([AM_PATH_OPENOBEX], [ -+ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) -+ -+ if test "$OPENOBEX_CONFIG" = "no" ; then -+ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.) -+ fi -+ -+ min_obex_version=ifelse([$1], ,0.9.6,$1) -+ AC_MSG_CHECKING(for openobex - version >= $min_obex_version) -+ -+ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` -+ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` -+ -+ obex_config_version=`$OPENOBEX_CONFIG --version` -+ -+ obex_config_major_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ obex_req_major_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_req_minor_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_req_micro_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ -+ if test $obex_req_major_version -lt $obex_config_major_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_major_version -eq $obex_config_major_version ; then -+ if test $obex_req_minor_version -lt $obex_config_minor_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_minor_version -eq $obex_config_minor_version ; then -+ if test $obex_req_micro_version -le $obex_config_micro_version ; then -+ obex_config_version_ok="yes" -+ fi -+ fi -+ fi -+ -+ if test "$obex_config_version_ok" != "yes" ; then -+ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version)) -+ fi -+ -+ AC_SUBST(OPENOBEX_CFLAGS) -+ AC_SUBST(OPENOBEX_LIBS) -+ AC_MSG_RESULT(yes) -+]) diff --git a/packages/openobex-apps/openobex-apps_1.0.0.bb b/packages/openobex-apps/openobex-apps_1.0.0.bb deleted file mode 100644 index 5fee78ce9b..0000000000 --- a/packages/openobex-apps/openobex-apps_1.0.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Applications for OpenOBEX" -SECTION = "console/network" -PRIORITY = "optional" -DEPENDS = "openobex" - -SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-apps-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://gcc34.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-glibtest --with-glib-prefix=${STAGING_LIBDIR}/.." -EXTRA_OEMAKE = "'INCLUDES='" diff --git a/packages/openobex/files/.mtn2git_empty b/packages/openobex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openobex/files/disable-cable-test.patch b/packages/openobex/files/disable-cable-test.patch new file mode 100644 index 0000000000..95b636dd8f --- /dev/null +++ b/packages/openobex/files/disable-cable-test.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- openobex-1.2/apps/Makefile.am~disable-cable-test ++++ openobex-1.2/apps/Makefile.am +@@ -6,7 +6,7 @@ + obex_io.c obex_io.h \ + obex_put_common.c obex_put_common.h + +-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test ++bin_PROGRAMS = irxfer obex_tcp irobex_palm3 + + obex_test_SOURCES = \ + obex_test.c obex_test.h \ diff --git a/packages/openobex/openobex-1.0.1/.mtn2git_empty b/packages/openobex/openobex-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openobex/openobex-1.0.1/syms.patch b/packages/openobex/openobex-1.0.1/syms.patch deleted file mode 100644 index 46eea177cf..0000000000 --- a/packages/openobex/openobex-1.0.1/syms.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: obex.sym -=================================================================== -RCS file: /cvsroot/openobex/openobex/lib/src/obex.sym,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- openobex/src/obex.sym 15 Nov 2002 09:14:11 -0000 1.7 -+++ openobex/src/obex.sym 30 Jan 2004 19:25:45 -0000 1.8 -@@ -1,27 +1,31 @@ - OBEX_Init - OBEX_Cleanup -+OBEX_SetUserData -+OBEX_GetUserData -+OBEX_SetUserCallBack -+OBEX_SetTransportMTU -+OBEX_GetFD - OBEX_RegisterCTransport - OBEX_SetCustomData - OBEX_GetCustomData - OBEX_TransportConnect - OBEX_TransportDisconnect - OBEX_CustomDataFeed --OBEX_GetFD - OBEX_HandleInput - OBEX_ServerRegister -+OBEX_ServerAccept - OBEX_Request - OBEX_CancelRequest --OBEX_SetUserData --OBEX_GetUserData - OBEX_ObjectNew - OBEX_ObjectDelete - OBEX_ObjectAddHeader - OBEX_ObjectGetNextHeader --OBEX_ObjectReadStream -+OBEX_ObjectReParseHeaders - OBEX_ObjectSetRsp - OBEX_ObjectGetNonHdrData - OBEX_ObjectSetNonHdrData - OBEX_ObjectSetHdrOffset -+OBEX_ObjectReadStream - OBEX_UnicodeToChar - OBEX_CharToUnicode - OBEX_ResponseToString diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb deleted file mode 100644 index 221ea71d61..0000000000 --- a/packages/openobex/openobex_1.0.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "The Openobex project aims to make an \ -open source implementation of the Object Exchange \ -(OBEX) protocol." -SECTION = "libs" -PR = "r4" - -# put openobex-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ - file://syms.patch;patch=1" - -inherit autotools binconfig - -do_stage () { - oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR} - ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so - install -d ${STAGING_INCDIR}/openobex - install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/ - install -d ${STAGING_DIR}/aclocal - install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb new file mode 100644 index 0000000000..61ce72663b --- /dev/null +++ b/packages/openobex/openobex_1.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "The Openobex project aims to make an \ +open source implementation of the Object Exchange \ +(OBEX) protocol." +HOMEPAGE = "http://openobex.triq.net" +SECTION = "libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ + file://disable-cable-test.patch;patch=1" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump" + +do_stage() { + oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} + ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so + install -d ${STAGING_INCDIR}/openobex + install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/ + install -d ${STAGING_DIR}/aclocal + install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/ +} + +# how to stop shlibrename from renaming -apps? +PACKAGES = "${PN} ${PN}-dev openobex-apps" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/openobex-config" +FILES_${PN}-apps = "${bindir}" -- cgit v1.2.3 From a26a3b34e65571dc2967876aee13049e5b2d46bf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:44:26 +0000 Subject: obexftp: add 0.19 (openobex 1.1 and later), remove 0.10.3 (openobex 1.0) --- packages/obexftp/files/.mtn2git_empty | 0 packages/obexftp/files/m4.patch | 64 ++++++++++++++++++++++++++ packages/obexftp/obexftp-0.10.3/.mtn2git_empty | 0 packages/obexftp/obexftp-0.10.3/m4.patch | 64 -------------------------- packages/obexftp/obexftp_0.10.3.bb | 14 ------ packages/obexftp/obexftp_0.19.bb | 18 ++++++++ 6 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 packages/obexftp/files/.mtn2git_empty create mode 100644 packages/obexftp/files/m4.patch delete mode 100644 packages/obexftp/obexftp-0.10.3/.mtn2git_empty delete mode 100644 packages/obexftp/obexftp-0.10.3/m4.patch delete mode 100644 packages/obexftp/obexftp_0.10.3.bb create mode 100644 packages/obexftp/obexftp_0.19.bb (limited to 'packages') diff --git a/packages/obexftp/files/.mtn2git_empty b/packages/obexftp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obexftp/files/m4.patch b/packages/obexftp/files/m4.patch new file mode 100644 index 0000000000..07c5eedcd7 --- /dev/null +++ b/packages/obexftp/files/m4.patch @@ -0,0 +1,64 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null 2003-09-23 18:19:32.000000000 -0400 ++++ obexftp-0.10.3/m4/openobex.m4 2004-03-06 05:10:27.000000000 -0500 +@@ -0,0 +1,56 @@ ++dnl Check for openobex library ++dnl Written by Pontus Fuchs 2000-08-18 ++dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17 ++ ++AC_DEFUN([AM_PATH_OPENOBEX], [ ++ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) ++ ++ if test "$OPENOBEX_CONFIG" = "no" ; then ++ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.) ++ fi ++ ++ min_obex_version=ifelse([$1], ,0.9.6,$1) ++ AC_MSG_CHECKING(for openobex - version >= $min_obex_version) ++ ++ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` ++ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` ++ ++ obex_config_version=`$OPENOBEX_CONFIG --version` ++ ++ obex_config_major_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ ++ obex_req_major_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ obex_req_minor_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ obex_req_micro_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ ++ ++ if test $obex_req_major_version -lt $obex_config_major_version ; then ++ obex_config_version_ok="yes" ++ fi ++ if test $obex_req_major_version -eq $obex_config_major_version ; then ++ if test $obex_req_minor_version -lt $obex_config_minor_version ; then ++ obex_config_version_ok="yes" ++ fi ++ if test $obex_req_minor_version -eq $obex_config_minor_version ; then ++ if test $obex_req_micro_version -le $obex_config_micro_version ; then ++ obex_config_version_ok="yes" ++ fi ++ fi ++ fi ++ ++ if test "$obex_config_version_ok" != "yes" ; then ++ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version)) ++ fi ++ ++ AC_SUBST(OPENOBEX_CFLAGS) ++ AC_SUBST(OPENOBEX_LIBS) ++ AC_MSG_RESULT(yes) ++]) diff --git a/packages/obexftp/obexftp-0.10.3/.mtn2git_empty b/packages/obexftp/obexftp-0.10.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obexftp/obexftp-0.10.3/m4.patch b/packages/obexftp/obexftp-0.10.3/m4.patch deleted file mode 100644 index 07c5eedcd7..0000000000 --- a/packages/obexftp/obexftp-0.10.3/m4.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ obexftp-0.10.3/m4/openobex.m4 2004-03-06 05:10:27.000000000 -0500 -@@ -0,0 +1,56 @@ -+dnl Check for openobex library -+dnl Written by Pontus Fuchs 2000-08-18 -+dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17 -+ -+AC_DEFUN([AM_PATH_OPENOBEX], [ -+ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) -+ -+ if test "$OPENOBEX_CONFIG" = "no" ; then -+ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.) -+ fi -+ -+ min_obex_version=ifelse([$1], ,0.9.6,$1) -+ AC_MSG_CHECKING(for openobex - version >= $min_obex_version) -+ -+ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` -+ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` -+ -+ obex_config_version=`$OPENOBEX_CONFIG --version` -+ -+ obex_config_major_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ obex_req_major_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_req_minor_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_req_micro_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ -+ if test $obex_req_major_version -lt $obex_config_major_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_major_version -eq $obex_config_major_version ; then -+ if test $obex_req_minor_version -lt $obex_config_minor_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_minor_version -eq $obex_config_minor_version ; then -+ if test $obex_req_micro_version -le $obex_config_micro_version ; then -+ obex_config_version_ok="yes" -+ fi -+ fi -+ fi -+ -+ if test "$obex_config_version_ok" != "yes" ; then -+ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version)) -+ fi -+ -+ AC_SUBST(OPENOBEX_CFLAGS) -+ AC_SUBST(OPENOBEX_LIBS) -+ AC_MSG_RESULT(yes) -+]) diff --git a/packages/obexftp/obexftp_0.10.3.bb b/packages/obexftp/obexftp_0.10.3.bb deleted file mode 100644 index c4285c5c9c..0000000000 --- a/packages/obexftp/obexftp_0.10.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "OBEX Ftp Client" -SECTION = "console/network" -LICENSE = "GPL" -PRIORITY = "optional" -DEPENDS = "openobex libgsm" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ - file://m4.patch;patch=1" - -inherit autotools - -#EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo doc'" -EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo'" diff --git a/packages/obexftp/obexftp_0.19.bb b/packages/obexftp/obexftp_0.19.bb new file mode 100644 index 0000000000..e5479c14de --- /dev/null +++ b/packages/obexftp/obexftp_0.19.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "OBEX Ftp Client based on openobex." +SECTION = "console/network" +HOMEPAGE = "http://openobex.triq.net" +LICENSE = "GPL" +DEPENDS = "openobex libgsm" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ + file://m4.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = " --enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From a8ce58df9771978d98beeb476be86a7e2a5ab190 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:53:10 +0000 Subject: opie-bluetoothmanager: catch up with recent changes in the opie cvs depend on obexftp and show where to find its headers --- packages/opie-bluetoothmanager/opie-bluetoothmanager.inc | 3 ++- packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb | 3 +-- packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc index f5ebf88cb2..fbc9a06625 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Bluetooth manager for Opie" SECTION = "opie/settings" PRIORITY = "optional" -DEPENDS = "libopietooth1" +DEPENDS = "libopietooth1 obexftp" RDEPENDS = "opie-bluepin" MAINTAINER = "Team Opie " LICENSE = "GPL" @@ -10,6 +10,7 @@ APPNAME = "bluetooth-manager" S = "${WORKDIR}/manager" EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth " +EXTRA_QMAKEVARS_PRE = 'LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp' inherit opie diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb index b048a02795..7f022404b1 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb @@ -1,6 +1,5 @@ include ${PN}.inc - - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb index f6040cfdd1..0dcb90892f 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc - PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};module=opie/apps \ -- cgit v1.2.3 From 68e40b62e47cd5f08c4665e60b95393757019c85 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 27 Mar 2006 16:33:26 +0000 Subject: openssh: Make openssh-sshd and the meta-package openssh RREPLACES and RCONFLICT dropbear. --- packages/openssh/openssh_4.0p1.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index e41b8f655c..bcfe2f370f 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -1,4 +1,10 @@ DEPENDS = "zlib openssl" + +RREPLACES_openssh = "dropbear" +RCONFLICTS_openssh = "dropbear" +RREPLACES_openssh-sshd = "dropbear" +RCONFLICTS_openssh-sshd = "dropbear" + SECTION = "console/network" DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ Ssh (Secure Shell) is a program for logging into a remote machine \ @@ -11,7 +17,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf " -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ -- cgit v1.2.3 From 6871ac2f5e65a2961f58024a80c2ead7ae9bc5c5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 27 Mar 2006 17:18:12 +0000 Subject: pvrusb2-mci: added 20060326 snapshot note: this does not work out-of-the box for the new pvrusb2 devices see http://www.isely.net/pvrusb2.html for details --- .../pvrusb2-mci-20060326/.mtn2git_empty | 0 .../pvrusb2-mci-20060326/Makefile.patch | 25 +++++++++++++++++ packages/pvrusb2-mci/pvrusb2-mci_20060326.bb | 31 ++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060326.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch new file mode 100644 index 0000000000..29b1267177 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile- Tue Feb 28 21:05:41 2006 +--- driver/Makefile Tue Feb 28 21:07:15 2006 +*************** +*** 45,54 **** + M:=$(shell pwd) + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install + + else + +--- 45,54 ---- + M:=$(shell pwd) + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb new file mode 100644 index 0000000000..98b5765064 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM " +LICENSE = "GPL" +PR = "r0" +RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} -- cgit v1.2.3 From fa5bcf6e2804497a09e06f66d1455dabd0525738 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 27 Mar 2006 17:33:26 +0000 Subject: display-brightness: Fix execution error (busybox related?) --- packages/display-brightness/display-brightness.sh | 9 ++++++--- packages/display-brightness/display-brightness_1.0.0.bb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh index 8141866858..4e706e1e75 100644 --- a/packages/display-brightness/display-brightness.sh +++ b/packages/display-brightness/display-brightness.sh @@ -7,10 +7,13 @@ STEP=5 -MAX_BRIGHTNESS=`cat /sys/class/backlight/*/max_brightness` -ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/*/actual_brightness` -BRIGHTNESS_FILE="/sys/class/backlight/*/brightness" +DRIVER="`ls /sys/class/backlight/|head -1`" +MAX_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/max_brightness` +ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/actual_brightness` +BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" +echo "max / current" +echo "$MAX_BRIGHTNESS / $ACTUAL_BRIGHTNESS" if [ ! -n "$1" ]; then exit 0 fi diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb index e275b3f8bc..1919f98231 100644 --- a/packages/display-brightness/display-brightness_1.0.0.bb +++ b/packages/display-brightness/display-brightness_1.0.0.bb @@ -3,7 +3,7 @@ AUTHOR = "Patrick Steiner " MAINTAINER = "Patrick Steiner " DEPENDS = "" PRIORITY = "optional" -PR = "r0" +PR = "r1" LICENSE = "GPLv2" SRC_URI = "file://display-brightness.sh" -- cgit v1.2.3 From 1a780ea25fb3b5d0261149e3a4b91bcd25386daa Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 27 Mar 2006 17:39:14 +0000 Subject: ixp4xx kernel: added patch for copypage-xscale.c this patch exports scale_mc_clear_user_page so video-buf can be loaded again; this symbol got lost between 2.6.15 and 2.6.16 --- .../ixp4xx-kernel/2.6.16/copypage-xscale.patch | 21 +++++++++++++++++++++ packages/linux/ixp4xx-kernel_2.6.16.bb | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch b/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch new file mode 100644 index 0000000000..b73d219708 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch @@ -0,0 +1,21 @@ +*** linux-2.6.16/arch/arm/mm/copypage-xscale.c- Mon Mar 27 19:10:25 2006 +--- linux-2.6.16/arch/arm/mm/copypage-xscale.c Sun Mar 26 19:32:53 2006 +*************** +*** 15,20 **** +--- 15,21 ---- + */ + #include + #include ++ #include + + #include + #include +*************** +*** 129,131 **** +--- 130,135 ---- + .cpu_clear_user_page = xscale_mc_clear_user_page, + .cpu_copy_user_page = xscale_mc_copy_user_page, + }; ++ ++ EXPORT_SYMBOL(xscale_mc_clear_user_page); ++ EXPORT_SYMBOL(xscale_mc_copy_user_page); diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 7c19cc9b1d..ba9a2522f7 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r0.${PR_CONFIG}" +PR = "r1.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -17,8 +17,9 @@ include ixp4xx-kernel.inc # IXP4XX_PATCHES - full list of patches to apply IXP4XX_PATCHES = "" -IXP4XX_PATCHES += "file://patch-2.6.16-rc6-ide1;patch=1" +IXP4XX_PATCHES += "file://patch-2.6.16-rc4-ide2;patch=1" IXP4XX_PATCHES += "file://leds-class.patch;patch=1" +IXP4XX_PATCHES += "file://copypage-xscale.patch;patch=1" # IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1" IXP4XX_PATCHES += "file://10-ixp4xx-fix-irq.patch;patch=1" IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" -- cgit v1.2.3 From 0c49ca03295c8be002a9ebd649f9023d26314ac9 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 27 Mar 2006 18:17:39 +0000 Subject: keylaunch: - Adjust keylaunchrc for akita / spitz / borzoi - Add a DEPENDS / RDEPENDS to "display-bightness" on openzaurus - Akita / spitz / borzoi can now change their displays bightness via the default Fn key combinations - Also mapped "Home" to switch between open windows and Fn+Home to show the desktop --- packages/keylaunch/files/akita/keylaunchrc | 14 +++++++++----- packages/keylaunch/files/borzoi/keylaunchrc | 14 +++++++++----- packages/keylaunch/files/spitz/keylaunchrc | 14 +++++++++----- packages/keylaunch/keylaunch_2.0.10.bb | 5 ++++- 4 files changed, 31 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index e0b729a508..8ef83c2830 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -1,6 +1,10 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts +key=....F9:-:gpe-contacts +key=....F10:-:gpe-calendar key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up +key=....F12:-:~matchbox-remote -next +key=...*F12:-:~matchbox-remote -desktop +#key=....F11:-:~matchbox-remote -menu +#key=...*1:-:~zoom out +#key=...*2:-:~zoom in +key=...*3:-:~display-brightness.sh down +key=...*4:-:~display-brightness.sh up diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc index e0b729a508..8ef83c2830 100644 --- a/packages/keylaunch/files/borzoi/keylaunchrc +++ b/packages/keylaunch/files/borzoi/keylaunchrc @@ -1,6 +1,10 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts +key=....F9:-:gpe-contacts +key=....F10:-:gpe-calendar key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up +key=....F12:-:~matchbox-remote -next +key=...*F12:-:~matchbox-remote -desktop +#key=....F11:-:~matchbox-remote -menu +#key=...*1:-:~zoom out +#key=...*2:-:~zoom in +key=...*3:-:~display-brightness.sh down +key=...*4:-:~display-brightness.sh up diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index e0b729a508..8ef83c2830 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -1,6 +1,10 @@ -key=....F9:-:gpe-calendar -key=....F10:-:gpe-contacts +key=....F9:-:gpe-contacts +key=....F10:-:gpe-calendar key=....F13:-:sylpheed -key=....F12:-:gpe-mini-browser -key=...*F18:-:display-brightness.sh down -key=...*F19:-:display-brightness.sh up +key=....F12:-:~matchbox-remote -next +key=...*F12:-:~matchbox-remote -desktop +#key=....F11:-:~matchbox-remote -menu +#key=...*1:-:~zoom out +#key=...*2:-:~zoom in +key=...*3:-:~display-brightness.sh down +key=...*4:-:~display-brightness.sh up diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index f84cd35b33..c0d0b2c44a 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -1,6 +1,9 @@ inherit gpe DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch" +DEPENDS_append_openzaurus = " display-brightness" +RDEPENDS_append_openzaurus = " display-brightness" + SECTION = "gpe" LICENSE = "GPL" DESCRIPTION = "A small utility for binding commands to a hot key.\ @@ -10,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r0" +PR = "r1" SRC_URI += " file://keylaunchrc" -- cgit v1.2.3 From d3c722af15628e53d2c7d929d9c6037f96215251 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Mon, 27 Mar 2006 20:27:18 +0000 Subject: gomunicator: Create gomunicator icon to desktop by installing the gomunicator.desktop. --- packages/gomunicator/gomunicator_cvs.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index d45d467d45..d6d4ac6218 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -7,8 +7,12 @@ DEPENDS = "libgpewidget gtk+ glib-2.0" #Remove the dash below when 0.1.3 changes in PV PV = "0.1.3+cvs-${SRCDATE}" - inherit autotools pkgconfig SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xanadux;module=gomunicator" S = "${WORKDIR}/${PN}" + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 gomunicator.desktop ${D}${datadir}/applications/ +} -- cgit v1.2.3 From 528d726da9c4651e48ac57914ae2725bacb3939d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 27 Mar 2006 21:16:43 +0000 Subject: cdparanoia: add patch for Makefile.in; replace strip by $(STRIP) --- packages/cdparanoia/cdparanoia_9.8alpha.bb | 5 +++-- packages/cdparanoia/files/Makefile.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/cdparanoia/files/Makefile.patch (limited to 'packages') diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb index 9160fdd577..4e9b00ee20 100644 --- a/packages/cdparanoia/cdparanoia_9.8alpha.bb +++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb @@ -2,11 +2,12 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -PR="r1" +PR="r2" LICENSE="GPL" SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch;patch=1" + file://fixes.patch;patch=1 \ + file://Makefile.patch;patch=1" S="${WORKDIR}/cdparanoia-III-alpha9.8" diff --git a/packages/cdparanoia/files/Makefile.patch b/packages/cdparanoia/files/Makefile.patch new file mode 100644 index 0000000000..798ccf9003 --- /dev/null +++ b/packages/cdparanoia/files/Makefile.patch @@ -0,0 +1,19 @@ +*** cdparanoia-III-alpha9.8/Makefile.in- Mon Mar 27 23:09:24 2006 +--- cdparanoia-III-alpha9.8/Makefile.in Mon Mar 27 23:09:56 2006 +*************** +*** 44,50 **** + cd interface && $(MAKE) all + cd paranoia && $(MAKE) all + $(MAKE) cdparanoia CFLAGS="$(OPT)" +! strip cdparanoia + + debug: + cd interface && $(MAKE) debug +--- 44,50 ---- + cd interface && $(MAKE) all + cd paranoia && $(MAKE) all + $(MAKE) cdparanoia CFLAGS="$(OPT)" +! $(STRIP) cdparanoia + + debug: + cd interface && $(MAKE) debug -- cgit v1.2.3 From 42c7a2f16f2986a5d0857b789741509b3d9a7c7e Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Mon, 27 Mar 2006 22:07:06 +0000 Subject: gomunicator: Gomunicator requires that alsa-lib is installed to target device. --- packages/gomunicator/gomunicator_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index d6d4ac6218..a567d16009 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" LICENSE = "GPLv2" AUTHOR = "Robert Woerle" MAINTAINER = "Koen Kooi " -DEPENDS = "libgpewidget gtk+ glib-2.0" +DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib" +RDEPENDS = "alsa-lib" #Remove the dash below when 0.1.3 changes in PV PV = "0.1.3+cvs-${SRCDATE}" -- cgit v1.2.3 From f44b81361e71d294d29872f8e373eb68174f7805 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 28 Mar 2006 08:46:32 +0000 Subject: openobex_1.2.bb : fix to stop openobex pulling in includes from host --- packages/openobex/openobex_1.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 61ce72663b..1bb8149f55 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -11,7 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ inherit autotools binconfig pkgconfig -EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump" +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_DIR} --with-bluez=${STAGING_DIR}" do_stage() { oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} -- cgit v1.2.3 From 68a72241d56b3daec21f780235d34a84efb06b0b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:00:09 +0000 Subject: grub: substitute the anonymous python function w/ COMPATIBLE_HOST --- packages/grub/grub_0.93.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/grub/grub_0.93.bb b/packages/grub/grub_0.93.bb index d67247ccff..8341184476 100644 --- a/packages/grub/grub_0.93.bb +++ b/packages/grub/grub_0.93.bb @@ -1,5 +1,6 @@ +DESCRIPTION = "GRUB is the GRand Unified Bootloader" SECTION = "base" -DESCRIPTION = "grand unified bootloader" +HOMEPAGE = "http://www.gnu.org/software/grub" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;patch=1 \ @@ -10,9 +11,4 @@ S = "${WORKDIR}/grub-${PV}" inherit autotools -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('i.86.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} +COMPATIBLE_HOST = 'i.86.*-linux' -- cgit v1.2.3 From b522171f13f0aa07616f055200511f2ec73a0632 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:04:42 +0000 Subject: add python-psyco, a specializing compiler --- packages/python/python-egenix-mx-base_2.0.5.bb | 15 --------------- packages/python/python-egenix-mx-base_2.0.6.bb | 18 ++++++++++++++++++ packages/python/python-psyco_1.5.bb | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 packages/python/python-egenix-mx-base_2.0.5.bb create mode 100644 packages/python/python-egenix-mx-base_2.0.6.bb create mode 100644 packages/python/python-psyco_1.5.bb (limited to 'packages') diff --git a/packages/python/python-egenix-mx-base_2.0.5.bb b/packages/python/python-egenix-mx-base_2.0.5.bb deleted file mode 100644 index 9e7f426928..0000000000 --- a/packages/python/python-egenix-mx-base_2.0.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ -tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ -processing, date/time processing and web site programming." -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "EGENIX" -SRCNAME = "egenix-mx-base" - -SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -FILES_${PN} += "${datadir}" diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb new file mode 100644 index 0000000000..84bf7e2e3c --- /dev/null +++ b/packages/python/python-egenix-mx-base_2.0.6.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ +tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ +processing, date/time processing and web site programming." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "EGENIX" +SRCNAME = "egenix-mx-base" + +SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}" +export LIB = "${STAGING_LIBDIR}" + +FILES_${PN} += "${datadir}" diff --git a/packages/python/python-psyco_1.5.bb b/packages/python/python-psyco_1.5.bb new file mode 100644 index 0000000000..b633b65061 --- /dev/null +++ b/packages/python/python-psyco_1.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Psyco lets you run your existing Python software much faster, with no change in your source." +HOMEPAGE = "http://psyco.sourceforge.net" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "dkm@kataplop.net" +LICENSE = "PSF" +RDEPENDS = "python-core" +SRCNAME = "psyco" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}-src.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit distutils -- cgit v1.2.3 From c20b2ca34cdf9be3245912dcf9b53590103cd9f7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:22:32 +0000 Subject: uicmoc 2.3.10, 3.3.5: add patch to make it build on 64bit platforms. Thanks Darren Edmundson for writing the patch and Eric Shattow for testing. --- .../uicmoc-native-2.3.10/64bit-cleanup.patch | 226 +++++++++++++++++++++ packages/uicmoc/uicmoc-native_2.3.10.bb | 6 +- .../uicmoc3-native-3.3.5/64bit-cleanup.patch | 147 ++++++++++++++ packages/uicmoc/uicmoc3-native_3.3.5.bb | 7 +- 4 files changed, 382 insertions(+), 4 deletions(-) create mode 100644 packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch (limited to 'packages') diff --git a/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch new file mode 100644 index 0000000000..3cca3e0d1d --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + #if defined(QT_POSIX_QSHM) + #include +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include ++ + #ifndef QT_H + #include + #include +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index db884e166a..c9457e139e 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -1,15 +1,17 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ file://gcc3_4.patch;patch=1" \ file://gcc4.patch;patch=1 \ - file://gcc4_1.patch;patch=1" + file://gcc4_1.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch new file mode 100644 index 0000000000..17836802a6 --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch @@ -0,0 +1,147 @@ +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 +@@ -176,7 +176,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -737,7 +737,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +@@ -31,6 +31,7 @@ + **********************************************************************/ + + #include "qsharedmemory_p.h" ++#include + + #if !defined(QT_QWS_NO_SHM) + +@@ -132,7 +133,7 @@ + shmId = shmget (key, shmSize, 0); + + shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ if ((intptr_t) shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +@@ -107,6 +107,7 @@ + #include + #include + #include ++#include + + #if defined(Q_OS_QNX) + #include +@@ -1879,7 +1880,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -1898,11 +1899,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2130,7 +2131,7 @@ + } + if ( !qws_overrideCursor ) { + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +@@ -49,6 +49,7 @@ + #include "qgfx_qws.h" + #include "qtextengine_p.h" + #include "qfontengine_p.h" ++#include + + QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; + +@@ -133,7 +134,7 @@ + req.pointSize = req.pixelSize*10; + + if ( ! engineData ) { +- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); ++ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); + + // look for the requested font in the engine data cache + engineData = QFontCache::instance->findEngineData( key ); +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -288,7 +289,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +@@ -53,6 +53,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -631,7 +632,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1845,7 +1846,7 @@ + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb index 6354377bcf..142b3997e0 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -1,11 +1,14 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL QPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ - file://no-examples.patch;patch=1" + file://no-examples.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-embedded-free-${PV}" -- cgit v1.2.3 From 7c51ef4d2a6273039792bfc5f9dfc777e9f4f096 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 28 Mar 2006 16:01:16 +0000 Subject: keymap-locales: Include change from .oz3.5.4x --- packages/keymap-locales/keymap-locales.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index 5ba84e69ca..f1b479d47a 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,13 +4,17 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "file://*.map" # If any python guru wants to setup PACKAGES_$machine with some code instead, # be my guet =) PACKAGES_akita = "keymap-extension-de" +PACKAGES_spitz = "keymap-extension-de" +PACKAGES_borzoi = "keymap-extension-de" +PACKAGES_c7x0 = "keymap-extension-de" +PACKAGES_collie = "keymap-extension-de" FILES_keymap-extension-de = "/etc/*-de.map" FILES_keymap-extension-fr = "/etc/*-fr.map" -- cgit v1.2.3 From ecc1bd45d39bd4b1f36f682905c3f8b16c96d983 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Tue, 28 Mar 2006 17:57:59 +0000 Subject: libxml2: Fixed the download URL's for all libxml2 packages. --- packages/libxml/libxml2_2.6.10.bb | 2 +- packages/libxml/libxml2_2.6.22.bb | 3 +-- packages/libxml/libxml2_2.6.7.bb | 2 +- packages/libxml/libxml2_2.6.9.bb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.10.bb +++ b/packages/libxml/libxml2_2.6.10.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb index eb5f087df7..fae00a6063 100644 --- a/packages/libxml/libxml2_2.6.22.bb +++ b/packages/libxml/libxml2_2.6.22.bb @@ -8,9 +8,8 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz \ +SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \ file://no-testapi.patch;patch=1" - inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb index fc04b5e9d3..b204351b7b 100644 --- a/packages/libxml/libxml2_2.6.7.bb +++ b/packages/libxml/libxml2_2.6.7.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.9.bb +++ b/packages/libxml/libxml2_2.6.9.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig -- cgit v1.2.3 From aca937147be3a8a24513f2a46980e81ae7ee4dca Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 28 Mar 2006 18:24:47 +0000 Subject: altboot: Add tosa support for kernel 2.4 Contributed by Sebastian S --- packages/altboot/altboot_0.0.0.bb | 2 +- packages/altboot/files/tosa/.mtn2git_empty | 0 packages/altboot/files/tosa/altboot-2.4.cfg | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/altboot/files/tosa/.mtn2git_empty create mode 100644 packages/altboot/files/tosa/altboot-2.4.cfg (limited to 'packages') diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 7d56cbd3a6..4b69c50e14 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r26" +PR = "r27" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg new file mode 100644 index 0000000000..edbaff8b87 --- /dev/null +++ b/packages/altboot/files/tosa/altboot-2.4.cfg @@ -0,0 +1,27 @@ +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="4" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="no" + +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" + +USB_HOST_AVAILABLE="yes" +USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" -- cgit v1.2.3 From 45e6ba5a493ba86472bab1238049a055f8fd9d9f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 28 Mar 2006 20:43:05 +0000 Subject: slugos-native: Fixed the libc6 RDEPENDS problem --- packages/meta/slugos-native.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index cbb74fc823..e23bfd1d8f 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,7 +5,7 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r0" +PR = "r1" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" @@ -16,8 +16,7 @@ PROVIDES += "${SLUGOS_IMAGENAME}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. SLUGOS_NATIVE_RT_prepend_linux = "\ - glibc-extra-nss glibc-utils \ - libc6 libc6-dev \ + glibc-extra-nss glibc-utils glibc \ " SLUGOS_NATIVE_RT_prepend_linux-uclibc = "\ uclibc-dev uclibc-utils \ -- cgit v1.2.3 From f19059ca2d12415411489190c9b3c3849ecd1c0f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 03:38:18 +0000 Subject: altboot: Altboot now remembers the last loop-image (or realfs),too, which allowsa true automatic booting of the last user-setting --- packages/altboot/altboot_0.0.0.bb | 2 +- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 20 ++++++++++-- packages/altboot/files/altboot.func | 36 +++++++++++++++++++--- packages/altboot/files/init.altboot | 7 +++++ 4 files changed, 56 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 4b69c50e14..020546dd64 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r27" +PR = "r28" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 3a41fccf79..baa426218b 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -91,7 +91,20 @@ run_module() { do stty echo echo -n "Boot NFS root: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-bootNFS-source.last + then + junk="`cat /etc/.altboot-bootNFS-source.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi + cnt=1 for nfs_mount in $nfs_mounts @@ -99,6 +112,7 @@ run_module() { if test "$junk" = "$cnt" then selection="$nfs_mount" + echo "$junk" > /etc/.altboot-bootNFS-source.last fi let cnt=$cnt+1 done @@ -115,10 +129,10 @@ run_module() { mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs - echo -n "Copying resolv.conf..." + #echo -n "Copying resolv.conf..." #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - check_target "/media/nfsroot" + check_target "/media/nfsroot" bootNFS } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index c6af50a008..4389ff4ff8 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -1,6 +1,7 @@ #! /bin/sh # This function checks for the presence of a real filesystem and loop-images on the target # $1 = folder of rootfs, $2 = runlevel (defaults to 5) +# $2 = name of calling module check_target() { # Check if there is a /sbin/init or /sbin/init.sysvinit on the card if test -x $1/sbin/init -o -x $1/$REAL_INIT @@ -31,11 +32,24 @@ check_target() { while test -z "$ans" do echo -n "Your choice: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-$2-real-or-loop.last + then + junk="`cat /etc/.altboot-$2-real-or-loop.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi if test "$junk" = 1 -o "$junk" = 2 then ans="$junk" + echo "$junk" > /etc/.altboot-$2-real-or-loop.last fi done @@ -62,7 +76,7 @@ check_target() { # This function pivot_root's into a real filesystem calling $newrootfs/sbin/init # $1 = The new rootfs pivot_realfs() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" mount -o remount,ro / >/dev/null 2>&1 @@ -73,7 +87,7 @@ pivot_realfs() { # This function loop-mounts an image-file and pivot_root's into it # $1: The new rootfs pivot_image() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" cd $1/$IMAGE_PATH # Check for rootfs images on the card @@ -95,7 +109,18 @@ pivot_image() { while test -z "$IMAGE_NAME" do echo -en "Please choose one of the above: " - read junk < /dev/tty1 + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-loopimage.last + then + junk="`cat /etc/.altboot-loopimage.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi x=0 for file in `ls *rootfs.bin` @@ -103,7 +128,8 @@ pivot_image() { let x=$x+1 if test "$x" = "$junk" then - IMAGE_NAME="$file" + IMAGE_NAME="$file" + echo "$junk" > /etc/.altboot-loopimage.last fi done done diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 850912f20c..665b3fa4b5 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -183,6 +183,13 @@ run_timer() { echo -n "." >/dev/tty1 let cnt=$cnt+1 done + + if test "$launch_altboot" != "yes" + then + AUTOBOOT=yes + else + rm -f /etc/.altboot*.last + fi else launch_altboot=yes fi -- cgit v1.2.3 From 4c2325e5291acea9530852ca38486c6e9970796e Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 03:53:28 +0000 Subject: zaurusd: Include changes from .oz354x --- packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch | 4 ++-- packages/zaurusd/zaurusd_svn.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch index f4ef7c5aee..e2d56874c9 100644 --- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch +++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch @@ -25,8 +25,8 @@ + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then -+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr ++ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" ++ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + else + cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + rm "/tmp/gpe-panel.session-$panel_user" diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 4f20dc23c5..52a7b353d3 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -3,7 +3,7 @@ SECTION = "base" MAINTAINER = "Richard Purdie " DESCRIPTION = "Daemon to handle device specifc features." PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r2" DEPENDS = "tslib" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ -- cgit v1.2.3 From b5250ea5c6edf8034c783f1b1e96a8334555ff4a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 29 Mar 2006 11:34:08 +0000 Subject: slugos-init: Make linuxrc load all the necessary modules --- packages/slugos-init/files/turnup | 6 ++++++ packages/slugos-init/slugos-init_0.10.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index f7fe0e7960..b365a49dda 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -403,6 +403,12 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' + echo 'modprobe ehci-hcd' + echo 'modprobe ohci-hcd' + echo 'modprobe sd_mod' + echo 'modprobe usb-storage' + echo 'modprobe ext3' + echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 3f1ab456ac..971f6cf288 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r57" +PR = "r58" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From eb3e23a1c96bc6b5738c8aa0ec023b93dc035880 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 29 Mar 2006 13:02:31 +0000 Subject: uicmoc4: upgrade from 4.0.1 to 4.1.1 NOTE: fix-mkspecs needs to be upgraded, 64bit platform patch needs to be added --- .../uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch | 179 --------------------- .../uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch | 179 +++++++++++++++++++++ packages/uicmoc/uicmoc4-native_4.0.1.bb | 42 ----- packages/uicmoc/uicmoc4-native_4.1.1.bb | 42 +++++ 6 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch delete mode 100644 packages/uicmoc/uicmoc4-native_4.0.1.bb create mode 100644 packages/uicmoc/uicmoc4-native_4.1.1.bb (limited to 'packages') diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch deleted file mode 100644 index 491edde370..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch +++ /dev/null @@ -1,179 +0,0 @@ -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-06 16:35:19.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-15 21:26:15.000000000 +0200 -@@ -8,12 +8,12 @@ - QT += core gui network - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = arm-linux-gcc -+QMAKE_CC = $(CCACHE) arm-linux-gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -+QMAKE_CFLAGS = -pipe $(EXTRA_CFLAGS) - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = - QMAKE_CFLAGS_RELEASE = -O2 -@@ -22,8 +22,8 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = arm-linux-g++ --QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti -+QMAKE_CXX = $(CCACHE) arm-linux-g++ -+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON - QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF - QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -@@ -45,14 +45,14 @@ - - QMAKE_LINK = arm-linux-g++ - QMAKE_LINK_SHLIB = arm-linux-g++ --QMAKE_LFLAGS = -+QMAKE_LFLAGS = $(EXTRA_LFLAGS) - QMAKE_LFLAGS_RELEASE = - QMAKE_LFLAGS_DEBUG = - QMAKE_LFLAGS_SHLIB = -shared - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf 2005-06-15 21:41:52.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf 2005-06-15 21:42:13.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc34 -+QMAKE_CC = $(CCACHE) gcc34 - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++34 -+QMAKE_CXX = $(CCACHE) g++34 - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf 2005-06-15 21:42:44.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc40 -+QMAKE_CC = $(CCACHE) gcc40 - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++40 -+QMAKE_CXX = $(CCACHE) g++40 - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf 2005-06-15 21:40:50.000000000 +0200 -@@ -8,7 +8,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ - QMAKE_CFLAGS_THREAD = -D_REENTRANT - QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf 2005-06-15 21:41:10.000000000 +0200 -@@ -11,7 +11,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -26,7 +26,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf 2005-06-15 21:40:24.000000000 +0200 -@@ -8,7 +8,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ - QMAKE_CFLAGS_THREAD = -D_REENTRANT - QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch new file mode 100644 index 0000000000..491edde370 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch @@ -0,0 +1,179 @@ +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-06 16:35:19.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-15 21:26:15.000000000 +0200 +@@ -8,12 +8,12 @@ + QT += core gui network + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = arm-linux-gcc ++QMAKE_CC = $(CCACHE) arm-linux-gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(EXTRA_CFLAGS) + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = + QMAKE_CFLAGS_RELEASE = -O2 +@@ -22,8 +22,8 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + +-QMAKE_CXX = arm-linux-g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti ++QMAKE_CXX = $(CCACHE) arm-linux-g++ ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF + QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +@@ -45,14 +45,14 @@ + + QMAKE_LINK = arm-linux-g++ + QMAKE_LINK_SHLIB = arm-linux-g++ +-QMAKE_LFLAGS = ++QMAKE_LFLAGS = $(EXTRA_LFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf 2005-06-15 21:41:52.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf 2005-06-15 21:42:13.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc34 ++QMAKE_CC = $(CCACHE) gcc34 + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++34 ++QMAKE_CXX = $(CCACHE) g++34 + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf 2005-06-15 21:42:44.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc40 ++QMAKE_CC = $(CCACHE) gcc40 + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++40 ++QMAKE_CXX = $(CCACHE) g++40 + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf 2005-06-15 21:40:50.000000000 +0200 +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -27,7 +27,7 @@ + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf 2005-06-15 21:41:10.000000000 +0200 +@@ -11,7 +11,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -26,7 +26,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf 2005-06-15 21:40:24.000000000 +0200 +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -27,7 +27,7 @@ + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/packages/uicmoc/uicmoc4-native_4.0.1.bb b/packages/uicmoc/uicmoc4-native_4.0.1.bb deleted file mode 100644 index 399215c0eb..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.0.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://fix-mkspecs.patch;patch=1 " -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -inherit native - -EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 -} diff --git a/packages/uicmoc/uicmoc4-native_4.1.1.bb b/packages/uicmoc/uicmoc4-native_4.1.1.bb new file mode 100644 index 0000000000..59bdd1bc40 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native_4.1.1.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" + +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +inherit native + +EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ + -no-nis -no-cups -no-exceptions \ + -no-accessibility -no-libjpeg \ + -no-nas-sound -no-sm \ + -no-xshape -no-xinerama \ + -no-xcursor -no-xrandr \ + -no-xrender -no-fontconfig \ + -no-tablet -no-xkb \ + -no-libpng \ + -verbose -release -fast -static " +EXTRA_OEMAKE = " " + +do_configure() { + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" +} + +do_stage() { + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 +} -- cgit v1.2.3 From 5f57cca6f31cb84bca409bd75b37005ce3d219b8 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 15:36:18 +0000 Subject: keymap-locales: Add finnish keymap to Akita, Borzoi, Spitz, C7x0 & Collie Courtesy of arzgi from oesf.org --- .../files/akita/keymap-extension-2.6-fi.map | 7 +++++++ .../files/borzoi/keymap-extension-2.6-fi.map | 7 +++++++ .../keymap-locales/files/c7x0/keymap-extension-2.6-fi.map | 7 +++++++ .../files/collie/keymap-extension-2.4-fi.map | 7 +++++++ .../files/spitz/keymap-extension-2.6-fi.map | 7 +++++++ packages/keymap-locales/keymap-locales.bb | 15 ++++++++------- 6 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map create mode 100644 packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map create mode 100644 packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map create mode 100644 packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map create mode 100644 packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map (limited to 'packages') diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map new file mode 100644 index 0000000000..314db5843a --- /dev/null +++ b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map @@ -0,0 +1,7 @@ +# Finnish keymappings +shift altgr keycode 63 = +Adiaeresis +shift altgr keycode 13 = +Odiaeresis +altgr keycode 63 = +adiaeresis +altgr keycode 13 = +odiaeresis + +keycode 103 = AltGr \ No newline at end of file diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index f1b479d47a..e54fea1d2d 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,20 +4,21 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "file://*.map" # If any python guru wants to setup PACKAGES_$machine with some code instead, -# be my guet =) -PACKAGES_akita = "keymap-extension-de" -PACKAGES_spitz = "keymap-extension-de" -PACKAGES_borzoi = "keymap-extension-de" -PACKAGES_c7x0 = "keymap-extension-de" -PACKAGES_collie = "keymap-extension-de" +# be my guest =) +PACKAGES_akita = "keymap-extension-de keymap-extension-fi" +PACKAGES_spitz = "keymap-extension-de keymap-extension-fi" +PACKAGES_borzoi = "keymap-extension-de keymap-extension-fi" +PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi" +PACKAGES_collie = "keymap-extension-de keymap-extension-fi" FILES_keymap-extension-de = "/etc/*-de.map" FILES_keymap-extension-fr = "/etc/*-fr.map" +FILES_keymap-extension-fi = "/etc/*-fi.map" do_install() { install -d ${D}/${sysconfdir} -- cgit v1.2.3 From 526c992f458accf3a372f8ce16dabb88a1fffe87 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 15:57:27 +0000 Subject: matchbox-wm: Include update from .oz354x --- .../matchbox-wm/matchbox-wm/akita/.mtn2git_empty | 0 packages/matchbox-wm/matchbox-wm/akita/kbdconfig | 51 ++++++++++++++++++++++ .../matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty | 0 packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig | 51 ++++++++++++++++++++++ .../matchbox-wm/matchbox-wm/spitz/.mtn2git_empty | 0 packages/matchbox-wm/matchbox-wm/spitz/kbdconfig | 51 ++++++++++++++++++++++ packages/matchbox-wm/matchbox-wm_svn.bb | 2 +- 7 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty create mode 100644 packages/matchbox-wm/matchbox-wm/akita/kbdconfig create mode 100644 packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty create mode 100644 packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig create mode 100644 packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty create mode 100644 packages/matchbox-wm/matchbox-wm/spitz/kbdconfig (limited to 'packages') diff --git a/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-wm/matchbox-wm/akita/kbdconfig b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +n=next +p=prev +c=close +d=desktop +m=!matchbox-remote -mbmenu + +### App launching. + +x=!xterm +r=!rxvt + +### App launching with startup notify + +e=!!gpe-calender + +### windows style key shortcuts + +Tab=next +Tab=prev + +space=taskmenu +escape=!matchbox-remote -mbmenu +f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#d=desktop +#r=!xterm +#e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +n=next +p=prev +c=close +d=desktop +m=!matchbox-remote -mbmenu + +### App launching. + +x=!xterm +r=!rxvt + +### App launching with startup notify + +e=!!gpe-calender + +### windows style key shortcuts + +Tab=next +Tab=prev + +space=taskmenu +escape=!matchbox-remote -mbmenu +f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#d=desktop +#r=!xterm +#e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +n=next +p=prev +c=close +d=desktop +m=!matchbox-remote -mbmenu + +### App launching. + +x=!xterm +r=!rxvt + +### App launching with startup notify + +e=!!gpe-calender + +### windows style key shortcuts + +Tab=next +Tab=prev + +space=taskmenu +escape=!matchbox-remote -mbmenu +f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#d=desktop +#r=!xterm +#e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 7654ebd94c..c17ce96252 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "0.9.5+svn${SRCDATE}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ -- cgit v1.2.3 From b559644ed9ce578d7ddf98a5384e0a5c2a7fb457 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 16:59:02 +0000 Subject: keylauch: include changes from .oz354x --- packages/keylaunch/files/akita/keylaunchrc | 2 +- packages/keylaunch/files/borzoi/keylaunchrc | 2 +- packages/keylaunch/files/spitz/keylaunchrc | 2 +- packages/keylaunch/keylaunch_2.0.10.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/borzoi/keylaunchrc +++ b/packages/keylaunch/files/borzoi/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index c0d0b2c44a..a1c13188ca 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r1" +PR = "r2" SRC_URI += " file://keylaunchrc" -- cgit v1.2.3 From 50b3e6d7c4cfab38bc987a24a611ec2e64e0bccd Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 17:55:28 +0000 Subject: gpe-session-scripts: Include change from .oz354x --- .../files/fix-small-fonts-SL-Cxxxx.patch | 13 +++++++++++++ packages/gpe-session-scripts/gpe-session-scripts_0.66.bb | 11 +++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch (limited to 'packages') diff --git a/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch b/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch new file mode 100644 index 0000000000..b216711c99 --- /dev/null +++ b/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch @@ -0,0 +1,13 @@ +--- gpe-session-scripts-0.66/X11/xsettings.default.orig 2006-03-29 19:31:24.356027984 +0200 ++++ gpe-session-scripts-0.66/X11/xsettings.default 2006-03-29 19:31:38.532872776 +0200 +@@ -1,8 +1,8 @@ + Gtk/IconSizes:S:gtk-dialog=30,30:gtk-button=16,16 + Gtk/ToolbarIconSize:I:1 + Gtk/ToolbarStyle:I:2 +-Gtk/FontName:S:Sans 7 +-MATCHBOX/Desktop/Font:S:Sans 7 ++Gtk/FontName:S:Sans 12 ++MATCHBOX/Desktop/Font:S:Sans 12 + Net/ThemeName:S:Default + MATCHBOX/Background:S:col-solid:#1f00a2 + diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb index c57366399d..ab006e7278 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r3" +PR = "r4" inherit gpe @@ -16,12 +16,15 @@ SRC_URI += "file://matchbox-session \ #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" +# While SL-Cxxxx has a 200dpi screen, too, a fontsize < 10 is barely readable +SRC_URI_append_akita += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1" +SRC_URI_append_borzoi += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1" +SRC_URI_append_spitz += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1" + + do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then -- cgit v1.2.3 From 4530f5e0c38984e60ea56bf1665bb8a073687b2c Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 30 Mar 2006 09:54:53 +0000 Subject: zd1211: Update to -r67, remove old cruft --- packages/zd1211/zd1211-20050822/.mtn2git_empty | 0 packages/zd1211/zd1211-20050822/access_ok.patch | 11 - .../zd1211/zd1211-20050822/iwconfig-rate.patch | 126 -------- packages/zd1211/zd1211-20050822/makefile.patch | 11 - packages/zd1211/zd1211-20050822/urb-async.patch | 82 ------ packages/zd1211/zd1211-r52/.mtn2git_empty | 0 packages/zd1211/zd1211-r52/firmware.patch | 327 --------------------- packages/zd1211/zd1211-r52/makefile.patch | 57 ---- .../zd1211/zd1211-r52/transmitkey.index.fix.diff | 16 - packages/zd1211/zd1211-r52/zd1205.c.diff | 10 - packages/zd1211/zd1211-r52/zdhci.c.diff | 10 - packages/zd1211/zd1211-r67/.mtn2git_empty | 0 packages/zd1211/zd1211-r67/makefile-unslung.patch | 48 +++ packages/zd1211/zd1211-r67/makefile.patch | 47 +++ packages/zd1211/zd1211_20050822.bb | 36 --- packages/zd1211/zd1211_r52.bb | 36 --- packages/zd1211/zd1211_r67.bb | 35 +++ 17 files changed, 130 insertions(+), 722 deletions(-) delete mode 100644 packages/zd1211/zd1211-20050822/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-20050822/access_ok.patch delete mode 100644 packages/zd1211/zd1211-20050822/iwconfig-rate.patch delete mode 100644 packages/zd1211/zd1211-20050822/makefile.patch delete mode 100644 packages/zd1211/zd1211-20050822/urb-async.patch delete mode 100644 packages/zd1211/zd1211-r52/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-r52/firmware.patch delete mode 100644 packages/zd1211/zd1211-r52/makefile.patch delete mode 100644 packages/zd1211/zd1211-r52/transmitkey.index.fix.diff delete mode 100644 packages/zd1211/zd1211-r52/zd1205.c.diff delete mode 100644 packages/zd1211/zd1211-r52/zdhci.c.diff create mode 100644 packages/zd1211/zd1211-r67/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-r67/makefile-unslung.patch create mode 100644 packages/zd1211/zd1211-r67/makefile.patch delete mode 100644 packages/zd1211/zd1211_20050822.bb delete mode 100644 packages/zd1211/zd1211_r52.bb create mode 100644 packages/zd1211/zd1211_r67.bb (limited to 'packages') diff --git a/packages/zd1211/zd1211-20050822/.mtn2git_empty b/packages/zd1211/zd1211-20050822/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-20050822/access_ok.patch b/packages/zd1211/zd1211-20050822/access_ok.patch deleted file mode 100644 index 95fbb592b0..0000000000 --- a/packages/zd1211/zd1211-20050822/access_ok.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zd1211/src/zd1205.c.orig 2005-10-06 03:30:27.200837520 +0200 -+++ zd1211/src/zd1205.c 2005-10-06 03:29:37.176442384 +0200 -@@ -4434,7 +4434,7 @@ - { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" }, - }; - -- err = verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)); -+ err = access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)); - if (err) - break; - diff --git a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch b/packages/zd1211/zd1211-20050822/iwconfig-rate.patch deleted file mode 100644 index c1cb634b1a..0000000000 --- a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- zd1211/src/zd1205.c 7 Jun 2005 21:45:21 -0000 1.17 -+++ zd1211/src/zd1205.c 24 Aug 2005 11:39:29 -0000 -@@ -3599,9 +3599,59 @@ - - } - -+static const unsigned long zd1205_rates[] = { -+ /* RATE_1M, 0 */ -+ 1000000, -+ /* RATE_2M, 1 */ -+ 2000000, -+ /* RATE_5M, 2 */ -+ 5500000, -+ /* RATE_11M, 3 */ -+ 11000000, -+ /* RATE_6M, 4 */ -+ 600000, -+ /* RATE_9M, 5 */ -+ 9000000, -+ /* RATE_12M, 6 */ -+ 12000000, -+ /* RATE_18M, 7 */ -+ 18000000, -+ /* RATE_24M, 8 */ -+ 24000000, -+ /* RATE_36M, 9 */ -+ 36000000, -+ /* RATE_48M, 10 */ -+ 48000000, -+ /* RATE_54M, 11 */ -+ 54000000, -+}; -+ -+#define ZD1205_NRATES ((sizeof(zd1205_rates))/(sizeof(unsigned long))) -+ - static int zd1205_ioctl_setrate(struct net_device *dev, struct iw_param *frq) - { -- return 0; -+ struct zd1205_private *macp = dev->priv; -+ U8 rate; -+ if(frq->value < 0) { -+ /* Auto */ -+ macp->bFixedRate = 0; -+ macp->AdapterMaxRate = RATE_54M; -+ return 0; -+ } -+ for(rate = 0; rate < ZD1205_NRATES; rate++) -+ if(zd1205_rates[rate] == frq->value) { -+ zd1205_lock(macp); -+ macp->bFixedRate = frq->fixed; -+ if(frq->fixed) -+ macp->cardSetting.FixedRate = rate; -+ else { -+ macp->AdapterMaxRate = rate; -+ macp->cardSetting.TxRate = rate; -+ } -+ zd1205_unlock(macp); -+ return 0; -+ } -+ return -EINVAL; - } - - static int zd1205_ioctl_getrate(struct net_device *dev, struct iw_param *frq) -@@ -3612,60 +3662,9 @@ - frq->disabled = 0; - frq->value = 0; - -- switch(macp->cardSetting.CurrTxRate) -- { -- case RATE_1M: -- frq->value = 1000000; -- break; -- -- case RATE_2M: -- frq->value = 2000000; -- break; -- -- case RATE_5M: -- frq->value = 5500000; -- break; -- -- case RATE_11M: -- frq->value = 11000000; -- break; -- -- case RATE_6M: -- frq->value = 600000; -- break; -- -- case RATE_9M: -- frq->value = 9000000; -- break; -- -- case RATE_12M: -- frq->value = 12000000; -- break; -- -- case RATE_18M: -- frq->value = 18000000; -- break; -- -- case RATE_24M: -- frq->value = 24000000; -- break; -- -- case RATE_36M: -- frq->value = 36000000; -- break; -- -- case RATE_48M: -- frq->value = 48000000; -- break; -- -- case RATE_54M: -- frq->value = 54000000; -- break; -- -- default: -+ if(macp->cardSetting.CurrTxRate > ZD1205_NRATES) - return -EINVAL; -- } -- -+ frq->value = zd1205_rates[macp->cardSetting.CurrTxRate]; - return 0; - } - diff --git a/packages/zd1211/zd1211-20050822/makefile.patch b/packages/zd1211/zd1211-20050822/makefile.patch deleted file mode 100644 index 91f3192d4d..0000000000 --- a/packages/zd1211/zd1211-20050822/makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zd1211/Makefile.orig 2005-04-15 12:34:32.000000000 -1000 -+++ zd1211/Makefile 2005-09-02 02:40:41.857339000 -1000 -@@ -90,7 +90,7 @@ - ifeq ($(KVER), 2.6) # we're on a 2.6.x kernel - $(MAKE) V=0 -C $(KSRC) SUBDIRS=$(SUBDIRS) modules - else -- $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) depend modules -+ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules - endif - - $(SRC_DIR)/zddevlist.h: $(SRC_DIR)/zddevlist diff --git a/packages/zd1211/zd1211-20050822/urb-async.patch b/packages/zd1211/zd1211-20050822/urb-async.patch deleted file mode 100644 index cd1149e766..0000000000 --- a/packages/zd1211/zd1211-20050822/urb-async.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- zd1211/src/zd1211.c.orig 2005-03-27 22:47:35.000000000 +0200 -+++ zd1211/src/zd1211.c 2005-10-06 02:53:23.380909536 +0200 -@@ -313,7 +313,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pBuffer, DataLen,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); -@@ -362,7 +361,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((ret = SUBMIT_URB(macp->reg_urb, memflags))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); - zd1211_DumpErrorCode(macp, ret); -@@ -426,7 +424,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); -@@ -569,7 +566,6 @@ - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } - -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); - zd1211_DumpErrorCode(macp, ret); -@@ -1240,7 +1236,6 @@ - pRegBuffer, bufSize, - zd1211_reg_cb, macp); - -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed rf reg_urb\n"); -@@ -1311,7 +1306,6 @@ - return; - - printk("%s: Tx timed out.\n", dev->name); -- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; - USB_URB(macp->tx_urb); - } - -@@ -1384,7 +1378,6 @@ - zd1211_intr_cb, macp); - #endif - -- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((res = SUBMIT_URB(macp->intr_urb, GFP_KERNEL))) { - printk(KERN_ERR "zd1211: failed intr_urb\n"); -@@ -1822,7 +1815,6 @@ - macp->IntEPBuffer, MAX_EPINT_BUFFER, - zd1211_intr_cb, macp); - -- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK; - status = SUBMIT_URB(macp->intr_urb, GFP_ATOMIC); - - if (status) -@@ -1916,7 +1908,6 @@ - usb_rcvbulkpipe(macp->usb, EP_DATA_IN), - rx_buff, bufLen, zd1211_rx_comp_cb, macp); - -- macp->rx_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((res = SUBMIT_URB(macp->rx_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed rx_urb\n"); - zd1211_DumpErrorCode(macp, res); -@@ -2024,7 +2015,6 @@ - macp->tx_buff, TotalLength,zd1211_tx_comp_cb, macp); - - macp->tx_urb->transfer_buffer_length = TotalLength; -- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; - res = SUBMIT_URB(macp->tx_urb, GFP_ATOMIC); - if (res) { - printk("error in tx submit urb: %d", res); diff --git a/packages/zd1211/zd1211-r52/.mtn2git_empty b/packages/zd1211/zd1211-r52/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-r52/firmware.patch b/packages/zd1211/zd1211-r52/firmware.patch deleted file mode 100644 index b7cd575c24..0000000000 --- a/packages/zd1211/zd1211-r52/firmware.patch +++ /dev/null @@ -1,327 +0,0 @@ -Index: branches/vendor/src/WS11UPhR.h -=================================================================== ---- zd1211-driver-r52/src/WS11UPhR.h (revision 8) -+++ zd1211-driver-r52/Makefile/src/WS11UPhR.h (revision 53) -@@ -166,164 +166,163 @@ - ={ - 0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE, 0xD1, 0x94, 0x11, 0xEE, 0x88, 0xD4, 0xD1, 0x96, 0xD1, 0x98, 0x5C, 0x99, 0x5C, 0x99, 0x4C, 0x99, 0x04, 0x9D, 0xD1, 0x98, 0xD1, 0x9A, 0x03, 0xEE, -- 0xF4, 0x94, 0xD3, 0xD4, 0x41, 0x2A, 0x40, 0x4A, 0x45, 0xBE, 0x88, 0x92, 0x41, 0x24, 0x40, 0x44, 0x53, 0xBE, 0x40, 0xF0, 0x8E, 0xEE, 0x41, 0xEE, 0x98, 0x9A, 0xEB, 0xF7, 0x02, 0x00, 0x1F, 0xEC, -- 0x00, 0x00, 0xB2, 0xF8, 0x4D, 0x00, 0xA1, 0xEC, 0x00, 0x00, 0xBD, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xD8, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, -- 0x40, 0xF0, 0xCC, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x5F, 0xEF, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x09, 0xF1, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -- 0x0E, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x0F, 0xF6, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xAE, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x42, 0x02, 0xC1, 0x92, 0x03, 0x96, 0x1B, 0xD7, 0x2A, 0x86, 0x1A, 0xD5, 0x2B, 0x86, 0x09, 0xA3, 0x00, 0x80, 0x19, 0xD3, -- 0x2C, 0x86, 0x00, 0xEE, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, -- 0x05, 0x00, 0x05, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x01, 0xD4, 0x42, 0x02, 0xC1, 0x96, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x99, 0xC4, 0x92, 0x41, 0xA2, 0xC4, 0xD2, 0xC5, 0x98, -- 0x1C, 0xD9, 0x2A, 0x86, 0x01, 0x98, 0x1C, 0xD9, 0x2B, 0x86, 0x1B, 0xD7, 0x2C, 0x86, 0x00, 0xEE, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xE0, 0xEE, 0x11, 0x93, 0xEF, 0xF7, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA9, 0xEE, 0x40, 0xF1, 0x40, 0x92, 0x19, 0xD3, 0xEF, 0xF7, 0xC5, 0x92, 0x41, 0x92, -- 0x19, 0xD3, 0x00, 0x83, 0x40, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x0F, 0x9F, 0x95, 0xF8, 0x0F, 0x9F, 0x94, 0xEE, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x94, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0xEF, 0xF7, -- 0x09, 0x93, 0xDE, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x72, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0F, 0x9F, 0x94, 0xEE, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x09, 0x93, 0xDE, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, -- 0x72, 0xF2, 0x40, 0xF0, 0xFB, 0xF3, 0x11, 0x93, 0x04, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xDE, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0x04, 0xEC, 0x40, 0xF0, 0x4B, 0xF2, 0x88, 0x98, 0x90, 0x9A, -- 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFD, 0x19, 0xD3, 0x44, 0x96, 0x40, 0xF0, 0xA7, 0xF7, 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0xF0, 0xBF, 0xEE, -- 0x4B, 0x62, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2B, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x00, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2F, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x34, 0xEE, 0xD1, 0xD4, -- 0x0B, 0x97, 0x39, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x3E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x43, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x48, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, -- 0x49, 0xEE, 0xC1, 0xD4, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x43, 0xF1, 0x09, 0x93, 0x01, 0x3F, 0x19, 0xD3, 0xC0, 0x85, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, -- 0xFF, 0xFC, 0x19, 0xD3, 0x44, 0x96, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x03, 0x96, 0x41, 0x02, 0x03, 0x99, 0xC4, 0x94, 0x42, 0x04, 0xC1, 0x04, -- 0xC2, 0x94, 0xC3, 0xD4, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x13, 0x97, 0x95, 0xEC, 0x1B, 0xD7, 0x02, 0x80, 0x11, 0x93, 0x99, 0xEC, -- 0x19, 0xD3, 0x7C, 0x96, 0x0B, 0x97, 0xA0, 0x00, 0x1B, 0xD7, 0x6E, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xBF, 0x11, 0xA3, 0x9A, 0xEC, 0xC2, 0xD2, 0x0A, 0x65, -- 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x14, 0x99, 0x03, 0x80, 0x0C, 0xB3, 0x00, 0x10, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAF, 0xF0, 0x11, 0x93, 0x30, 0x9B, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x78, 0xEF, 0x09, 0x93, 0x0C, 0x02, 0x19, 0xD3, 0x02, 0x80, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, 0x9F, 0xEC, 0x41, 0x02, 0x19, 0xD3, 0x9F, 0xEC, 0x11, 0x93, 0xED, 0xF7, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x8C, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x04, 0xC2, 0xD2, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x02, 0xD2, 0x40, 0x42, -- 0x02, 0x5E, 0x0F, 0x9F, 0xD8, 0xEF, 0x41, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x19, 0xD3, 0x9F, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x1A, 0xD5, 0x95, 0xEC, 0x13, 0x97, 0x7C, 0x96, 0x1B, 0xD7, 0x99, 0xEC, -- 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0x40, 0x19, 0xD3, 0x9A, 0xEC, 0x09, 0x63, 0x00, 0x40, 0xC2, 0xD2, 0x02, 0x94, 0x1A, 0xD5, 0x7C, 0x96, 0x0C, 0xB3, 0x00, 0x08, -- 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB8, 0xEF, 0x0C, 0xB3, 0xFF, 0x07, 0x0F, 0x9F, 0xBC, 0xEF, 0x11, 0x93, 0x06, 0x80, 0x09, 0xB3, 0xFF, 0x07, 0x09, 0x03, 0x00, 0xA0, 0x19, 0xD3, 0x97, 0xEC, -- 0x40, 0x98, 0x0B, 0x97, 0x9C, 0xEC, 0x04, 0x95, 0x03, 0x05, 0x14, 0x03, 0x97, 0xEC, 0x46, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x41, 0x08, 0x42, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xC3, 0xEF, 0x11, 0x93, -- 0x97, 0xEC, 0xC1, 0x92, 0xC5, 0xD2, 0x5F, 0xB2, 0x19, 0xD3, 0x9B, 0xEC, 0x0F, 0x9F, 0xDB, 0xEF, 0x13, 0x97, 0x98, 0xEC, 0xC5, 0xD6, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x08, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0xF1, 0xEF, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x10, 0x19, 0xD3, 0xF2, 0xF7, 0x40, 0x98, 0x1C, 0xD9, -- 0x9B, 0xEC, 0x12, 0x95, 0x9B, 0xEC, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x9E, 0xF0, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x0F, 0xF0, 0x0A, 0xB3, 0x07, 0x00, 0x09, 0x05, -- 0xA9, 0xEC, 0xC2, 0x94, 0x01, 0xD4, 0x09, 0x03, 0xA1, 0xEC, 0xC1, 0x92, 0x19, 0xD3, 0x9B, 0xEC, 0xC5, 0x94, 0x0A, 0xB5, 0x00, 0xFF, 0x01, 0xA5, 0xC5, 0xD4, 0x0F, 0x9F, 0x1B, 0xF0, 0x0A, 0x05, -- 0xFF, 0xFF, 0x0A, 0x03, 0xB1, 0xEC, 0xC1, 0x92, 0x01, 0xD2, 0x1A, 0xD5, 0x9B, 0xEC, 0xC5, 0x96, 0x0B, 0x07, 0xFF, 0xFF, 0xC5, 0xD6, 0x11, 0x93, 0x97, 0xEC, 0xC5, 0x98, 0xC1, 0xD8, 0x11, 0x93, -- 0x97, 0xEC, 0x09, 0x05, 0x0B, 0x00, 0x03, 0xD4, 0xC2, 0x96, 0x06, 0xD6, 0x7B, 0x95, 0x7A, 0x95, 0x4C, 0x02, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0xA5, 0x01, 0x98, 0x0C, 0xF5, 0x7B, 0x93, -- 0x09, 0x09, 0x01, 0x00, 0x06, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0x04, 0xD2, 0x5C, 0x93, 0x59, 0x93, 0x04, 0x94, 0x01, 0xA5, 0x03, 0x96, 0xC3, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4C, 0x02, 0x05, 0xD2, -- 0xC1, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0x7C, 0x95, 0x7A, 0x95, 0x02, 0xA3, 0x05, 0x98, 0xC4, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x45, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, -- 0x12, 0x95, 0x97, 0xEC, 0x4D, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4E, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0xC2, 0xD2, -- 0x12, 0x95, 0x9B, 0xEC, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x73, 0xF0, 0x12, 0x95, 0x97, 0xEC, 0x4A, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x01, 0x98, 0x0C, 0xF3, 0x7B, 0x93, -- 0x41, 0x02, 0x0F, 0x9F, 0x94, 0xF0, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x95, 0xF0, 0x11, 0x93, 0x97, 0xEC, 0x42, 0x02, 0x0A, 0x05, 0xFF, 0xFF, 0xC1, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4A, 0x02, -- 0x12, 0x95, 0x60, 0x96, 0xC1, 0xD4, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x1F, 0xFF, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x11, 0x93, 0x62, 0x96, -- 0x41, 0x93, 0x59, 0x93, 0x02, 0x99, 0xC4, 0xA2, 0xC2, 0xD2, 0xC5, 0x92, 0x19, 0xD3, 0x98, 0xEC, 0x0A, 0x95, 0x0C, 0x02, 0x1A, 0xD5, 0x02, 0x80, 0x0F, 0x9F, 0xC9, 0xF0, 0x09, 0x63, 0xFE, 0x7F, -- 0x01, 0x97, 0xC3, 0x94, 0x0A, 0xA5, 0x00, 0x04, 0xC1, 0xD4, 0x11, 0x93, 0x9F, 0xEC, 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x9F, 0xEC, 0x40, 0xF0, 0x34, 0xEF, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, -- 0x94, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBE, 0xF0, 0x40, 0xF0, 0x34, 0xEF, 0x11, 0x93, 0x95, 0xEC, 0x44, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC9, 0xF0, 0x48, 0x98, 0x1C, 0xD9, -- 0x02, 0x80, 0x11, 0x93, 0x91, 0xEC, 0x41, 0x22, 0x0A, 0x95, 0xC9, 0xF0, 0x88, 0xD4, 0x88, 0xDC, 0x91, 0x9A, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, -- 0x04, 0x82, 0x48, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xE0, 0xF0, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xFE, 0xC2, 0xD2, 0x41, 0x92, 0x19, 0xD3, 0xBF, 0xEC, -- 0x11, 0x93, 0x04, 0x82, 0x43, 0xB2, 0x12, 0x95, 0x03, 0x82, 0x02, 0xB3, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x07, 0xF1, 0x0A, 0xB3, 0x00, 0xFF, 0x48, 0xA2, 0x19, 0xD3, 0x03, 0x82, 0x40, 0xF0, -- 0x08, 0xF4, 0x11, 0x93, 0xBF, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x07, 0xF1, 0x11, 0x93, 0x07, 0x82, 0x11, 0x43, 0x03, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0x07, 0xF1, 0x11, 0x93, 0x03, 0x82, -- 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x40, 0x96, 0x1B, 0xD7, 0xBF, 0xEC, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x20, 0xBC, 0xC8, 0xD2, 0x40, 0xF0, -- 0x5B, 0xF1, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0x41, 0x02, 0xC1, 0x92, 0x01, 0x97, 0xC3, 0x96, 0xC2, 0xD6, -- 0x0A, 0x45, 0x00, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0x58, 0xF1, 0xC1, 0x92, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x58, 0xF1, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0x58, 0xF1, 0x41, 0x98, 0x1C, 0xD9, 0xC0, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x01, 0xD4, 0x40, 0xF0, 0x69, 0xF2, 0x0B, 0x67, 0xFD, 0x7D, 0x03, 0x99, 0xC4, 0x92, 0x0C, 0x99, 0x96, 0x03, 0x1C, 0xD9, -- 0x06, 0x82, 0x41, 0x98, 0x1C, 0xD9, 0x02, 0x82, 0x42, 0x98, 0x1C, 0xD9, 0x05, 0x82, 0x0C, 0x69, 0x80, 0x7F, 0x1C, 0xD9, 0x00, 0xB0, 0x09, 0xA3, 0x00, 0x01, 0xC3, 0xD2, 0x01, 0x94, 0x0A, 0xB3, -- 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x56, 0xF1, 0x42, 0xA4, 0x1A, 0xD5, 0x02, 0x80, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x05, 0x92, -- 0xC5, 0xD2, 0x60, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x68, 0xF1, 0x40, 0xF0, 0x4C, 0xF7, 0xC5, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x71, 0xF1, 0x40, 0xF0, -- 0x3A, 0xF6, 0xC5, 0x96, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x7A, 0xF1, 0x40, 0xF0, 0x74, 0xF5, 0xC5, 0x94, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -- 0xDB, 0xF1, 0x13, 0x97, 0x21, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x8C, 0xF1, 0x40, 0xF0, 0x62, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x95, 0xF1, 0x40, 0xF0, 0x6C, 0xFB, 0x01, 0x96, 0x0B, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xB5, 0xF1, 0x40, 0xF0, 0xB0, 0xFA, 0x41, 0x92, 0x19, 0xD3, -- 0xEC, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x09, 0x43, 0x40, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0x94, 0x1A, 0xD5, 0xEC, 0xF7, 0x11, 0x93, 0x00, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -- 0xBE, 0xF1, 0x40, 0xF0, 0x4B, 0xF2, 0x0F, 0x9F, 0xBE, 0xF1, 0x01, 0x96, 0x0B, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xBE, 0xF1, 0x40, 0xF0, 0x7C, 0xFB, 0x01, 0x94, 0x0A, 0xB3, -- 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC7, 0xF1, 0x40, 0xF0, 0x87, 0xFB, 0x11, 0x93, 0x10, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD2, 0xF1, 0x44, 0x96, 0x1B, 0xD7, 0x0B, 0xBC, -- 0x0F, 0x9F, 0xD8, 0xF1, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD8, 0xF1, 0x19, 0xD3, 0x0B, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x10, 0xEC, 0xC5, 0x94, 0x0A, 0xB3, 0x80, 0x00, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x25, 0xF2, 0x13, 0x97, 0x28, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xED, 0xF1, 0x40, 0xF0, 0x2F, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x02, 0x00, -- 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x00, 0xF2, 0x40, 0xF0, 0xBF, 0xEE, 0x40, 0xF0, 0x8F, 0xFB, 0x40, 0xF0, 0x2E, 0xF2, 0x40, 0x96, 0x1B, 0xD7, 0x00, 0xEC, 0x41, 0x92, 0x19, 0xD3, 0xEF, 0xF7, -- 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x1C, 0xF2, 0x40, 0xF0, 0x9E, 0xFB, 0x09, 0x63, 0x00, 0x44, 0x01, 0x97, 0xC3, 0x94, 0x48, 0xA4, 0xC1, 0xD4, 0x00, 0xEE, -- 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x41, 0x92, 0x19, 0xD3, 0xEF, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x25, 0xF2, 0x40, 0xF0, 0xAE, 0xFB, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, -- 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x80, -- 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, -- 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x02, 0x80, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x09, 0x19, 0xD3, 0x02, 0x80, 0x40, 0xF0, 0x69, 0xF2, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0xC8, 0xD2, 0x09, 0x93, -- 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x52, 0xF5, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x98, 0xF2, -- 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0xA5, 0xF2, 0x40, 0xF0, 0xA7, 0xF2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA5, 0xF2, 0xC8, 0xD2, 0x09, 0x93, -- 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xF1, 0xBD, 0x19, 0xD3, 0xB6, 0xEC, 0x11, 0x93, 0xB4, 0xEC, -- 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBF, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0x07, 0x07, 0x00, 0xC1, 0xD6, 0x0A, 0x05, 0x00, 0xA0, 0x1A, 0xD5, 0x96, 0xEC, 0x11, 0x93, -- 0xB6, 0xEC, 0x19, 0xD3, 0x01, 0x80, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x41, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, -- 0x13, 0x97, 0xB4, 0xEC, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x49, 0xF3, 0x12, 0x95, 0x96, 0xEC, 0x0A, 0x03, 0x07, 0x00, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x01, 0x00, -- 0x48, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x4E, 0x02, 0xC1, 0x94, 0xC5, 0xD6, 0xC5, 0x92, 0x11, 0x07, 0x96, 0xEC, 0x0B, 0x03, 0x0F, 0x00, 0xC1, 0x98, 0x46, 0x06, 0x7A, 0x93, -- 0x79, 0x93, 0x5C, 0x95, 0x5A, 0x95, 0x02, 0xA3, 0xC3, 0xD2, 0x04, 0x95, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x42, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0xE8, 0xF2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, -- 0x05, 0x00, 0x41, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0xC1, 0x92, 0x09, 0xB5, 0x1F, 0x00, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x15, 0xF3, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, -- 0x16, 0xF3, 0x0A, 0x05, 0xFF, 0xFF, 0x0F, 0x9F, 0x16, 0xF3, 0x43, 0x94, 0x11, 0x93, 0x96, 0xEC, 0x42, 0x02, 0xC1, 0xD4, 0x13, 0x97, 0x96, 0xEC, 0x03, 0x93, 0xD1, 0x94, 0x7A, 0x95, 0x7A, 0x95, -- 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0x05, 0x49, 0x06, 0xC3, 0x92, 0x7F, 0xB2, 0x01, 0x05, 0x1A, 0xD5, 0xB4, 0xEC, 0x0A, 0x03, 0xF2, 0xFF, 0x19, 0xD3, 0x92, 0xEC, 0x0A, 0x45, 0xD0, 0x07, -- 0x02, 0x9E, 0x0F, 0x9F, 0x49, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x40, 0x00, 0x19, 0xD3, 0xF2, 0xF7, 0x09, 0x63, 0x00, 0x80, -- 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB5, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x0F, 0x9F, 0xAF, 0xF3, 0x11, 0x93, 0x92, 0xEC, 0x12, 0x95, 0xB6, 0xEC, 0x02, 0x43, 0x02, 0x8E, 0x0F, 0x9F, -- 0x97, 0xF3, 0x02, 0x0E, 0x0F, 0x9F, 0x6A, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x80, 0x00, 0x19, 0xD3, 0xF2, 0xF7, 0x09, 0x63, -- 0x00, 0x80, 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB5, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x0F, 0x9F, 0xAF, 0xF3, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x7C, 0xF3, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x7C, 0xF3, 0x40, 0xF0, 0xC3, 0xF3, 0x0F, 0x9F, 0xB1, 0xF3, 0x41, 0x92, 0xC8, 0xD2, 0x0A, 0x95, 0x91, 0xEC, -- 0xC8, 0xD4, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x8F, 0xF3, 0x42, 0x96, 0x1B, 0xD7, 0xC0, 0xEC, 0x0F, 0x9F, 0xB1, 0xF3, 0x0A, 0x65, -- 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0xB1, 0xF3, 0x12, 0x45, 0x03, 0xEC, 0x02, 0x4E, 0x0F, 0x9F, 0xA9, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, -- 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x08, 0x19, 0xD3, 0xF2, 0xF7, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x19, 0x25, 0x92, 0xEC, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, -- 0xF2, 0xBD, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xC3, 0xF3, 0x40, 0x92, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, -- 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xEE, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xD3, 0xF3, 0x0A, 0x65, 0xBC, 0x69, 0x02, 0x97, 0xC3, 0x92, -- 0x09, 0x83, 0x00, 0x02, 0xC2, 0xD2, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xE6, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, -- 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x20, 0x19, 0xD3, 0xF2, 0xF7, 0x11, 0x93, 0xB5, 0xEC, 0x19, 0xD3, 0x04, 0x80, 0x12, 0x95, 0xB4, 0xEC, 0x1A, 0xD5, 0x05, 0x80, 0x09, 0x63, 0x00, 0x80, -- 0x01, 0x97, 0xC3, 0x96, 0x1B, 0xD7, 0xB5, 0xEC, 0x40, 0x94, 0x1A, 0xD5, 0xB4, 0xEC, 0x19, 0xD3, 0xF2, 0xBD, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x96, 0x03, -- 0x19, 0xD3, 0x06, 0x82, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x01, 0x82, 0xC5, 0xD2, 0x40, 0x94, -- 0x01, 0xD4, 0x13, 0x97, 0xB8, 0xEC, 0x02, 0xD6, 0x03, 0x95, 0x0C, 0x99, 0xBB, 0xEC, 0x04, 0x05, 0x13, 0x97, 0x03, 0xEC, 0x01, 0x27, 0x02, 0x99, 0xC4, 0x92, 0x03, 0x03, 0xC2, 0xD2, 0x14, 0x99, -- 0xBA, 0xEC, 0x03, 0x09, 0x1C, 0xD9, 0xBA, 0xEC, 0x12, 0x95, 0x04, 0x82, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x40, 0xF5, 0x01, 0x92, 0x03, 0xD2, 0x0A, 0xA3, 0x02, 0x00, -- 0x19, 0xD3, 0x04, 0x82, 0x02, 0x96, 0x0B, 0x05, 0x01, 0x00, 0x1A, 0xD5, 0xB8, 0xEC, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x54, 0xF4, 0x42, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x54, 0xF4, -- 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x54, 0xF4, 0x0C, 0x49, 0xD3, 0x08, 0x02, 0x8E, 0x0F, 0x9F, 0x54, 0xF4, 0x11, 0x63, 0x07, 0x82, 0x11, 0xA3, 0x07, 0x82, 0x71, 0x93, -- 0x79, 0x93, 0x79, 0x93, 0x79, 0x93, 0x03, 0xD2, 0xC5, 0x94, 0x0A, 0xB5, 0xFC, 0xFF, 0x04, 0xD4, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x63, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, -- 0x02, 0x8E, 0x0F, 0x9F, 0x70, 0xF4, 0xC5, 0x98, 0x0C, 0x03, 0xFF, 0xFF, 0x42, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x97, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x97, 0xF4, -- 0x0A, 0x95, 0xBB, 0xEC, 0x42, 0x92, 0x19, 0xD3, 0xB9, 0xEC, 0xC5, 0x96, 0x43, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0x89, 0xF4, 0x0B, 0x07, 0xFC, 0xFF, 0xC5, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, -- 0xD2, 0x96, 0x1B, 0xD7, 0xCA, 0xBC, 0x09, 0x03, 0xFF, 0xFF, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x75, 0xF4, 0x19, 0xD3, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x95, 0xF4, 0x0A, 0x05, -- 0xFE, 0xFF, 0xCA, 0xD2, 0xC2, 0xD2, 0x0F, 0x9F, 0x97, 0xF4, 0x1A, 0xD5, 0x93, 0xEC, 0x03, 0x98, 0x40, 0x48, 0x02, 0x5E, 0x0F, 0x9F, 0xB9, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x9E, -- 0x0F, 0x9F, 0xB9, 0xF4, 0x04, 0x92, 0x48, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB9, 0xF4, 0x41, 0x94, 0x01, 0xD4, 0x0A, 0x65, 0xBD, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x80, 0x00, 0xC2, 0xD2, -- 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0x11, 0xF5, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x11, 0xF5, 0x4F, 0x96, 0x41, 0xB2, -- 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x47, 0x96, 0x11, 0x93, 0xB7, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xED, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0xED, 0xF4, 0x12, 0x95, 0x00, 0x82, 0x0A, 0x05, 0xFF, 0xAF, 0x05, 0xD4, 0xC8, 0xD6, 0xC8, 0xD2, 0x40, 0xF0, 0x92, 0xF7, 0x42, 0x00, 0x05, 0x96, 0xC3, 0x94, 0x01, 0xB5, 0x40, 0x44, 0x02, 0x4E, -- 0x0F, 0x9F, 0xED, 0xF4, 0x06, 0x98, 0x50, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x92, 0x03, 0xD2, 0x0F, 0x9F, 0x16, 0xF5, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, -- 0x0F, 0x9F, 0xFA, 0xF4, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x16, 0xF5, 0x11, 0x93, 0xB8, 0xEC, 0x0C, 0x99, 0xBB, 0xEC, 0x04, 0x03, 0x04, 0x96, -- 0x13, 0x25, 0x03, 0xEC, 0xC1, 0xD4, 0x11, 0x93, 0xBA, 0xEC, 0x19, 0x05, 0xBA, 0xEC, 0x1B, 0xD7, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x99, 0xC4, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x41, 0x92, -- 0x01, 0xD2, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x2A, 0xF5, 0x11, 0x93, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x22, 0xF5, 0x19, 0xD3, 0xB8, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, -- 0x19, 0xD3, 0xBB, 0xEC, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x2A, 0xF5, 0x41, 0x98, 0x1C, 0xD9, 0xB7, 0xEC, 0x11, 0x93, 0xBF, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x3B, 0xF5, -- 0x11, 0x93, 0x00, 0x82, 0x19, 0xD3, 0x02, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x40, 0x98, 0x1C, 0xD9, 0xBF, 0xEC, 0x0F, 0x9F, 0x43, 0xF5, -- 0x01, 0x92, 0x19, 0xD3, 0xB7, 0xEC, 0x01, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x4F, 0xF5, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x47, 0x00, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x12, 0x95, 0x03, 0x80, 0x0A, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x6E, 0xF5, 0x0A, 0xB7, 0x00, 0x08, 0x40, 0x46, -- 0x02, 0x5E, 0x0F, 0x9F, 0x71, 0xF5, 0x11, 0x93, 0x03, 0xEC, 0x41, 0x02, 0x09, 0xB3, 0xFE, 0xFF, 0x12, 0x95, 0x07, 0x80, 0x01, 0x45, 0x02, 0x8E, 0x0F, 0x9F, 0x71, 0xF5, 0x41, 0x92, 0x0F, 0x9F, -- 0x72, 0xF5, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x13, 0x97, -- 0x6E, 0xEC, 0x0B, 0x47, 0xA0, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x9D, 0xF5, 0x09, 0x63, 0x08, 0x43, 0x0A, 0x65, 0xFF, 0x5F, 0x01, 0x99, 0xC4, 0xD4, 0x0A, 0x95, 0x9B, 0xEC, 0xD2, 0x96, 0x1B, 0xD7, -- 0xFA, 0xBC, 0xD2, 0x96, 0xC4, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0xD2, 0x96, 0xC1, 0xD6, 0xC2, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x0F, 0x9F, 0xDB, 0xF5, 0x0C, 0x69, 0xFF, 0x6F, 0x1C, 0xD9, -- 0xF8, 0xBC, 0x0B, 0x47, 0x10, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0xB5, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, 0x09, 0x63, 0x06, 0x43, 0x01, 0x99, 0xC4, 0xD6, 0xD2, 0x96, 0x1B, 0xD7, 0xF8, 0xBC, 0x0C, 0x69, -- 0xEE, 0x6A, 0xC1, 0xD8, 0xC2, 0x94, 0x1A, 0xD5, 0xF8, 0xBC, 0x40, 0x92, 0xC5, 0xD2, 0x11, 0x43, 0xC1, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xD8, 0xF5, 0xC5, 0x94, 0x0A, 0x03, 0x71, 0xEC, 0xC1, 0x94, -- 0x1A, 0xD5, 0xFA, 0xBC, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xCA, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0xB3, 0xF7, 0x19, 0xD3, 0xF8, 0xBC, 0x41, 0x00, -- 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x13, 0x47, 0xC1, 0xEC, 0x02, 0x1E, 0x0F, 0x9F, 0xBC, 0xF5, 0x40, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x6E, 0xEC, 0x19, 0xD3, 0xC1, 0xEC, -- 0x0A, 0x65, 0x52, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, -- 0x88, 0xDA, 0x43, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x06, 0x92, 0x01, 0xD2, 0x0A, 0x65, 0xF0, 0x6A, 0x0B, 0x97, 0x6F, 0xEC, 0x02, 0x99, 0xC4, 0x98, 0xD3, 0xD8, 0x02, 0xD6, 0x0A, 0x03, 0x02, 0x00, -- 0x01, 0x97, 0xC3, 0x98, 0x02, 0x96, 0xC3, 0xD8, 0x01, 0x96, 0xC1, 0xD6, 0x1A, 0xD5, 0x6E, 0xEC, 0xC5, 0x98, 0x14, 0x99, 0x6F, 0xEC, 0xC2, 0xD8, 0x43, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0xC8, 0xD2, 0x40, 0xF0, 0xF0, 0xF5, 0x41, 0x00, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x2A, 0xF6, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0x27, 0xF6, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0xC0, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, -- 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x63, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xAF, 0xBC, -- 0x47, 0xB2, 0x59, 0x95, 0x5A, 0x95, 0x12, 0xA5, 0xBF, 0xBC, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4C, 0xF6, 0x41, 0x04, 0x05, 0x93, 0x40, 0x96, 0x20, 0xD6, 0x62, 0x97, -- 0x0F, 0x9F, 0x5B, 0xF6, 0x14, 0x99, 0xFC, 0xBC, 0xD1, 0xD8, 0x14, 0x99, 0xFE, 0xBC, 0xD1, 0xD8, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x20, 0x98, 0x03, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x52, 0xF6, -- 0xC5, 0x92, 0x62, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x74, 0xF6, 0x02, 0x8E, 0x0F, 0x9F, 0x6E, 0xF6, 0x61, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x98, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x63, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0xBB, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x0C, 0x99, 0x71, 0xEC, 0x0B, 0x05, 0xFF, 0xFF, 0x40, 0x96, 0x0F, 0x9F, 0x81, 0xF6, 0xD1, 0x96, 0xD4, 0xD6, 0x20, 0x96, -- 0x41, 0x06, 0x20, 0xD6, 0x02, 0x47, 0x02, 0x1E, 0x0F, 0x9F, 0x7D, 0xF6, 0x1A, 0xD5, 0xC1, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, -- 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0xC5, 0xF6, 0x0A, 0x03, 0xFE, 0xFF, 0x61, 0x95, 0x40, 0x98, 0x20, 0xD8, 0x02, 0x49, 0x02, 0x0E, 0x0F, 0x9F, -- 0xC5, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x21, 0xD2, 0x20, 0x92, 0x05, 0x03, 0x42, 0x02, 0xC8, 0xD2, 0x21, 0x96, 0xC3, 0x92, 0x42, 0x06, 0x21, 0xD6, 0xC8, 0xD2, 0x22, 0xD4, 0x40, 0xF0, 0x14, 0xF1, -- 0x42, 0x00, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x22, 0x94, 0x02, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0xA4, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x0D, 0x03, 0x03, 0x00, 0xC8, 0xD2, 0x02, 0x92, 0xC8, 0xD2, -- 0x01, 0x96, 0xC8, 0xD6, 0x40, 0xF0, 0xC8, 0xF6, 0x43, 0x00, 0x63, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x45, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x08, 0x00, 0x08, 0x94, 0xC5, 0xD4, -- 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x03, 0xD4, 0x42, 0x02, 0xC1, 0x92, 0x01, 0xD2, 0x02, 0x97, 0xC5, 0x94, 0x0A, 0x83, 0xFF, 0xFF, 0x11, 0xB3, 0x2C, 0x93, 0x09, 0xB3, 0xFB, 0xFF, 0x19, 0xD3, -- 0x2C, 0x93, 0x03, 0x92, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xFB, 0xF6, 0x01, 0x94, 0xD2, 0x92, 0x19, 0xD3, 0x2C, 0x93, 0x01, 0xD4, 0x02, 0x94, 0x12, 0x95, 0x2C, 0x93, 0x44, 0xA4, 0x1A, 0xD5, -- 0x2C, 0x93, 0x0A, 0xB5, 0xFB, 0xFF, 0x1A, 0xD5, 0x2C, 0x93, 0x0B, 0x07, 0xFF, 0xFF, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0xE6, 0xF6, 0x09, 0x63, 0xD4, 0x6C, 0x01, 0x95, 0xC2, 0x96, 0xC5, 0x94, -- 0x02, 0xA7, 0xC1, 0xD6, 0x03, 0x92, 0x54, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x0B, 0xF7, 0x0A, 0x83, 0xFF, 0xFF, 0x1B, 0xB3, 0x2C, 0x93, 0x45, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, 0x40, 0xF0, 0x52, 0xF5, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x1F, 0xF7, 0x40, 0xF0, 0xA7, 0xF2, 0x0F, 0x9F, 0x2D, 0xF7, 0x40, 0x96, -- 0xC8, 0xD6, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, -- 0x40, 0x92, 0x19, 0xD3, 0x2D, 0xBC, 0x0A, 0x65, 0xD8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, -- 0xEA, 0x43, 0x01, 0x97, 0xC3, 0x94, 0x44, 0xA4, 0xC1, 0xD4, 0x11, 0x93, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x86, 0xF7, 0x12, 0x95, 0x93, 0xEC, 0x0B, 0x67, 0x36, 0x43, 0xD2, 0x98, -- 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x98, 0x03, 0x93, 0xC1, 0xD8, 0x11, 0x93, 0xB9, 0xEC, 0x09, 0x03, 0xFF, 0xFF, 0x19, 0xD3, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x5F, 0xF7, 0x19, 0xD3, -- 0xB8, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, 0x0A, 0x05, 0xFE, 0xFF, 0xCA, 0xD2, 0xCA, 0xD2, 0xC2, 0xD2, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, -- 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0x0F, 0x9F, 0x8F, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x19, 0xD3, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x43, 0xA2, 0xC2, 0xD2, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x03, 0x92, 0x04, 0x96, 0x0D, 0x5E, 0x50, 0x46, 0x02, 0x0E, 0x40, 0x92, 0x09, 0xEE, 0x44, 0x46, 0x04, 0x0E, 0x59, 0x93, 0x44, 0x26, -- 0x04, 0x5E, 0x46, 0xEE, 0x41, 0x93, 0x41, 0x26, 0x43, 0x4E, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xB1, 0xFE, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x03, 0x94, 0x1A, 0xD5, 0xBA, 0xF7, 0x11, 0x93, 0x00, 0x90, 0x88, 0x98, 0x90, 0x9A, 0x1D, 0x00, 0x1A, 0x00, 0x03, 0x00, -- 0x03, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x16, 0x00, 0x21, 0x00, 0x12, 0x00, 0x09, 0x00, 0x13, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00, 0x21, 0x00, 0x2D, 0x00, 0x21, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xF2, -- 0xE4, 0xF7, 0x00, 0x00, 0x87, 0xF2, 0xE4, 0xF7, 0x00, 0x00, 0xCC, 0xF2, 0xE1, 0xF7, 0xE8, 0xF7, 0x00, 0x00, 0xB4, 0xF3, 0xE4, 0xF7, 0x25, 0x47, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0xF4, 0x94, 0xD3, 0xD4, 0x41, 0x2A, 0x40, 0x4A, 0x45, 0xBE, 0x88, 0x92, 0x41, 0x24, 0x40, 0x44, 0x53, 0xBE, 0x40, 0xF0, 0x93, 0xEE, 0x41, 0xEE, 0x98, 0x9A, 0xC6, 0xF7, 0x02, 0x00, 0x1F, 0xEC, -+ 0x00, 0x00, 0xB2, 0xF8, 0x4D, 0x00, 0xA0, 0xEC, 0x00, 0x00, 0x98, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xD8, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, -+ 0x40, 0xF0, 0xB4, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x64, 0xEF, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xF6, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -+ 0xE9, 0xF6, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xE7, 0xF5, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xF1, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -+ 0x89, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x42, 0x02, 0xC1, 0x92, 0x03, 0x96, 0x1B, 0xD7, 0x2A, 0x86, -+ 0x1A, 0xD5, 0x2B, 0x86, 0x09, 0xA3, 0x00, 0x80, 0x19, 0xD3, 0x2C, 0x86, 0x00, 0xEE, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, -+ 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x01, 0xD4, 0x42, 0x02, 0xC1, 0x96, 0x0A, 0x65, 0xC0, 0x7A, -+ 0x02, 0x99, 0xC4, 0x92, 0x41, 0xA2, 0xC4, 0xD2, 0xC5, 0x98, 0x1C, 0xD9, 0x2A, 0x86, 0x01, 0x98, 0x1C, 0xD9, 0x2B, 0x86, 0x1B, 0xD7, 0x2C, 0x86, 0x00, 0xEE, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, -+ 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xE5, 0xEE, 0x11, 0x93, 0xCA, 0xF7, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xAE, 0xEE, 0x40, 0xF1, -+ 0x40, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0xC5, 0x92, 0x41, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x40, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x0F, 0x9F, 0x95, 0xF8, 0x0F, 0x9F, 0x99, 0xEE, 0x42, 0x42, 0x02, 0x5E, -+ 0x0F, 0x9F, 0x99, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x09, 0x93, 0xB9, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x5F, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0F, 0x9F, -+ 0x99, 0xEE, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, -+ 0x09, 0x93, 0xB9, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x5F, 0xF2, 0x40, 0xF0, 0xCD, 0xF3, 0x11, 0x93, 0x04, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xE3, 0xEE, 0x40, 0x92, 0x19, 0xD3, -+ 0x04, 0xEC, 0x40, 0xF0, 0x38, 0xF2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFD, 0x19, 0xD3, 0x44, 0x96, 0x40, 0xF0, 0x82, 0xF7, -+ 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0xF0, 0xC4, 0xEE, 0x4B, 0x62, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2B, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x00, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, -+ 0x2F, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x34, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x39, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x3E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x43, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x48, 0xEE, -+ 0xD1, 0xD4, 0x0B, 0x97, 0x4D, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x4E, 0xEE, 0xC1, 0xD4, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x43, 0xF1, 0x09, 0x93, 0x01, 0x3F, -+ 0x19, 0xD3, 0xC0, 0x85, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFC, 0x19, 0xD3, 0x44, 0x96, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x03, 0x96, -+ 0x41, 0x02, 0x03, 0x99, 0xC4, 0x94, 0x42, 0x04, 0xC1, 0x04, 0xC2, 0x94, 0xC3, 0xD4, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x13, 0x97, -+ 0x95, 0xEC, 0x1B, 0xD7, 0x02, 0x80, 0x11, 0x93, 0x99, 0xEC, 0x19, 0xD3, 0x7C, 0x96, 0x0B, 0x97, 0xA0, 0x00, 0x1B, 0xD7, 0x6E, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, -+ 0xFF, 0xBF, 0x11, 0xA3, 0x9A, 0xEC, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, -+ 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x14, 0x99, 0x03, 0x80, 0x0C, 0xB3, 0x00, 0x10, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x97, 0xF0, -+ 0x11, 0x93, 0x9F, 0xEC, 0x41, 0x02, 0x19, 0xD3, 0x9F, 0xEC, 0x11, 0x93, 0xC8, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x84, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, -+ 0x00, 0x04, 0xC2, 0xD2, 0x0F, 0x9F, 0xB1, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x02, 0xD2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD0, 0xEF, 0x41, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x19, 0xD3, 0x9F, 0xEC, -+ 0x12, 0x95, 0x02, 0x80, 0x1A, 0xD5, 0x95, 0xEC, 0x13, 0x97, 0x7C, 0x96, 0x1B, 0xD7, 0x99, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0x40, 0x19, 0xD3, 0x9A, 0xEC, -+ 0x09, 0x63, 0x00, 0x40, 0xC2, 0xD2, 0x02, 0x94, 0x1A, 0xD5, 0x7C, 0x96, 0x0C, 0xB3, 0x00, 0x08, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB0, 0xEF, 0x0C, 0xB3, 0xFF, 0x07, 0x0F, 0x9F, 0xB4, 0xEF, -+ 0x11, 0x93, 0x06, 0x80, 0x09, 0xB3, 0xFF, 0x07, 0x09, 0x03, 0x00, 0xA0, 0x19, 0xD3, 0x97, 0xEC, 0x40, 0x98, 0x0B, 0x97, 0x9C, 0xEC, 0x04, 0x95, 0x03, 0x05, 0x14, 0x03, 0x97, 0xEC, 0x46, 0x02, -+ 0xC1, 0x92, 0xC2, 0xD2, 0x41, 0x08, 0x42, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xBB, 0xEF, 0x11, 0x93, 0x97, 0xEC, 0xC1, 0x92, 0xC5, 0xD2, 0x5F, 0xB2, 0x19, 0xD3, 0x9B, 0xEC, 0x0F, 0x9F, 0xD3, 0xEF, -+ 0x13, 0x97, 0x98, 0xEC, 0xC5, 0xD6, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x08, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xE9, 0xEF, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, -+ 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x10, 0x19, 0xD3, 0xCD, 0xF7, 0x40, 0x98, 0x1C, 0xD9, 0x9B, 0xEC, 0x12, 0x95, 0x9B, 0xEC, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x86, 0xF0, 0x0A, 0xB3, -+ 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x07, 0xF0, 0x0A, 0xB3, 0x07, 0x00, 0x09, 0x05, 0xA8, 0xEC, 0xC2, 0x94, 0x01, 0xD4, 0x09, 0x03, 0xA0, 0xEC, 0xC1, 0x92, 0x19, 0xD3, 0x9B, 0xEC, -+ 0xC5, 0x94, 0x0A, 0xB5, 0x00, 0xFF, 0x01, 0xA5, 0xC5, 0xD4, 0x0F, 0x9F, 0x13, 0xF0, 0x0A, 0x05, 0xFF, 0xFF, 0x0A, 0x03, 0xB0, 0xEC, 0xC1, 0x92, 0x01, 0xD2, 0x1A, 0xD5, 0x9B, 0xEC, 0xC5, 0x96, -+ 0x0B, 0x07, 0xFF, 0xFF, 0xC5, 0xD6, 0x11, 0x93, 0x97, 0xEC, 0xC5, 0x98, 0xC1, 0xD8, 0x11, 0x93, 0x97, 0xEC, 0x09, 0x05, 0x0B, 0x00, 0x03, 0xD4, 0xC2, 0x96, 0x06, 0xD6, 0x7B, 0x95, 0x7A, 0x95, -+ 0x4C, 0x02, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0xA5, 0x01, 0x98, 0x0C, 0xF5, 0x7B, 0x93, 0x09, 0x09, 0x01, 0x00, 0x06, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0x04, 0xD2, 0x5C, 0x93, 0x59, 0x93, -+ 0x04, 0x94, 0x01, 0xA5, 0x03, 0x96, 0xC3, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4C, 0x02, 0x05, 0xD2, 0xC1, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0x7C, 0x95, 0x7A, 0x95, 0x02, 0xA3, 0x05, 0x98, 0xC4, 0xD2, -+ 0x12, 0x95, 0x97, 0xEC, 0x45, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x12, 0x95, 0x9B, 0xEC, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x5B, 0xF0, -+ 0x12, 0x95, 0x97, 0xEC, 0x4A, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x01, 0x98, 0x0C, 0xF3, 0x7B, 0x93, 0x41, 0x02, 0x0F, 0x9F, 0x7C, 0xF0, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x7D, 0xF0, 0x11, 0x93, -+ 0x97, 0xEC, 0x42, 0x02, 0x0A, 0x05, 0xFF, 0xFF, 0xC1, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4A, 0x02, 0x12, 0x95, 0x60, 0x96, 0xC1, 0xD4, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xB3, 0x1F, 0xFF, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x11, 0x93, 0x62, 0x96, 0x41, 0x93, 0x59, 0x93, 0x02, 0x99, 0xC4, 0xA2, 0xC2, 0xD2, 0xC5, 0x92, 0x19, 0xD3, 0x98, 0xEC, -+ 0x0A, 0x95, 0x0C, 0x02, 0x1A, 0xD5, 0x02, 0x80, 0x0F, 0x9F, 0xB1, 0xF0, 0x09, 0x63, 0xFE, 0x7F, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0xA5, 0x00, 0x04, 0xC1, 0xD4, 0x11, 0x93, 0x9F, 0xEC, 0x09, 0xA3, -+ 0x00, 0x01, 0x19, 0xD3, 0x9F, 0xEC, 0x40, 0xF0, 0x39, 0xEF, 0x0F, 0x9F, 0xB1, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA6, 0xF0, 0x40, 0xF0, 0x39, 0xEF, 0x11, 0x93, -+ 0x95, 0xEC, 0x44, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xB1, 0xF0, 0x48, 0x98, 0x1C, 0xD9, 0x02, 0x80, 0x11, 0x93, 0x91, 0xEC, 0x41, 0x22, 0x0A, 0x95, 0xB1, 0xF0, 0x88, 0xD4, 0x88, 0xDC, -+ 0x91, 0x9A, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x04, 0x82, 0x48, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC8, 0xF0, 0x0A, 0x65, 0xFD, 0x7D, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xFE, 0xC2, 0xD2, 0x41, 0x92, 0x19, 0xD3, 0xBE, 0xEC, 0x11, 0x93, 0x04, 0x82, 0x43, 0xB2, 0x12, 0x95, 0x03, 0x82, 0x02, 0xB3, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0xEF, 0xF0, 0x0A, 0xB3, 0x00, 0xFF, 0x48, 0xA2, 0x19, 0xD3, 0x03, 0x82, 0x40, 0xF0, 0xDA, 0xF3, 0x11, 0x93, 0xBE, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xEF, 0xF0, 0x11, 0x93, -+ 0x07, 0x82, 0x11, 0x43, 0x03, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xEF, 0xF0, 0x11, 0x93, 0x03, 0x82, 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x40, 0x96, 0x1B, 0xD7, 0xBE, 0xEC, 0x88, 0x98, -+ 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x20, 0xBC, 0xC8, 0xD2, 0x40, 0xF0, 0x48, 0xF1, 0x41, 0x00, 0x88, 0x98, -+ 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0x41, 0x02, 0xC1, 0x92, 0x01, 0x97, 0xC3, 0x96, 0xC2, 0xD6, 0x0A, 0x45, 0x00, 0x95, 0x02, 0x5E, -+ 0x0F, 0x9F, 0x45, 0xF1, 0xC1, 0x92, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x45, 0xF1, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x45, 0xF1, 0x41, 0x98, 0x1C, 0xD9, -+ 0xBF, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x01, 0xD4, 0x40, 0xF0, 0x56, 0xF2, 0x0B, 0x67, 0xFD, 0x7D, 0x03, 0x99, 0xC4, 0x92, 0x0C, 0x99, 0x96, 0x03, 0x1C, 0xD9, 0x06, 0x82, 0x41, 0x98, 0x1C, 0xD9, -+ 0x02, 0x82, 0x42, 0x98, 0x1C, 0xD9, 0x05, 0x82, 0x0C, 0x69, 0x80, 0x7F, 0x1C, 0xD9, 0x00, 0xB0, 0x09, 0xA3, 0x00, 0x01, 0xC3, 0xD2, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0x43, 0xF1, 0x42, 0xA4, 0x1A, 0xD5, 0x02, 0x80, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x05, 0x92, 0xC5, 0xD2, 0x60, 0xB2, 0x40, 0x42, -+ 0x02, 0x4E, 0x0F, 0x9F, 0x55, 0xF1, 0x40, 0xF0, 0x27, 0xF7, 0xC5, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x5E, 0xF1, 0x40, 0xF0, 0x15, 0xF6, 0xC5, 0x96, 0x0B, 0xB3, -+ 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x67, 0xF1, 0x40, 0xF0, 0x4C, 0xF5, 0xC5, 0x94, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC8, 0xF1, 0x13, 0x97, 0x21, 0xBC, -+ 0x01, 0xD6, 0x0B, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x79, 0xF1, 0x40, 0xF0, 0x62, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x82, 0xF1, -+ 0x40, 0xF0, 0x6C, 0xFB, 0x01, 0x96, 0x0B, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA2, 0xF1, 0x40, 0xF0, 0xB0, 0xFA, 0x41, 0x92, 0x19, 0xD3, 0xC7, 0xF7, 0x11, 0x93, 0x03, 0xEC, -+ 0x09, 0x43, 0x40, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x98, 0xF1, 0x40, 0x94, 0x1A, 0xD5, 0xC7, 0xF7, 0x11, 0x93, 0x00, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0xF0, 0x38, 0xF2, -+ 0x0F, 0x9F, 0xAB, 0xF1, 0x01, 0x96, 0x0B, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0xF0, 0x7C, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0xB4, 0xF1, 0x40, 0xF0, 0x87, 0xFB, 0x11, 0x93, 0x10, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBF, 0xF1, 0x44, 0x96, 0x1B, 0xD7, 0x0B, 0xBC, 0x0F, 0x9F, 0xC5, 0xF1, 0x41, 0x42, -+ 0x02, 0x5E, 0x0F, 0x9F, 0xC5, 0xF1, 0x19, 0xD3, 0x0B, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x10, 0xEC, 0xC5, 0x94, 0x0A, 0xB3, 0x80, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x12, 0xF2, 0x13, 0x97, -+ 0x28, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xDA, 0xF1, 0x40, 0xF0, 0x0A, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -+ 0xED, 0xF1, 0x40, 0xF0, 0xC4, 0xEE, 0x40, 0xF0, 0x8F, 0xFB, 0x40, 0xF0, 0x1B, 0xF2, 0x40, 0x96, 0x1B, 0xD7, 0x00, 0xEC, 0x41, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, -+ 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x09, 0xF2, 0x40, 0xF0, 0x9E, 0xFB, 0x09, 0x63, 0x00, 0x44, 0x01, 0x97, 0xC3, 0x94, 0x48, 0xA4, 0xC1, 0xD4, 0x00, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, -+ 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x41, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x12, 0xF2, -+ 0x40, 0xF0, 0xAE, 0xFB, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, -+ 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, -+ 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, -+ 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, -+ 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x02, 0x80, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -+ 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x09, 0x19, 0xD3, 0x02, 0x80, 0x40, 0xF0, 0x56, 0xF2, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x2A, 0xF5, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x85, 0xF2, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, -+ 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x92, 0xF2, 0x40, 0xF0, 0x94, 0xF2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x92, 0xF2, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xF1, 0xBD, 0x19, 0xD3, 0xB5, 0xEC, 0x11, 0x93, 0xB3, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -+ 0xAC, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0x07, 0x07, 0x00, 0xC1, 0xD6, 0x0A, 0x05, 0x00, 0xA0, 0x1A, 0xD5, 0x96, 0xEC, 0x11, 0x93, 0xB5, 0xEC, 0x19, 0xD3, 0x01, 0x80, -+ 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x41, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x13, 0x97, 0xB3, 0xEC, 0x40, 0x46, -+ 0x02, 0x5E, 0x0F, 0x9F, 0x1B, 0xF3, 0x12, 0x95, 0x96, 0xEC, 0x0A, 0x03, 0x07, 0x00, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x01, 0x00, 0x48, 0x02, 0xC1, 0x92, 0xC2, 0xD2, -+ 0x11, 0x93, 0x96, 0xEC, 0x4E, 0x02, 0xC1, 0x94, 0xC5, 0xD6, 0xC5, 0x92, 0x11, 0x07, 0x96, 0xEC, 0x0B, 0x03, 0x0F, 0x00, 0xC1, 0x98, 0x46, 0x06, 0x7A, 0x93, 0x79, 0x93, 0x5C, 0x95, 0x5A, 0x95, -+ 0x02, 0xA3, 0xC3, 0xD2, 0x04, 0x95, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x42, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0xD5, 0xF2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x05, 0x00, 0x41, 0x02, 0xC1, 0x92, -+ 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0xC1, 0x92, 0x09, 0xB5, 0x1F, 0x00, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x02, 0xF3, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x03, 0xF3, 0x0A, 0x05, 0xFF, 0xFF, -+ 0x0F, 0x9F, 0x03, 0xF3, 0x43, 0x94, 0x11, 0x93, 0x96, 0xEC, 0x42, 0x02, 0xC1, 0xD4, 0x13, 0x97, 0x96, 0xEC, 0x03, 0x93, 0xD1, 0x94, 0x7A, 0x95, 0x7A, 0x95, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, -+ 0x01, 0x05, 0x49, 0x06, 0xC3, 0x92, 0x7F, 0xB2, 0x01, 0x05, 0x1A, 0xD5, 0xB3, 0xEC, 0x0A, 0x05, 0xF2, 0xFF, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x12, 0x95, 0xB5, 0xEC, 0x02, 0x43, -+ 0x02, 0x8E, 0x0F, 0x9F, 0x69, 0xF3, 0x02, 0x0E, 0x0F, 0x9F, 0x3C, 0xF3, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x80, 0x00, 0x19, 0xD3, -+ 0xCD, 0xF7, 0x09, 0x63, 0x00, 0x80, 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB4, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB3, 0xEC, 0x0F, 0x9F, 0x81, 0xF3, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, -+ 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4E, 0xF3, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x4E, 0xF3, 0x40, 0xF0, 0x95, 0xF3, 0x0F, 0x9F, 0x83, 0xF3, 0x41, 0x92, 0xC8, 0xD2, -+ 0x0A, 0x95, 0x91, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0x2A, 0xEF, 0x42, 0x00, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x61, 0xF3, 0x42, 0x96, 0x1B, 0xD7, 0xBF, 0xEC, 0x0F, 0x9F, -+ 0x83, 0xF3, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x83, 0xF3, 0x12, 0x45, 0x03, 0xEC, 0x02, 0x4E, 0x0F, 0x9F, 0x7B, 0xF3, 0x11, 0x93, 0xCE, 0xF7, -+ 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x08, 0x19, 0xD3, 0xCD, 0xF7, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x19, 0x25, 0x92, 0xEC, 0x09, 0x63, -+ 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x95, 0xF3, 0x40, 0x92, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, -+ 0x40, 0xF0, 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xC9, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA5, 0xF3, 0x0A, 0x65, 0xBC, 0x69, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0x83, 0x00, 0x02, 0xC2, 0xD2, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB8, 0xF3, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, -+ 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x20, 0x19, 0xD3, 0xCD, 0xF7, 0x11, 0x93, 0xB4, 0xEC, 0x19, 0xD3, 0x04, 0x80, 0x12, 0x95, 0xB3, 0xEC, 0x1A, 0xD5, 0x05, 0x80, -+ 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x40, 0x94, 0x1A, 0xD5, 0xB3, 0xEC, 0x19, 0xD3, 0xF2, 0xBD, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, -+ 0x09, 0x93, 0x96, 0x03, 0x19, 0xD3, 0x06, 0x82, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x01, 0x82, -+ 0xC5, 0xD2, 0x40, 0x94, 0x01, 0xD4, 0x13, 0x97, 0xB7, 0xEC, 0x02, 0xD6, 0x03, 0x95, 0x0C, 0x99, 0xBA, 0xEC, 0x04, 0x05, 0x13, 0x97, 0x03, 0xEC, 0x01, 0x27, 0x02, 0x99, 0xC4, 0x92, 0x03, 0x03, -+ 0xC2, 0xD2, 0x14, 0x99, 0xB9, 0xEC, 0x03, 0x09, 0x1C, 0xD9, 0xB9, 0xEC, 0x12, 0x95, 0x04, 0x82, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x18, 0xF5, 0x01, 0x92, 0x03, 0xD2, -+ 0x0A, 0xA3, 0x02, 0x00, 0x19, 0xD3, 0x04, 0x82, 0x02, 0x96, 0x0B, 0x05, 0x01, 0x00, 0x1A, 0xD5, 0xB7, 0xEC, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x26, 0xF4, 0x42, 0x44, 0x02, 0x8E, -+ 0x0F, 0x9F, 0x26, 0xF4, 0x11, 0x93, 0xBE, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x26, 0xF4, 0x0C, 0x49, 0xD3, 0x08, 0x02, 0x8E, 0x0F, 0x9F, 0x26, 0xF4, 0x11, 0x63, 0x07, 0x82, 0x11, 0xA3, -+ 0x07, 0x82, 0x71, 0x93, 0x79, 0x93, 0x79, 0x93, 0x79, 0x93, 0x03, 0xD2, 0xC5, 0x94, 0x0A, 0xB5, 0xFC, 0xFF, 0x04, 0xD4, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x35, 0xF4, 0x11, 0x93, -+ 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x3C, 0xF4, 0xC5, 0x98, 0x0C, 0x03, 0xFF, 0xFF, 0x42, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x63, 0xF4, 0x0A, 0x95, 0xBA, 0xEC, 0x42, 0x92, 0x19, 0xD3, -+ 0xB8, 0xEC, 0xC5, 0x96, 0x43, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0x55, 0xF4, 0x0B, 0x07, 0xFC, 0xFF, 0xC5, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x96, 0x1B, 0xD7, 0xCA, 0xBC, 0x09, 0x03, -+ 0xFF, 0xFF, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x41, 0xF4, 0x19, 0xD3, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x61, 0xF4, 0x0A, 0x05, 0xFE, 0xFF, 0xCA, 0xD2, 0xC2, 0xD2, 0x0F, 0x9F, -+ 0x63, 0xF4, 0x1A, 0xD5, 0x93, 0xEC, 0x03, 0x98, 0x40, 0x48, 0x02, 0x5E, 0x0F, 0x9F, 0x90, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x73, 0xF4, 0x04, 0x94, 0x48, 0x44, -+ 0x02, 0x4E, 0x0F, 0x9F, 0x7E, 0xF4, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x90, 0xF4, 0x11, 0x93, 0x04, 0x82, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x90, 0xF4, 0x41, 0x96, 0x01, 0xD6, -+ 0x0A, 0x65, 0xBD, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0x80, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0xE9, 0xF4, -+ 0xC5, 0x98, 0x43, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xE9, 0xF4, 0x4F, 0x96, 0x0C, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x9D, 0xF4, 0x47, 0x96, 0x11, 0x93, 0xB6, 0xEC, 0x40, 0x42, -+ 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xC5, 0xF4, 0x12, 0x95, 0x00, 0x82, 0x0A, 0x05, 0xFF, 0xAF, 0x05, 0xD4, 0xC8, 0xD6, 0xC8, 0xD2, -+ 0x40, 0xF0, 0x6D, 0xF7, 0x42, 0x00, 0x05, 0x96, 0xC3, 0x94, 0x01, 0xB5, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x06, 0x98, 0x50, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x98, 0x1C, 0xD9, -+ 0xA2, 0xBC, 0x40, 0x92, 0x03, 0xD2, 0x0F, 0x9F, 0xEE, 0xF4, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0xD2, 0xF4, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, -+ 0x0F, 0x9F, 0xEE, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x0C, 0x99, 0xBA, 0xEC, 0x04, 0x03, 0x04, 0x96, 0x13, 0x25, 0x03, 0xEC, 0xC1, 0xD4, 0x11, 0x93, 0xB9, 0xEC, 0x19, 0x05, 0xB9, 0xEC, 0x1B, 0xD7, -+ 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x99, 0xC4, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x41, 0x92, 0x01, 0xD2, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF5, 0x11, 0x93, 0xB8, 0xEC, -+ 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xFA, 0xF4, 0x19, 0xD3, 0xB7, 0xEC, 0x19, 0xD3, 0xB9, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF5, 0x41, 0x98, -+ 0x1C, 0xD9, 0xB6, 0xEC, 0x11, 0x93, 0xBE, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x13, 0xF5, 0x11, 0x93, 0x00, 0x82, 0x19, 0xD3, 0x02, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x40, 0x98, 0x1C, 0xD9, 0xBE, 0xEC, 0x0F, 0x9F, 0x1B, 0xF5, 0x01, 0x92, 0x19, 0xD3, 0xB6, 0xEC, 0x01, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x27, 0xF5, -+ 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x12, 0x95, 0x03, 0x80, 0x0A, 0xB3, -+ 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x46, 0xF5, 0x0A, 0xB7, 0x00, 0x08, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x49, 0xF5, 0x11, 0x93, 0x03, 0xEC, 0x41, 0x02, 0x09, 0xB3, 0xFE, 0xFF, -+ 0x12, 0x95, 0x07, 0x80, 0x01, 0x45, 0x02, 0x8E, 0x0F, 0x9F, 0x49, 0xF5, 0x41, 0x92, 0x0F, 0x9F, 0x4A, 0xF5, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, -+ 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x13, 0x97, 0x6E, 0xEC, 0x0B, 0x47, 0xA0, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x75, 0xF5, 0x09, 0x63, 0x08, 0x43, -+ 0x0A, 0x65, 0xFF, 0x5F, 0x01, 0x99, 0xC4, 0xD4, 0x0A, 0x95, 0x9B, 0xEC, 0xD2, 0x96, 0x1B, 0xD7, 0xFA, 0xBC, 0xD2, 0x96, 0xC4, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0xD2, 0x96, 0xC1, 0xD6, -+ 0xC2, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x0F, 0x9F, 0xB3, 0xF5, 0x0C, 0x69, 0xFF, 0x6F, 0x1C, 0xD9, 0xF8, 0xBC, 0x0B, 0x47, 0x10, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0x8D, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, -+ 0x09, 0x63, 0x06, 0x43, 0x01, 0x99, 0xC4, 0xD6, 0xD2, 0x96, 0x1B, 0xD7, 0xF8, 0xBC, 0x0C, 0x69, 0xEE, 0x6A, 0xC1, 0xD8, 0xC2, 0x94, 0x1A, 0xD5, 0xF8, 0xBC, 0x40, 0x92, 0xC5, 0xD2, 0x11, 0x43, -+ 0xC0, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xB0, 0xF5, 0xC5, 0x94, 0x0A, 0x03, 0x71, 0xEC, 0xC1, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA2, 0xF5, -+ 0x0A, 0x95, 0x6F, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0x8E, 0xF7, 0x19, 0xD3, 0xF8, 0xBC, 0x41, 0x00, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x13, 0x47, 0xC0, 0xEC, 0x02, 0x1E, 0x0F, 0x9F, 0x94, 0xF5, -+ 0x40, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x6E, 0xEC, 0x19, 0xD3, 0xC0, 0xEC, 0x0A, 0x65, 0x52, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, -+ 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x43, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x06, 0x92, 0x01, 0xD2, 0x0A, 0x65, 0xF0, 0x6A, -+ 0x0B, 0x97, 0x6F, 0xEC, 0x02, 0x99, 0xC4, 0x98, 0xD3, 0xD8, 0x02, 0xD6, 0x0A, 0x03, 0x02, 0x00, 0x01, 0x97, 0xC3, 0x98, 0x02, 0x96, 0xC3, 0xD8, 0x01, 0x96, 0xC1, 0xD6, 0x1A, 0xD5, 0x6E, 0xEC, -+ 0xC5, 0x98, 0x14, 0x99, 0x6F, 0xEC, 0xC2, 0xD8, 0x43, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0x96, 0xC8, 0xD6, 0x40, 0xF0, -+ 0xC8, 0xF5, 0x41, 0x00, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x05, 0xF6, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF6, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, -+ 0x42, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0xBF, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x63, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xAF, 0xBC, 0x47, 0xB2, 0x59, 0x95, 0x5A, 0x95, 0x12, 0xA5, 0xBF, 0xBC, -+ 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x27, 0xF6, 0x41, 0x04, 0x05, 0x93, 0x40, 0x96, 0x20, 0xD6, 0x62, 0x97, 0x0F, 0x9F, 0x36, 0xF6, 0x14, 0x99, 0xFC, 0xBC, 0xD1, 0xD8, -+ 0x14, 0x99, 0xFE, 0xBC, 0xD1, 0xD8, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x20, 0x98, 0x03, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x2D, 0xF6, 0xC5, 0x92, 0x62, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4F, 0xF6, -+ 0x02, 0x8E, 0x0F, 0x9F, 0x49, 0xF6, 0x61, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x73, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x63, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x96, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, -+ 0x01, 0x00, 0x0C, 0x99, 0x71, 0xEC, 0x0B, 0x05, 0xFF, 0xFF, 0x40, 0x96, 0x0F, 0x9F, 0x5C, 0xF6, 0xD1, 0x96, 0xD4, 0xD6, 0x20, 0x96, 0x41, 0x06, 0x20, 0xD6, 0x02, 0x47, 0x02, 0x1E, 0x0F, 0x9F, -+ 0x58, 0xF6, 0x1A, 0xD5, 0xC0, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, -+ 0xC2, 0xD2, 0x0F, 0x9F, 0xA0, 0xF6, 0x0A, 0x03, 0xFE, 0xFF, 0x61, 0x95, 0x40, 0x98, 0x20, 0xD8, 0x02, 0x49, 0x02, 0x0E, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x21, 0xD2, 0x20, 0x92, -+ 0x05, 0x03, 0x42, 0x02, 0xC8, 0xD2, 0x21, 0x96, 0xC3, 0x92, 0x42, 0x06, 0x21, 0xD6, 0xC8, 0xD2, 0x22, 0xD4, 0x40, 0xF0, 0x01, 0xF1, 0x42, 0x00, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x22, 0x94, -+ 0x02, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x7F, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, 0x03, 0x00, 0xC8, 0xD2, 0x02, 0x92, 0xC8, 0xD2, 0x01, 0x96, 0xC8, 0xD6, 0x40, 0xF0, 0xA3, 0xF6, 0x43, 0x00, -+ 0x63, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x45, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x08, 0x00, 0x08, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x03, 0xD4, 0x42, 0x02, -+ 0xC1, 0x92, 0x01, 0xD2, 0x02, 0x97, 0xC5, 0x94, 0x0A, 0x83, 0xFF, 0xFF, 0x11, 0xB3, 0x2C, 0x93, 0x09, 0xB3, 0xFB, 0xFF, 0x19, 0xD3, 0x2C, 0x93, 0x03, 0x92, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -+ 0xD6, 0xF6, 0x01, 0x94, 0xD2, 0x92, 0x19, 0xD3, 0x2C, 0x93, 0x01, 0xD4, 0x02, 0x94, 0x12, 0x95, 0x2C, 0x93, 0x44, 0xA4, 0x1A, 0xD5, 0x2C, 0x93, 0x0A, 0xB5, 0xFB, 0xFF, 0x1A, 0xD5, 0x2C, 0x93, -+ 0x0B, 0x07, 0xFF, 0xFF, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0xC1, 0xF6, 0x09, 0x63, 0xD4, 0x6C, 0x01, 0x95, 0xC2, 0x96, 0xC5, 0x94, 0x02, 0xA7, 0xC1, 0xD6, 0x03, 0x92, 0x54, 0x42, 0x02, 0x5E, -+ 0x0F, 0x9F, 0xE6, 0xF6, 0x0A, 0x83, 0xFF, 0xFF, 0x1B, 0xB3, 0x2C, 0x93, 0x45, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, -+ 0x40, 0xF0, 0x2A, 0xF5, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xFA, 0xF6, 0x40, 0xF0, 0x94, 0xF2, 0x0F, 0x9F, 0x08, 0xF7, 0x40, 0x96, 0xC8, 0xD6, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, -+ 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0x2D, 0xBC, 0x0A, 0x65, 0xD8, 0x43, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0xEA, 0x43, 0x01, 0x97, 0xC3, 0x94, 0x44, 0xA4, 0xC1, 0xD4, -+ 0x11, 0x93, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x61, 0xF7, 0x12, 0x95, 0x93, 0xEC, 0x0B, 0x67, 0x36, 0x43, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x98, 0x03, 0x93, 0xC1, 0xD8, -+ 0x11, 0x93, 0xB8, 0xEC, 0x09, 0x03, 0xFF, 0xFF, 0x19, 0xD3, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x3A, 0xF7, 0x19, 0xD3, 0xB7, 0xEC, 0x19, 0xD3, 0xB9, 0xEC, 0x0A, 0x05, 0xFE, 0xFF, -+ 0xCA, 0xD2, 0xCA, 0xD2, 0xC2, 0xD2, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0x0F, 0x9F, -+ 0x6A, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x19, 0xD3, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, -+ 0x03, 0x92, 0x04, 0x96, 0x0D, 0x5E, 0x50, 0x46, 0x02, 0x0E, 0x40, 0x92, 0x09, 0xEE, 0x44, 0x46, 0x04, 0x0E, 0x59, 0x93, 0x44, 0x26, 0x04, 0x5E, 0x46, 0xEE, 0x41, 0x93, 0x41, 0x26, 0x43, 0x4E, -+ 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xB1, 0xFE, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -+ 0x01, 0x00, 0x03, 0x94, 0x1A, 0xD5, 0x95, 0xF7, 0x11, 0x93, 0x00, 0x90, 0x88, 0x98, 0x90, 0x9A, 0x1D, 0x00, 0x1A, 0x00, 0x03, 0x00, 0x03, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, -+ 0x16, 0x00, 0x21, 0x00, 0x12, 0x00, 0x09, 0x00, 0x13, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00, 0x21, 0x00, 0x2D, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0xF2, 0xBF, 0xF7, 0x00, 0x00, 0x74, 0xF2, 0xBF, 0xF7, 0x00, 0x00, -+ 0xB9, 0xF2, 0xBC, 0xF7, 0xC3, 0xF7, 0x00, 0x00, 0x86, 0xF3, 0xBF, 0xF7, 0x21, 0x47, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; -- - #endif diff --git a/packages/zd1211/zd1211-r52/makefile.patch b/packages/zd1211/zd1211-r52/makefile.patch deleted file mode 100644 index 9ec821daa1..0000000000 --- a/packages/zd1211/zd1211-r52/makefile.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- zd1211-driver-r52/Makefile.orig 2006-01-22 11:32:24.000000000 +0100 -+++ zd1211-driver-r52/Makefile 2006-01-22 12:37:17.000000000 +0100 -@@ -4,17 +4,17 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+#CC=gcc -+#CPP=g++ -+#LD=ld -+#RM=rm -f -r - --MODPATH := /lib/modules/$(shell uname -r) -+#MODPATH := /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this - KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+#KERNEL_SOURCE=$(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b -@@ -46,7 +46,7 @@ - EXTRA_CFLAGS += -D__SMP__ -DSMP - endif - --KDIR := $(MODPATH)/build -+#KDIR := $(MODPATH)/build - PWD := $(shell pwd) - - WLAN_SRC=$(PWD) -@@ -219,15 +219,15 @@ - - - install: all -- mkdir -p $(MODPATH)/net -+# mkdir -p $(MODPATH)/net - # mkdir -p /etc/zd1211 -- cp $(MODULE) $(MODPATH)/net -- depmod -a -+# cp $(MODULE) $(MODPATH)/net -+# depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff b/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff deleted file mode 100644 index a225d37698..0000000000 --- a/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- zd1211-driver-r52/src/zd1205.c.orig 2006-02-10 10:02:56.000000000 +0100 -+++ zd1211-driver-r52/src/zd1205.c 2006-02-10 10:02:56.000000000 +0100 -@@ -5693,7 +5693,12 @@ - /* Check if the key is not marked as invalid */ - if (!(erq->flags & IW_ENCODE_NOKEY)) { // for command: key xxxxxxxxxx [n] - // ZD1211DEBUG(0, "Set contents of key %d\n", index+1); -- pSetting->EncryKeyId = index; -+ /* We change the transmit key only if we are -+ * transitioning from a no-encrypt state. This -+ * behavior is deduced from the iwconfig man page */ -+ if (pSetting->EncryOnOff == 0) { -+ pSetting->EncryKeyId = index; -+ } - memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen); - zd1205_config_wep_keys(macp); - } else { // For command: key on diff --git a/packages/zd1211/zd1211-r52/zd1205.c.diff b/packages/zd1211/zd1211-r52/zd1205.c.diff deleted file mode 100644 index 946df139df..0000000000 --- a/packages/zd1211/zd1211-r52/zd1205.c.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- zd1211-driver-r52/src/zd1205.c.orig 2006-02-09 02:45:12.000000000 +0100 -+++ zd1211-driver-r52/src/zd1205.c 2006-02-09 02:46:53.000000000 +0100 -@@ -8512,6 +8512,7 @@ - printk(KERN_ERR "STA_DEAUTHED\n"); - printk(KERN_ERR "mac addr = %02x:%02x:%02x:%02x:%02x:%02x\n", - StaAddr[0], StaAddr[1], StaAddr[2], StaAddr[3], StaAddr[4], StaAddr[5]); -+ memset(&macp->BSSID[0], 0, 6); - break; - - default: diff --git a/packages/zd1211/zd1211-r52/zdhci.c.diff b/packages/zd1211/zd1211-r52/zdhci.c.diff deleted file mode 100644 index ad6568685c..0000000000 --- a/packages/zd1211/zd1211-r52/zdhci.c.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- zd1211-driver-r52/src/zdhci.c.orig 2006-02-09 02:47:21.000000000 +0100 -+++ zd1211-driver-r52/src/zdhci.c 2006-02-09 02:48:27.000000000 +0100 -@@ -892,6 +892,7 @@ - //check capability ... - if (cap & CAP_PRIVACY) { - if (!mPrivacyInvoked) -+ if (!mPrivacyInvoked && !mProbeWithSsid) - continue; - } else { - if (mPrivacyInvoked) diff --git a/packages/zd1211/zd1211-r67/.mtn2git_empty b/packages/zd1211/zd1211-r67/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-r67/makefile-unslung.patch b/packages/zd1211/zd1211-r67/makefile-unslung.patch new file mode 100644 index 0000000000..3ad1e24424 --- /dev/null +++ b/packages/zd1211/zd1211-r67/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r67/makefile.patch b/packages/zd1211/zd1211-r67/makefile.patch new file mode 100644 index 0000000000..5c575faece --- /dev/null +++ b/packages/zd1211/zd1211-r67/makefile.patch @@ -0,0 +1,47 @@ +--- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this + KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211_20050822.bb b/packages/zd1211/zd1211_20050822.bb deleted file mode 100644 index dbd2c905f4..0000000000 --- a/packages/zd1211/zd1211_20050822.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "dyoung " -LICENSE = "GPL" -PR = "r5" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz \ - file://makefile.patch;patch=1 \ - file://iwconfig-rate.patch;patch=1 \ - file://access_ok.patch;patch=1 \ - file://urb-async.patch;patch=1" - -S = "${WORKDIR}/zd1211" - -inherit module - -#do_compile_prepend() { -# cp -f ${WORKDIR}/Makefile ${S}/ -#} - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNRELEASE=${KERNEL_VERSION}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/src/modules-${KERNEL_VERSION}/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} - diff --git a/packages/zd1211/zd1211_r52.bb b/packages/zd1211/zd1211_r52.bb deleted file mode 100644 index 21982ad64f..0000000000 --- a/packages/zd1211/zd1211_r52.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r4" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1 \ - file://firmware.patch;patch=1 \ - file://zd1205.c.diff;patch=1 \ - file://zdhci.c.diff;patch=1 \ - file://transmitkey.index.fix.diff;patch=1 \ - " - -S = "${WORKDIR}/zd1211-driver-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ - 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'SRC_DIR=${S}/src' \ - 'KERNE_VERSION=${KERNEL_VERSION}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} - diff --git a/packages/zd1211/zd1211_r67.bb b/packages/zd1211/zd1211_r67.bb new file mode 100644 index 0000000000..af03e7657f --- /dev/null +++ b/packages/zd1211/zd1211_r67.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r2" +RDEPENDS = "wireless-tools" + +SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile.patch;patch=1 \ + " + +SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile-unslung.patch;patch=1 \ + " + +S = "${WORKDIR}/zd1211-driver-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ + 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'KERNEL_VERSION=${KERNEL_VERSION}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net + install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net +} + -- cgit v1.2.3 From b06947117d509732650abe04637a85953e28a645 Mon Sep 17 00:00:00 2001 From: Adrian Davey Date: Thu, 30 Mar 2006 14:49:57 +0000 Subject: qemu: add a differing native qemu that works with gcc4, arm support only atm --- packages/qemu/qemu-qop-nogfx-native_svn.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/qemu/qemu-qop-nogfx-native_svn.bb (limited to 'packages') diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb new file mode 100644 index 0000000000..cfe57653a2 --- /dev/null +++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +PV = "0.8.0+svn${SRCDATE}" +PROVIDES = "qemu-native" + +SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \ + file://configure.patch;patch=1" + +S = "${WORKDIR}/trunk" + +inherit autotools native + +EXTRA_OECONF = "--disable-gcc-check --target-list=arm-user,arm-softmmu --disable-gfx-check" + +prefix = "${STAGING_DIR}/${BUILD_SYS}" + +# tested to work with gcc4 for arm target only +# this is purely for others to test, not intended to be used as a replacement for the real qemu -- cgit v1.2.3