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

slice: update master with 8.2 changes

Browse Source
This commit is contained in:
chewitt 2017-09-30 12:58:29 +01:00
parent f417959228
commit 6767df7177
13 changed files with 160 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/linux-firmware/slice-firmware/package.mk
View File

@ -33,13 +33,13 @@ PKG_AUTORECONF="no"
make_target() {
if [ "$DEVICE" = "Slice3" ]; then
dtc -O dtb -I dts -o dt-blob.bin slice3-dt-blob.dts
$(kernel_path)/scripts/dtc/dtc -O dtb -I dts -o dt-blob.bin slice3-dt-blob.dts
elif [ "$DEVICE" = "Slice" ]; then
dtc -O dtb -I dts -o dt-blob.bin slice-dt-blob.dts
$(kernel_path)/scripts/dtc/dtc -O dtb -I dts -o dt-blob.bin slice-dt-blob.dts
fi
}
makeinstall_target() {
mkdir -p $INSTALL/usr/share/bootloader/
cp -a dt-blob.bin $INSTALL/usr/share/bootloader/
cp -a $PKG_BUILD/dt-blob.bin $INSTALL/usr/share/bootloader/
}

3
packages/mediacenter/kodi/package.mk
View File

@ -323,6 +323,9 @@ post_makeinstall_target() {
xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.libreelec.tv" $ADDON_MANIFEST
xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.retroplayer.libreelec.tv" $ADDON_MANIFEST
xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "service.libreelec.settings" $ADDON_MANIFEST
if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "service.slice" $ADDON_MANIFEST
fi
# more binaddons cross compile badness meh
sed -e "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR $SYSROOT_PREFIX/usr/include/kodi:g" \

10
packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-21 22:09:04.765734381 +0400
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-22 16:12:57.942164800 +0400
@@ -100,7 +100,6 @@
#endif
SetControlLabel(i++, "%s: %s", 12390, SYSTEM_UPTIME);
SetControlLabel(i++, "%s: %s", 12394, SYSTEM_TOTALUPTIME);
- SetControlLabel(i++, "%s: %s", 12395, SYSTEM_BATTERY_LEVEL);
}
else if (m_section == CONTROL_BT_STORAGE)
{

2
packages/tools/led_tools/package.mk
View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.fiveninjas.com"
PKG_URL="http://updates.fiveninjas.com/src/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain zlib libpng"
PKG_DEPENDS_TARGET="toolchain zlib libpng slice-addon"
PKG_DEPENDS_HOST="toolchain"
PKG_SECTION="tools"
PKG_SHORTDESC="led_tools"

43
packages/tools/slice-addon/package.mk Normal file
View File

@ -0,0 +1,43 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="slice-addon"
PKG_VERSION="1.0"
PKG_REV="101"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE=""
PKG_URL=""
PKG_DEPENDS_TARGET=""
PKG_SHORTDESC="Controls the LED lights on the Slice box using Kodi actions"
PKG_LONGDESC="Controls the LED lights on the Slice box using Kodi actions"
PKG_AUTORECONF="no"
PKG_IS_ADDON="no"
make_target() {
(
cd $ROOT
scripts/create_addon slice
)
}
makeinstall_target() {
mkdir -p $INSTALL/usr/share/kodi/addons
cp -R $BUILD/$ADDONS/slice/service.slice $INSTALL/usr/share/kodi/addons
}

12
projects/RPi/devices/Slice/filesystem/usr/config/shutdown.sh
View File

@ -1,22 +1,18 @@
#!/bin/bash
if [ -f /storage/.kodi/media/ledpatterns/shutdown.png ]; then
LEDDIR=/storage/.kodi
else
LEDDIR=/usr/share/kodi
fi
LEDDIR="/usr/share/kodi/addons/service.slice/resources/media/ledpatterns"
case "$1" in
halt)
hdparm -y /dev/sda
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
poweroff)
hdparm -y /dev/sda
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
reboot)
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
*)
;;

1
projects/RPi/devices/Slice/linux Symbolic link
View File

@ -0,0 +1 @@
../RPi/linux

1
projects/RPi/devices/Slice/linux/linux.arm.conf
View File

@ -1 +0,0 @@
../../RPi/linux/linux.arm.conf

45
projects/RPi/devices/Slice/patches/kodi/kodi-004-keyboard.patch Normal file
View File

