kodi: add experimenta support for 21.0b2

3 files changed, 30 insertions, 49 deletions

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index c8d0ab60c..9fb6deccb 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		20.3
+PKG_VERSION:=		21.0b2
 PKG_RELEASE:=		1
-PKG_HASH:=		1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d
+PKG_HASH:=		b9d6ecbb8769cdfe00cbbe5da5c330a7624eee50cffb87d87f6271033f1ee74b
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		python3 libsquish libressl libxz libfmt rapidjson
@@ -17,11 +17,11 @@ PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate libuuid
 PKG_DEPENDS+=		taglib libjasper libmp3lame libgpg-error giflib
 PKG_DEPENDS+=		glib libdcadec libffmpeg libxvidcore libiconv harfbuzz
 PKG_DEPENDS+=		flatbuffers fstrcmp spdlog mesa libinput libxkbcommon
-PKG_DEPENDS+=		xkeyboard-config
-PKG_BUILDDEP:=		python3 libass ffmpeg rtmpdump libiconv
+PKG_DEPENDS+=		xkeyboard-config tinyxml2 libdisplay-info libudfread
+PKG_BUILDDEP:=		python3 libass ffmpeg rtmpdump libiconv libudfread
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo fmt rapidjson
-PKG_BUILDDEP+=		curl flac bzip2 libtiff yajl cmake-host
-PKG_BUILDDEP+=		tinyxml sqlite pcre libcdio freetype libpng
+PKG_BUILDDEP+=		curl flac bzip2 libtiff yajl cmake-host libdisplay-info
+PKG_BUILDDEP+=		tinyxml tinyxml2 sqlite pcre libcdio freetype libpng
 PKG_BUILDDEP+=		libsamplerate taglib libjasper giflib xkeyboard-config
 PKG_BUILDDEP+=		glib libmodplug libgpg-error xvidcore libxshmfence
 PKG_BUILDDEP+=		swig-host liblzo-host libpng-host libjpeg-turbo-host
@@ -32,8 +32,8 @@ PKG_NEEDS:=		threads c++ data iconv
 PKG_URL:=		http://kodi.tv/
 PKG_SITES:=		https://github.com/xbmc/xbmc/archive/
 
-DISTFILES:=		$(PKG_VERSION)-Nexus.tar.gz
-WRKDIST=		${WRKDIR}/xbmc-$(PKG_VERSION)-Nexus
+DISTFILES:=		$(PKG_VERSION)-Omega.tar.gz
+WRKDIST=		${WRKDIR}/xbmc-$(PKG_VERSION)-Omega
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5
@@ -77,8 +77,8 @@ CMAKE_FLAGS+= 		-DENABLE_CCACHE=OFF \
 			-DENABLE_INTERNAL_RapidJSON=OFF \
 			-DWITH_FFMPEG=$(STAGING_TARGET_DIR)/usr \
 			-DPYTHON_EXECUTABLE=$(STAGING_HOST_DIR)/usr/bin/python3 \
-			-DPYTHON_INCLUDE_DIRS=$(STAGING_HOST_DIR)/usr/include/python3.11 \
-			-DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python3.11 \
+			-DPYTHON_INCLUDE_DIRS=$(STAGING_TARGET_DIR)/usr/include/python3.11 \
+			-DPYTHON_PATH=$(STAGING_TARGET_DIR)/usr/lib/python3.11 \
 			-DPYTHON_VER=3.11 \
 			-DKODI_DEPENDSBUILD=OFF \
 			-DENABLE_OPENSSL=ON \
@@ -98,8 +98,9 @@ CMAKE_FLAGS+= 		-DENABLE_CCACHE=OFF \
 			-DENABLE_UDEV=ON \
 			-DENABLE_PLIST=OFF \
 			-DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \
-			-DDEPENDS_PATH=$(STAGING_HOST_DIR) \
+			-DDEPENDS_PATH=$(STAGING_TARGET_DIR)/usr \
 			-DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \
+			-DWITH_JSONSCHEMABUILDER=$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder \
 			-DCMAKE_EXE_LINKER_FLAGS=-latomic \
 			-DLIBDVDCSS_URL=$(DL_DIR)/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \
 			-DLIBDVDNAV_URL=$(DL_DIR)/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \
@@ -161,24 +162,24 @@ CMAKE_FLAGS+=		-DENABLE_SSH=OFF
 endif
 
 XAKE_FLAGS+=		VERBOSE=1
