diff --git a/packages/linux/config/initramfs b/packages/linux/config/initramfs index ce59ce650b..ce5f143dd6 100644 --- a/packages/linux/config/initramfs +++ b/packages/linux/config/initramfs @@ -5,6 +5,7 @@ dir /dev 755 0 0 dir /bin 755 1000 1000 slink /bin/sh busybox 777 0 0 file /bin/busybox initramfs/bin/busybox 4755 0 0 +file /bin/ply-image initramfs/bin/ply-image 755 0 0 # dir /lib 755 1000 1000 # file /lib/ld-uClibc.so.0 initramfs/lib/ld-uClibc.so.0 755 0 0 @@ -17,4 +18,4 @@ dir /sysroot 755 0 0 dir /storage 755 0 0 file /init initramfs/init 755 0 0 -# file /splash.png initramfs/splash.png 644 0 0 +file /splash.png initramfs/splash.png 644 0 0 diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index c2c09d0634..2eb1da2fac 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-31392.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-31443.tar.bz2 diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 33dad242cd..5dad4a55de 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -89,7 +89,11 @@ cd - # overriding Splash image mkdir -p $INSTALL/usr/share/xbmc/media rm -rf $INSTALL/usr/share/xbmc/media/Splash.png - cp $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ + if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then + cp $PROJECT_DIR/$PROJECT/filesystem/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png + else + cp $PKG_DIR/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png + fi mkdir -p $PYTHON_LIBDIR/site-packages cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages diff --git a/packages/mediacenter/xbmc/splash/Splash.png b/packages/mediacenter/xbmc/splash/splash.png similarity index 100% rename from packages/mediacenter/xbmc/splash/Splash.png rename to packages/mediacenter/xbmc/splash/splash.png diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index a30f7d8349..d48c6b5a72 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-31392.tar.bz2 +http://sources.openelec.tv/svn/xbmc-31443.tar.bz2 diff --git a/packages/sysutils/busybox-initramfs/install b/packages/sysutils/busybox-initramfs/install index 1187d18278..6288033538 100755 --- a/packages/sysutils/busybox-initramfs/install +++ b/packages/sysutils/busybox-initramfs/install @@ -2,6 +2,7 @@ . config/options $SCRIPTS/unpack linux +$SCRIPTS/install plymouth-lite initramfs PKG_DIR=`find $PACKAGES -type d -name $1` diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/sysutils/busybox-initramfs/scripts/init index ecfcd49d05..a106e1bbfe 100755 --- a/packages/sysutils/busybox-initramfs/scripts/init +++ b/packages/sysutils/busybox-initramfs/scripts/init @@ -38,6 +38,14 @@ REBOOT=0 fi } + show_splash() { + if [ "$SPLASH" = yes ]; then + if [ -f "/bin/ply-image" -a -f "/splash.png" ]; then + /bin/ply-image /splash.png + fi + fi + } + error() { echo "Error Code: $1 that means: $2" } @@ -69,6 +77,8 @@ REBOOT=0 fi } + show_splash + mount_part "$boot" "/flash" "ro,noatime" mount_part "$disk" "/storage" "rw,noatime" diff --git a/packages/sysutils/busybox/config/profile b/packages/sysutils/busybox/config/profile index f629dae7ff..395c8918d1 100644 --- a/packages/sysutils/busybox/config/profile +++ b/packages/sysutils/busybox/config/profile @@ -22,8 +22,6 @@ progress() { if test "$DEBUG" = yes; then echo "### $1 ###" - else - echo -n "***" fi } diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 6cefe46872..09c7277e33 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -20,8 +20,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -clear - # mounting needed special filesystems mount -n -t proc none /proc mount -n -t sysfs none /sys diff --git a/packages/sysutils/plymouth-lite/build b/packages/sysutils/plymouth-lite/build new file mode 100755 index 0000000000..80dbd20387 --- /dev/null +++ b/packages/sysutils/plymouth-lite/build @@ -0,0 +1,10 @@ +#!/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/install b/packages/sysutils/plymouth-lite/install new file mode 100755 index 0000000000..e3a63689fb --- /dev/null +++ b/packages/sysutils/plymouth-lite/install @@ -0,0 +1,19 @@ +#!/bin/sh + +. config/options + +PKG_DIR=`find $PACKAGES -type d -name $1` + +if [ "$2" = initramfs ]; then + mkdir -p $INSTALL/initramfs/bin + cp $PKG_BUILD/ply-image $INSTALL/initramfs/bin + + mkdir -p $INSTALL/initramfs + if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then + cp $PROJECT_DIR/$PROJECT/filesystem/splash/splash.png $INSTALL/initramfs/ + else + cp $PKG_DIR/splash/splash.png $INSTALL/initramfs/ + fi + + exit 0 +fi diff --git a/packages/sysutils/plymouth-lite/patches/cursor.diff b/packages/sysutils/plymouth-lite/patches/cursor.diff new file mode 100644 index 0000000000..fc69b27811 --- /dev/null +++ b/packages/sysutils/plymouth-lite/patches/cursor.diff @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000000..5525d629ca --- /dev/null +++ b/packages/sysutils/plymouth-lite/patches/plymouth-fix-build.diff @@ -0,0 +1,10 @@ +--- 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) -static $(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 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 new file mode 100644 index 0000000000..cf5a08ac95 --- /dev/null +++ b/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0_libpng-1.4.0.diff @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000000..4bebf11213 --- /dev/null +++ b/packages/sysutils/plymouth-lite/patches/plymouth-resize.diff @@ -0,0 +1,110 @@ +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 new file mode 100644 index 0000000000..8c86ae06a7 Binary files /dev/null and b/packages/sysutils/plymouth-lite/splash/splash.png differ diff --git a/packages/sysutils/plymouth-lite/url b/packages/sysutils/plymouth-lite/url new file mode 100644 index 0000000000..d4557ad929 --- /dev/null +++ b/packages/sysutils/plymouth-lite/url @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/plymouth-lite-0.6.0.tar.bz2 \ No newline at end of file