[oe-commits] org.oe.dev merge of '056153b8d72df761dd453a0744b47f49b1526274'

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Aug 3 17:19:34 UTC 2007


merge of '056153b8d72df761dd453a0744b47f49b1526274'
     and '84faa8309d20a2d72895ea64790f085a69d15fab'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8a506316a17c249d0b58a6a584e41a5f3920f173
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8a506316a17c249d0b58a6a584e41a5f3920f173
Files:
1
packages/tslib/tslib/htctornado/tslib.sh
packages/tslib/tslib/htctornado/ts.conf
classes/patch.bbclass
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/linux/linux-rp_2.6.21.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/tslib/tslib_1.0.bb
packages/xorg-app/xrandr_1.2.0.bb
packages/xorg-util/makedepend-native_1.0.1.bb
packages/psplash/files/fic-gta01
packages/psplash/files/configurability.patch
packages/psplash/files/fic-gta01/psplash-bar-img.h
packages/psplash/files/fic-gta01/psplash-hand-img.h
packages/psplash/psplash_svn.bb
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -r056153b8d72df761dd453a0744b47f49b1526274 -r8a506316a17c249d0b58a6a584e41a5f3920f173
#
# 
# 
# delete "packages/tslib/tslib/htctornado/tslib.sh"
# 
# add_file "packages/tslib/tslib/htctornado/ts.conf"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# patch "classes/patch.bbclass"
#  from [501ddb8911d7ccbf0fec063727781c8a4647692a]
#    to [13f060e11ac73613512bdea10a347394f120fba9]
# 
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
#  from [1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1]
#    to [2066088fb6f08b47ace0f9b1b4755bc9ea14fed6]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
#  from [0b15c2bd8e24d2c3c24fab57a684fe921123a952]
#    to [4c21f111521b327915ac064d09fa63c6d1b1891b]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [a4ef82513766940d2b728b8089a10118cda3dc9a]
#    to [d80feb79f4ed86271008fb110587f45d2a76a4a8]
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [1f363d64742737bc103dabdfe8ea7079ea768b49]
#    to [10c5f028c9b6c543f29a92c40be16b67b5115751]
# 
# patch "packages/tslib/tslib_1.0.bb"
#  from [f07f9416c5b2bf045a4b37e9132c0533a9344d61]
#    to [d61e7fbdba448eea4a9e938eaf4d56a7ce5aa7df]
# 
# patch "packages/xorg-app/xrandr_1.2.0.bb"
#  from [ee85b371d620be9dba06122f7122eb39a90a578d]
#    to [b36e8f4f8737452cdb1d9a618dd6b339c0afd60c]
# 
# patch "packages/xorg-util/makedepend-native_1.0.1.bb"
#  from [78b179556261b85dcff7b1d824cb47fda685c5a8]
#    to [2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7]
# 
============================================================
--- packages/tslib/tslib/htctornado/ts.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/tslib/tslib/htctornado/ts.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- classes/patch.bbclass	501ddb8911d7ccbf0fec063727781c8a4647692a
+++ classes/patch.bbclass	13f060e11ac73613512bdea10a347394f120fba9
@@ -492,34 +492,36 @@ python patch_do_patch() {
 		else:
 			pname = os.path.basename(unpacked)
 
-		if "mindate" in parm:
-			mindate = parm["mindate"]
-		else:
-			mindate = 0
+                if "mindate" in parm or "maxdate" in parm:
+			pn = bb.data.getVar('PN', d, 1)
+			srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+			if not srcdate:
+				srcdate = bb.data.getVar('SRCDATE', d, 1)
 
-		if "maxdate" in parm:
-			maxdate = parm["maxdate"]
-		else:
-			maxdate = "20711226"
+			if srcdate == "now":
+				srcdate = bb.data.getVar('DATE', d, 1)
 
-		pn = bb.data.getVar('PN', d, 1)
-		srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+			if "maxdate" in parm and parm["maxdate"] < srcdate:
+				bb.note("Patch '%s' is outdated" % pname)
+				continue
 
-		if not srcdate:
-			srcdate = bb.data.getVar('SRCDATE', d, 1)
+			if "mindate" in parm and parm["mindate"] > srcdate:
+				bb.note("Patch '%s' is predated" % pname)
+				continue
 
-		if srcdate == "now":
-			srcdate = bb.data.getVar('DATE', d, 1)
 
-		if (maxdate < srcdate) or (mindate > srcdate):
-			if (maxdate < srcdate):
-				bb.note("Patch '%s' is outdated" % pname)
+		if "minrev" in parm:
+			srcrev = bb.data.getVar('SRCREV', d, 1)
+			if srcrev and srcrev < parm["minrev"]:
+				bb.note("Patch '%s' applies to later revisions" % pname)
+				continue
 
-			if (mindate > srcdate):
-				bb.note("Patch '%s' is predated" % pname)
+		if "maxrev" in parm:
+			srcrev = bb.data.getVar('SRCREV', d, 1)		
+			if srcrev and srcrev > parm["maxrev"]:
+				bb.note("Patch '%s' applies to earlier revisions" % pname)
+				continue
 
-			continue
-
 		bb.note("Applying patch '%s'" % pname)
 		try:
 			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
============================================================
--- packages/linux/ixp4xx-kernel/2.6.21/defconfig	1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1
+++ packages/linux/ixp4xx-kernel/2.6.21/defconfig	2066088fb6f08b47ace0f9b1b4755bc9ea14fed6
@@ -883,12 +883,12 @@ CONFIG_NET_ETHERNET=y
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_IXP4XX_QMGR=y
-CONFIG_IXP4XX_NPE=y
+CONFIG_MII=m
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
 CONFIG_IXP4XX_NPE_FW_LOAD=y
 CONFIG_IXP4XX_NPE_FW_MTD=y
-CONFIG_IXP4XX_MAC=y
+CONFIG_IXP4XX_MAC=m
 CONFIG_IXP4XX_CRYPTO=m
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
@@ -1537,7 +1537,7 @@ CONFIG_USB_DEVICEFS=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.6.bb	0b15c2bd8e24d2c3c24fab57a684fe921123a952
+++ packages/linux/ixp4xx-kernel_2.6.21.6.bb	4c21f111521b327915ac064d09fa63c6d1b1891b
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "911"
+IXP4XX_KERNEL_SVN_REV = "914"
 #
 # The directory containing the patches to be applied is
 # specified below
============================================================
--- packages/linux/linux-rp_2.6.21.bb	a4ef82513766940d2b728b8089a10118cda3dc9a
+++ packages/linux/linux-rp_2.6.21.bb	d80feb79f4ed86271008fb110587f45d2a76a4a8
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r9"
+PR = "r10"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -33,7 +33,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r4.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
-           ${RPSRC}/poodle_pm-r3.patch;patch=1 \
+           ${RPSRC}/poodle_pm-r4.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
            ${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	1f363d64742737bc103dabdfe8ea7079ea768b49
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	10c5f028c9b6c543f29a92c40be16b67b5115751
@@ -1,8 +1,8 @@ PV = "0.1.0+svnr${SRCDATE}"
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.0+svnr${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
============================================================
--- packages/tslib/tslib_1.0.bb	f07f9416c5b2bf045a4b37e9132c0533a9344d61
+++ packages/tslib/tslib_1.0.bb	d61e7fbdba448eea4a9e938eaf4d56a7ce5aa7df
@@ -1,10 +1,10 @@ LICENSE = "LGPL"
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
 HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://tslib-input_raw-grab_events.patch;patch=1 \
============================================================
--- packages/xorg-app/xrandr_1.2.0.bb	ee85b371d620be9dba06122f7122eb39a90a578d
+++ packages/xorg-app/xrandr_1.2.0.bb	b36e8f4f8737452cdb1d9a618dd6b339c0afd60c
@@ -5,6 +5,5 @@ PE = "1"
 
 DEPENDS += " libxrandr libxrender virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
============================================================
--- packages/xorg-util/makedepend-native_1.0.1.bb	78b179556261b85dcff7b1d824cb47fda685c5a8
+++ packages/xorg-util/makedepend-native_1.0.1.bb	2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7
@@ -1,7 +1,8 @@ DESCRIPTION = "create dependencies in ma
 require xorg-util-common.inc
 inherit native
 
 DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto-native"
 PR = "r1"
 PE = "1"
 


#
# mt diff -r84faa8309d20a2d72895ea64790f085a69d15fab -r8a506316a17c249d0b58a6a584e41a5f3920f173
#
# 
# 
# add_dir "packages/psplash/files/fic-gta01"
# 
# add_file "packages/psplash/files/configurability.patch"
#  content [62ed2328f8bd83a1609058709ddf254ee396d33d]
# 
# add_file "packages/psplash/files/fic-gta01/psplash-bar-img.h"
#  content [a5a1e99a9370f213300b5cbe8050a3348618fd62]
# 
# add_file "packages/psplash/files/fic-gta01/psplash-hand-img.h"
#  content [25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2]
# 
# patch "packages/psplash/psplash_svn.bb"
#  from [8d16d46a864427dd7047c62819b842812bb29747]
#    to [f04098f3adc195f405ebb9fd80276fb254aff8de]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [05641f0d6e74840050984ae4d28d5508734476f3]
#    to [d268c3cc077fe92e490a25cbde7cac22df2d2334]
# 
============================================================
--- packages/psplash/files/configurability.patch	62ed2328f8bd83a1609058709ddf254ee396d33d
+++ packages/psplash/files/configurability.patch	62ed2328f8bd83a1609058709ddf254ee396d33d
@@ -0,0 +1,292 @@
+Index: psplash/psplash.c
+===================================================================
+--- psplash.orig/psplash.c
++++ psplash/psplash.c
+@@ -44,17 +44,17 @@ psplash_draw_msg (PSplashFB *fb, const c
+ 
+   /* Clear */
+ 
+-  psplash_fb_draw_rect (fb, 
+-			0, 
+-			fb->height - (fb->height/6) - h, 
++  psplash_fb_draw_rect (fb,
++			0,
++			fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h,
+ 			fb->width,
+ 			h,
+-			0xec, 0xec, 0xe1);
++			PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+ 
+   psplash_fb_draw_text (fb,
+-			(fb->width-w)/2, 
+-			fb->height - (fb->height/6) - h,
+-			0x6d, 0x6d, 0x70,
++			(fb->width-w)/2,
++			fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h,
++			PSPLASH_TEXT_COLOR_R, PSPLASH_TEXT_COLOR_G, PSPLASH_TEXT_COLOR_B,
+ 			&radeon_font,
+ 			msg);
+ }
+@@ -66,36 +66,36 @@ psplash_draw_progress (PSplashFB *fb, in
+ 
+   /* 4 pix border */
+   x      = ((fb->width  - BAR_IMG_WIDTH)/2) + 4 ;
+-  y      = fb->height - (fb->height/6) + 4;
+-  width  = BAR_IMG_WIDTH - 8; 
++  y      = fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER) + 4;
++  width  = BAR_IMG_WIDTH - 8;
+   height = BAR_IMG_HEIGHT - 8;
+ 
+   if (value > 0)
+     {
+       barwidth = (CLAMP(value,0,100) * width) / 100;
+-      psplash_fb_draw_rect (fb, x + barwidth, y, 
++      psplash_fb_draw_rect (fb, x + barwidth, y,
+     			width - barwidth, height,
+-			0xec, 0xec, 0xe1);
++			PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+       psplash_fb_draw_rect (fb, x, y, barwidth,
+-			    height, 0x6d, 0x6d, 0x70);
++			    height, PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B);
+     }
+   else
+     {
+       barwidth = (CLAMP(-value,0,100) * width) / 100;
+-      psplash_fb_draw_rect (fb, x, y, 
++      psplash_fb_draw_rect (fb, x, y,
+     			width - barwidth, height,
+-			0xec, 0xec, 0xe1);
++			PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+       psplash_fb_draw_rect (fb, x + width - barwidth,
+ 			    y, barwidth, height,
+-			    0x6d, 0x6d, 0x70);
++			    PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B);
+     }
+ 
+-  DBG("value: %i, width: %i, barwidth :%i\n", value, 
++  DBG("value: %i, width: %i, barwidth :%i\n", value,
+ 		width, barwidth);
+ }
+ 
+-static int 
+-parse_command (PSplashFB *fb, char *string, int length) 
++static int
++parse_command (PSplashFB *fb, char *string, int length)
+ {
+   char *command;
+   int   parsed=0;
+@@ -103,21 +103,21 @@ parse_command (PSplashFB *fb, char *stri
+   parsed = strlen(string)+1;
+ 
+   DBG("got cmd %s", string);
+-	
++
+   if (strcmp(string,"QUIT") == 0)
+     return 1;
+ 
+   command = strtok(string," ");
+ 
+-  if (!strcmp(command,"PROGRESS")) 
++  if (!strcmp(command,"PROGRESS"))
+     {
+       psplash_draw_progress (fb, atoi(strtok(NULL,"\0")));
+-    } 
+-  else if (!strcmp(command,"MSG")) 
++    }
++  else if (!strcmp(command,"MSG"))
+     {
+       psplash_draw_msg (fb, strtok(NULL,"\0"));
+-    } 
+-  else if (!strcmp(command,"QUIT")) 
++    }
++  else if (!strcmp(command,"QUIT"))
+     {
+       return 1;
+     }
+@@ -125,8 +125,8 @@ parse_command (PSplashFB *fb, char *stri
+   return 0;
+ }
+ 
+-void 
+-psplash_main (PSplashFB *fb, int pipe_fd, int timeout) 
++void
++psplash_main (PSplashFB *fb, int pipe_fd, int timeout)
+ {
+   int            err;
+   ssize_t        length = 0;
+@@ -143,14 +143,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+ 
+   end = command;
+ 
+-  while (1) 
++  while (1)
+     {
+-      if (timeout != 0) 
++      if (timeout != 0)
+ 	err = select(pipe_fd+1, &descriptors, NULL, NULL, &tv);
+       else
+ 	err = select(pipe_fd+1, &descriptors, NULL, NULL, NULL);
+-      
+-      if (err <= 0) 
++
++      if (err <= 0)
+ 	{
+ 	  /*
+ 	  if (errno == EINTR)
+@@ -158,29 +158,29 @@ psplash_main (PSplashFB *fb, int pipe_fd
+ 	  */
+ 	  return;
+ 	}
+-      
++
+       length += read (pipe_fd, end, sizeof(command) - (end - command));
+ 
+-      if (length == 0) 
++      if (length == 0)
+ 	{
+ 	  /* Reopen to see if there's anything more for us */
+ 	  close(pipe_fd);
+ 	  pipe_fd = open(PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
+ 	  goto out;
+ 	}
+-      
+-      if (command[length-1] == '\0') 
++
++      if (command[length-1] == '\0')
+ 	{
+-	  if (parse_command(fb, command, strlen(command))) 
++	  if (parse_command(fb, command, strlen(command)))
+ 	    return;
+ 	  length = 0;
+-	} 
++	}
+     out:
+       end = &command[length];
+-    
++
+       tv.tv_sec = timeout;
+       tv.tv_usec = 0;
+-      
++
+       FD_ZERO(&descriptors);
+       FD_SET(pipe_fd,&descriptors);
+     }
+@@ -188,14 +188,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+   return;
+ }
+ 
+-int 
+-main (int argc, char** argv) 
++int
++main (int argc, char** argv)
+ {
+   char      *tmpdir;
+   int        pipe_fd, i = 0, angle = 0;
+   PSplashFB *fb;
+   bool       disable_console_switch = FALSE;
+-  
++
+   signal(SIGHUP, psplash_exit);
+   signal(SIGINT, psplash_exit);
+   signal(SIGQUIT, psplash_exit);
+@@ -214,10 +214,10 @@ main (int argc, char** argv) 
+ 	  angle = atoi(argv[i]);
+ 	  continue;
+ 	}
+-      
++
+     fail:
+-      fprintf(stderr, 
+-	      "Usage: %s [-n|--no-console-switch][-a|--angle <0|90|180|270>]\n", 
++      fprintf(stderr,
++	      "Usage: %s [-n|--no-console-switch][-a|--angle <0|90|180|270>]\n",
+ 	      argv[0]);
+       exit(-1);
+     }
+@@ -231,7 +231,7 @@ main (int argc, char** argv) 
+ 
+   if (mkfifo(PSPLASH_FIFO, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP))
+     {
+-      if (errno!=EEXIST) 
++      if (errno!=EEXIST)
+ 	{
+ 	  perror("mkfifo");
+ 	  exit(-1);
+@@ -239,8 +239,8 @@ main (int argc, char** argv) 
+     }
+ 
+   pipe_fd = open (PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
+-  
+-  if (pipe_fd==-1) 
++
++  if (pipe_fd==-1)
+     {
+       perror("pipe open");
+       exit(-2);
+@@ -252,30 +252,30 @@ main (int argc, char** argv) 
+   if ((fb = psplash_fb_new(angle)) == NULL)
+     exit(-1);
+ 
+-  /* Clear the background with #ecece1 */
+-  psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1);
++  /* Clear the background */
++  psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+ 
+   /* Draw the OH logo  */
+-  psplash_fb_draw_image (fb, 
+-			 (fb->width  - HAND_IMG_WIDTH)/2, 
+-			 (fb->height - HAND_IMG_HEIGHT)/2, 
++  psplash_fb_draw_image (fb,
++			 (fb->width  - HAND_IMG_WIDTH)/2,
++			 (fb->height - HAND_IMG_HEIGHT)/2,
+ 			 HAND_IMG_WIDTH,
+ 			 HAND_IMG_HEIGHT,
+ 			 HAND_IMG_BYTES_PER_PIXEL,
+ 			 HAND_IMG_RLE_PIXEL_DATA);
+ 
+   /* Draw progress bar border */
+-  psplash_fb_draw_image (fb, 
+-			 (fb->width  - BAR_IMG_WIDTH)/2, 
+-			 fb->height - (fb->height/6), 
++  psplash_fb_draw_image (fb,
++			 (fb->width  - BAR_IMG_WIDTH)/2,
++			 fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
+ 			 BAR_IMG_WIDTH,
+ 			 BAR_IMG_HEIGHT,
+ 			 BAR_IMG_BYTES_PER_PIXEL,
+ 			 BAR_IMG_RLE_PIXEL_DATA);
+ 
+-  psplash_draw_progress (fb, 0);
++  psplash_draw_progress (fb, 0); /* draw initial progress */
+ 
+-  psplash_draw_msg (fb, MSG);
++  if (strlen(MSG)) psplash_draw_msg (fb, MSG);
+ 
+   psplash_main (fb, pipe_fd, 0);
+ 
+Index: psplash/psplash.h
+===================================================================
+--- psplash.orig/psplash.h
++++ psplash/psplash.h
+@@ -54,6 +54,21 @@ typedef int            bool;
+ #define TRUE 1
+ #endif
+ 
++#define PSPLASH_BACKGROUND_COLOR_R    0x00
++#define PSPLASH_BACKGROUND_COLOR_G    0x00
++#define PSPLASH_BACKGROUND_COLOR_B    0x00
++
++#define PSPLASH_PROGRESS_COLOR_R    0xe3
++#define PSPLASH_PROGRESS_COLOR_G    0x71
++#define PSPLASH_PROGRESS_COLOR_B    0x00
++
++#define PSPLASH_TEXT_COLOR_R    0xff
++#define PSPLASH_TEXT_COLOR_G    0xff
++#define PSPLASH_TEXT_COLOR_B    0xff
++
++#define PSPLASH_PROGRESS_DIVIDER    3
++#define PSPLASH_TEXT_DIVIDER    3
++
+ #define PSPLASH_FIFO "psplash_fifo"
+ 
+ #define CLAMP(x, low, high) \
============================================================
--- packages/psplash/files/fic-gta01/psplash-bar-img.h	a5a1e99a9370f213300b5cbe8050a3348618fd62
+++ packages/psplash/files/fic-gta01/psplash-bar-img.h	a5a1e99a9370f213300b5cbe8050a3348618fd62
@@ -0,0 +1,35 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define BAR_IMG_ROWSTRIDE (920)
+#define BAR_IMG_WIDTH (230)
+#define BAR_IMG_HEIGHT (28)
+#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \
+  "\203\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377\377h" \
+  "lp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310\377\205" \
+  "\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250\377" \
+  "\203\0\0\0\377\1\260\260\250\377\377hlp\377\343hlp\377\4\260\260\250" \
+  "\377\0\0\0\377\345\345\337\377ppp\377\377hlp\377\343hlp\377\3ppp\377" \
+  "\220\220\212\377\240\244\240\377\203hlp\377\377\0\0\0\377\337\0\0\0\377" \
+  "\203hlp\377\2\240\244\240\377\210\210\210\377\203hlp\377\377\0\0\0\377" \
+  "\337\0\0\0\377\203hlp\377\2\210\210\210\377ppp\377\203hlp\377\377\0\0" \
+  "\0\377\337\0\0\0\377\203hlp\377\1ppp\377\204hlp\377\377\0\0\0\377\337" \
+  "\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0" \
+  "\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377" \
+  "\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210" \
+  "hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0" \
+  "\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \
+  "\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377" \
+  "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \
+  "lp\377\377\0\0\0\377\337\0\0\0\377\204hlp\377\1ppp\377\203hlp\377\377" \
+  "\0\0\0\377\337\0\0\0\377\203hlp\377\2ppp\377\210\210\210\377\203hlp\377" \
+  "\377\0\0\0\377\337\0\0\0\377\203hlp\377\2\210\210\210\377\240\244\240" \
+  "\377\203hlp\377\377\0\0\0\377\337\0\0\0\377\203hlp\377\3\240\244\240" \
+  "\377\220\220\212\377ppp\377\377hlp\377\343hlp\377\4ppp\377\220\220\212" \
+  "\377\0\0\0\377\260\260\250\377\377hlp\377\343hlp\377\1\260\260\250\377" \
+  "\203\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250" \
+  "\377\205\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377" \
+  "\377hlp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310" \
+  "\377\203\0\0\0\377")
+
+
============================================================
--- packages/psplash/files/fic-gta01/psplash-hand-img.h	25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2
+++ packages/psplash/files/fic-gta01/psplash-hand-img.h	25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2
@@ -0,0 +1,5377 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define HAND_IMG_ROWSTRIDE (1920)
+#define HAND_IMG_WIDTH (480)
+#define HAND_IMG_HEIGHT (640)
+#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+  "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377"%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list