From a6ef42364c9d381c8b4da91484ee6b263ada58b8 Mon Sep 17 00:00:00 2001 From: graysky Date: Mon, 10 Aug 2020 08:25:35 -0400 Subject: [PATCH] kodi-rbp-git: prep for update and rename --- alarm/kodi-rbp-git/99-kodi.rules | 4 - alarm/kodi-rbp-git/PKGBUILD | 239 ------------------- alarm/kodi-rbp-git/fix-python-lib-path.patch | 29 --- alarm/kodi-rbp-git/fix_libdvd.patch | 18 -- alarm/kodi-rbp-git/kodi-framebuffer | 9 - alarm/kodi-rbp-git/kodi.install | 24 -- alarm/kodi-rbp-git/kodi.service | 18 -- alarm/kodi-rbp-git/polkit.rules | 12 - 8 files changed, 353 deletions(-) delete mode 100644 alarm/kodi-rbp-git/99-kodi.rules delete mode 100644 alarm/kodi-rbp-git/PKGBUILD delete mode 100644 alarm/kodi-rbp-git/fix-python-lib-path.patch delete mode 100644 alarm/kodi-rbp-git/fix_libdvd.patch delete mode 100644 alarm/kodi-rbp-git/kodi-framebuffer delete mode 100644 alarm/kodi-rbp-git/kodi.install delete mode 100644 alarm/kodi-rbp-git/kodi.service delete mode 100644 alarm/kodi-rbp-git/polkit.rules diff --git a/alarm/kodi-rbp-git/99-kodi.rules b/alarm/kodi-rbp-git/99-kodi.rules deleted file mode 100644 index 1c4193177..000000000 --- a/alarm/kodi-rbp-git/99-kodi.rules +++ /dev/null @@ -1,4 +0,0 @@ -SUBSYSTEM=="bcm2708_vcio",GROUP="video",MODE="0660" -SUBSYSTEM=="vc-sm",GROUP="video",MODE="0660" -SUBSYSTEM=="vchiq",GROUP="video",MODE="0660" -SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0660" diff --git a/alarm/kodi-rbp-git/PKGBUILD b/alarm/kodi-rbp-git/PKGBUILD deleted file mode 100644 index a7ca3ae42..000000000 --- a/alarm/kodi-rbp-git/PKGBUILD +++ /dev/null @@ -1,239 +0,0 @@ -# Contributor graysky -# Contributor BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor Oleg Rakhmanov -# Contributor tomasgroth at yahoo.dk -# Contributor WarheadsSE -# Contributor Adrian Fedoreanu - -buildarch=20 - -_prefix=/usr - -pkgbase=kodi-rbp-git -_suffix=rbp-git -pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix") -pkgver=18.2rc1.20190415 -pkgrel=2 -_codename=Leia -_tag="18.2rc1-$_codename" -_ffmpeg_version="4.0.3-$_codename-18.2" -_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-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' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon' 'ghostscript' -) -source=("https://github.com/popcornmix/xbmc/archive/newclock5_$_tag.tar.gz" - 'kodi.service' - 'kodi-framebuffer' - '99-kodi.rules' - 'polkit.rules' - '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" -) -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=('05ed821ae667b93876279fa556405976b854763c9859a3fed2c6eeb1ad51d915' - '6eded8b5f52808d5ffa77de546fbf799a255dde2473540e8a8bd46daa6f753d9' - 'fe7a1ab2a6e2bf00f756c76545a338d2763003052764d722d492b06b1bc05f5e' - 'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d' - '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96' - '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb' - '68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314' - '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d' - '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a' - 'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf' - '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44' - '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' - 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' - '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3') -prepare() { - 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 - - # _CPU=arm1176jzf-s for rpi1 - # _CPU=cortex-a7 for rpi2 - # _CPU=cortex-a53 for rpi3 - - 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_PLATFORM_NAME=rbpi \ - -DWITH_CPU="$_CPU" \ - -DENABLE_EVENTCLIENTS=ON \ - -DENABLE_OPENGL=OFF \ - -DENABLE_INTERNAL_FFMPEG=ON \ - -DENABLE_INTERNAL_FMT=ON \ - -DENABLE_INTERNAL_CROSSGUID=ON \ - -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 -} - -package_kodi-rbp-git() { - pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi)" - depends=( - 'bluez-libs' 'desktop-file-utils' 'freetype2' 'fribidi' 'libcec-rpi' - 'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'mariadb-libs' - 'libmicrohttpd' 'libpulse' 'libssh' 'libxrandr' 'lirc' 'raspberrypi-firmware' - 'libxslt' 'lzo' 'python2-pillow' 'python2-simplejson' 'smbclient' - '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' - 'libplist: Limited AirPlay support' - 'lsb-release: log distro information in crashlog' - 'shairplay: Limited AirPlay support' - 'unrar: Archives support' - 'unzip: Archives support' - 'upower: Display battery level' - ) - install='kodi.install' - provides=('xbmc' 'kodi') - conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git') - replaces=('xbmc-rbp-git') - _components=('kodi' 'kodi-bin') - - cd kodi-build - for _cmp in ${_components[@]}; do - DESTDIR="$pkgdir" /usr/bin/cmake \ - -DCMAKE_INSTALL_COMPONENT="$_cmp" \ - -P cmake_install.cmake - 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/" - - # fix permissions necessary for accelerated video playback - install -Dm0644 "$srcdir/99-kodi.rules" "$pkgdir/etc/udev/rules.d/99-kodi.rules" -} - -package_kodi-eventclients-rbp-git() { - pkgdesc="Kodi Event Clients (master branch)" - provides=('kodi-eventclients') - conflicts=('kodi-eventclients') - optdepends=('python2: most eventclients are implemented in python2') - _components=('kodi-eventclients-common' - 'kodi-eventclients-ps3' - 'kodi-eventclients-kodi-send') - - cd kodi-build - for _cmp in ${_components[@]}; do - DESTDIR="$pkgdir" /usr/bin/cmake \ - -DCMAKE_INSTALL_COMPONENT="$_cmp" \ - -P cmake_install.cmake - done - - # python2 is being used - cd "$pkgdir" - grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done -} - -package_kodi-tools-texturepacker-rbp-git() { - pkgdesc="Kodi Texturepacker tool (master branch)" - depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo') - _components=('kodi-tools-texturepacker') - - cd kodi-build - for _cmp in ${_components[@]}; do - DESTDIR="$pkgdir" /usr/bin/cmake \ - -DCMAKE_INSTALL_COMPONENT="$_cmp" \ - -P cmake_install.cmake - done -} - -package_kodi-dev-rbp-git() { - pkgdesc="Kodi dev files (master branch)" - depends=('kodi') - provides=('kodi-dev') - - _components=('kodi-addon-dev' - 'kodi-audio-dev' - 'kodi-eventclients-dev' - 'kodi-game-dev' - 'kodi-inputstream-dev' - 'kodi-peripheral-dev' - 'kodi-pvr-dev' - 'kodi-screensaver-dev' - 'kodi-visualization-dev') - - cd kodi-build - for _cmp in ${_components[@]}; do - DESTDIR="$pkgdir" /usr/bin/cmake \ - -DCMAKE_INSTALL_COMPONENT="$_cmp" \ - -P cmake_install.cmake - done - - # python2 is being used - cd "$pkgdir" - grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done -} diff --git a/alarm/kodi-rbp-git/fix-python-lib-path.patch b/alarm/kodi-rbp-git/fix-python-lib-path.patch deleted file mode 100644 index 395658008..000000000 --- a/alarm/kodi-rbp-git/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-git/fix_libdvd.patch b/alarm/kodi-rbp-git/fix_libdvd.patch deleted file mode 100644 index 891de7cd6..000000000 --- a/alarm/kodi-rbp-git/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-git/kodi-framebuffer b/alarm/kodi-rbp-git/kodi-framebuffer deleted file mode 100644 index 317422dce..000000000 --- a/alarm/kodi-rbp-git/kodi-framebuffer +++ /dev/null @@ -1,9 +0,0 @@ -# -# /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-git/kodi.install b/alarm/kodi-rbp-git/kodi.install deleted file mode 100644 index 4476a5601..000000000 --- a/alarm/kodi-rbp-git/kodi.install +++ /dev/null @@ -1,24 +0,0 @@ -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-git/kodi.service b/alarm/kodi-rbp-git/kodi.service deleted file mode 100644 index 1914fb6c9..000000000 --- a/alarm/kodi-rbp-git/kodi.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Kodi standalone -After=remote-fs.target - -[Service] -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 diff --git a/alarm/kodi-rbp-git/polkit.rules b/alarm/kodi-rbp-git/polkit.rules deleted file mode 100644 index 603c1274c..000000000 --- a/alarm/kodi-rbp-git/polkit.rules +++ /dev/null @@ -1,12 +0,0 @@ -polkit.addRule(function(action, subject) { - if (subject.user == "kodi") { - polkit.log("action=" + action); - polkit.log("subject=" + subject); - if (action.id.indexOf("org.freedesktop.login1.") == 0) { - return polkit.Result.YES; - } - if (action.id.indexOf("org.freedesktop.udisks.") == 0) { - return polkit.Result.YES; - } - } -});