Fix up splash, 4k image with a black background for improved scaling. For rotated displays invert the splash resolution so they scale correctly. Replace the ES image with a link to the splash.
This commit is contained in:
parent
29a276483c
commit
c965a43690
10 changed files with 27 additions and 12 deletions
Binary file not shown.
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 78 KiB |
|
@ -21,6 +21,12 @@ rsync -a --delete ${EXCLUDE} /usr/config/system/ /storage/.config/system/ &
|
|||
rsync -a --ignore-existing /usr/config/game /storage/.config/ &
|
||||
rsync -a /usr/config/modules /storage/.config/ &
|
||||
|
||||
if [ ! -L "/storage/.config/emulationstation/resources/logo.png" ]
|
||||
then
|
||||
rm -f /storage/.config/emulationstation/resources/logo.png ||:
|
||||
ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
|
||||
fi
|
||||
|
||||
### Update add-ons and themes
|
||||
wait < <(jobs -p)
|
||||
|
||||
|
|
|
@ -31,12 +31,12 @@ then
|
|||
### Remove and link es configs so they are managed with OS updates.
|
||||
for es_cfg in es_features.cfg es_systems.cfg
|
||||
do
|
||||
rm -f /storage/.config/emulationstation/${es_cfg}
|
||||
ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg}
|
||||
done
|
||||
|
||||
hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
|
||||
cp -f /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
|
||||
### Link the ES splash to the distribution splash
|
||||
rm -f /storage/.config/emulationstation/resources/logo.png
|
||||
ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
|
||||
fi
|
||||
|
||||
if [ ! -e "/storage/.cache/ld.so.cache" ]
|
||||
|
|
|
@ -21,10 +21,19 @@ make_target() {
|
|||
|
||||
mksplash() {
|
||||
SPLASH="${ROOT}/distributions/${DISTRO}/splash/splash.png"
|
||||
if [ -n "${DISPLAY_RESOLUTION}" ]
|
||||
if [ -n "${SPLASH_RESOLUTION}" ]
|
||||
then
|
||||
convert ${SPLASH} -quality 100 -background black -resize ${DISPLAY_RESOLUTION} -gravity center -extent ${DISPLAY_RESOLUTION} ${1}/splash.png
|
||||
convert ${SPLASH} -quality 100 -rotate 270 -background black -resize ${DISPLAY_RESOLUTION} -gravity center -extent ${DISPLAY_RESOLUTION} ${1}/splashl.png
|
||||
|
||||
# Switch the resolution so the rotated image will scale correctly.
|
||||
HRES=$(echo "${SPLASH_RESOLUTION}" | awk 'BEGIN {FS="x"} {print $1}')
|
||||
VRES=$(echo "${SPLASH_RESOLUTION}" | awk 'BEGIN {FS="x"} {print $2}')
|
||||
if [ "${VRES}" -gt "${HRES}" ]
|
||||
then
|
||||
convert ${SPLASH} -quality 100 -background black -resize ${VRES}x${HRES} -gravity center -extent ${VRES}x${HRES} ${1}/splash.png
|
||||
else
|
||||
convert ${SPLASH} -quality 100 -background black -resize ${SPLASH_RESOLUTION} -gravity center -extent ${SPLASH_RESOLUTION} ${1}/splash.png
|
||||
fi
|
||||
convert ${SPLASH} -rotate 270 -quality 100 -background black -resize ${SPLASH_RESOLUTION} -gravity center -extent ${SPLASH_RESOLUTION} ${1}/splashl.png
|
||||
else
|
||||
cp ${SPLASH} ${INSTALL}/splash
|
||||
convert ${SPLASH} -quality 100 -rotate 270 -background black ${INSTALL}/splash/splashl.png
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="640x480"
|
||||
SPLASH_RESOLUTION="640x480"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="bifrost-g31"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="320x480"
|
||||
SPLASH_RESOLUTION="320x480"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="bifrost-g31"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="640x480"
|
||||
SPLASH_RESOLUTION="640x480"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="bifrost-g31"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="640x480"
|
||||
SPLASH_RESOLUTION="640x480"
|
||||
|
||||
# Define the CPU
|
||||
HW_CPU="Rockchip RK3566"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="960x544"
|
||||
SPLASH_RESOLUTION="960x544"
|
||||
|
||||
# Define the CPU
|
||||
HW_CPU="Rockchip RK3566"
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
HW_CPU="Rockchip RK3399"
|
||||
|
||||
# Display Resolution
|
||||
DISPLAY_RESOLUTION="1152x1920"
|
||||
SPLASH_RESOLUTION="1152x1920"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="midgard-t86x"
|
||||
|
|
Loading…
Reference in a new issue