jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7205 from HiassofT/le11-kodi-test

Browse Source 
kodi: update to Nexus 20.0 RC 1
This commit is contained in:
CvH 2022-12-10 15:33:22 +01:00 committed by GitHub
commit 9bf596cbc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi" PKG_NAME="kodi"
PKG_VERSION="20.0b1-Nexus" PKG_VERSION="20.0rc1-Nexus"
PKG_SHA256="dc714f4730ad213f8b1dffdea6b93dc88d8e3c7985f45889fcc0fd46951eee27" PKG_SHA256="0f354516c9b02b0c1dab5f085865fd0dc3db5d759292db34a77c8977f1f76c4b"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv" PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

22
packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch
View File

@ -1,16 +1,20 @@
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
index a4acf6453a..c56630001a 100644 index 4817d15799..c56630001a 100644
--- a/cmake/modules/buildtools/FindTexturePacker.cmake --- a/cmake/modules/buildtools/FindTexturePacker.cmake
+++ b/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake
@@ -50,11 +50,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) @@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
# and unset TEXTUREPACKER_EXECUTABLE variable
message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!")
endif() endif()
- else()
- # Ship TexturePacker only on Linux and FreeBSD
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE)
- endif()
endif() endif()
- # Ship TexturePacker only on Linux and FreeBSD
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # But skip shipping it if build architecture can be executed on host
- # and TEXTUREPACKER_EXECUTABLE is found
- if(NOT (HOST_CAN_EXECUTE_TARGET AND TEXTUREPACKER_EXECUTABLE))
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE)
- endif()
- endif()
-
# Use it during build if build architecture can be executed on host # Use it during build if build architecture can be executed on host
# and TEXTUREPACKER_EXECUTABLE is not found
if(HOST_CAN_EXECUTE_TARGET AND NOT TEXTUREPACKER_EXECUTABLE)