[oe-commits] org.oe.dev merge of '8b37dea089f02d115ec3e3af14478ea8264ad822'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:40:50 UTC 2007
merge of '8b37dea089f02d115ec3e3af14478ea8264ad822'
and 'cc77b9d135248dc8b58b6894e8ed95dcbd474752'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4567013523400a8e89a74ec7813771456b7ffb5f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4567013523400a8e89a74ec7813771456b7ffb5f
Files:
1
packages/c3110x/files
packages/c3110x/files/umac_binary.patch
packages/gpe-login/files/brightness-adjust-keyluanchrc.patch
packages/kazehakase/kazehakase_0.4.7.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
packages/xserver-common/files/sl-cxx00-modmap.patch
packages/zaurusd/files/zaurusd-mixer-callback.patch
conf/distro/angstrom-2007.1.conf
contrib/mtn2cl/mtn2cl.sh
packages/c3110x/cx3110x_1.1.bb
packages/gaim/pidgin.inc
packages/gaim/pidgin_2.0.1.bb
packages/gpe-login/gpe-login_0.88.bb
packages/initscripts/initscripts-1.0/mountall.sh
packages/initscripts/initscripts_1.0.bb
packages/keylaunch/files/akita/keylaunchrc
packages/keylaunch/files/spitz/keylaunchrc
packages/keylaunch/keylaunch_2.0.10.bb
packages/netbase/netbase/interfaces
packages/netbase/netbase_4.21.bb
packages/xserver-common/xserver-common_1.16.bb
packages/xserver-common/xserver-common_svn.bb
packages/zaurusd/zaurusd_svn.bb
Diffs:
#
# mt diff -r8b37dea089f02d115ec3e3af14478ea8264ad822 -r4567013523400a8e89a74ec7813771456b7ffb5f
#
#
#
# add_dir "packages/c3110x/files"
#
# add_file "packages/c3110x/files/umac_binary.patch"
# content [d753b30d10b2aaa31d3ca72209594ae1eafcadad]
#
# add_file "packages/gpe-login/files/brightness-adjust-keyluanchrc.patch"
# content [5bda9a025ae304ef8cbf71ec04d926fb5cc7dbb2]
#
# add_file "packages/kazehakase/kazehakase_0.4.7.bb"
# content [c1051d793dabd07e39bcfb134d49967696a9bf43]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch"
# content [0078824b570a934713aa9b95e9fc9a95d1fe1429]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch"
# content [4f26c38b131dd985703e5df02c42d6f3b6c4b555]
#
# add_file "packages/xserver-common/files/sl-cxx00-modmap.patch"
# content [ccb48cbc7313d17c580c7eac8c5fce0ac7c35b43]
#
# add_file "packages/zaurusd/files/zaurusd-mixer-callback.patch"
# content [de26f226001c10241eac71d058092e2ad1ea1927]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [5a33e5de0027e06d005b28771b59efd5b2e3286d]
# to [6e2d7e04510d38751ad3e52415f04a0617d95738]
#
# patch "contrib/mtn2cl/mtn2cl.sh"
# from [b8f257c554bc38c8b98082a6c5715d46d7851766]
# to [408e3b1e5deeb7ee3ad3f18954c7ae2db17cc458]
#
# patch "packages/c3110x/cx3110x_1.1.bb"
# from [3d0ce9880e020231b0d4c895af91db4d3fee389c]
# to [e450918114547b95dbcb7a2e4ee7b71154d95fcc]
#
# patch "packages/gaim/pidgin.inc"
# from [27ad6199f42325b839880cc64215dbfb286c1e8a]
# to [1ef6b04de4b3b54f482935723aa851bf0d8040f5]
#
# patch "packages/gaim/pidgin_2.0.1.bb"
# from [165e9139e682c9431865f04be900ab693ffd1e65]
# to [baa1477ad595fab755cb26f1bc12800510ba9a35]
#
# patch "packages/gpe-login/gpe-login_0.88.bb"
# from [ddb8e5758a4f49e203856319a3c37a331432c198]
# to [2f98ebbc2ab8bc6d51f0d84b7913899f01770fde]
#
# patch "packages/initscripts/initscripts-1.0/mountall.sh"
# from [89eaec0062c930692dd90bdd17aa709b5b27ce01]
# to [29211fcb04749397e5ead868510403ce326702fc]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [cb18b58d0c39215866ca132ff89673b783674782]
# to [50e5a2313f1bf7c0308b574f46bdddd919f59aaf]
#
# patch "packages/keylaunch/files/akita/keylaunchrc"
# from [1e4ec5c8dd47d19bdfc5fd5d1b21b07ed8251cc8]
# to [7dbc44c3d92b6a1dcb2ecf09826c626e57c855ee]
#
# patch "packages/keylaunch/files/spitz/keylaunchrc"
# from [1e4ec5c8dd47d19bdfc5fd5d1b21b07ed8251cc8]
# to [7dbc44c3d92b6a1dcb2ecf09826c626e57c855ee]
#
# patch "packages/keylaunch/keylaunch_2.0.10.bb"
# from [d60ce1872e1bd515a0b65125de5e624cf9567e2c]
# to [a826322be029da6f070361e625bdf06ea694f78d]
#
# patch "packages/netbase/netbase/interfaces"
# from [60005034f2e04aa12c8bebf4f6ad65ad41a910b6]
# to [2b5a6f5a0a1bef0622ed5e41ced2945a6ebbed2f]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [4a00786291a28c5069f8f2f8abf5b6648c9d01d4]
# to [cac1713a9bb6c16d9ca908f859b4d62aa7cd0fe7]
#
# patch "packages/xserver-common/xserver-common_1.16.bb"
# from [d1abe1688f64090876798bf1435be309392d3bef]
# to [6b44ed9375b3f12356d847a9f85bbbd73d634875]
#
# patch "packages/xserver-common/xserver-common_svn.bb"
# from [a67738f7f01abf16584247c29788d6b2e6af5b0e]
# to [4a13a693c4ab8488b63d6fdec190d0b2e6c83871]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [8b451c1c4b8d4de40888cbc057c5d8461b30aea1]
# to [dad0843c0e28f2feef5ff6cf71783be4730b5917]
#
============================================================
--- packages/c3110x/files/umac_binary.patch d753b30d10b2aaa31d3ca72209594ae1eafcadad
+++ packages/c3110x/files/umac_binary.patch d753b30d10b2aaa31d3ca72209594ae1eafcadad
@@ -0,0 +1,69 @@
+ src/Makefile.k26 | 4 ++--
+ src/dummy_umac.c | 38 ++------------------------------------
+ 2 files changed, 4 insertions(+), 38 deletions(-)
+
+Index: cx3110x-1.1/src/Makefile.k26
+===================================================================
+--- cx3110x-1.1.orig/src/Makefile.k26 2007-05-25 17:51:15.000000000 +0100
++++ cx3110x-1.1/src/Makefile.k26 2007-05-25 22:44:36.000000000 +0100
+@@ -8,8 +8,8 @@ cx3110x-objs = $(SM_OBJECTS) $(SM_UMAC_O
+ #MTUM module
+ cx3110x_mt-objs = $(SM_OBJECTS) $(SM_MTUM_OBJECTS)
+
+-umac-objs = dummy_umac.o
+-mtum-objs = dummy_umac.o
++umac-objs = dummy_umac.o binary_umac.o
++mtum-objs = dummy_umac.o binary_umac.o
+
+ obj-$(CONFIG_CX3110X_STA) += cx3110x.o umac.o
+ obj-$(CONFIG_CX3110X_PROD) += cx3110x_mt.o mtum.o
+Index: cx3110x-1.1/src/dummy_umac.c
+===================================================================
+--- cx3110x-1.1.orig/src/dummy_umac.c 2007-05-25 17:51:15.000000000 +0100
++++ cx3110x-1.1/src/dummy_umac.c 2007-05-25 22:50:59.000000000 +0100
+@@ -15,43 +15,9 @@
+ */
+ #include <linux/module.h>
+ #include "softmac2.h"
++#include "sm_drv.h"
+
+-SM_API int32_t SM_FDECL prism_softmac_parse_bra(const uint8_t* bra,
+- struct s_sm_initdata *data) { return 0; }
+-
+-SM_API int32_t SM_FDECL prism_softmac_describe(struct s_sm_descr *descr,
+- struct s_sm_initdata *data) { return 0; }
+-
+-SM_API int32_t SM_FDECL prism_softmac_create(uint32_t *context,
+- struct s_sm_setup *setup,
+- struct s_pda *pda,
+- struct s_sm_initdata *data) { return 0; }
+-
+-SM_API int32_t SM_FDECL prism_softmac_destroy(uint32_t *context) { return 0; }
+-
+-SM_API int32_t SM_FDECL prism_softmac_conf( uint32_t *context, struct s_sm_conf *conf ){ return 0; }
+-SM_API int32_t SM_FDECL prism_softmac_trap( uint32_t *context, struct s_sm_conf *conf ){ return 0; }
+-
+-SM_API int32_t SM_FDECL prism_softmac_frame_tx(uint32_t *context, struct s_sm_frame *frame){ return 0; }
+-SM_API int32_t SM_FDECL prism_softmac_frame_tx_done(uint32_t *context, struct s_sm_frame **frame){ return 0; }
+-SM_API int32_t SM_FDECL prism_softmac_frame_rx(uint32_t *context, struct s_sm_frame **frame){ return 0; }
+-SM_API int32_t SM_FDECL prism_softmac_service(uint32_t *context) { return 0; }
+-
+-SM_API int32_t SM_FDECL prism_interconnect_message_query(uint32_t *context,
+- uint32_t mask,
+- struct s_ic_msg **msg){ return 0; }
+-SM_API int32_t SM_FDECL prism_interconnect_message_handle(uint32_t *context, struct s_ic_msg *msg){ return 0; }
+-SM_API int32_t SM_FDECL prism_interconnect_trigger(uint32_t *context){ return 0;}
+-
+-void prism_driver_free(uint32_t *context, void *buffer){}
+-void prism_driver_frame_free(uint32_t *context, struct s_sm_frame *frame){}
+-
+-int sm_net_device;
+-void sm_drv_get_device(void) {}
+-void frame_skb_alloc(void) {}
+-void frame_skb_free(void) {}
+-void frame_to_skb(void) {}
+-void skb_to_frame(void) {}
++extern int sm_net_device;
+
+ EXPORT_SYMBOL(prism_driver_free);
+ EXPORT_SYMBOL(prism_driver_frame_free);
============================================================
--- packages/gpe-login/files/brightness-adjust-keyluanchrc.patch 5bda9a025ae304ef8cbf71ec04d926fb5cc7dbb2
+++ packages/gpe-login/files/brightness-adjust-keyluanchrc.patch 5bda9a025ae304ef8cbf71ec04d926fb5cc7dbb2
@@ -0,0 +1,10 @@
+--- gpe-login-0.88/gpe-login.keylaunchrc.orig 2007-06-05 00:50:27.000000000 +0000
++++ gpe-login-0.88/gpe-login.keylaunchrc 2007-06-05 00:52:03.000000000 +0000
+@@ -7,3 +7,7 @@
+ key=...*Right:-:~chvt 3
+ key=...*Escape:-:~/etc/init.d/gpe-dm stop
+
++# Brightness control
++key=...*3:-:~display-brightness.sh down
++key=...*4:-:~display-brightness.sh up
++
============================================================
--- packages/kazehakase/kazehakase_0.4.7.bb c1051d793dabd07e39bcfb134d49967696a9bf43
+++ packages/kazehakase/kazehakase_0.4.7.bb c1051d793dabd07e39bcfb134d49967696a9bf43
@@ -0,0 +1,11 @@
+DESCRIPTION = "A gtk-webcore based browser"
+HOMEPAGE = "http://kazehakase.sourceforge.jp/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+DEPENDS = "osb-nrcit glib-2.0"
+SRC_URI = "http://iij.dl.sourceforge.jp/kazehakase/25610/kazehakase-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch 0078824b570a934713aa9b95e9fc9a95d1fe1429
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch 0078824b570a934713aa9b95e9fc9a95d1fe1429
@@ -0,0 +1,26 @@
+---
+ hw/kdrive/src/kmode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2007-05-16 10:30:29.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-05-16 10:31:08.000000000 +0100
+@@ -106,6 +106,8 @@ const KdMonitorTiming kdMonitorTimings[
+ 16, 120, 176, KdSyncNegative, /* 37.861 */
+ 1, 20, 24, KdSyncNegative, /* 72.809 */
+ },
++ /* DEFAULT */
++#define MONITOR_TIMING_DEFAULT 13
+ { 640, 480, 60, 25175, /* VESA */
+ 16, 48, 160, KdSyncNegative, /* 31.469 */
+ 10, 33, 45, KdSyncNegative, /* 59.940 */
+@@ -127,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
+ 16, 160, 256, KdSyncPositive, /* 46.875 */
+ 1, 21, 25, KdSyncPositive, /* 75.000 */
+ },
+- /* DEFAULT */
+-#define MONITOR_TIMING_DEFAULT 9
+ { 800, 600, 72, 50000, /* VESA */
+ 56, 64, 240, KdSyncPositive, /* 48.077 */
+ 37, 23, 66, KdSyncPositive, /* 72.188 */
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch 4f26c38b131dd985703e5df02c42d6f3b6c4b555
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch 4f26c38b131dd985703e5df02c42d6f3b6c4b555
@@ -0,0 +1,307 @@
+diff -u -r xorg-server-X11R7.1-1.1.0.orig/dix/window.c xorg-server-X11R7.1-1.1.0/dix/window.c
+--- xorg-server-X11R7.1-1.1.0.orig/dix/window.c 2007-01-08 14:30:38.000000000 +0000
++++ xorg-server-X11R7.1-1.1.0/dix/window.c 2007-01-16 17:16:19.000000000 +0000
+@@ -185,6 +185,8 @@
+ _X_EXPORT int numSaveUndersViewable = 0;
+ _X_EXPORT int deltaSaveUndersViewable = 0;
+
++char* RootPPM = NULL;
++
+ #ifdef DEBUG
+ /******
+ * PrintWindowTree
+@@ -311,6 +313,115 @@
+ #endif
+ }
+
++static int
++get_int(FILE *fp)
++{
++ int c = 0;
++
++ while ((c = getc(fp)) != EOF)
++ {
++ if (isspace(c))
++ continue;
++
++ if (c == '#')
++ while (c = getc(fp))
++ if (c == EOF)
++ return 0;
++ else if (c == '\n')
++ break;
++
++ if (isdigit(c))
++ {
++ int val = c - '0';
++ while ((c = getc(fp)) && isdigit(c))
++ val = (val * 10) + (c - '0');
++ return val;
++ }
++ }
++
++ return 0;
++}
++
++static unsigned char*
++ppm_load (const char* path, int depth, int *width, int *height)
++{
++ FILE *fp;
++ int max, n = 0, w, h, i, j, bytes_per_line;
++ unsigned char *data, *res, h1, h2;
++
++ if (depth < 16 || depth > 32)
++ return NULL;
++
++ if (depth > 16)
++ depth = 32;
++
++ fp = fopen (path, "r");
++ if (fp == NULL)
++ return FALSE;
++
++ h1 = getc(fp);
++ h2 = getc(fp);
++
++ /* magic is 'P6' for raw ppm */
++ if (h1 != 'P' && h2 != '6')
++ goto fail;
++
++ w = get_int(fp);
++ h = get_int(fp);
++
++ if (w == 0 || h == 0)
++ goto fail;
++
++ max = get_int(fp);
++
++ if (max != 255)
++ goto fail;
++
++ bytes_per_line = ((w * depth + 31) >> 5) << 2;
++
++ res = data = malloc(bytes_per_line * h);
++
++ for (i=0; i<h; i++)
++ {
++ for (j=0; j<w; j++)
++ {
++ unsigned char buf[3];
++ fread(buf, 1, 3, fp);
++
++ switch (depth)
++ {
++ case 24:
++ case 32:
++ *data = buf[2];
++ *(data+1) = buf[1];
++ *(data+2) = buf[0];
++ data += 4;
++ break;
++ case 16:
++ default:
++ *(unsigned short*)data
++ = ((buf[0] >> 3) << 11) | ((buf[1] >> 2) << 5) | (buf[2] >> 3);
++ data += 2;
++ break;
++ }
++ }
++ data += (bytes_per_line - (w*(depth>>3)));
++ }
++
++ data = res;
++
++ *width = w;
++ *height = h;
++
++ fclose(fp);
++
++ return res;
++
++ fail:
++ fclose(fp);
++ return NULL;
++}
++
+ static void
+ MakeRootTile(WindowPtr pWin)
+ {
+@@ -321,6 +432,36 @@
+ register unsigned char *from, *to;
+ register int i, j;
+
++ if (RootPPM != NULL)
++ {
++ int w, h;
++ unsigned char *data;
++
++ if ((data = ppm_load (RootPPM, pScreen->rootDepth, &w, &h)) != NULL)
++ {
++ pWin->background.pixmap
++ = (*pScreen->CreatePixmap)(pScreen, w, h, pScreen->rootDepth);
++
++ pWin->backgroundState = BackgroundPixmap;
++ pGC = GetScratchGC(pScreen->rootDepth, pScreen);
++ if (!pWin->background.pixmap || !pGC)
++ FatalError("could not create root tile");
++
++ ValidateGC((DrawablePtr)pWin->background.pixmap, pGC);
++
++ (*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap,
++ pGC,
++ pScreen->rootDepth,
++ 0, 0, w, h, 0, ZPixmap, (char *)data);
++ FreeScratchGC(pGC);
++
++ free(data);
++ return;
++ }
++ else
++ ErrorF("Unable to load root window image.");
++ }
++
+ pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4,
+ pScreen->rootDepth);
+
+@@ -357,6 +498,7 @@
+
+ }
+
++
+ WindowPtr
+ AllocateWindow(ScreenPtr pScreen)
+ {
+diff -u -r xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c
+--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c 2007-01-08 14:30:38.000000000 +0000
++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c 2007-01-15 17:53:06.000000000 +0000
+@@ -58,6 +58,9 @@
+ { 32, 32 }
+ };
+
++int
++ProcXFixesHideCursor (ClientPtr client) ;
++
+ #define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))
+
+ int kdScreenPrivateIndex;
+@@ -84,6 +87,9 @@
+ KdOsFuncs *kdOsFuncs;
+ extern WindowPtr *WindowTable;
+
++extern Bool CursorInitiallyHidden; /* See Xfixes cursor.c */
++extern char* RootPPM; /* dix/window.c */
++
+ void
+ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
+ {
+@@ -312,6 +318,7 @@
+ KdSetRootClip (pScreen, TRUE);
+ if (pScreenPriv->card->cfuncs->dpms)
+ (*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
++
+ return TRUE;
+ }
+
+@@ -686,10 +693,14 @@
+ ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
+ ErrorF("-switchCmd Command to execute on vt switch\n");
+ ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
++ ErrorF("-hide-cursor Start with cursor hidden\n");
++ ErrorF("-root-ppm [path] Specify ppm file to use as root window background.\n");
+ ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
+ #ifdef PSEUDO8
+ p8UseMsg ();
+ #endif
++
++
+ }
+
+ int
+@@ -761,6 +772,19 @@
+ kdSoftCursor = TRUE;
+ return 1;
+ }
++ if (!strcmp (argv[i], "-hide-cursor"))
++ {
++ CursorInitiallyHidden = TRUE;
++ return 1;
++ }
++ if (!strcmp (argv[i], "-root-ppm"))
++ {
++ if ((i+1) < argc)
++ RootPPM = argv[i+1];
++ else
++ UseMsg ();
++ return 2;
++ }
+ if (!strcmp (argv[i], "-videoTest"))
+ {
+ kdVideoTest = TRUE;
+diff -u -r xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c xorg-server-X11R7.1-1.1.0/xfixes/cursor.c
+--- xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c 2007-01-08 14:30:38.000000000 +0000
++++ xorg-server-X11R7.1-1.1.0/xfixes/cursor.c 2007-01-11 16:33:00.000000000 +0000
+@@ -59,9 +59,12 @@
+ static RESTYPE CursorWindowType;
+ static int CursorScreenPrivateIndex = -1;
+ static int CursorGeneration;
++static Bool CursorGloballyHidden;
+ static CursorPtr CursorCurrent;
+ static CursorPtr pInvisibleCursor = NULL;
+
++Bool CursorInitiallyHidden = FALSE;
++
+ static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
+
+ #define VERIFY_CURSOR(pCursor, cursor, client, access) { \
+@@ -130,7 +133,7 @@
+
+ Unwrap (cs, pScreen, DisplayCursor);
+
+- if (cs->pCursorHideCounts != NULL) {
++ if (cs->pCursorHideCounts != NULL || CursorGloballyHidden) {
+ ret = (*pScreen->DisplayCursor) (pScreen, pInvisibleCursor);
+ } else {
+ ret = (*pScreen->DisplayCursor) (pScreen, pCursor);
+@@ -848,6 +851,12 @@
+ return BadWindow;
+ }
+
++ /* Is cursor set to be initially hidden ?, if so reset this
++ * flag as n%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rcc77b9d135248dc8b58b6894e8ed95dcbd474752 -r4567013523400a8e89a74ec7813771456b7ffb5f
#
#
# no changes
#
More information about the Openembedded-commits
mailing list