jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://openelec.git.sourceforge.net/gitroot/openelec/openelec into testing

Browse Source
This commit is contained in:
Stephan Raue 2010-06-29 10:43:41 +02:00
commit 01ebc95918
17 changed files with 193 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/linux/config/initramfs
View File

@ -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

2
packages/mediacenter/xbmc-theme-Confluence/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-31392.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-31443.tar.bz2

6
packages/mediacenter/xbmc/install
View File

@ -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

0
packages/mediacenter/xbmc/splash/Splash.png → packages/mediacenter/xbmc/splash/splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 292 KiB

2
packages/mediacenter/xbmc/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-31392.tar.bz2
http://sources.openelec.tv/svn/xbmc-31443.tar.bz2

1
packages/sysutils/busybox-initramfs/install
View File

@ -2,6 +2,7 @@
. config/options
$SCRIPTS/unpack linux
$SCRIPTS/install plymouth-lite initramfs
PKG_DIR=`find $PACKAGES -type d -name $1`

10
packages/sysutils/busybox-initramfs/scripts/init
View File

@ -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"

2
packages/sysutils/busybox/config/profile
View File

@ -22,8 +22,6 @@
progress() {
if test "$DEBUG" = yes; then
echo "### $1 ###"
else
echo -n "***"
fi
}

2
packages/sysutils/busybox/scripts/init
View File

@ -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

10
packages/sysutils/plymouth-lite/build Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build libpng
cd $PKG_BUILD
make

19
packages/sysutils/plymouth-lite/install Executable file
View File

@ -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

11
packages/sysutils/plymouth-lite/patches/cursor.diff Normal file
View File

@ -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");

10
packages/sysutils/plymouth-lite/patches/plymouth-fix-build.diff Normal file
View File

@ -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

12
packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0_libpng-1.4.0.diff Normal file
View File

@ -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);

110
packages/sysutils/plymouth-lite/patches/plymouth-resize.diff Normal file
View File

@ -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 <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);

BIN
packages/sysutils/plymouth-lite/splash/splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 KiB

1
packages/sysutils/plymouth-lite/url Normal file
View File

@ -0,0 +1 @@
http://sources.openelec.tv/svn/plymouth-lite-0.6.0.tar.bz2