-TARGET_LDFLAGS+=	-latomic
+TARGET_LDFLAGS+=	-latomic -liconv
 
 KODI_LIBDVDCSS_VERSION 	= 1.4.3-Next-Nexus-Alpha2-2
 KODI_LIBDVDNAV_VERSION 	= 6.1.1-Next-Nexus-Alpha2-2
 KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2
 
 pre-configure:
-	(cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .)
-	PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder
-	cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
-		$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder::JsonSchemaBuilder
-	(cd $(WRKSRC)/tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' cmake \
-		-DCORE_SOURCE_DIR=$(WRKSRC) \
-		-DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \
-		-DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .)
-	PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker
-	cp $(WRKSRC)/tools/depends/native/TexturePacker/TexturePacker \
-		$(STAGING_HOST_DIR)/usr/bin
+	#(cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src && PATH='$(HOST_PATH)' cmake .)
+	#PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src
+	#cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \
+	#	$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder
+	#(cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \
+	#	-DKODI_SOURCE_DIR=$(WRKSRC) \
+	#	-DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \
+	#	-DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .)
+	#PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src
+	#cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \
+	#	$(STAGING_HOST_DIR)/usr/bin
 	(cd $(DL_DIR) && wget -O libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/$(KODI_LIBDVDCSS_VERSION).tar.gz)
 	(cd $(DL_DIR) && wget -O libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz https://github.com/xbmc/libdvdnav/archive/refs/tags/$(KODI_LIBDVDNAV_VERSION).tar.gz)
 	(cd $(DL_DIR) && wget -O libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz https://github.com/xbmc/libdvdread/archive/refs/tags/$(KODI_LIBDVDREAD_VERSION).tar.gz)
diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt b/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt
deleted file mode 100644
index 2b62c1465..000000000
--- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-18.0a1-Leia.orig/tools/depends/native/TexturePacker/CMakeLists.txt	2018-03-04 10:21:28.000000000 +0100
-+++ xbmc-18.0a1-Leia/tools/depends/native/TexturePacker/CMakeLists.txt	2018-05-26 06:54:36.060611270 +0200
-@@ -33,7 +33,7 @@ set(SOURCES src/md5.cpp
-             src/decoder/GifHelper.cpp
-             src/decoder/JPGDecoder.cpp
-             src/decoder/PNGDecoder.cpp
--            ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp)
-+	    ${CORE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp)
- 
- set(CMAKE_POSITITION_INDEPENDENT_CODE 1)
- 
-@@ -42,7 +42,7 @@ target_include_directories(TexturePacker
-                            PRIVATE ${PNG_INCLUDE_DIRS}
-                                     ${JPEG_INCLUDE_DIR}
-                                     ${GIF_INCLUDE_DIR}
--                                    ${CMAKE_SOURCE_DIR}/xbmc
-+				    ${CORE_SOURCE_DIR}/xbmc
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/src
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder)
- target_link_libraries(TexturePacker
diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp
index afd13ea30..27c420df8 100644
--- a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp
+++ b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp
@@ -1,6 +1,6 @@
---- xbmc-19.3-Matrix.orig/xbmc/platform/linux/CPUInfoLinux.cpp	2021-10-24 12:09:58.000000000 +0200
-+++ xbmc-19.3-Matrix/xbmc/platform/linux/CPUInfoLinux.cpp	2022-02-26 13:55:19.357313177 +0100
-@@ -18,10 +18,7 @@
+--- xbmc-21.0b2-Omega.orig/xbmc/platform/linux/CPUInfoLinux.cpp	2023-12-09 22:24:46.000000000 +0100
++++ xbmc-21.0b2-Omega/xbmc/platform/linux/CPUInfoLinux.cpp	2024-01-30 15:52:43.704683194 +0100
+@@ -19,10 +19,7 @@
  #include <sstream>
  #include <vector>
  
@@ -12,9 +12,9 @@
  #include <cpuid.h>
  #endif
  
-@@ -252,16 +249,6 @@ CCPUInfoLinux::CCPUInfoLinux()
-   }
- #endif
+@@ -279,16 +276,6 @@ CCPUInfoLinux::CCPUInfoLinux()
+ 
+   m_cpuModel = m_cpuModel.substr(0, m_cpuModel.find(char(0))); // remove extra null terminations
  
 -#if defined(HAS_NEON) && defined(__arm__)
 -  if (getauxval(AT_HWCAP) & HWCAP_NEON)