diff options
-rw-r--r-- | kodi-rpi/60-kodi.rules (renamed from kodi/60-kodi.rules) | 0 | ||||
-rw-r--r-- | kodi-rpi/APKBUILD (renamed from kodi/APKBUILD) | 153 | ||||
-rw-r--r-- | kodi-rpi/cassert.patch (renamed from kodi/cassert.patch) | 0 | ||||
-rw-r--r-- | kodi-rpi/fix-musl-incompability.patch (renamed from kodi/fix-musl-incompability.patch) | 0 | ||||
-rw-r--r-- | kodi-rpi/kodi-gbm.pre-install (renamed from kodi/kodi-gbm.pre-install) | 0 | ||||
-rw-r--r-- | kodi-rpi/kodi.initd (renamed from kodi/kodi.initd) | 0 | ||||
-rw-r--r-- | kodi-rpi/set-default-stacksize.patch (renamed from kodi/set-default-stacksize.patch) | 0 |
7 files changed, 8 insertions, 145 deletions
diff --git a/kodi/60-kodi.rules b/kodi-rpi/60-kodi.rules index 7023ff7..7023ff7 100644 --- a/kodi/60-kodi.rules +++ b/kodi-rpi/60-kodi.rules diff --git a/kodi/APKBUILD b/kodi-rpi/APKBUILD index f799c79..3b3dd7a 100644 --- a/kodi/APKBUILD +++ b/kodi-rpi/APKBUILD @@ -1,6 +1,5 @@ -# Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=kodi +# Maintainer: Karel Kočí <cynerd@email.cz> +pkgname=kodi-rpi pkgver=18.5 _realname=Leia pkgrel=0 @@ -8,7 +7,7 @@ _libdvdcss_pkgver="1.4.2-Leia-Beta-5" _libdvdread_pkgver="6.0.0-Leia-Alpha-3" _libdvdnav_pkgver="6.0.0-Leia-Alpha-3" _crossguid_hash="8f399e8bd4" -pkgdesc="A software media player and entertainment hub for digital media" +pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi build)" url="https://kodi.tv" arch="armv7" license="GPL-2.0-only" @@ -24,7 +23,7 @@ depends="python2 depends_dev="libass-dev libcdio-dev curl-dev - ffmpeg-dev + ffmpeg-rpi-dev flatbuffers-dev fmt-dev freetype-dev @@ -43,16 +42,6 @@ depends_dev="libass-dev libjpeg-turbo-dev " -# Required for Wayland -depends_dev="$depends_dev - libxkbcommon-dev -" - -# Required for gbm -depends_dev="$depends_dev - libinput-dev -" - # Required for Raspberry Pi depends_dev="$depends_dev raspberrypi-dev @@ -82,16 +71,15 @@ makedepends="$depends_dev swig autoconf automake - binutils-gold libtool doxygen graphviz xz tar openjdk8-jre-base" -#subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-dbg $pkgname-bin $pkgname-wayland $pkgname-gbm $pkgname-rpi $pkgname-polkit::noarch" -subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-dbg $pkgname-rpi3::armv7 $pkgname-polkit::noarch" + replaces="xbmc" +provides="kodi kodi-bin" options="ldpath-recursive !check" # No testsuite source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz libdvdcss-$_libdvdcss_pkgver.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_pkgver.tar.gz @@ -107,93 +95,16 @@ source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz builddir="$srcdir/xbmc-$pkgver-$_realname" -# secfixes: -# 18.2-r0: -# - CVE-2018-8831 - -prepare() { - default_prepare - - mkdir "$builddir"/build-x11 - mkdir "$builddir"/build-wayland - mkdir "$builddir"/build-gbm - mkdir "$builddir"/build-rpi3 -} - build() { make -C tools/depends/target/crossguid PREFIX="$PWD"/usr - # X11 - #cd "$builddir"/build-x11 - #cmake "$builddir" \ - # -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - # -DCMAKE_INSTALL_PREFIX=/usr \ - # -DCMAKE_INSTALL_LIBDIR=lib \ - # -DENABLE_INTERNAL_CROSSGUID=ON \ - # -DENABLE_INTERNAL_FFMPEG=OFF \ - # -DENABLE_INTERNAL_RapidJSON=OFF \ - # -DENABLE_INTERNAL_FMT=OFF \ - # -DENABLE_INTERNAL_FSTRCMP=OFF \ - # -DENABLE_INTERNAL_FLATBUFFERS=OFF \ - # -Dlibdvdcss_URL="$srcdir"/libdvdcss-$_libdvdcss_pkgver.tar.gz \ - # -Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \ - # -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ - # -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz - #make - #make preinstall - - ## Wayland - #cd "$builddir"/build-wayland - #cmake "$builddir" \ - # -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - # -DCMAKE_INSTALL_PREFIX=/usr \ - # -DCMAKE_INSTALL_LIBDIR=lib \ - # -DENABLE_INTERNAL_CROSSGUID=ON \ - # -DENABLE_INTERNAL_FFMPEG=OFF \ - # -DENABLE_INTERNAL_RapidJSON=OFF \ - # -DENABLE_INTERNAL_FMT=OFF \ - # -DENABLE_INTERNAL_FSTRCMP=OFF \ - # -DENABLE_INTERNAL_FLATBUFFERS=OFF \ - # -Dlibdvdcss_URL="$srcdir"/libdvdcss-$_libdvdcss_pkgver.tar.gz \ - # -Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \ - # -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ - # -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \ - # -DCORE_PLATFORM_NAME=wayland \ - # -DWAYLAND_RENDER_SYSTEM=gl - #make - #make preinstall - - ## GBM - #cd "$builddir"/build-gbm - #cmake "$builddir" \ - # -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - # -DCMAKE_INSTALL_PREFIX=/usr \ - # -DCMAKE_INSTALL_LIBDIR=lib \ - # -DENABLE_INTERNAL_CROSSGUID=ON \ - # -DENABLE_INTERNAL_FFMPEG=OFF \ - # -DENABLE_INTERNAL_RapidJSON=OFF \ - # -DENABLE_INTERNAL_FMT=OFF \ - # -DENABLE_INTERNAL_FSTRCMP=OFF \ - # -DENABLE_INTERNAL_FLATBUFFERS=OFF \ - # -Dlibdvdcss_URL="$srcdir"/libdvdcss-$_libdvdcss_pkgver.tar.gz \ - # -Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \ - # -Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \ - # -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \ - # -DCORE_PLATFORM_NAME=gbm \ - # -DGBM_RENDER_SYSTEM=gles - #make - #make preinstall - - # Raspberry Pi (3) - # NOTE: CPU for Raspberry Pi 2 should be cortex-a7 - cd "$builddir"/build-rpi3 cmake "$builddir" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_PREFIX_PATH=/opt/vc \ -DENABLE_EVENTCLIENTS=ON \ - -DENABLE_INTERNAL_FFMPEG=ON \ + -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_FMT=OFF \ -DENABLE_INTERNAL_CROSSGUID=ON \ -DENABLE_INTERNAL_FSTRCMP=OFF \ @@ -205,65 +116,17 @@ build() { -DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \ -DWITH_CPU="cortex-a53" \ -DCORE_PLATFORM_NAME=rbpi + # NOTE: CPU for Raspberry Pi 2 should be cortex-a7 make make preinstall } package() { - depends="$pkgname-rpi" - - cd "$builddir"/build-rpi3 make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/kodi.initd "$pkgdir"/etc/init.d/kodi - - #rm \ - # "$pkgdir"/usr/lib/kodi/kodi-x11 \ - # "$pkgdir"/usr/lib/kodi/kodi-xrandr -} - -bin() { - pkgdesc="X11 Kodi binary" - - cd "$builddir"/build-x11 - install -Dm755 kodi-x11 "$subpkgdir"/usr/lib/kodi/kodi-x11 - install -Dm755 kodi-xrandr "$subpkgdir"/usr/lib/kodi/kodi-xrandr } -wayland() { - pkgdesc="Wayland Kodi binary" - provides="$pkgname-bin" - - cd "$builddir"/build-wayland - install -Dm755 kodi-wayland "$subpkgdir"/usr/lib/kodi/kodi-wayland -} - -gbm() { - pkgdesc="GBM Kodi binary" - provides="$pkgname-bin" - depends="$pkgname-openrc" - install="$subpkgname.pre-install" - - cd "$builddir"/build-gbm - install -Dm755 kodi-gbm "$subpkgdir"/usr/lib/kodi/kodi-gbm -} - -rpi3() { - pkgdesc="Raspberry Pi 3 Kodi binary" - provides="$pkgname-bin" - - cd "$builddir"/build-rpi3 - ls - #install -Dm755 kodi-x11 "$subpkgdir"/usr/lib/kodi/kodi-x11 - #install -Dm755 kodi-xrandr "$subpkgdir"/usr/lib/kodi/kodi-xrandr -} - -polkit() { - pkgdesc="Polkit rules for Kodi in combination with GBM" - install_if="$pkgname-gbm polkit" - - install -Dm644 "$srcdir"/60-kodi.rules "$subpkgdir"/etc/polkit-1/rules.d/60-kodi.rules -} sha512sums="6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029 18.5-Leia.tar.gz 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e libdvdcss-1.4.2-Leia-Beta-5.tar.gz diff --git a/kodi/cassert.patch b/kodi-rpi/cassert.patch index 5246c5c..5246c5c 100644 --- a/kodi/cassert.patch +++ b/kodi-rpi/cassert.patch diff --git a/kodi/fix-musl-incompability.patch b/kodi-rpi/fix-musl-incompability.patch index 77d9bb8..77d9bb8 100644 --- a/kodi/fix-musl-incompability.patch +++ b/kodi-rpi/fix-musl-incompability.patch diff --git a/kodi/kodi-gbm.pre-install b/kodi-rpi/kodi-gbm.pre-install index 03b2e52..03b2e52 100644 --- a/kodi/kodi-gbm.pre-install +++ b/kodi-rpi/kodi-gbm.pre-install diff --git a/kodi/kodi.initd b/kodi-rpi/kodi.initd index 4fedd31..4fedd31 100644 --- a/kodi/kodi.initd +++ b/kodi-rpi/kodi.initd diff --git a/kodi/set-default-stacksize.patch b/kodi-rpi/set-default-stacksize.patch index 8a79215..8a79215 100644 --- a/kodi/set-default-stacksize.patch +++ b/kodi-rpi/set-default-stacksize.patch |