@ -0,0 +1,45 @@
--- a/system/keymaps/keyboard.xml 2016-09-17 16:35:20.000000000 +0100
+++ b/system/keymaps/keyboard.xml 2016-10-01 19:31:07.928719606 +0100
@@ -56,7 +56,7 @@
<menu mod="longpress">Menu</menu>
<c>ContextMenu</c>
<c mod="longpress">Menu</c>
- <space>Pause</space>
+ <space>PlayPause</space>
<x>Stop</x>
<period>SkipNext</period>
<comma>SkipPrevious</comma>
@@ -321,8 +321,8 @@
<l>NextSubtitle</l>
<left>StepBack</left>
<right>StepForward</right>
- <up>ChapterOrBigStepForward</up>
- <down>ChapterOrBigStepBack</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<up mod="longpress">AudioNextLanguage</up>
<down mod="longpress">NextSubtitle</down>
<a>AudioDelay</a>
@@ -425,8 +425,8 @@
<right>StepForward</right>
<left mod="longpress">Rewind</left>
<right mod="longpress">FastForward</right>
- <up>SkipNext</up>
- <down>SkipPrevious</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<o>PlayerProcessInfo</o>
<l>LockPreset</l>
<escape>FullScreen</escape>
@@ -632,8 +632,8 @@
<keyboard>
<left>StepBack</left>
<right>StepForward</right>
- <up>Up</up>
- <down>Down</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<return>OSD</return>
<enter>OSD</enter>
<return mod="longpress">ActivateWindow(PVROSDChannels)</return>

12
projects/RPi/devices/Slice3/filesystem/usr/config/shutdown.sh
View File

@ -1,22 +1,18 @@
#!/bin/bash
if [ -f /storage/.kodi/media/ledpatterns/shutdown.png ]; then
LEDDIR=/storage/.kodi
else
LEDDIR=/usr/share/kodi
fi
LEDDIR="/usr/share/kodi/addons/service.slice/resources/media/ledpatterns"
case "$1" in
halt)
hdparm -y /dev/sda
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
poweroff)
hdparm -y /dev/sda
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
reboot)
led_png $LEDDIR/media/ledpatterns/shutdown.png
led_png $LEDDIR/shutdown.png
;;
*)
;;

1
projects/RPi/devices/Slice3/linux Symbolic link
View File

@ -0,0 +1 @@
../RPi2/linux

1
projects/RPi/devices/Slice3/linux/linux.arm.conf
View File

@ -1 +0,0 @@
../../RPi2/linux/linux.arm.conf

45
projects/RPi/devices/Slice3/patches/kodi/kodi-004-keyboard.patch Normal file
View File

@ -0,0 +1,45 @@
--- a/system/keymaps/keyboard.xml 2016-09-17 16:35:20.000000000 +0100
+++ b/system/keymaps/keyboard.xml 2016-10-01 19:31:07.928719606 +0100
@@ -56,7 +56,7 @@
<menu mod="longpress">Menu</menu>
<c>ContextMenu</c>
<c mod="longpress">Menu</c>
- <space>Pause</space>
+ <space>PlayPause</space>
<x>Stop</x>
<period>SkipNext</period>
<comma>SkipPrevious</comma>
@@ -321,8 +321,8 @@
<l>NextSubtitle</l>
<left>StepBack</left>
<right>StepForward</right>
- <up>ChapterOrBigStepForward</up>
- <down>ChapterOrBigStepBack</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<up mod="longpress">AudioNextLanguage</up>
<down mod="longpress">NextSubtitle</down>
<a>AudioDelay</a>
@@ -425,8 +425,8 @@
<right>StepForward</right>
<left mod="longpress">Rewind</left>
<right mod="longpress">FastForward</right>
- <up>SkipNext</up>
- <down>SkipPrevious</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<o>PlayerProcessInfo</o>
<l>LockPreset</l>
<escape>FullScreen</escape>
@@ -632,8 +632,8 @@
<keyboard>
<left>StepBack</left>
<right>StepForward</right>
- <up>Up</up>
- <down>Down</down>
+ <up>VolumeUp</up>
+ <down>VolumeDown</down>
<return>OSD</return>
<enter>OSD</enter>
<return mod="longpress">ActivateWindow(PVROSDChannels)</return>