wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop plymouth-lite patches, since they're merged into the repo.

Browse source
This commit is contained in:
fewtarius 2022-02-24 21:52:26 -05:00
parent ef00c213f5
commit ecd5e6655c
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
6 changed files with 0 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-01-fix-build.patch
View file

@ -1,10 +0,0 @@
--- plymouth-lite-0.6.0/Makefile~ 2009-07-22 11:22:32.000000000 -0700
+++ plymouth-lite-0.6.0/Makefile 2009-07-22 11:22:32.000000000 -0700
@@ -1,6 +1,6 @@
ply-image: ply-image.c ply-frame-buffer.c Makefile
- gcc -O2 -march=core2 -mtune=generic -lm `pkg-config --cflags libpng12` `pkg-config --libs libpng12` ply-image.c ply-frame-buffer.c -o ply-image
+ $(CC) $(CFLAGS) `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng` -lm -lz
clean:
rm -f ply-image *~ gmon.out

12
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-02-libpng_1.4.0.patch
View file

@ -1,12 +0,0 @@
diff -Naur plymouth-lite-0.6.0/ply-image.c plymouth-lite-0.6.0.patch/ply-image.c
--- plymouth-lite-0.6.0/ply-image.c 2009-02-19 12:16:36.000000000 +0100
+++ plymouth-lite-0.6.0.patch/ply-image.c 2010-02-08 01:30:05.336856616 +0100
@@ -220,7 +220,7 @@
png_set_palette_to_rgb (png);
if ((color_type == PNG_COLOR_TYPE_GRAY) && (bits_per_pixel < 8))
- png_set_gray_1_2_4_to_8 (png);
+ png_set_expand_gray_1_2_4_to_8 (png);
if (png_get_valid (png, info, PNG_INFO_tRNS))
png_set_tRNS_to_alpha (png);

11
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-11-cursor.patch
View file

@ -1,11 +0,0 @@
--- plymouth-lite-0.6.0/ply-image.c~ 2009-03-06 16:20:52.000000000 -0800
+++ plymouth-lite-0.6.0/ply-image.c 2009-03-06 16:20:52.000000000 -0800
@@ -439,7 +439,7 @@
exit_code = 0;
-// hide_cursor ();
+ hide_cursor ();
if (argc == 1)
image = ply_image_new ("/usr/share/plymouth/splash.png");

110
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-12-resize.patch
View file

@ -1,110 +0,0 @@
diff -urN plymouth-lite-0.6.0/ply-frame-buffer.c plymouth-lite-0.6.0.change/ply-frame-buffer.c
--- plymouth-lite-0.6.0/ply-frame-buffer.c 2009-02-19 19:14:24.000000000 +0800
+++ plymouth-lite-0.6.0.change/ply-frame-buffer.c 2009-06-13 17:44:05.000000000 +0800
@@ -47,41 +47,6 @@
#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0"
#endif
-struct _ply_frame_buffer
-{
- char *device_name;
- int device_fd;
-
- char *map_address;
- size_t size;
-
- uint32_t *shadow_buffer;
-
- uint32_t red_bit_position;
- uint32_t green_bit_position;
- uint32_t blue_bit_position;
- uint32_t alpha_bit_position;
-
- uint32_t bits_for_red;
- uint32_t bits_for_green;
- uint32_t bits_for_blue;
- uint32_t bits_for_alpha;
-
- int32_t dither_red;
- int32_t dither_green;
- int32_t dither_blue;
-
- unsigned int bytes_per_pixel;
- unsigned int row_stride;
-
- ply_frame_buffer_area_t area;
- ply_frame_buffer_area_t area_to_flush;
-
- void (*flush)(ply_frame_buffer_t *buffer);
-
- int pause_count;
-};
-
static bool ply_frame_buffer_open_device (ply_frame_buffer_t *buffer);
static void ply_frame_buffer_close_device (ply_frame_buffer_t *buffer);
static bool ply_frame_buffer_query_device (ply_frame_buffer_t *buffer);
diff -urN plymouth-lite-0.6.0/ply-frame-buffer.h plymouth-lite-0.6.0.change/ply-frame-buffer.h
--- plymouth-lite-0.6.0/ply-frame-buffer.h 2009-02-19 17:35:54.000000000 +0800
+++ plymouth-lite-0.6.0.change/ply-frame-buffer.h 2009-06-13 17:31:42.000000000 +0800
@@ -38,6 +38,41 @@
unsigned long height;
};
+struct _ply_frame_buffer
+{
+ char *device_name;
+ int device_fd;
+
+ char *map_address;
+ size_t size;
+
+ uint32_t *shadow_buffer;
+
+ uint32_t red_bit_position;
+ uint32_t green_bit_position;
+ uint32_t blue_bit_position;
+ uint32_t alpha_bit_position;
+
+ uint32_t bits_for_red;
+ uint32_t bits_for_green;
+ uint32_t bits_for_blue;
+ uint32_t bits_for_alpha;
+
+ int32_t dither_red;
+ int32_t dither_green;
+ int32_t dither_blue;
+
+ unsigned int bytes_per_pixel;
+ unsigned int row_stride;
+
+ ply_frame_buffer_area_t area;
+ ply_frame_buffer_area_t area_to_flush;
+
+ void (*flush)(ply_frame_buffer_t *buffer);
+
+ int pause_count;
+};
+
#define PLY_FRAME_BUFFER_COLOR_TO_PIXEL_VALUE(r,g,b,a) \
(((uint8_t) (CLAMP (a * 255.0, 0.0, 255.0)) << 24) \
| ((uint8_t) (CLAMP (r * 255.0, 0.0, 255.0)) << 16) \
diff -urN plymouth-lite-0.6.0/ply-image.c plymouth-lite-0.6.0.change/ply-image.c
--- plymouth-lite-0.6.0/ply-image.c 2009-02-19 19:16:36.000000000 +0800
+++ plymouth-lite-0.6.0.change/ply-image.c 2009-06-13 17:42:52.000000000 +0800
@@ -43,6 +43,7 @@
#include <png.h>
#include <linux/fb.h>
+#include "ply-frame-buffer.h"
#define MIN(a,b) ((a) <= (b)? (a) : (b))
#define MAX(a,b) ((a) >= (b)? (a) : (b))
@@ -464,6 +465,8 @@
return exit_code;
}
+ image = ply_image_resize(image, buffer->area.width, buffer->area.height);
+
animate_at_time (buffer, image);
ply_frame_buffer_close (buffer);

