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/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 1b4baa796e..4ef6e081fd 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -83,6 +83,7 @@ mkdir -p $INSTALL/usr/share/xbmc/media/Fonts mkdir -p $INSTALL/usr/share/xbmc/media cp -P $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/ cp -P $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/ + cp -P $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ mkdir -p $INSTALL/usr/share/xbmc/skin diff --git a/packages/mediacenter/xbmc/patches/452-xbmc-change_lcd_content-0.1.diff b/packages/mediacenter/xbmc/patches/452-xbmc-change_lcd_content-0.1.diff new file mode 100644 index 0000000000..d9c54b3756 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/452-xbmc-change_lcd_content-0.1.diff @@ -0,0 +1,12 @@ +diff -Naur xbmc-29490/userdata/LCD.xml xbmc-29490.patch/userdata/LCD.xml +--- xbmc-29490/userdata/LCD.xml 2010-04-24 22:42:45.000000000 +0200 ++++ xbmc-29490.patch/userdata/LCD.xml 2010-04-27 17:26:02.946045110 +0200 +@@ -21,7 +21,7 @@ + Freemem: $INFO[System.FreeMemory] + + +- XBMC running... ++ *** OpenELEC.tv *** + $INFO[System.Time] $INFO[System.Date] + Freemem: $INFO[System.FreeMemory] + $INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode] diff --git a/packages/sysutils/plymouth-lite/splash/Splash.png b/packages/mediacenter/xbmc/splash/Splash.png similarity index 100% rename from packages/sysutils/plymouth-lite/splash/Splash.png rename to packages/mediacenter/xbmc/splash/Splash.png diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index c22aca4a05..584fc3a78d 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.16.0 -# Sat Jan 30 22:58:05 2010 +# Busybox version: 1.16.1 +# Tue Apr 27 18:57:48 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -172,8 +172,8 @@ CONFIG_CHROOT=y # CONFIG_UNIX2DOS is not set # CONFIG_DU is not set # CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -# CONFIG_ECHO is not set -# CONFIG_FEATURE_FANCY_ECHO is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y # CONFIG_ENV is not set # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set # CONFIG_EXPAND is not set @@ -203,7 +203,7 @@ CONFIG_CHROOT=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set # CONFIG_MD5SUM is not set CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set # CONFIG_MKFIFO is not set # CONFIG_MKNOD is not set CONFIG_MV=y @@ -863,7 +863,7 @@ CONFIG_ASH_BASH_COMPAT=y # CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_GETOPTS is not set -CONFIG_ASH_BUILTIN_ECHO=y +# CONFIG_ASH_BUILTIN_ECHO is not set # CONFIG_ASH_BUILTIN_PRINTF is not set CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 55d1bd1358..e19516e704 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -282,7 +282,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # Console Utilities # CONFIG_CHVT=y -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set # CONFIG_KBD_MODE is not set diff --git a/packages/sysutils/busybox/config/profile b/packages/sysutils/busybox/config/profile index 395c8918d1..f629dae7ff 100644 --- a/packages/sysutils/busybox/config/profile +++ b/packages/sysutils/busybox/config/profile @@ -22,6 +22,8 @@ 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 0a0d1756d8..5c717a7157 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -1,5 +1,7 @@ #!/bin/sh -l +clear + # starting init scripts for wanted runlevel progress "Starting Init Scripts" RET=0 diff --git a/packages/sysutils/irserver/config/81-irtrans.rules b/packages/sysutils/irserver/config/81-irtrans.rules new file mode 100644 index 0000000000..58495b5f37 --- /dev/null +++ b/packages/sysutils/irserver/config/81-irtrans.rules @@ -0,0 +1 @@ +BUS=="usb", ATTRS{interface}=="IRTrans USB", NAME="irtrans%n" diff --git a/packages/sysutils/irserver/init.d/30_irserver b/packages/sysutils/irserver/init.d/30_irserver index d13973dc6b..16e8c106c5 100755 --- a/packages/sysutils/irserver/init.d/30_irserver +++ b/packages/sysutils/irserver/init.d/30_irserver @@ -2,9 +2,18 @@ # # runlevels: openelec, textmode +IRTRANS_DEV="/dev/irtrans0" +IRSERVER_LOG="/var/log/irserver.log" +IRSERVER_PID="/var/run/irserver.pid" + +[ "$DEBUG" = "yes" ] && \ + IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode + ( progress "Starting IRtrans daemon" - irtrans > /dev/null 2>&1 - + irserver -logfile $IRSERVER_LOG \ + -pidfile $IRSERVER_PID \ + -daemon $IRTRANS_DEV \ + $IRSERVER_ARG > /dev/null 2>&1 )& diff --git a/packages/sysutils/irserver/install b/packages/sysutils/irserver/install index f38e5ec61b..8c196ca804 100755 --- a/packages/sysutils/irserver/install +++ b/packages/sysutils/irserver/install @@ -10,6 +10,10 @@ mkdir -p $INSTALL/usr/sbin [ $TARGET_ARCH = arm ] && cp -P $PKG_BUILD/irserver_arm $INSTALL/usr/sbin/irserver mkdir -p $INSTALL/usr/share/irtrans/remotes - cp $PKG_BUILD/remotes/ccf.rem $INSTALL/usr/share/irtrans/remotes cp $PKG_BUILD/remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes cp $PKG_BUILD/remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes + cp $PKG_DIR/remotes/*.rem $INSTALL/usr/share/irtrans/remotes + + +mkdir -p $INSTALL/lib/udev/rules.d + cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d diff --git a/packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff b/packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff new file mode 100644 index 0000000000..c9aa492d56 --- /dev/null +++ b/packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff @@ -0,0 +1,30 @@ +diff -Naur irserver-05.02.10/lowlevel.c irserver-05.02.10.patch/lowlevel.c +--- irserver-05.02.10/lowlevel.c 2010-02-05 01:14:44.000000000 +0100 ++++ irserver-05.02.10.patch/lowlevel.c 2010-04-26 13:22:40.171936190 +0200 +@@ -2638,10 +2638,17 @@ + #endif + #ifdef LINUX + //LINUX Autofind USB devices +- if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) { ++ if( !strncmp( st, "/dev/irtrans", 12 ) && !autoflag ) { ++ autoflag = 1; ++ res = 0; ++ get_detail_deviceinfo ("",st,IF_USB); ++ } ++ else if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) { + autoflag = 1; + res = 0; + for (i=0;i < 16;i++) { ++ sprintf (dst,"/dev/irtrans%d",i); ++ if (get_detail_deviceinfo ("",dst,IF_USB)) { + sprintf (dst,"/dev/ttyUSB%d",i); + if (get_detail_deviceinfo ("",dst,IF_USB)) { + sprintf (dst,"/dev/usb/ttyUSB%d",i); +@@ -2655,6 +2662,7 @@ + } + } + } ++ } + else if ((!strncmp (st + q,"/dev/usb/tty",12) || !strncmp (st + q,"/dev/ttyUSB",11) || !strncmp (st + q,"/dev/usb/tts",12) || + !strncmp (st + q,"/dev/ttyusb",11) || !strncmp (st + q,"/dev/tts/USB",12)) && !autoflag) { + if (st[q + strlen (st+q) - 1] == ']') { diff --git a/packages/sysutils/irserver/remotes/philips-rc197.rem b/packages/sysutils/irserver/remotes/philips-rc197.rem new file mode 100644 index 0000000000..f3ca22a38f --- /dev/null +++ b/packages/sysutils/irserver/remotes/philips-rc197.rem @@ -0,0 +1,53 @@ +[REMOTE] + [NAME]philips-rc197 + +[TIMING] + [0][N]0[RC]2[RP]87[FREQ]36[SB][RS][RC6] + +[COMMANDS] + [1][T]0[D]S11101010000000000011110000010000000001 + [2][T]0[D]S11101010000000000011110000010000000010 + [3][T]0[D]S11101010000000000011110000010000000011 + [4][T]0[D]S11101010000000000011110000010000000100 + [5][T]0[D]S11101010000000000011110000010000000101 + [6][T]0[D]S11101010000000000011110000010000000110 + [7][T]0[D]S11101010000000000011110000010000000111 + [8][T]0[D]S11101010000000000011110000010000001000 + [9][T]0[D]S11101010000000000011110000010000001001 + [0][T]0[D]S11101010000000000011110000010000000000 + [Star][T]0[D]S11101010000000000011110000010000011101 + [Hash][T]0[D]S11101010000000000011110000010000011100 + [ok][T]0[D]S11101010000000000011110000010000100010 + [left][T]0[D]S11101010000000000011110000010000100000 + [right][T]0[D]S11101010000000000011110000010000100001 + [down][T]0[D]S11101010000000000011110000010000011111 + [up][T]0[D]S11101010000000000011110000010000011110 + [play][T]0[D]S11101010000000000011110000010000010110 + [power][T]0[D]S11101010000000000011110000010000001100 + [Stop][T]0[D]S11101010000000000011110000010000011001 + [Rec][T]0[D]S11101010000000000011110000010000010111 + [Rew][T]0[D]S11101010000000000011110000010000010101 + [Fwd][T]0[D]S11101010000000000011110000010000010100 + [Pause][T]0[D]S11101010000000000011110000010000011000 + [Next][T]0[D]S11101010000000000011110000010000011010 + [Prev][T]0[D]S11101010000000000011110000010000011011 + [eHome][T]0[D]S11101010000000000011110000010000001101 + [Back][T]0[D]S11101010000000000011110000010000100011 + [EPG][T]0[D]S11101010000000000011110000010000100110 + [Info][T]0[D]S11101010000000000011110000010000001111 + [LiveTV][T]0[D]S11101010000000000011110000010000100101 + [TV][T]0[D]S11101010000000000011110000010001000110 + [Vol+][T]0[D]S11101010000000000011110000010000010000 + [Vol-][T]0[D]S11101010000000000011110000010000010001 + [Mute][T]0[D]S11101010000000000011110000010000001110 + [Ch+][T]0[D]S11101010000000000011110000010000010010 + [Ch-][T]0[D]S11101010000000000011110000010000010011 + [Enter][T]0[D]S11101010000000000011110000010000001011 + [Clear][T]0[D]S11101010000000000011110000010000001010 + [DVDMenu][T]0[D]S11101010000000000011110000010000100100 + [Rectv][T]0[D]S11101010000000000011110000010001001000 + [Teletext][T][0][D]S11101010000000000011110000010001011010 + [Red][T][0][D]S11101010000000000011110000010001011011 + [Green][T][0][D]S11101010000000000011110000010001011100 + [Yellow][T][0][D]S11101010000000000011110000010001011101 + [Blue][T][0][D]S11101010000000000011110000010001011110 diff --git a/packages/sysutils/lcdproc/build b/packages/sysutils/lcdproc/build index da38b67505..f35d8c9c57 100755 --- a/packages/sysutils/lcdproc/build +++ b/packages/sysutils/lcdproc/build @@ -17,4 +17,8 @@ make sed -i -e "s|^DriverPath=.*$|DriverPath=/usr/lib/lcdproc/|" LCDd.conf sed -i -e "s|^Driver=.*$|Driver=irtrans|" LCDd.conf -sed -i -e "s|^#Foreground=.*$|Foreground=no|" LCDd.conf \ No newline at end of file +sed -i -e "s|^#Foreground=.*$|Foreground=no|" LCDd.conf +sed -i -e "s|^#ServerScreen=.*$|ServerScreen=blank|" LCDd.conf +sed -i -e "s|^#Backlight=.*$|Backlight=open|" LCDd.conf +sed -i -e "s|^#Heartbeat=.*$|Heartbeat=open|" LCDd.conf +sed -i -e "s|^#TitleSpeed=.*$|TitleSpeed=10|" LCDd.conf diff --git a/packages/sysutils/lcdproc/init.d/33_lcdproc b/packages/sysutils/lcdproc/init.d/33_lcdproc index d29efb58dd..119dbef8bc 100755 --- a/packages/sysutils/lcdproc/init.d/33_lcdproc +++ b/packages/sysutils/lcdproc/init.d/33_lcdproc @@ -5,16 +5,6 @@ ( progress "Starting LCD daemon" - LCD_USERCONF="/storage/.config/LCDd.conf" - LCD_DEFCONF="/etc/LCDd.conf" - LCD_ARG="" - - if [ -f $LCD_USERCONF ]; then - LCD_ARG="$LCD_ARG -c $LCD_USERCONF" - else - LCD_ARG="$LCD_ARG -c $LCD_DEFCONF" - fi - - LCDd $LCD_ARG > /dev/null 2>&1 + LCDd -c /etc/LCDd.conf > /dev/null 2>&1 )& diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install index 1bd711dce1..969d25da3c 100755 --- a/packages/sysutils/lcdproc/install +++ b/packages/sysutils/lcdproc/install @@ -7,19 +7,14 @@ $SCRIPTS/install irserver PKG_DIR=`find $PACKAGES -type d -name $1` +add_user nobody x 999 999 "Nobody" "/" "/bin/sh" +add_group nobody 999 + mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/server/LCDd $INSTALL/usr/sbin -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/clients/lcdproc/lcdproc $INSTALL/usr/bin - mkdir -p $INSTALL/usr/lib/lcdproc cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc mkdir -p $INSTALL/etc cp $PKG_BUILD/LCDd.conf $INSTALL/etc - cp $PKG_BUILD/clients/lcdproc/lcdproc.conf $INSTALL/etc - -mkdir -p $INSTALL/usr/config - cp $PKG_BUILD/LCDd.conf $INSTALL/usr/config/LCDd.conf.sample - cp $PKG_BUILD/clients/lcdproc/lcdproc.conf $INSTALL/usr/config/lcdproc.conf.sample 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/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 diff --git a/projects/ION/options b/projects/ION/options index 53ff6e3e0a..90aa5c90fb 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -27,20 +27,20 @@ # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx athlon-mp athlon-xp athlon-4 # athlon-tbird athlon k6-3 k6-2 k6 geode - # (Intel CPUs) core2 nocona prescott pentium4[m] pentium3[m] pentium-m - # pentium2 pentiumpro pentium-mmx pentium + # (Intel CPUs) atom core2 nocona prescott pentium4[m] pentium3[m] + # pentium-m pentium2 pentiumpro pentium-mmx pentium # i686 i586 i486 i386 # (VIA CPUs) c3 c3-2 # - #TARGET_CPU="i686" + TARGET_CPU="atom" ;; x86_64) # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx amdfam10 barcelona - # (Intel CPUs) core2 nocona + # (Intel CPUs) atom core2 nocona # - #TARGET_CPU="generic" + TARGET_CPU="atom" ;; esac @@ -48,7 +48,7 @@ OPTIMIZATIONS="speed" # Project CFLAGS - PROJECT_CFLAGS="-mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse" + PROJECT_CFLAGS="" # Timezone to use (empty disables timezone support) # use a TZ environment string diff --git a/projects/generic/options b/projects/generic/options index 1536d5417e..9445078e59 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -27,8 +27,8 @@ # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx athlon-mp athlon-xp athlon-4 # athlon-tbird athlon k6-3 k6-2 k6 geode - # (Intel CPUs) core2 nocona prescott pentium4[m] pentium3[m] pentium-m - # pentium2 pentiumpro pentium-mmx pentium + # (Intel CPUs) atom core2 nocona prescott pentium4[m] pentium3[m] + # pentium-m pentium2 pentiumpro pentium-mmx pentium # i686 i586 i486 i386 # (VIA CPUs) c3 c3-2 # @@ -38,7 +38,7 @@ x86_64) # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx amdfam10 barcelona - # (Intel CPUs) core2 nocona + # (Intel CPUs) atom core2 nocona # #TARGET_CPU="generic" ;; diff --git a/projects/intel/options b/projects/intel/options index 6600a199cb..a2f9a43a21 100644 --- a/projects/intel/options +++ b/projects/intel/options @@ -27,8 +27,8 @@ # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx athlon-mp athlon-xp athlon-4 # athlon-tbird athlon k6-3 k6-2 k6 geode - # (Intel CPUs) core2 nocona prescott pentium4[m] pentium3[m] pentium-m - # pentium2 pentiumpro pentium-mmx pentium + # (Intel CPUs) atom core2 nocona prescott pentium4[m] pentium3[m] + # pentium-m pentium2 pentiumpro pentium-mmx pentium # i686 i586 i486 i386 # (VIA CPUs) c3 c3-2 # @@ -38,7 +38,7 @@ x86_64) # (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3 # athlon-fx amdfam10 barcelona - # (Intel CPUs) core2 nocona + # (Intel CPUs) atom core2 nocona # TARGET_CPU="core2" ;; @@ -48,7 +48,7 @@ OPTIMIZATIONS="speed" # Project CFLAGS - PROJECT_CFLAGS="-mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse" + PROJECT_CFLAGS="" # Timezone to use (empty disables timezone support) # use a TZ environment string