From 7c32bacf411453758366994f301941ea59ae4165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 5 Feb 2020 16:08:12 +0100
Subject: kodi: it is no way to make it work on aarch64 so instead armv7

---
 kodi/APKBUILD | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'kodi')

diff --git a/kodi/APKBUILD b/kodi/APKBUILD
index 5851b6d..e50a44a 100644
--- a/kodi/APKBUILD
+++ b/kodi/APKBUILD
@@ -10,7 +10,7 @@ _libdvdnav_pkgver="6.0.0-Leia-Alpha-3"
 _crossguid_hash="8f399e8bd4"
 pkgdesc="A software media player and entertainment hub for digital media"
 url="https://kodi.tv"
-arch="aarch64"
+arch="armv7"
 license="GPL-2.0-only"
 depends="python2
 	hicolor-icon-theme
@@ -94,7 +94,7 @@ makedepends="$depends_dev
 	openjdk8-jre-base
 	wayland-protocols"
 #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-rpi $pkgname-polkit::noarch"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-dbg $pkgname-rpi3::armv7 $pkgname-polkit::noarch"
 replaces="xbmc"
 options="ldpath-recursive !check" # No testsuite
 source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz
@@ -121,7 +121,7 @@ prepare() {
 	mkdir "$builddir"/build-x11
 	mkdir "$builddir"/build-wayland
 	mkdir "$builddir"/build-gbm
-	mkdir "$builddir"/build-rpi
+	mkdir "$builddir"/build-rpi3
 }
 
 build() {
@@ -188,14 +188,14 @@ build() {
 	#make
 	#make preinstall
 
-
-		#-DCMAKE_PREFIX_PATH=/opt/vc \
-	# Raspberry Pi
-	cd "$builddir"/build-rpi
+	# 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_FMT=OFF \
@@ -207,6 +207,7 @@ build() {
 		-Dlibdvdread_URL="$srcdir"/libdvdread-$_libdvdread_pkgver.tar.gz \
 		-Dlibdvdnav_URL="$srcdir"/libdvdnav-$_libdvdnav_pkgver.tar.gz \
 		-DCROSSGUID_URL="$srcdir"/crossguid-$_crossguid_hash.tar.gz \
+		-DWITH_CPU="cortex-a53" \
 		-DCORE_PLATFORM_NAME=rbpi
 	make
 	make preinstall
@@ -215,14 +216,14 @@ build() {
 package() {
 	depends="$pkgname-rpi"
 
-	cd "$builddir"/build-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
+	#rm \
+	#	"$pkgdir"/usr/lib/kodi/kodi-x11 \
+	#	"$pkgdir"/usr/lib/kodi/kodi-xrandr
 }
 
 bin() {
@@ -251,14 +252,14 @@ gbm() {
 	install -Dm755 kodi-gbm "$subpkgdir"/usr/lib/kodi/kodi-gbm
 }
 
-rpi() {
-	pkgdesc="Kodi binary for Raspberry Pi"
+rpi3() {
+	pkgdesc="Raspberry Pi 3 Kodi binary"
 	provides="$pkgname-bin"
 
-	cd "$builddir"/build-rpi
+	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
+	#install -Dm755 kodi-x11 "$subpkgdir"/usr/lib/kodi/kodi-x11
+	#install -Dm755 kodi-xrandr "$subpkgdir"/usr/lib/kodi/kodi-xrandr
 }
 
 polkit() {
-- 
cgit v1.2.3