diff --git a/packages/image/install b/packages/image/install index 2233f49e9f..12d0bece25 100755 --- a/packages/image/install +++ b/packages/image/install @@ -54,7 +54,6 @@ case "$2" in $SCRIPTS/install gcc-final $SCRIPTS/install linux $2 $SCRIPTS/install busybox - $SCRIPTS/install plymouth-lite $SCRIPTS/install util-linux-ng echo "OpenELEC" > $INSTALL/etc/distribution diff --git a/packages/sysutils/plymouth-lite/build b/packages/sysutils/plymouth-lite/build deleted file mode 100755 index 80dbd20387..0000000000 --- a/packages/sysutils/plymouth-lite/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build libpng - -cd $PKG_BUILD - -make \ No newline at end of file diff --git a/packages/sysutils/plymouth-lite/init.d/00_plymouth b/packages/sysutils/plymouth-lite/init.d/00_plymouth deleted file mode 100755 index 29d0e7e828..0000000000 --- a/packages/sysutils/plymouth-lite/init.d/00_plymouth +++ /dev/null @@ -1,11 +0,0 @@ -# -# starting splash -# -# runlevels: openelec, textmode - -( - [ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \ - -a -f /usr/bin/ply-image -a -f /usr/share/splash/Splash.png \ - ] && ply-image /usr/share/splash/Splash.png -)& - diff --git a/packages/sysutils/plymouth-lite/install b/packages/sysutils/plymouth-lite/install deleted file mode 100755 index a901b44026..0000000000 --- a/packages/sysutils/plymouth-lite/install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install libpng - -PKG_DIR=`find $PACKAGES -type d -name $1` - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/ply-image $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/share/splash - cp -PR $PKG_DIR/splash/Splash.png $INSTALL/usr/share/splash diff --git a/packages/sysutils/plymouth-lite/patches/cursor.diff b/packages/sysutils/plymouth-lite/patches/cursor.diff deleted file mode 100644 index fc69b27811..0000000000 --- a/packages/sysutils/plymouth-lite/patches/cursor.diff +++ /dev/null @@ -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"); diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-fix-build.diff b/packages/sysutils/plymouth-lite/patches/plymouth-fix-build.diff deleted file mode 100644 index 5c27e29e46..0000000000 --- a/packages/sysutils/plymouth-lite/patches/plymouth-fix-build.diff +++ /dev/null @@ -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` - - clean: - rm -f ply-image *~ gmon.out diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0_libpng-1.4.0.diff b/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0_libpng-1.4.0.diff deleted file mode 100644 index cf5a08ac95..0000000000 --- a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0_libpng-1.4.0.diff +++ /dev/null @@ -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); diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-resize.diff b/packages/sysutils/plymouth-lite/patches/plymouth-resize.diff deleted file mode 100644 index 4bebf11213..0000000000 --- a/packages/sysutils/plymouth-lite/patches/plymouth-resize.diff +++ /dev/null @@ -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 - - #include -+#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); diff --git a/packages/sysutils/plymouth-lite/splash/Splash.png b/packages/sysutils/plymouth-lite/splash/Splash.png deleted file mode 100644 index 8c86ae06a7..0000000000 Binary files a/packages/sysutils/plymouth-lite/splash/Splash.png and /dev/null differ diff --git a/packages/sysutils/plymouth-lite/url b/packages/sysutils/plymouth-lite/url deleted file mode 100644 index d4557ad929..0000000000 --- a/packages/sysutils/plymouth-lite/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/plymouth-lite-0.6.0.tar.bz2 \ No newline at end of file