diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-29 17:05:27 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-29 16:10:34 +0000 |
| commit | 6cd2a0970fff43c9000bfb5f48d0e348963875fb (patch) | |
| tree | 1ccdf651e58cef2f2d889b482cafd908cf632af3 /main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch | |
| parent | 338b9d74c73b3c61c93da3b3abd9c5a5cffe6d4f (diff) | |
| download | aports-6cd2a0970fff43c9000bfb5f48d0e348963875fb.tar.bz2 aports-6cd2a0970fff43c9000bfb5f48d0e348963875fb.tar.xz | |
main/busybox: upgrade to 1.26.0
Diffstat (limited to 'main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch')
| -rw-r--r-- | main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch index a2886202f0..b930cb1167 100644 --- a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch @@ -1,7 +1,7 @@ -From 942f123dce1f36144b200731df7abfd3dbc92f22 Mon Sep 17 00:00:00 2001 +From 1dab8b58ff051d529fd3fd74caf6016e51b10ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 21 Nov 2014 16:06:34 +0200 -Subject: [PATCH 06/15] fbsplash: support image and bar alignment and +Subject: [PATCH 06/12] fbsplash: support image and bar alignment and positioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -13,10 +13,10 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index aaaca39..ea0dc22 100644 +index ec5947314..34bbf81f5 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c -@@ -28,6 +28,7 @@ +@@ -53,6 +53,7 @@ //usage: "\n -c Hide cursor" //usage: "\n -d Framebuffer device (default /dev/fb0)" //usage: "\n -i Config file (var=value):" @@ -24,7 +24,7 @@ index aaaca39..ea0dc22 100644 //usage: "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" //usage: "\n BAR_R,BAR_G,BAR_B" //usage: "\n -f Control pipe (else exit after drawing image)" -@@ -46,13 +47,38 @@ +@@ -71,13 +72,38 @@ /* If you want logging messages on /tmp/fbsplash.log... */ #define DEBUG 0 @@ -64,7 +64,7 @@ index aaaca39..ea0dc22 100644 const char *image_filename; int silent_tty, fd_tty_s; bool do_not_draw; -@@ -69,14 +95,6 @@ struct globals { +@@ -94,14 +120,6 @@ struct globals { SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) @@ -79,7 +79,7 @@ index aaaca39..ea0dc22 100644 #if DEBUG #define DEBUG_MESSAGE(strMessage, args...) \ if (G.bdebug_messages) { \ -@@ -357,7 +375,7 @@ static void fb_drawimage(void) +@@ -382,7 +400,7 @@ static void fb_drawimage(void) FILE *theme_file; char *read_ptr; unsigned char *pixline; @@ -88,7 +88,7 @@ index aaaca39..ea0dc22 100644 if (LONE_DASH(G.image_filename)) { theme_file = stdin; -@@ -407,18 +425,46 @@ static void fb_drawimage(void) +@@ -432,18 +450,46 @@ static void fb_drawimage(void) line_size = width*3; pixline = xmalloc(line_size); @@ -137,7 +137,7 @@ index aaaca39..ea0dc22 100644 for (i = 0; i < width; i++) { unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]); fb_write_pixel(src, thispix); -@@ -437,9 +483,17 @@ static void fb_drawimage(void) +@@ -462,9 +508,17 @@ static void fb_drawimage(void) */ static void init(const char *cfg_filename) { @@ -155,7 +155,7 @@ index aaaca39..ea0dc22 100644 "BAR_R\0" "BAR_G\0" "BAR_B\0" #if DEBUG "DEBUG\0" -@@ -449,14 +503,21 @@ static void init(const char *cfg_filename) +@@ -474,14 +528,21 @@ static void init(const char *cfg_filename) parser_t *parser = config_open2(cfg_filename, xfopen_stdin); while (config_read(parser, token, 2, 2, "#=", (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) { @@ -181,5 +181,5 @@ index aaaca39..ea0dc22 100644 if (G.bdebug_messages) G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log"); -- -2.9.1 +2.11.0 |