From a1cda26adf70ce575d006b55558f6e4a786c157f Mon Sep 17 00:00:00 2001 From: graysky Date: Mon, 28 Jan 2019 19:28:50 -0500 Subject: [PATCH] alarm/kodi-rbp to 18.0-1 (#1662) --- alarm/kodi-rbp/PKGBUILD | 173 ++++++++++++----------- alarm/kodi-rbp/fix-python-lib-path.patch | 29 ---- alarm/kodi-rbp/fix_libdvd.patch | 18 --- alarm/kodi-rbp/hifiberry_digi.patch | 14 -- alarm/kodi-rbp/kodi-framebuffer | 9 ++ alarm/kodi-rbp/kodi.install | 13 ++ alarm/kodi-rbp/kodi.service | 21 +-- 7 files changed, 125 insertions(+), 152 deletions(-) delete mode 100644 alarm/kodi-rbp/fix-python-lib-path.patch delete mode 100644 alarm/kodi-rbp/fix_libdvd.patch delete mode 100644 alarm/kodi-rbp/hifiberry_digi.patch create mode 100644 alarm/kodi-rbp/kodi-framebuffer diff --git a/alarm/kodi-rbp/PKGBUILD b/alarm/kodi-rbp/PKGBUILD index 228a2e29f..77bb93b48 100644 --- a/alarm/kodi-rbp/PKGBUILD +++ b/alarm/kodi-rbp/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Oleg Rakhmanov # Contributor graysky # Contributor BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor Oleg Rakhmanov # Contributor tomasgroth at yahoo.dk # Contributor WarheadsSE # Contributor Adrian Fedoreanu @@ -11,102 +11,121 @@ _prefix=/usr pkgbase=kodi-rbp pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev') -_codename=Krypton -pkgver=17.6 -pkgrel=7 +pkgver=18.0 +pkgrel=1 +_codename=Leia +_tag="18.0-$_codename" +_ffmpeg_version="4.0.3-$_codename-RC5" +_libdvdcss_version="1.4.2-$_codename-Beta-5" +_libdvdnav_version="6.0.0-$_codename-Alpha-3" +_libdvdread_version="6.0.0-$_codename-Alpha-3" +_fmt_version="5.1.0" +_crossguid_version="8f399e8bd4" +_fstrcmp_version="0.7.D001" +_flatbuffers_version="1.9.0" arch=('armv6h' 'armv7h') url="http://kodi.tv" license=('GPL2') makedepends=( 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'doxygen' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-environment' 'libaacs' 'libass' - 'libbluray' 'libcdio' 'libcec-rpi' 'mariadb-libs' 'libmicrohttpd' - 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' - 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' + 'libbluray-kodi-rbp' 'libcdio' 'mariadb-libs' 'libmicrohttpd' 'groff' + 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libcec-rpi' + 'libxrandr' 'libxslt' 'lirc' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'raspberrypi-firmware' 'rtmpdump' 'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' - 'yajl' 'zip' 'giflib' + 'yajl' 'zip' 'giflib' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon' 'ghostscript' ) -_libdvdcss_commit="2f12236bc1c92f73c21e973363f79eb300de603f" -_libdvdnav_commit="981488f7f27554b103cca10c1fbeba027396c94a" -_libdvdread_commit="17d99db97e7b8f23077b342369d3c22a6250affd" -#_ffmpeg_version="3.1.11-$_codename-$pkgver" -_ffmpeg_version="3.1.11-$_codename-17.5" -source=( - "$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" - "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_commit.tar.gz" - "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_commit.tar.gz" - "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_commit.tar.gz" - "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz" +source=("https://github.com/popcornmix/xbmc/archive/newclock5_$_tag.tar.gz" 'kodi.service' + 'kodi-framebuffer' '99-kodi.rules' - 'https://github.com/popcornmix/xbmc/commit/0c320b6cdd4fb409be45008e6b9042463d54b742.patch' - 'https://github.com/popcornmix/xbmc/commit/4d983105d7fd65b1d92f2ae2602e6e1cdcaddbe0.patch' 'polkit.rules' - 'hifiberry_digi.patch' - 'fix-python-lib-path.patch') -noextract=( - "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz" - "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz" - "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz" - "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz" + '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch' + "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz" + "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz" + "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz" + "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz" ) -sha256sums=('c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d' - 'b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34' - '312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d' - 'e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b' - '7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0' - '5235068d5800d69f0287087815990e7fe8d6572733d60c8800546d35f608e87f' +noextract=( + "libdvdcss-$_libdvdcss_version.tar.gz" + "libdvdnav-$_libdvdnav_version.tar.gz" + "libdvdread-$_libdvdread_version.tar.gz" + "ffmpeg-$_ffmpeg_version.tar.gz" + "fmt-$_fmt_version.tar.gz" + "crossguid-$_crossguid_version.tar.gz" + "fstrcmp-$_fstrcmp_version.tar.gz" + "flatbuffers-$_flatbuffers_version.tar.gz" +) +sha256sums=('9c056808eecc7dd2e72fffd3f3412d83c60fe3742bc0d96f16f9abdfc55c8012' + '6eded8b5f52808d5ffa77de546fbf799a255dde2473540e8a8bd46daa6f753d9' + 'fe7a1ab2a6e2bf00f756c76545a338d2763003052764d722d492b06b1bc05f5e' 'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d' - '47572eb56439fe9e5b396089621aba8f8e657337a6cbe473191b692b495e33d9' - '82057eccc4cadbd568dda76103dcc667754194e926ede78e43d70b3a17bbb5e5' '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96' - '0b9d951911a8576c26dec8a31f394282677e48afff49b9579448121d27b8509e' - '1c07c9fdd8e2958262cf917e4266c4933fcd06529c111e3cb0cbaaa05c934033') + '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb' + '9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8' + '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d' + '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a' + 'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf' + '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44' + '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' + 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' + '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3') prepare() { - cd "$srcdir/xbmc-$pkgver-$_codename" - # python2 path fix - patch -p1 -i "$srcdir/fix-python-lib-path.patch" - - # ffmpeg: Automatic switch to software decode for GMC with more than one warp point - patch -Np1 -i "$srcdir/0c320b6cdd4fb409be45008e6b9042463d54b742.patch" - # fix for files with GMC - patch -Np1 -i "$srcdir/4d983105d7fd65b1d92f2ae2602e6e1cdcaddbe0.patch" - # fix for lack of passthrough audio with hifiberry-digi+ card - patch -Np1 -i "$srcdir/hifiberry_digi.patch" + cd "xbmc-newclock5_$_tag" [[ -d kodi-build ]] && rm -rf kodi-build mkdir $srcdir/kodi-build + + patch -Np1 -i ../00-fix.building.with.mariadb.patch } build() { cd kodi-build - # -DCPU=arm1176jzf-s for rpi1 - # -DCPU=cortex-a7 for rpi2 - # -DCPU=cortex-a53 for rpi3 + # _CPU=arm1176jzf-s for rpi1 + # _CPU=cortex-a7 for rpi2 + # _CPU=cortex-a53 for rpi3 - [[ $CARCH == "armv6h" ]] && _CPU=arm1176jzf-s && LDFLAGS+=" -latomic" - [[ $CARCH == "armv7h" ]] && _CPU=cortex-a7 + if [[ $CARCH == "armv6h" ]]; then + _CPU=arm1176jzf-s + CFLAGS+=" -march=armv6zk" + CXXFLAGS="${CFLAGS}" + LDFLAGS+=" -latomic" + elif [[ $CARCH == "armv7h" ]]; then + _CPU=cortex-a7 + CFLAGS+=" -march=armv7ve" + CXXFLAGS="${CFLAGS}" + fi cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_PREFIX_PATH=/opt/vc \ - -DCORE_SYSTEM_NAME=rbpi \ + -DCORE_PLATFORM_NAME=rbpi \ -DWITH_CPU="$_CPU" \ -DENABLE_EVENTCLIENTS=ON \ -DENABLE_OPENGL=OFF \ - -DENABLE_X11=OFF \ - -DENABLE_VAAPI=OFF \ - -DENABLE_VDPAU=OFF \ + -DENABLE_INTERNAL_FFMPEG=ON \ + -DENABLE_INTERNAL_FMT=ON \ -DENABLE_INTERNAL_CROSSGUID=ON \ - -DLIRC_DEVICE=/run/lirc/lircd \ - -Dlibdvdcss_URL="$srcdir/$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz" \ - -Dlibdvdnav_URL="$srcdir/$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz" \ - -Dlibdvdread_URL="$srcdir/$pkgbase-libdvdread-$_libdvdread_commit.tar.gz" \ - -DFFMPEG_URL="$srcdir/$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz" \ - ../"xbmc-$pkgver-$_codename"/project/cmake + -DENABLE_INTERNAL_FSTRCMP=ON \ + -DENABLE_INTERNAL_FLATBUFFERS=ON \ + -DENABLE_MARIADBCLIENT=ON \ + -DENABLE_MYSQLCLIENT=OFF \ + -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \ + -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \ + -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \ + -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz" \ + -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz" \ + -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \ + -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \ + -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \ + ../"xbmc-newclock5_$_tag" make make preinstall } @@ -114,20 +133,18 @@ build() { package_kodi-rbp() { pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi)" depends=( - 'bluez-libs' 'desktop-file-utils' 'freetype2' 'fribidi' + 'bluez-libs' 'desktop-file-utils' 'freetype2' 'fribidi' 'libcec-rpi' 'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'mariadb-libs' - 'libmicrohttpd' 'libpulse' 'libssh' 'libxrandr' 'raspberrypi-firmware' + 'libmicrohttpd' 'libpulse' 'libssh' 'libxrandr' 'lirc' 'raspberrypi-firmware' 'libxslt' 'lzo' 'python2-pillow' 'python2-simplejson' 'smbclient' - 'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'polkit' + 'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libinput' 'libxkbcommon' 'libbluray-kodi-rbp' + 'fbset' 'libnfs' 'curl' ) optdepends=( 'afpfs-ng: Apple shares support' 'bluez: Blutooth support' 'python2-pybluez: Bluetooth support' - 'libnfs: NFS shares support' 'libplist: Limited AirPlay support' - 'libcec-rpi: Pulse-Eight USB-CEC adapter support' - 'lirc: Remote controller support' 'lsb-release: log distro information in crashlog' 'shairplay: Limited AirPlay support' 'unrar: Archives support' @@ -141,25 +158,18 @@ package_kodi-rbp() { _components=('kodi' 'kodi-bin') cd kodi-build - # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ -DCMAKE_INSTALL_COMPONENT="$_cmp" \ -P cmake_install.cmake done - # Licenses - install -dm755 "$pkgdir/usr/share/licenses/$pkgname" - for licensef in LICENSE.GPL copying.txt; do - mv "$pkgdir/usr/share/doc/kodi/$licensef" \ - "$pkgdir/usr/share/licenses/$pkgname" - done - # python2 is being used cd "$pkgdir" grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done install -Dm0644 "$srcdir/kodi.service" "$pkgdir/usr/lib/systemd/system/kodi.service" + install -Dm0644 "$srcdir/kodi-framebuffer" "$pkgdir/etc/conf.d/kodi-framebuffer" install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-kodi.rules" chmod 0750 "$pkgdir/usr/share/polkit-1/rules.d/" @@ -168,16 +178,15 @@ package_kodi-rbp() { } package_kodi-rbp-eventclients() { - pkgdesc="Kodi event clients (Raspberry Pi)" + pkgdesc="Kodi Event Clients (Raspberry Pi)" provides=('kodi-eventclients') conflicts=('kodi-eventclients') optdepends=('python2: most eventclients are implemented in python2') _components=('kodi-eventclients-common' 'kodi-eventclients-ps3' - 'kodi-eventclients-xbmc-send') + 'kodi-eventclients-kodi-send') cd kodi-build - # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ -DCMAKE_INSTALL_COMPONENT="$_cmp" \ @@ -190,12 +199,11 @@ package_kodi-rbp-eventclients() { } package_kodi-rbp-tools-texturepacker() { - pkgdesc="Kodi texturepacker tool (Raspberry Pi)" + pkgdesc="Kodi Texturepacker tool (Raspberry Pi)" depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo') _components=('kodi-tools-texturepacker') cd kodi-build - # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ -DCMAKE_INSTALL_COMPONENT="$_cmp" \ @@ -219,7 +227,6 @@ package_kodi-rbp-dev() { 'kodi-visualization-dev') cd kodi-build - # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ -DCMAKE_INSTALL_COMPONENT="$_cmp" \ diff --git a/alarm/kodi-rbp/fix-python-lib-path.patch b/alarm/kodi-rbp/fix-python-lib-path.patch deleted file mode 100644 index 395658008..000000000 --- a/alarm/kodi-rbp/fix-python-lib-path.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/project/cmake/scripts/linux/Install.cmake 2017-03-20 17:17:49.000000000 +0100 -+++ b/project/cmake/scripts/linux/Install.cmake 2017-05-20 15:42:09.608550173 +0200 -@@ -199,7 +199,7 @@ - install(PROGRAMS ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/bt.py - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/hid.py -- DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC}/bt -+ DESTINATION lib/python2.7/site-packages/${APP_NAME_LC}/bt - COMPONENT kodi-eventclients-common) - - # Install kodi-eventclients-common PS3 python files -@@ -208,7 +208,7 @@ - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixaxis.py - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixpair.py - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixwatch.py -- DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC}/ps3 -+ DESTINATION lib/python2.7/site-packages/${APP_NAME_LC}/ps3 - COMPONENT kodi-eventclients-common) - - # Install kodi-eventclients-common python files -@@ -218,7 +218,7 @@ - "${CORE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py" - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/xbmcclient.py - ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/zeroconf.py -- DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC} -+ DESTINATION lib/python2.7/site-packages/${APP_NAME_LC} - COMPONENT kodi-eventclients-common) - - # Install kodi-eventclients-common icons diff --git a/alarm/kodi-rbp/fix_libdvd.patch b/alarm/kodi-rbp/fix_libdvd.patch deleted file mode 100644 index 891de7cd6..000000000 --- a/alarm/kodi-rbp/fix_libdvd.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig 2016-05-15 08:11:58.074191520 +0000 -+++ Makefile.in 2016-05-15 08:12:25.599007513 +0000 -@@ -11,7 +11,6 @@ - - DVDPCODECS_DIRS= \ - lib \ -- lib/libdvd - - VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \ - xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \ -@@ -341,7 +340,6 @@ - $(MAKE) -C lib/addons/library.xbmc.pvr - $(MAKE) -C lib/addons/library.kodi.inputstream - dvdpcodecs: dllloader -- $(MAKE) -C lib/libdvd - - dvdpextcodecs: - diff --git a/alarm/kodi-rbp/hifiberry_digi.patch b/alarm/kodi-rbp/hifiberry_digi.patch deleted file mode 100644 index 0998e02fa..000000000 --- a/alarm/kodi-rbp/hifiberry_digi.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2016-04-24 07:48:30.000000000 +0100 -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2016-07-06 23:15:14.851453568 +0100 -@@ -1342,6 +1342,10 @@ void CAESinkALSA::EnumerateDevice(AEDevi - if (snd_card_get_name(cardNr, &cardName) == 0) - info.m_displayName = cardName; - -+ /* hifiberry digi doesn't correctly report as iec958 device. Needs fixing in kernel driver */ -+ if (info.m_displayName == "snd_rpi_hifiberry_digi") -+ info.m_deviceType = AE_DEVTYPE_IEC958; -+ - if (info.m_deviceType == AE_DEVTYPE_HDMI && info.m_displayName.size() > 5 && - info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") - { diff --git a/alarm/kodi-rbp/kodi-framebuffer b/alarm/kodi-rbp/kodi-framebuffer new file mode 100644 index 000000000..317422dce --- /dev/null +++ b/alarm/kodi-rbp/kodi-framebuffer @@ -0,0 +1,9 @@ +# +# /etc/conf.d/kodi-framebuffer +# +# The RESTOREMODE variable defines the preferred settings for the frame buffer +# when kodi is stopped. Syntax is +# +# Tip: get the current frame buffer settings by running `fbset` as root + +RESTOREMODE="1824 984 1824 984 32" diff --git a/alarm/kodi-rbp/kodi.install b/alarm/kodi-rbp/kodi.install index 73525c062..4476a5601 100644 --- a/alarm/kodi-rbp/kodi.install +++ b/alarm/kodi-rbp/kodi.install @@ -1,11 +1,24 @@ post_install() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications getent group kodi > /dev/null || groupadd -r kodi getent passwd kodi > /dev/null || useradd -r -m -d /var/lib/kodi -g kodi -s /usr/bin/nologin kodi usermod -a -G kodi,audio,video,power,network,optical,storage,disk,tty,input kodi mkdir -p var/lib/kodi chown -R kodi:kodi var/lib/kodi + + echo "****************************************************************" + echo "Recommended GPU memory for 1080p x265 content is at least 320 MB" + echo "Add the following to /boot/config.txt: gpu_mem=320" + echo "****************************************************************" } post_upgrade() { post_install $1 } + +post_remove() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent passwd kodi > /dev/null && userdel kodi +} diff --git a/alarm/kodi-rbp/kodi.service b/alarm/kodi-rbp/kodi.service index b680eace5..1914fb6c9 100644 --- a/alarm/kodi-rbp/kodi.service +++ b/alarm/kodi-rbp/kodi.service @@ -1,13 +1,18 @@ [Unit] -Description = Starts an instance of Kodi -After = remote-fs.target +Description=Kodi standalone +After=remote-fs.target [Service] -User = kodi -Group = kodi -Type = simple -ExecStart = /usr/bin/kodi-standalone -l /run/lirc/lircd -Restart = on-failure +User=kodi +Group=kodi +ExecStartPre=+/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind' +ExecStartPre=+/usr/bin/fbset -g 4 2 4 2 32 +ExecStart=/usr/bin/kodi-standalone +ExecStopPost=+/usr/bin/fbset -g $RESTOREMODE +ExecStopPost=+/bin/sh -c 'echo 1 > /sys/class/vtconsole/vtcon1/bind' +Restart=on-failure +SendSIGHUP=yes +EnvironmentFile=/etc/conf.d/kodi-framebuffer [Install] -WantedBy = multi-user.target +WantedBy=multi-user.target