78
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-21-16bpp.patch
View file

@ -1,78 +0,0 @@
--- plymouth-lite-0.6.0/ply-frame-buffer.c 2015-07-02 01:04:37.625076373 +0100
+++ plymouth-lite-0.6.0.patch/ply-frame-buffer.c 2015-07-02 01:04:42.973076293 +0100
@@ -184,6 +184,58 @@
}
}
+static void
+flush_xbgr32 (ply_frame_buffer_t *buffer)
+{
+ unsigned long x1, y1, x2, y2, x, y;
+ char *dst, *src;
+
+ x1 = buffer->area_to_flush.x;
+ y1 = buffer->area_to_flush.y;
+ x2 = x1 + buffer->area_to_flush.width;
+ y2 = y1 + buffer->area_to_flush.height;
+
+ for (y = y1; y < y2; y++)
+ {
+ dst = &buffer->map_address[(y * buffer->row_stride + x1) * 4];
+ src = (char *) &buffer->shadow_buffer[y * buffer->area.width + x1];
+
+ for (x = x1; x < x2; x++)
+ {
+ dst[0] = src[2];
+ dst[1] = src[1];
+ dst[2] = src[0];
+ dst[3] = src[3];
+ dst += 4;
+ src += 4;
+ }
+ }
+}
+
+static void
+flush_rgb16 (ply_frame_buffer_t *buffer)
+{
+ unsigned long x1, y1, x2, y2, x, y;
+ unsigned short *dst; unsigned char *src;
+
+ x1 = buffer->area_to_flush.x;
+ y1 = buffer->area_to_flush.y;
+ x2 = x1 + buffer->area_to_flush.width;
+ y2 = y1 + buffer->area_to_flush.height;
+
+ for (y = y1; y < y2; y++)
+ {
+ dst = (unsigned short *)&buffer->map_address[(y * buffer->row_stride + x1) * 2];
+ src = (unsigned char *) &buffer->shadow_buffer[y * buffer->area.width + x1];
+
+ for (x = x1; x < x2; x++)
+ {
+ *dst++ = (src[0]>>3) << 0 | (src[1]>>2) << 5 | (src[2]>>3) << 11;
+ src += 4;
+ }
+ }
+}
+
static const char const *p_visual(int visual)
{
static const char const *visuals[] =
@@ -300,6 +352,16 @@
buffer->green_bit_position == 8 && buffer->bits_for_green == 8 &&
buffer->blue_bit_position == 0 && buffer->bits_for_blue == 8)
buffer->flush = flush_xrgb32;
+ else if (buffer->bytes_per_pixel == 4 &&
+ buffer->red_bit_position == 0 && buffer->bits_for_red == 8 &&
+ buffer->green_bit_position == 8 && buffer->bits_for_green == 8 &&
+ buffer->blue_bit_position == 16 && buffer->bits_for_blue == 8)
+ buffer->flush = flush_xbgr32;
+ else if (buffer->bytes_per_pixel == 2 &&
+ buffer->red_bit_position == 11 && buffer->bits_for_red == 5 &&
+ buffer->green_bit_position == 5 && buffer->bits_for_green == 6 &&
+ buffer->blue_bit_position == 0 && buffer->bits_for_blue == 5)
+ buffer->flush = flush_rgb16;
else
buffer->flush = flush_generic;

18
packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-22-link-static.patch
View file

@ -1,18 +0,0 @@
diff --git a/Makefile b/Makefile
index 6ab27ef..17d12a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
ply-image: ply-image.c ply-frame-buffer.c Makefile
- $(CC) $(CFLAGS) `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng` -lm -lz
+ $(CC) $(CFLAGS) -Wl,-Bstatic `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image `pkg-config --libs libpng` -lz -Wl,-Bdynamic -lc -lm $(LDFLAGS)
clean:
rm -f ply-image *~ gmon.out
@@ -11,4 +11,3 @@ install: ply-image
cp ply-image $(DESTDIR)/usr/bin
cp splash.png $(DESTDIR)/usr/share/plymouth/splash.png
-
\ No newline at end of file