From 98920c6c19588dd5a1799c0230d4aa29eaff8690 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 30 Jan 2019 22:57:53 +0100
Subject: [PATCH] kodi-rpi: update to 18.0, adopt package

[skip ci]
---
 srcpkgs/kodi-rpi/files/swig.nojava-18.0 |  1 +
 srcpkgs/kodi-rpi/template               | 51 +++++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)
 create mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.0

diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.0 b/srcpkgs/kodi-rpi/files/swig.nojava-18.0
new file mode 120000
index 00000000000..9e96cd5051e
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/swig.nojava-18.0
@@ -0,0 +1 @@
+../../kodi/files/swig.nojava-18.0
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 76d216da745..5ee14b8d3c4 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,18 +1,17 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=17.6
-revision=5
+version=18.0
+revision=1
 build_style=cmake
 patch_args="-Np1"
-_codename="Krypton"
+_codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 short_desc="A software media player and entertainment hub for digital media (RPi)"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 homepage="http://www.kodi.tv/"
-license="GPL-2"
+license="GPL-2.0-or-later"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d
-build_wrksrc=project/cmake
+checksum=ac5d64d59c6f4811b41a869538506e56c342b530fac97ad9dc9715f3d480e633
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 nopie=yes
@@ -21,16 +20,20 @@ only_for_archs="armv6l armv6l-musl armv7l armv7l-musl"
 hostmakedepends="
  automake libtool pkg-config gperf cmake zip unzip nasm yasm
  gettext-devel libltdl-devel python-devel libmysqlclient-devel
- SDL2_image-devel lzo-devel"
+ SDL2_image-devel lzo-devel flatbuffers"
 makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
- avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel
- libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel
- jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel
- libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel
- tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel libuuid-devel giflib-devel
- libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel crossguid cmake"
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel"
 
 # gold broken with musl
 case "$XBPS_MACHINE" in
@@ -38,7 +41,7 @@ case "$XBPS_MACHINE" in
 esac
 
 configure_args="
- -DCORE_SYSTEM_NAME=rbpi
+ -DCORE_PLATFORM_NAME=rbpi
  -DENABLE_OPENGL=OFF
  -DENABLE_OPENGLES=ON
  -DENABLE_X11=OFF
@@ -49,8 +52,8 @@ configure_args="
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
 "
 case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s"
-		  export LDFLAGS+=" -latomic";;
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
 	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
 	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
 esac
@@ -68,7 +71,7 @@ xbmc_homedir="/var/lib/xbmc"
 xbmc_groups="audio,input,video"
 
 pre_configure() {
-	find ../.. -type f | \
+	find -type f | \
 		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
 		xargs sed -i  -e "s;-isystem;-I;g"
 
@@ -80,11 +83,11 @@ pre_configure() {
 	cp -r $FILESDIR/swig.nojava-$version/* -t build/build/swig
 	cp $FILESDIR/CMakeCache.txt.nojava build/CMakeCache.txt
 
-	echo "set(FOUND_SWIG Yes)" > modules/FindSWIG.cmake
+	echo "set(FOUND_SWIG Yes)" > cmake/modules/FindSWIG.cmake
 
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
-			cat > modules/Find$i.cmake <<EOF
+			cat > cmake/modules/Find$i.cmake <<EOF
 				add_executable($i::$i IMPORTED GLOBAL)
 				set_target_properties($i::$i PROPERTIES
 				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
@@ -98,7 +101,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
 			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C ../../tools/depends/native/$i
+				make -C tools/depends/native/$i
 		done
 	fi
 }
@@ -107,7 +110,7 @@ post_build() {
 	# Rebuild for target
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
-			make -C ../../tools/depends/native/$i clean all \
+			make -C tools/depends/native/$i clean all \
 				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
 				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"