* [Buildroot] [PATCH v8 01/20] package/kodi-platform: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 02/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (19 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-platform/kodi-platform.hash | 2 +-
package/kodi-platform/kodi-platform.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/kodi-platform/kodi-platform.hash b/package/kodi-platform/kodi-platform.hash
index d99c6225cb..0b2ab6b147 100644
--- a/package/kodi-platform/kodi-platform.hash
+++ b/package/kodi-platform/kodi-platform.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 c53f37888d752e233f5adabc6ecfb8a1ea02728e010007200bbf671f6b9462de kodi-platform-36fb49371dbce49bf470a5bb1fc51b74b4a3612d.tar.gz
+sha256 d5b9b61c1c22b471d948b2c8de50f77ccadbd908869b13b5d98c42f447268d56 kodi-platform-915da086fa7b4ea72796052a04ed6de95501b95c.tar.gz
diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk
index 53f8ce956b..8bf517fa5d 100644
--- a/package/kodi-platform/kodi-platform.mk
+++ b/package/kodi-platform/kodi-platform.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_PLATFORM_VERSION = 36fb49371dbce49bf470a5bb1fc51b74b4a3612d
+KODI_PLATFORM_VERSION = 915da086fa7b4ea72796052a04ed6de95501b95c
KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
KODI_PLATFORM_LICENSE = GPL-2.0+
KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 02/20] package/kodi: bump to version 18.5-Leia
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 01/20] package/kodi-platform: bump version Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 03/20] package/kodi-audiodecoder-*: mass version bump Bernd Kuhls
` (18 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Reworked raspberry pi handling, it is not treated as separate platform
anymore. Added dependencies to autoreconf cpluff.
Rebased patch
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
Removed unneeded patch
- 0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
Removed backported patches
- 0003-cmake-iconv-is-a-required-dependency.patch
- 0004-Fix-ffmpeg-build-for-mips.patch
- kodi-texturepacker/0002-fix_reallocarray.patch
Added backported patches
- 0003-Add-missing-cassert-includes.patch
- 0004-Backport-Add-missing-cstddef-includes.patch
Updated dependencies
- bzip2 is not used anymore
- flatbuffers (upstream PR 14209)
- fmt (upstream PR 11039)
- fstrcmp (upstream PR 14221)
- yajl was replaced by RapidJSON (upstream PR 8008)
- internal rar support was removed (upstream PR 11912)
CMake option ENABLE_NONFREE was also removed
- internal sftp support was removed (upstream PR 12005)
- host-zip was removed (upstream PR 12643)
- CMake option ENABLE_OPENSSL was removed (upstream PR 13650)
- lirc support is now provided by lirc-tools (upstream PR 13761)
- IMX support was removed (upstream PR 12990)
- ENABLE_X11 was renamed to -DCORE_PLATFORM_NAME=x11 (upstream PR 12134)
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../kodi-jsonschemabuilder.mk | 4 +-
...-fix-texture-packer-cmake-source-dir.patch | 27 +++
.../0002-fix_reallocarray.patch | 170 ------------------
.../kodi-texturepacker/kodi-texturepacker.mk | 7 +-
...e-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 8 +-
...endency-on-gmp-and-libintl-from-Find.patch | 39 ----
...h => 0002-Fix-crosscompiling-issues.patch} | 29 ++-
.../0003-Add-missing-cassert-includes.patch | 50 ++++++
...cmake-iconv-is-a-required-dependency.patch | 92 ----------
...ackport-Add-missing-cstddef-includes.patch | 44 +++++
.../kodi/0004-Fix-ffmpeg-build-for-mips.patch | 43 -----
package/kodi/Config.in | 24 +--
package/kodi/kodi.hash | 13 +-
package/kodi/kodi.mk | 82 ++++-----
14 files changed, 184 insertions(+), 448 deletions(-)
create mode 100644 package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
delete mode 100644 package/kodi-texturepacker/0002-fix_reallocarray.patch
delete mode 100644 package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
rename package/kodi/{0005-Fix-crosscompiling-issues.patch => 0002-Fix-crosscompiling-issues.patch} (86%)
create mode 100644 package/kodi/0003-Add-missing-cassert-includes.patch
delete mode 100644 package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
create mode 100644 package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
delete mode 100644 package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
index 713d415fed..31003fe856 100644
--- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -6,12 +6,12 @@
# Not possible to directly refer to kodi variables, because of
# first/second expansion trickery...
-KODI_JSONSCHEMABUILDER_VERSION = 17.6-Krypton
+KODI_JSONSCHEMABUILDER_VERSION = 18.5-Leia
KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi
KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0
-KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.GPL
+KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.md
HOST_KODI_JSONSCHEMABUILDER_SUBDIR = tools/depends/native/JsonSchemaBuilder
HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \
diff --git a/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch b/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
new file mode 100644
index 0000000000..ddd82439fe
--- /dev/null
+++ b/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
@@ -0,0 +1,27 @@
+Fix stand-alone build
+
+CMake Error at CMakeLists.txt:40 (add_executable):
+ Cannot find source file:
+
+ /home/bernd/buildroot/output/build/host-kodi-texturepacker-18.4-Leia/tools/depends/native/TexturePacker/xbmc/guilib/XBTF.cpp
+
+ Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++ .hm
+ .hpp .hxx .in .txx
+
+CMake Error at CMakeLists.txt:40 (add_executable):
+ No SOURCES given to target: TexturePacker
+
+Downloaded from
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt
+--- a/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:28.593185862 +0000
++++ b/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:39.469253011 +0000
+@@ -1,3 +1,5 @@
++set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../../..)
++
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+ if(APPLE)
diff --git a/package/kodi-texturepacker/0002-fix_reallocarray.patch b/package/kodi-texturepacker/0002-fix_reallocarray.patch
deleted file mode 100644
index e32d09ef53..0000000000
--- a/package/kodi-texturepacker/0002-fix_reallocarray.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From ebc5dfcad836936a14e6f18fd7faa377b3c804e7 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Mon, 6 Nov 2017 11:47:28 +0000
-Subject: [PATCH] TexturePacker: use C++ headers
-
-Signed-off-by: Dagg Stompler <daggs@gmx.com>
----
- tools/depends/native/TexturePacker/src/SimpleFS.h | 4 ++--
- tools/depends/native/TexturePacker/src/TexturePacker.cpp | 2 +-
- tools/depends/native/TexturePacker/src/XBTFWriter.cpp | 6 +++---
- tools/depends/native/TexturePacker/src/XBTFWriter.h | 2 +-
- tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +-
- tools/depends/native/TexturePacker/src/md5.h | 4 ++--
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/tools/depends/native/TexturePacker/src/SimpleFS.h b/tools/depends/native/TexturePacker/src/SimpleFS.h
-index c48814c0ad..c2288cf8de 100644
---- a/tools/depends/native/TexturePacker/src/SimpleFS.h
-+++ b/tools/depends/native/TexturePacker/src/SimpleFS.h
-@@ -20,9 +20,9 @@
- *
- */
-
--#include <stdio.h>
-+#include <cstdio>
- #include <string>
--#include <stdint.h>
-+#include <cstdint>
-
- class CFile
- {
-diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
-index ba618be574..045c5ce38d 100644
---- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp
-+++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
-@@ -22,7 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #define __STDC_FORMAT_MACROS
--#include <inttypes.h>
-+#include <cinttypes>
- #define platform_stricmp _stricmp
- #else
- #define platform_stricmp stricmp
-diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
-index 9e2493369b..2e80ba674c 100644
---- a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
-+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
-@@ -19,14 +19,14 @@
- */
-
- #define __STDC_FORMAT_MACROS
--#include <inttypes.h>
-+#include <cinttypes>
- #if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN)
--#include <stdlib.h>
-+#include <cstdlib>
- #elif !defined(TARGET_DARWIN)
- #include <malloc.h>
- #endif
- #include <memory.h>
--#include <string.h>
-+#include <cstring>
-
- #include "XBTFWriter.h"
- #include "guilib/XBTFReader.h"
-diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h
-index 7509303a51..d5cf1a2965 100644
---- a/tools/depends/native/TexturePacker/src/XBTFWriter.h
-+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h
-@@ -23,7 +23,7 @@
-
- #include <vector>
- #include <string>
--#include <stdio.h>
-+#include <cstdio>
-
- #include "guilib/XBTF.h"
-
-diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-index 56c22f7c3a..3ddb20fe88 100644
---- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-@@ -20,7 +20,7 @@
-
- #include "GifHelper.h"
- #include <algorithm>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <cstring>
-
- #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8))
-diff --git a/tools/depends/native/TexturePacker/src/md5.h b/tools/depends/native/TexturePacker/src/md5.h
-index 456e5be17f..4bb48e0810 100644
---- a/tools/depends/native/TexturePacker/src/md5.h
-+++ b/tools/depends/native/TexturePacker/src/md5.h
-@@ -23,8 +23,8 @@
- #ifndef MD5_H
- #define MD5_H
-
--#include <string.h> /* for memcpy() */
--#include <stdint.h>
-+#include <cstring> /* for memcpy() */
-+#include <cstdint>
-
- struct MD5Context
- {
---
-2.16.0
-
-From ff3e6dad5fdb7b9a2985b2547c8020c709af0340 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Mon, 6 Nov 2017 18:05:17 +0000
-Subject: [PATCH] TexturePacker: drop unused variable
-
----
- tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
-index 53f5e9beb7..b0f18bed68 100644
---- a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
-+++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
-@@ -72,7 +72,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames)
- struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
-
-- char *linha;
- int ImageSize;
-
- cinfo.err = jpeg_std_error(&jerr);
-@@ -89,7 +88,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames)
- DecodedFrame frame;
-
- frame.rgbaImage.pixels = (char *)new char[ImageSize];
-- linha = (char *)frame.rgbaImage.pixels;
-
- unsigned char *scanlinebuff = new unsigned char[3 * cinfo.image_width];
- unsigned char *dst = (unsigned char *)frame.rgbaImage.pixels;
---
-2.16.0
-
-From ee441543be07de1222bcff2587bfcdb5c1231989 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Mon, 6 Nov 2017 21:02:06 +0000
-Subject: [PATCH] TexturePacker: include GifHelper after system headers
-
----
- tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-index 3ddb20fe88..9ced4ec5bc 100644
---- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
-@@ -18,10 +18,10 @@
- *
- */
-
--#include "GifHelper.h"
- #include <algorithm>
- #include <cstdlib>
- #include <cstring>
-+#include "GifHelper.h"
-
- #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8))
- #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames.
---
-2.16.0
-
diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk
index bb35252b94..e33e680e16 100644
--- a/package/kodi-texturepacker/kodi-texturepacker.mk
+++ b/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -6,12 +6,12 @@
# Not possible to directly refer to kodi variables, because of
# first/second expansion trickery...
-KODI_TEXTUREPACKER_VERSION = 17.6-Krypton
+KODI_TEXTUREPACKER_VERSION = 18.5-Leia
KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
KODI_TEXTUREPACKER_DL_SUBDIR = kodi
KODI_TEXTUREPACKER_LICENSE = GPL-2.0
-KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.GPL
+KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.md
HOST_KODI_TEXTUREPACKER_SUBDIR = tools/depends/native/TexturePacker
HOST_KODI_TEXTUREPACKER_DEPENDENCIES = \
host-giflib \
@@ -29,8 +29,7 @@ HOST_KODI_TEXTUREPACKER_CXXFLAGS = \
HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
-DCMAKE_CXX_FLAGS="$(HOST_KODI_TEXTUREPACKER_CXXFLAGS)" \
- -DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules \
- -DCORE_SOURCE_DIR=$(@D) \
+ -DCMAKE_MODULE_PATH=$(@D)/cmake/modules \
-Wno-dev
define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS
diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
index 0b88ce9d27..5abb77e777 100644
--- a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
+++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
@@ -17,9 +17,9 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
index 76626ec..ffb8e1d 100644
---- a/project/cmake/KodiConfig.cmake.in
-+++ b/project/cmake/KodiConfig.cmake.in
-@@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC at _PREFIX)
+--- a/cmake/KodiConfig.cmake.in
++++ b/cmake/KodiConfig.cmake.in
+@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC at _PREFIX)
set(@APP_NAME_UC at _PREFIX @APP_PREFIX@)
endif()
if(NOT @APP_NAME_UC at _INCLUDE_DIR)
@@ -28,7 +28,7 @@ index 76626ec..ffb8e1d 100644
endif()
if(NOT @APP_NAME_UC at _LIB_DIR)
set(@APP_NAME_UC at _LIB_DIR @APP_LIB_DIR@)
-@@ -18,7 +18,7 @@ endif()
+@@ -20,7 +20,7 @@ endif()
if(NOT WIN32)
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
endif()
diff --git a/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch b/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
deleted file mode 100644
index 80bf954d5e..0000000000
--- a/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-CMake: Remove dependency on gmp and libintl from FindPython.cmake
-
-Downloaded from Openelec:
-https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-998.02-cmake-python.patch
-
-The dependency for libintl and gmp was introduced by this commit
-https://github.com/xbmc/xbmc/commit/8558d672e98b62f3ea0126ba491376add8ed71cb
-without further explanation and, apparently, without necessity.
-
-A question asking whether this is really needed was sent upstream:
-https://github.com/xbmc/xbmc/pull/10973#pullrequestreview-34179550
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -Naur kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake
---- kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake 2017-03-20 17:17:49.000000000 +0100
-+++ kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake 2017-03-30 11:10:01.065718667 +0200
-@@ -16,14 +16,12 @@
- if(KODI_DEPENDSBUILD)
- find_library(FFI_LIBRARY ffi REQUIRED)
- find_library(EXPAT_LIBRARY expat REQUIRED)
-- find_library(INTL_LIBRARY intl REQUIRED)
-- find_library(GMP_LIBRARY gmp REQUIRED)
-
- if(NOT CORE_SYSTEM_NAME STREQUAL android)
- set(PYTHON_DEP_LIBRARIES pthread dl util)
- endif()
-
-- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
-+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${PYTHON_DEP_LIBRARIES})
- else()
- find_package(PythonLibs 2.7 REQUIRED)
- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
-@@ -36,4 +34,4 @@
- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
- endif()
-
--mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
-+mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY)
diff --git a/package/kodi/0005-Fix-crosscompiling-issues.patch b/package/kodi/0002-Fix-crosscompiling-issues.patch
similarity index 86%
rename from package/kodi/0005-Fix-crosscompiling-issues.patch
rename to package/kodi/0002-Fix-crosscompiling-issues.patch
index 63f71cabe1..12bb66dde0 100644
--- a/package/kodi/0005-Fix-crosscompiling-issues.patch
+++ b/package/kodi/0002-Fix-crosscompiling-issues.patch
@@ -24,11 +24,11 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake
index 28cc80710e..1ac8793149 100644
---- a/project/cmake/modules/FindFFMPEG.cmake
-+++ b/project/cmake/modules/FindFFMPEG.cmake
-@@ -233,16 +233,14 @@ if(NOT FFMPEG_FOUND)
- message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
- endif()
+--- a/cmake/modules/FindFFMPEG.cmake
++++ b/cmake/modules/FindFFMPEG.cmake
+@@ -234,14 +234,12 @@
+ -DENABLE_VAAPI=${ENABLE_VAAPI}
+ -DENABLE_VDPAU=${ENABLE_VDPAU})
- if(KODI_DEPENDSBUILD)
set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH}
@@ -37,16 +37,14 @@ index 28cc80710e..1ac8793149 100644
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DOS=${OS}
+ -DOS=linux
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_AR=${CMAKE_AR})
- endif()
+ set(LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+ list(APPEND LINKER_FLAGS ${SYSTEM_LDFLAGS})
- externalproject_add(ffmpeg
- URL ${FFMPEG_URL}
-@@ -270,12 +268,12 @@ if(NOT FFMPEG_FOUND)
- "#!/bin/bash
- if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
+@@ -280,12 +278,12 @@
+ "#!${BASH_COMMAND}
+ if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}${APP_BINARY_SUFFIX}* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
then
- avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec`
- avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat`
@@ -67,15 +65,12 @@ diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/f
index fda6b0cac4..af3afa6b60 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
-@@ -9,7 +9,7 @@ set(ffmpeg_conf "")
+@@ -13,7 +13,7 @@
if(CROSSCOMPILING)
set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig")
list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static)
- list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS})
+ list(APPEND ffmpeg_conf --enable-cross-compile --arch=${CPU} --target-os=${OS})
- list(APPEND ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER} --ar=${CMAKE_AR})
+ list(APPEND ffmpeg_conf --ar=${CMAKE_AR} --strip=${CMAKE_STRIP})
message(STATUS "CROSS: ${ffmpeg_conf}")
endif()
---
-2.18.0
-
diff --git a/package/kodi/0003-Add-missing-cassert-includes.patch b/package/kodi/0003-Add-missing-cassert-includes.patch
new file mode 100644
index 0000000000..ec52f32d0d
--- /dev/null
+++ b/package/kodi/0003-Add-missing-cassert-includes.patch
@@ -0,0 +1,50 @@
+From 711845d533f9f6b5fe68b7cbcc8f369ce7efe445 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 5 Dec 2019 14:49:50 -0500
+Subject: [PATCH] Add missing cassert includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without these includes, ?assert? was not declared in this scope errors
+occur.
+
+Backport of https://github.com/xbmc/xbmc/pull/17000
+
+Patch sent upstream: https://github.com/xbmc/xbmc/pull/17213
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 2 ++
+ xbmc/windowing/GraphicContext.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+index 222d1fa2c8..070ea0ae46 100644
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+@@ -33,6 +33,8 @@
+ #include "utils/Variant.h"
+ #include "ServiceBroker.h"
+
++#include <cassert>
++
+ #define SETTING_PROFILE_NAME "profile.name"
+ #define SETTING_PROFILE_IMAGE "profile.image"
+ #define SETTING_PROFILE_DIRECTORY "profile.directory"
+diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
+index 1ced49671b..0ddbe64c9f 100644
+--- a/xbmc/windowing/GraphicContext.cpp
++++ b/xbmc/windowing/GraphicContext.cpp
+@@ -24,6 +24,8 @@
+ #include "guilib/GUIWindowManager.h"
+ #include "guilib/TextureManager.h"
+
++#include <cassert>
++
+ using namespace KODI::MESSAGING;
+
+ CGraphicContext::CGraphicContext(void) = default;
+--
+2.20.1
+
diff --git a/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch b/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
deleted file mode 100644
index b95771c525..0000000000
--- a/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 70ab56d74aff8b2e3ac49fed6bdf3751c9b1457e Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 12 Feb 2017 14:24:18 +0100
-Subject: [PATCH] [cmake] iconv is a required dependency
-
-This patch adds support for libiconv currently only provided by the
-autoconf-based build system:
-https://github.com/xbmc/xbmc/blob/Krypton/configure.ac#L1172
-
-This commit fixes an error during linking with an uClibc-based
-buildroot toolchain:
-
-[100%] Linking CXX executable kodi.bin
-/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/lib/gcc/i586-buildroot-linux-uclibc/6.3.0/../../../../i586-buildroot-linux-uclibc/bin/ld: build/utils/utils.a(CharsetConverter.cpp.o): undefined reference to symbol 'libiconv_open'
-/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/lib32/libiconv.so.2: error adding symbols: DSO missing from command line
-
-Backported to Krypton from master branch commit:
-https://github.com/xbmc/xbmc/commit/9a64537543e8dc8609ca8a98181ba17f30c53493
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- project/cmake/CMakeLists.txt | 2 +-
- project/cmake/modules/FindIconv.cmake | 44 +++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 1 deletion(-)
- create mode 100644 project/cmake/modules/FindIconv.cmake
-
-diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
-index aeb1ff47c2..07c1d1a8d3 100644
---- a/project/cmake/CMakeLists.txt
-+++ b/project/cmake/CMakeLists.txt
-@@ -103,7 +103,7 @@ list(APPEND DEPLIBS ${CMAKE_THREAD_LIBS_INIT})
-
- # Required dependencies
- set(required_deps Sqlite3 FreeType PCRE Cpluff LibDvd
-- TinyXML Python Yajl Cdio
-+ TinyXML Python Yajl Cdio Iconv
- Lzo2 Fribidi TagLib FFMPEG CrossGUID)
- if(NOT WIN32)
- list(APPEND required_deps ZLIB)
-diff --git a/project/cmake/modules/FindIconv.cmake b/project/cmake/modules/FindIconv.cmake
-new file mode 100644
-index 0000000000..8ee01fb6b8
---- /dev/null
-+++ b/project/cmake/modules/FindIconv.cmake
-@@ -0,0 +1,44 @@
-+#.rst:
-+# FindICONV
-+# --------
-+# Finds the ICONV library
-+#
-+# This will will define the following variables::
-+#
-+# ICONV_FOUND - system has ICONV
-+# ICONV_INCLUDE_DIRS - the ICONV include directory
-+# ICONV_LIBRARIES - the ICONV libraries
-+#
-+# and the following imported targets::
-+#
-+# ICONV::ICONV - The ICONV library
-+
-+find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
-+
-+find_library(ICONV_LIBRARY NAMES iconv libiconv c)
-+
-+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
-+check_function_exists(iconv HAVE_ICONV_FUNCTION)
-+if(NOT HAVE_ICONV_FUNCTION)
-+ check_function_exists(libiconv HAVE_LIBICONV_FUNCTION2)
-+ set(HAVE_ICONV_FUNCTION ${HAVE_LIBICONV_FUNCTION2})
-+ unset(HAVE_LIBICONV_FUNCTION2)
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Iconv
-+ REQUIRED_VARS ICONV_LIBRARY ICONV_INCLUDE_DIR HAVE_ICONV_FUNCTION)
-+
-+if(ICONV_FOUND)
-+ set(ICONV_LIBRARIES ${ICONV_LIBRARY})
-+ set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
-+
-+ if(NOT TARGET ICONV::ICONV)
-+ add_library(ICONV::ICONV UNKNOWN IMPORTED)
-+ set_target_properties(ICONV::ICONV PROPERTIES
-+ IMPORTED_LOCATION "${ICONV_LIBRARY}"
-+ INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIR}")
-+ endif()
-+endif()
-+
-+mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARY HAVE_ICONV_FUNCTION)
---
-2.11.0
-
diff --git a/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch b/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
new file mode 100644
index 0000000000..607c80610a
--- /dev/null
+++ b/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
@@ -0,0 +1,44 @@
+From d1b2a27d2d2795fe82c103b49faef74b55df22c7 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 18 Jan 2020 14:49:16 +0100
+Subject: [PATCH] [Backport] Add missing cstddef includes
+
+Backport of https://github.com/xbmc/xbmc/pull/17214
+
+Patch sent upstream: https://github.com/xbmc/xbmc/pull/17215
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ .../rendering/VideoRenderers/RPRendererGuiTexture.cpp | 2 ++
+ xbmc/pictures/SlideShowPicture.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp
+index 5485358cad..ad2bf1b984 100644
+--- a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp
++++ b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp
+@@ -17,6 +17,8 @@
+ using namespace DirectX;
+ #endif
+
++#include <cstddef>
++
+ using namespace KODI;
+ using namespace RETRO;
+
+diff --git a/xbmc/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp
+index 05848191d2..08fc754471 100644
+--- a/xbmc/pictures/SlideShowPicture.cpp
++++ b/xbmc/pictures/SlideShowPicture.cpp
+@@ -32,6 +32,8 @@ using namespace DirectX;
+ using namespace Microsoft::WRL;
+ #endif
+
++#include <cstddef>
++
+ #define IMMEDIATE_TRANSITION_TIME 20
+
+ #define PICTURE_MOVE_AMOUNT 0.02f
+--
+2.20.1
+
diff --git a/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch b/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
deleted file mode 100644
index 709a2d39da..0000000000
--- a/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e3882a7d6c2e47731c0435d0faa3594041d58a2c Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 12 Aug 2018 15:12:29 +0200
-Subject: [PATCH] Fix ffmpeg build for mips
-
-Backported from upstream master branch:
-https://github.com/xbmc/xbmc/commit/71e09dd1ac66059e31e6240352da7091d820ef83
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- tools/depends/target/ffmpeg/CMakeLists.txt | 2 +-
- tools/depends/target/ffmpeg/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
-index 0a9e9d38ea..fda6b0cac4 100644
---- a/tools/depends/target/ffmpeg/CMakeLists.txt
-+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
-@@ -63,7 +63,7 @@ endif()
- if(CPU MATCHES arm OR CORE_SYSTEM_NAME STREQUAL rbpi)
- list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2)
- elseif(CPU MATCHES mips)
-- list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2)
-+ list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2)
- endif()
-
- find_package(GnuTls)
-diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
-index ea1113d293..098f6c0c14 100644
---- a/tools/depends/target/ffmpeg/Makefile
-+++ b/tools/depends/target/ffmpeg/Makefile
-@@ -58,7 +58,7 @@ ifeq ($(findstring arm, $(CPU)), arm)
- ffmpg_config += --enable-pic --disable-armv5te --disable-armv6t2
- endif
- ifeq ($(findstring mips, $(CPU)), mips)
-- ffmpg_config += --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2
-+ ffmpg_config += --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2
- endif
- ifeq ($(Configuration), Release)
- ffmpg_config += --disable-debug
---
-2.18.0
-
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index db6931ed8a..3fa7d3e6f9 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -50,10 +50,12 @@ menuconfig BR2_PACKAGE_KODI
depends on BR2_PACKAGE_PYTHON
depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
select BR2_NEEDS_HOST_JAVA
- select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_FLATBUFFERS
+ select BR2_PACKAGE_FMT
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_FSTRCMP
select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBASS
select BR2_PACKAGE_LIBCDIO
@@ -69,17 +71,16 @@ menuconfig BR2_PACKAGE_KODI
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_PCRE_UCP
select BR2_PACKAGE_PYTHON_BSDDB
- select BR2_PACKAGE_PYTHON_BZIP2
select BR2_PACKAGE_PYTHON_CURSES
select BR2_PACKAGE_PYTHON_PYEXPAT
select BR2_PACKAGE_PYTHON_SQLITE
select BR2_PACKAGE_PYTHON_SSL
select BR2_PACKAGE_PYTHON_UNICODEDATA
select BR2_PACKAGE_PYTHON_ZLIB
+ select BR2_PACKAGE_RAPIDJSON
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_TAGLIB
select BR2_PACKAGE_TINYXML
- select BR2_PACKAGE_YAJL
select BR2_PACKAGE_ZLIB
select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
help
@@ -152,11 +153,6 @@ config BR2_PACKAGE_KODI_LCMS2
help
Enable color management support.
-config BR2_PACKAGE_KODI_LIRC
- bool "lirc"
- help
- Enable lirc support
-
config BR2_PACKAGE_KODI_LIBMICROHTTPD
bool "web server"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd
@@ -181,12 +177,6 @@ config BR2_PACKAGE_KODI_MYSQL
help
Enable MySQL support
-config BR2_PACKAGE_KODI_NONFREE
- bool "nonfree components"
- help
- Enable components with non-free licenses. This option
- currently only controls support for RAR archives.
-
choice
prompt "platform"
default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
@@ -229,12 +219,6 @@ config BR2_PACKAGE_KODI_LIBSMBCLIENT
help
Enable Samba support
-config BR2_PACKAGE_KODI_LIBSSH
- bool "ssh"
- select BR2_PACKAGE_LIBSSH
- help
- Enable sftp virtual filesystem using libssh.
-
config BR2_PACKAGE_KODI_LIBTHEORA
bool "theora"
select BR2_PACKAGE_LIBTHEORA
diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash
index 2b2e5e64f9..cc248e537e 100644
--- a/package/kodi/kodi.hash
+++ b/package/kodi/kodi.hash
@@ -1,12 +1,11 @@
# Locally computed
-sha256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d kodi-17.6-Krypton.tar.gz
+sha256 108979df8b41ab4168f5cdc0233f46e38767eda5921f4ccae16584e98d0d6b29 kodi-18.5-Leia.tar.gz
+sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md
# Locally computed - ffmpeg
-sha256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 3.1.11-Krypton-17.5.tar.gz
+sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 4.0.4-Leia-18.4.tar.gz
# Locally computed - libdvdcss
-sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz
+sha256 d816ed421ca5b70319298bda7830cff475a77d446539c54cf6d576dd6c651cee e646b950095589e74a2c08cf0c34b758c669aa75.tar.gz
# Locally computed - libdvdnav
-sha256 312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d 981488f.tar.gz
+sha256 e50db40a823ddc795d1fe5f18db2517fb3e05fe0c4a88abf1578d95d7a1cce63 9277007ce2263b908e9ce3091cc31b3dd87c351c.tar.gz
# Locally computed - libdvdread
-sha256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b 17d99db.tar.gz
-# Locally computed
-sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL
+sha256 2d9d6d185dd25a983d6dfc2a00207cafdc396a969c227d5edd84b6215b2fba89 bd6b329f0137ab6a9f779a28dd96f04713735e17.tar.gz
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 9ea170ff6b..5d886344f9 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -6,18 +6,23 @@
# When updating the version, please also update kodi-jsonschemabuilder
# and kodi-texturepacker
-KODI_VERSION = 17.6-Krypton
+KODI_VERSION = 18.5-Leia
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
KODI_LICENSE = GPL-2.0
-KODI_LICENSE_FILES = LICENSE.GPL
+KODI_LICENSE_FILES = LICENSE.md
# needed for binary addons
KODI_INSTALL_STAGING = YES
+# kodi recommends building out-of-source
+KODI_SUPPORTS_IN_SOURCE_BUILD = NO
KODI_DEPENDENCIES = \
- bzip2 \
expat \
+ flatbuffers \
+ fmt \
fontconfig \
freetype \
+ fstrcmp \
gnutls \
+ host-flatbuffers \
host-gawk \
host-gettext \
host-gperf \
@@ -26,7 +31,6 @@ KODI_DEPENDENCIES = \
host-nasm \
host-swig \
host-xmlstarlet \
- host-zip \
libass \
libcdio \
libcrossguid \
@@ -39,44 +43,53 @@ KODI_DEPENDENCIES = \
openssl \
pcre \
python \
+ rapidjson \
sqlite \
taglib \
tinyxml \
- yajl \
zlib
-KODI_SUBDIR = project/cmake
-
# taken from tools/depends/target/ffmpeg/FFMPEG-VERSION
-KODI_FFMPEG_VERSION = 3.1.11-Krypton-17.5
+KODI_FFMPEG_VERSION = 4.0.4-Leia-18.4
KODI_EXTRA_DOWNLOADS += \
https://github.com/xbmc/FFmpeg/archive/$(KODI_FFMPEG_VERSION).tar.gz
-KODI_LIBDVDCSS_VERSION = 2f12236
-KODI_LIBDVDNAV_VERSION = 981488f
-KODI_LIBDVDREAD_VERSION = 17d99db
+# 1.4.2-Leia-Beta-5
+KODI_LIBDVDCSS_VERSION = e646b950095589e74a2c08cf0c34b758c669aa75
+# 6.0.0-Leia-Alpha-3
+KODI_LIBDVDNAV_VERSION = 9277007ce2263b908e9ce3091cc31b3dd87c351c
+# 6.0.0-Leia-Alpha-3
+KODI_LIBDVDREAD_VERSION = bd6b329f0137ab6a9f779a28dd96f04713735e17
KODI_EXTRA_DOWNLOADS += \
https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \
https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \
https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz
+define KODI_CPLUFF_AUTOCONF
+ cd $(KODI_SRCDIR)/lib/cpluff && ./autogen.sh
+endef
+KODI_PRE_CONFIGURE_HOOKS += KODI_CPLUFF_AUTOCONF
+KODI_DEPENDENCIES += host-automake host-autoconf host-libtool
+
KODI_CONF_OPTS += \
-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \
+ -DENABLE_APP_AUTONAME=OFF \
-DENABLE_CCACHE=OFF \
-DENABLE_DVDCSS=ON \
-DENABLE_INTERNAL_CROSSGUID=OFF \
-DENABLE_INTERNAL_FFMPEG=ON \
+ -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-DFFMPEG_URL=$(KODI_DL_DIR)/$(KODI_FFMPEG_VERSION).tar.gz \
-DKODI_DEPENDSBUILD=OFF \
- -DENABLE_OPENSSL=ON \
+ -DENABLE_LDGOLD=OFF \
-DNATIVEPREFIX=$(HOST_DIR) \
-DDEPENDS_PATH=$(STAGING_DIR)/usr \
+ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \
-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
-DLIBDVDCSS_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
-DLIBDVDNAV_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
- -DLIBDVDREAD_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \
- -DENABLE_IMX=OFF
+ -DLIBDVDREAD_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz
ifeq ($(BR2_ENABLE_LOCALE),)
KODI_DEPENDENCIES += libiconv
@@ -88,8 +101,7 @@ ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y)
ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
KODI_CONF_OPTS += -DWITH_CPU="$(GCC_TARGET_CPU)"
endif
-else
-ifeq ($(BR2_arceb)$(BR2_arcle),y)
+else ifeq ($(BR2_arceb)$(BR2_arcle),y)
KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc
else ifeq ($(BR2_armeb),y)
KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
@@ -108,7 +120,6 @@ else
# see project/cmake/scripts/linux/ArchSetup.cmake
KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH)
endif
-endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON
@@ -164,26 +175,14 @@ KODI_CXX_FLAGS += -latomic
endif
ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y)
-KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -DENABLE_OPENGLES=ON
+KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi
KODI_DEPENDENCIES += rpi-userland
-else
-# Kodi considers "rpbi" and "linux" as two separate platforms. The
-# below options, defined in
-# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the
-# "linux" platforms. The "rpbi" platform has a different set of
-# options, defined in project/cmake/scripts/rbpi/
-KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
endif
ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y)
-KODI_CONF_OPTS += \
- -DENABLE_OPENGL=ON \
- -DENABLE_OPENGLES=OFF \
- -DENABLE_X11=ON
+KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11
KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
xlib_libXrandr libdrm
-else
-KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
endif
ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
@@ -193,14 +192,6 @@ else
KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF
endif
-ifeq ($(BR2_PACKAGE_KODI_NONFREE),y)
-KODI_CONF_OPTS += -DENABLE_NONFREE=ON
-KODI_LICENSE += , unrar
-KODI_LICENSE_FILES += lib/UnrarXLib/license.txt
-else
-KODI_CONF_OPTS += -DENABLE_NONFREE=OFF
-endif
-
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
KODI_CONF_OPTS += -DENABLE_UDEV=ON
KODI_DEPENDENCIES += udev
@@ -288,13 +279,6 @@ else
KODI_CONF_OPTS += -DENABLE_AIRTUNES=OFF
endif
-ifeq ($(BR2_PACKAGE_KODI_LIBSSH),y)
-KODI_DEPENDENCIES += libssh
-KODI_CONF_OPTS += -DENABLE_SSH=ON
-else
-KODI_CONF_OPTS += -DENABLE_SSH=OFF
-endif
-
ifeq ($(BR2_PACKAGE_KODI_AVAHI),y)
KODI_DEPENDENCIES += avahi
KODI_CONF_OPTS += -DENABLE_AVAHI=ON
@@ -316,10 +300,8 @@ else
KODI_CONF_OPTS += -DENABLE_LCMS2=OFF
endif
-ifeq ($(BR2_PACKAGE_KODI_LIRC),y)
-KODI_CONF_OPTS += -DENABLE_LIRC=ON
-else
-KODI_CONF_OPTS += -DENABLE_LIRC=OFF
+ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y)
+KODI_DEPENDENCIES += lirc-tools
endif
ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y)
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 03/20] package/kodi-audiodecoder-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 01/20] package/kodi-platform: bump version Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 02/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 04/20] package/kodi-audioencoder-*: " Bernd Kuhls
` (17 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Changed _SITE after upstream relocated all audio decoders to xbmc repos
https://github.com/xbmc/repo-binary-addons/commit/4c900f6835889ce45ba4daaf0387bb5eb13db065
Changed dependency from kodi-platform to kodi itself, the dependency to
kodi-platform was removed upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-audiodecoder-modplug/Config.in | 3 +--
.../kodi-audiodecoder-modplug.hash | 2 +-
.../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 6 +++---
package/kodi-audiodecoder-nosefart/Config.in | 3 +--
.../kodi-audiodecoder-nosefart.hash | 2 +-
.../kodi-audiodecoder-nosefart.mk | 6 +++---
package/kodi-audiodecoder-sidplay/Config.in | 3 +--
.../kodi-audiodecoder-sidplay.hash | 2 +-
.../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 6 +++---
package/kodi-audiodecoder-snesapu/Config.in | 3 +--
.../kodi-audiodecoder-snesapu.hash | 2 +-
.../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 6 +++---
package/kodi-audiodecoder-stsound/Config.in | 3 +--
.../kodi-audiodecoder-stsound.hash | 2 +-
.../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 6 +++---
package/kodi-audiodecoder-timidity/Config.in | 2 +-
.../kodi-audiodecoder-timidity.hash | 2 +-
.../kodi-audiodecoder-timidity.mk | 4 ++--
package/kodi-audiodecoder-vgmstream/Config.in | 3 +--
.../kodi-audiodecoder-vgmstream.hash | 2 +-
.../kodi-audiodecoder-vgmstream.mk | 6 +++---
21 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/package/kodi-audiodecoder-modplug/Config.in b/package/kodi-audiodecoder-modplug/Config.in
index 026997319e..856ca8beb1 100644
--- a/package/kodi-audiodecoder-modplug/Config.in
+++ b/package/kodi-audiodecoder-modplug/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_KODI_AUDIODECODER_MODPLUG
bool "kodi-audiodecoder-modplug"
- select BR2_PACKAGE_KODI_PLATFORM
select BR2_PACKAGE_LIBMODPLUG
help
Modplug decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.modplug
+ https://github.com/xbmc/audiodecoder.modplug
diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
index 6a0607e83d..3f5a06ceff 100644
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 8be4f8c6324bf790069e42c963e14733c53fcdc27548f21f4822b178f47b8177 kodi-audiodecoder-modplug-1.1.0.tar.gz
+sha256 2e99f1c8b28e176268644c07020aa92ad74d22e7244db1af69f31b767f8e845f kodi-audiodecoder-modplug-2.0.2-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
index fb7003f093..6a501c2379 100644
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_MODPLUG_VERSION = 1.1.0
-KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,v$(KODI_AUDIODECODER_MODPLUG_VERSION))
+KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.2-Leia
+KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+
KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp
-KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug
+KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug
$(eval $(cmake-package))
diff --git a/package/kodi-audiodecoder-nosefart/Config.in b/package/kodi-audiodecoder-nosefart/Config.in
index 96591aae5c..bb56a3d6d4 100644
--- a/package/kodi-audiodecoder-nosefart/Config.in
+++ b/package/kodi-audiodecoder-nosefart/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_KODI_AUDIODECODER_NOSEFART
bool "kodi-audiodecoder-nosefart"
- select BR2_PACKAGE_KODI_PLATFORM
help
Nosefart decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.nosefart
+ https://github.com/xbmc/audiodecoder.nosefart
diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
index 670e324ee4..20bd7ebd92 100644
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 444cc85f4618daa5147a63633db3f300123d5e33b1b5894e7036fa9243e8a535 kodi-audiodecoder-nosefart-1.1.0.tar.gz
+sha256 0c17f407d90dd08368aead5df8bacf7589b97bf1c0d1ea45c60cc7d0da26844c kodi-audiodecoder-nosefart-2.0.1-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
index 5e008198ca..1d9944d6c6 100644
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_NOSEFART_VERSION = 1.1.0
-KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,v$(KODI_AUDIODECODER_NOSEFART_VERSION))
+KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.1-Leia
+KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+
KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp
-KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi
$(eval $(cmake-package))
diff --git a/package/kodi-audiodecoder-sidplay/Config.in b/package/kodi-audiodecoder-sidplay/Config.in
index ae99afa9e0..eca4160a90 100644
--- a/package/kodi-audiodecoder-sidplay/Config.in
+++ b/package/kodi-audiodecoder-sidplay/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_KODI_AUDIODECODER_SIDPLAY
bool "kodi-audiodecoder-sidplay"
- select BR2_PACKAGE_KODI_PLATFORM
select BR2_PACKAGE_LIBSIDPLAY2
help
Sidplay decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.sidplay
+ https://github.com/xbmc/audiodecoder.sidplay
diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
index 97c5f28fc7..2cd4fbabd0 100644
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 527b188679add8043e8cd691af9735b6fe8bd6935ad8ac8312b459d6f160cdac kodi-audiodecoder-sidplay-1.1.0.tar.gz
+sha256 0dbff020e1988261680f2329fb6a29a034fede467885158ee63bae7e763d8e87 kodi-audiodecoder-sidplay-1.2.1-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
index 8dc827a666..83541d5ec6 100644
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_SIDPLAY_VERSION = 1.1.0
-KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,v$(KODI_AUDIODECODER_SIDPLAY_VERSION))
+KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.1-Leia
+KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+
KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp
-KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2
+KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2
$(eval $(cmake-package))
diff --git a/package/kodi-audiodecoder-snesapu/Config.in b/package/kodi-audiodecoder-snesapu/Config.in
index 0cb572fec3..2c3bb15d2f 100644
--- a/package/kodi-audiodecoder-snesapu/Config.in
+++ b/package/kodi-audiodecoder-snesapu/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_KODI_AUDIODECODER_SNESAPU
bool "kodi-audiodecoder-snesapu"
- select BR2_PACKAGE_KODI_PLATFORM
help
SPC decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.snesapu
+ https://github.com/xbmc/audiodecoder.snesapu
diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
index 877b7a7f9c..c6ef3752e7 100644
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 20d85822d0c01223903b5e5472a1d029fa4931c2a9ac4d399345c4363fa8f905 kodi-audiodecoder-snesapu-1.1.0.tar.gz
+sha256 db39f1f4a892fede45a5bffadd760962b5f02ab62e095a35dc37298cf548013d kodi-audiodecoder-snesapu-2.0.1-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
index df7a8f09b9..d78f915384 100644
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_SNESAPU_VERSION = 1.1.0
-KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,v$(KODI_AUDIODECODER_SNESAPU_VERSION))
+KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.1-Leia
+KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+
KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp
-KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi
$(eval $(cmake-package))
diff --git a/package/kodi-audiodecoder-stsound/Config.in b/package/kodi-audiodecoder-stsound/Config.in
index 6be216a2c7..2001e481cd 100644
--- a/package/kodi-audiodecoder-stsound/Config.in
+++ b/package/kodi-audiodecoder-stsound/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_KODI_AUDIODECODER_STSOUND
bool "kodi-audiodecoder-stsound"
- select BR2_PACKAGE_KODI_PLATFORM
help
YM decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.stsound
+ https://github.com/xbmc/audiodecoder.stsound
diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
index 2d70e085d9..0d33d38566 100644
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 c9b6e98d544712f7cec3cf18f866ccaed2fbcd20410179259ae0455ffa967ca4 kodi-audiodecoder-stsound-1.1.0.tar.gz
+sha256 75e219bf9abac3949dd3dd3fe908bc2b6e6b85654594e5494335e7e2f14dd1f1 kodi-audiodecoder-stsound-2.0.1-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
index f49c614bb2..b20fc345fe 100644
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_STSOUND_VERSION = 1.1.0
-KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,v$(KODI_AUDIODECODER_STSOUND_VERSION))
+KODI_AUDIODECODER_STSOUND_VERSION = 2.0.1-Leia
+KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+
KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp
-KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi
$(eval $(cmake-package))
diff --git a/package/kodi-audiodecoder-timidity/Config.in b/package/kodi-audiodecoder-timidity/Config.in
index 3372dc5c05..ad3caf1e42 100644
--- a/package/kodi-audiodecoder-timidity/Config.in
+++ b/package/kodi-audiodecoder-timidity/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY
help
Timidity decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.timidity
+ https://github.com/xbmc/audiodecoder.timidity
diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
index 34260e9449..70a05acd94 100644
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 83a740010dc7fa01101da370c74e79287ebd67bd28d27125e4372abe2fb3bb47 kodi-audiodecoder-timidity-1.1.1.tar.gz
+sha256 bc6dea6dca0949571a3123e26f27dc73c78b8a876362fc8e95649280f2557bc0 kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
index a4847e0289..fa78a3d782 100644
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_AUDIODECODER_TIMIDITY_VERSION = 1.1.1
-KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,v$(KODI_AUDIODECODER_TIMIDITY_VERSION))
+KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.3-Leia
+KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+
KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp
KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi
diff --git a/package/kodi-audiodecoder-vgmstream/Config.in b/package/kodi-audiodecoder-vgmstream/Config.in
index ebf83df23b..440edc7cf6 100644
--- a/package/kodi-audiodecoder-vgmstream/Config.in
+++ b/package/kodi-audiodecoder-vgmstream/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_KODI_AUDIODECODER_VGMSTREAM
bool "kodi-audiodecoder-vgmstream"
- select BR2_PACKAGE_KODI_PLATFORM
help
VGM decoder addon for Kodi
- https://github.com/notspiff/audiodecoder.vgmstream
+ https://github.com/xbmc/audiodecoder.vgmstream
diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
index f4cf51aa21..26415717cf 100644
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 40cd4f7f143c9313a4437854e31c460046af47bd709364439f0e370ec464af0d kodi-audiodecoder-vgmstream-1.1.0.tar.gz
+sha256 6f1940d2a0607342cba8cffc0beb7c78caae5995c2d554a6079f4849997da7ba kodi-audiodecoder-vgmstream-1.1.4-Leia.tar.gz
diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
index e89602117e..81f4825885 100644
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.0
-KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,v$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
+KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.4-Leia
+KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+
KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp
-KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 04/20] package/kodi-audioencoder-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (2 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 03/20] package/kodi-audiodecoder-*: mass version bump Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 05/20] package/kodi-inputstream-adaptive: bump version Bernd Kuhls
` (16 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash | 2 +-
package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 4 ++--
package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +-
package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 4 ++--
.../kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 2 +-
package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 2 +-
package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash | 2 +-
package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
index 9a0f81e10d..7599ed9218 100644
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 811dac5766dc9ef1a3447c55637edde55c5ddca1d583124e9312328152015ae5 kodi-audioencoder-flac-1.1.0.tar.gz
+sha256 e6b8ad024c171eb463339a1f136f3ee9465267ef7fd3b80a5f0007b0180f36e5 kodi-audioencoder-flac-2.0.5-Leia.tar.gz
diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
index ea5a0860c6..9940949c7b 100644
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_AUDIOENCODER_FLAC_VERSION = 1.1.0
-KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,v$(KODI_AUDIOENCODER_FLAC_VERSION))
+KODI_AUDIOENCODER_FLAC_VERSION = 2.0.5-Leia
+KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp
KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf
diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
index 6edd161559..e25df69e79 100644
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 5118a2925bb0f7eca36b2d0f4d6822b45a8967c9fb91054bfaa8f83d21209c95 kodi-audioencoder-lame-1.2.0.tar.gz
+sha256 c9c0e700012e2763eb6d9ffcc80ccd87faf991e5cf58b30cabd51b435fd48614 kodi-audioencoder-lame-2.0.3-Leia.tar.gz
diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
index 3f06a06135..a278a0f410 100644
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_AUDIOENCODER_LAME_VERSION = 1.2.0
-KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,v$(KODI_AUDIOENCODER_LAME_VERSION))
+KODI_AUDIOENCODER_LAME_VERSION = 2.0.3-Leia
+KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp
KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame
diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
index 1b41a88dbc..7ba473e5f7 100644
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f00c74f010b465d43e8206bcbe155785e1f34660ca010acff3b890595ea2352c kodi-audioencoder-vorbis-1.1.0.tar.gz
+sha256 f6f220fad74a64d29a4375fbc24560ee528d0dbf1e195f17015381fcd67c8acc kodi-audioencoder-vorbis-2.0.2-Leia.tar.gz
diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
index 0c0c406a58..8ea569e638 100644
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_AUDIOENCODER_VORBIS_VERSION = 1.1.0
+KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.2-Leia
KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,v$(KODI_AUDIOENCODER_VORBIS_VERSION))
KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp
diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
index b302c18ac9..06e724a969 100644
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f9b0f79c8364fb7ef584137031fceb8d2ab1af28e110cfe2a31932631cb8d36e kodi-audioencoder-wav-1.1.0.tar.gz
+sha256 eb6939551fa7da01a7f333702af1959771e7db46437647d32eb2b002b142c9a0 kodi-audioencoder-wav-2.0.2-Leia.tar.gz
diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
index d21546ba05..25551927d1 100644
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_AUDIOENCODER_WAV_VERSION = 1.1.0
-KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,v$(KODI_AUDIOENCODER_WAV_VERSION))
+KODI_AUDIOENCODER_WAV_VERSION = 2.0.2-Leia
+KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp
KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 05/20] package/kodi-inputstream-adaptive: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (3 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 04/20] package/kodi-audioencoder-*: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 06/20] package/kodi-inputstream-rtmp: " Bernd Kuhls
` (15 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Switched dependencies from libplatform & kodi-platform to kodi after
upstream commit:
https://github.com/peak3d/inputstream.adaptive/commit/0d1c5503ad809a23062aebd3c01837ca5d21ea3a
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-inputstream-adaptive/Config.in | 2 --
.../kodi-inputstream-adaptive.hash | 2 +-
.../kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 6 ++----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in
index cb5127363a..f9ba20adcf 100644
--- a/package/kodi-inputstream-adaptive/Config.in
+++ b/package/kodi-inputstream-adaptive/Config.in
@@ -3,8 +3,6 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE
# wvdecrypter/cdm/build/build_config.h
depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \
|| BR2_mips64el || BR2_x86_64
- select BR2_PACKAGE_LIBPLATFORM
- select BR2_PACKAGE_KODI_PLATFORM
help
Kodi inputstream addon for several manifest types
diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
index 15ecf494f1..94a001c4e7 100644
--- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 872a6ffefb90b6201a1e01fe5a52e05877e2040737e052b2f249725b9a8a44ff kodi-inputstream-adaptive-c51b9a9b58a645f820883e6d99982277fc58aac5.tar.gz
+sha256 e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329 kodi-inputstream-adaptive-2.4.2-Leia.tar.gz
diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
index ab810d3248..90958bdf1a 100644
--- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
+++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
@@ -4,12 +4,10 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_INPUTSTREAM_ADAPTIVE_VERSION = c51b9a9b58a645f820883e6d99982277fc58aac5
+KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.2-Leia
KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp
-KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = libplatform kodi-platform
+KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 06/20] package/kodi-inputstream-rtmp: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (4 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 05/20] package/kodi-inputstream-adaptive: bump version Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 07/20] package/kodi-peripheral-joystick: " Bernd Kuhls
` (14 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Addon repo was moved to xbmc project:
https://github.com/xbmc/repo-binary-addons/commit/57b8ed5fb9b5f0368738260b762cc0bab1147172#diff-2ca1e23208f215d294c01b80edfff00a
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-inputstream-rtmp/Config.in | 2 +-
package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash | 2 +-
package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/kodi-inputstream-rtmp/Config.in b/package/kodi-inputstream-rtmp/Config.in
index c40bff2d7e..fa83926301 100644
--- a/package/kodi-inputstream-rtmp/Config.in
+++ b/package/kodi-inputstream-rtmp/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
help
RTMP input stream add-on for Kodi
- https://github.com/notspiff/inputstream.rtmp
+ https://github.com/xbmc/inputstream.rtmp
diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
index 2d7a68ba3c..050f86af4c 100644
--- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 75a3cc87243a7c92a0a2e3f16710a1e60d05cd8dbc8b7fd1852244fbc5da2ae8 kodi-inputstream-rtmp-1.0.4.tar.gz
+sha256 bc4cd1f4df6bc24d035c537c365977493f412acc711cf60d82179d1ef494e275 kodi-inputstream-rtmp-2.0.6-Leia.tar.gz
diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
index 061aedf1e7..dc141659ac 100644
--- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
+++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_INPUTSTREAM_RTMP_VERSION = 1.0.4
-KODI_INPUTSTREAM_RTMP_SITE = $(call github,notspiff,inputstream.rtmp,v$(KODI_INPUTSTREAM_RTMP_VERSION))
+KODI_INPUTSTREAM_RTMP_VERSION = 2.0.6-Leia
+KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION))
KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+
KODI_INPUTSTREAM_RTMP_LICENSE_FILES = src/RTMPStream.cpp
KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 07/20] package/kodi-peripheral-joystick: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (5 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 06/20] package/kodi-inputstream-rtmp: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 08/20] package/kodi-peripheral-*: mass version bump Bernd Kuhls
` (13 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Removed dependency to kodi-platform
https://github.com/xbmc/peripheral.joystick/commit/a9489ea0f08bbf04affb798857439540478ff90d
Added dependency to tinyxml
https://github.com/xbmc/peripheral.joystick/commit/471aa27d6c8ff9c9d0ac50c1b32f1504840194b5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-peripheral-joystick/Config.in | 2 +-
.../kodi-peripheral-joystick.hash | 2 +-
.../kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 8 +++-----
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/package/kodi-peripheral-joystick/Config.in b/package/kodi-peripheral-joystick/Config.in
index f257710a88..d93e71b607 100644
--- a/package/kodi-peripheral-joystick/Config.in
+++ b/package/kodi-peripheral-joystick/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_KODI_PERIPHERAL_JOYSTICK
bool "kodi-peripheral-joystick"
depends on BR2_PACKAGE_HAS_UDEV
- select BR2_PACKAGE_KODI_PLATFORM
+ select BR2_PACKAGE_TINYXML
help
Kodi joystick support (drivers and button maps)
diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
index 5a7348d414..84f847f309 100644
--- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
+++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 9a183e1f92ff2c68816bfa0056c65585a3e1129d924326359d7a5dfbcba6c56a kodi-peripheral-joystick-1.3.4.tar.gz
+sha256 b6ddefed73582a3dc9bc36a9d40f8309139802ef9cfc130933bd0fe6e569d933 kodi-peripheral-joystick-1.4.8-Leia.tar.gz
diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
index 13c33fc0af..c56cfef43f 100644
--- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
+++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
@@ -4,12 +4,10 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PERIPHERAL_JOYSTICK_VERSION = 1.3.4
-KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,v$(KODI_PERIPHERAL_JOYSTICK_VERSION))
+KODI_PERIPHERAL_JOYSTICK_VERSION = 1.4.8-Leia
+KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION))
KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+
KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = src/addon.cpp
-KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi-platform udev
+KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi tinyxml udev
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 08/20] package/kodi-peripheral-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (6 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 07/20] package/kodi-peripheral-joystick: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 09/20] package/kodi-pvr-iptvsimple: bump version Bernd Kuhls
` (12 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../kodi-peripheral-steamcontroller.hash | 2 +-
.../kodi-peripheral-steamcontroller.mk | 2 +-
package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash | 2 +-
package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash b/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
index c0b3bf6e22..5966ee8908 100644
--- a/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
+++ b/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 d5547b78ba84c9743c884a9377c398b540bfcf23e467e1edf8be2625d400c205 kodi-peripheral-steamcontroller-ef527cd81cfcd6c8342691f5c764e5c51df1fca2.tar.gz
+sha256 26edbe8778d9267cb35f18e44b7e9cbd3d3c193710edc9e586b20eed5f4ff0f8 kodi-peripheral-steamcontroller-0347e66dc8464184d636aea2cfe10491d6fcda96.tar.gz
diff --git a/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk b/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
index 98cccc8520..1b244602af 100644
--- a/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
+++ b/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = ef527cd81cfcd6c8342691f5c764e5c51df1fca2
+KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = 0347e66dc8464184d636aea2cfe10491d6fcda96
KODI_PERIPHERAL_STEAMCONTROLLER_SITE = $(call github,kodi-game,peripheral.steamcontroller,$(KODI_PERIPHERAL_STEAMCONTROLLER_VERSION))
KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE = GPL-2.0+
KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE_FILES = src/addon.cpp
diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
index 48dc5a0415..ec01bfdf76 100644
--- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
+++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 cd503e7f1413214693c28b59f19f3fffe0a54cff5c29d43b2eca9bb31c10edeb kodi-peripheral-xarcade-f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd.tar.gz
+sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz
diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
index c4ddba3eb5..0946a90d7b 100644
--- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
+++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_PERIPHERAL_XARCADE_VERSION = f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd
+KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524
KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION))
KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+
KODI_PERIPHERAL_XARCADE_LICENSE_FILES = src/addon.cpp
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 09/20] package/kodi-pvr-iptvsimple: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (7 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 08/20] package/kodi-peripheral-*: mass version bump Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 10/20] package/kodi-pvr-mediaportal-tvserver: " Bernd Kuhls
` (11 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Rapidxml was added as dependency:
https://github.com/kodi-pvr/pvr.iptvsimple/commit/d27b3ed1d379d2f865e95f08bdf2dbf086f8c0ad
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-pvr-iptvsimple/Config.in | 1 +
package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +-
package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 6 ++----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/kodi-pvr-iptvsimple/Config.in b/package/kodi-pvr-iptvsimple/Config.in
index b59674979f..94fc1f0602 100644
--- a/package/kodi-pvr-iptvsimple/Config.in
+++ b/package/kodi-pvr-iptvsimple/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE
bool "kodi-pvr-iptvsimple"
select BR2_PACKAGE_KODI_PLATFORM
+ select BR2_PACKAGE_RAPIDXML
help
IPTV Live TV and Radio PVR client addon for Kodi
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
index 0b0406feb8..1b79b57049 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 329bd71e5c786d7b037bf5fd103ee4abff892afc6e5186a5d0a797194a8c4c7c kodi-pvr-iptvsimple-2.4.14-Krypton.tar.gz
+sha256 25eff252ad748e0cf166cd01b0f08e8fb3977c98a1b04cad9ef6509ea30c5fa9 kodi-pvr-iptvsimple-3.8.8-Leia.tar.gz
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
index 0df509ea6a..16007cf404 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
@@ -4,12 +4,10 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_IPTVSIMPLE_VERSION = 2.4.14-Krypton
+KODI_PVR_IPTVSIMPLE_VERSION = 3.8.8-Leia
KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h
-KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform
+KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform rapidxml
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 10/20] package/kodi-pvr-mediaportal-tvserver: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (8 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 09/20] package/kodi-pvr-iptvsimple: bump version Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 11/20] package/kodi-pvr-stalker: " Bernd Kuhls
` (10 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Removed patch, not needed anymore after PR 81.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...e555-remove-xlocale.h-from-Locale.hh.patch | 33 -------------------
.../kodi-pvr-mediaportal-tvserver.hash | 2 +-
.../kodi-pvr-mediaportal-tvserver.mk | 4 +--
3 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
diff --git a/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch b/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
deleted file mode 100644
index 7abb153b0e..0000000000
--- a/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 64b264d141fd80991ac071c5370802e2d7394f6d Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 3 Dec 2017 22:17:12 +0100
-Subject: [PATCH] live555: remove xlocale.h from Locale.hh
-
-Fixes build error with glibc 2.26:
-https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
-
-Patch sent upstream:
-https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/79
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/lib/live555/liveMedia/include/Locale.hh | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/lib/live555/liveMedia/include/Locale.hh b/src/lib/live555/liveMedia/include/Locale.hh
-index b327948..c4b4f4a 100644
---- a/src/lib/live555/liveMedia/include/Locale.hh
-+++ b/src/lib/live555/liveMedia/include/Locale.hh
-@@ -43,9 +43,6 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
-
- #ifndef LOCALE_NOT_USED
- #include <locale.h>
--#ifndef XLOCALE_NOT_USED
--#include <xlocale.h> // because, on some systems, <locale.h> doesn't include <xlocale.h>; this makes sure that we get both
--#endif
- #endif
-
-
---
-2.11.0
-
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
index 6eb0abfbaf..d34635fd3e 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 3f5c022f83636b3739f26c1a07166b498eac82e8081ed7551980f4bb27c6b56e kodi-pvr-mediaportal-tvserver-2.4.19v2-Krypton.tar.gz
+sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
index 99a318911e..1b6ad39ef1 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.19v2-Krypton
+KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 3.5.18-Leia
KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+
KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 11/20] package/kodi-pvr-stalker: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (9 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 10/20] package/kodi-pvr-mediaportal-tvserver: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 12/20] package/kodi-pvr-vuplus: " Bernd Kuhls
` (9 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Removed patch after being applied upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-src-CWatchdog.h-Fix-gcc7-build.patch | 29 -------------------
.../kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +-
package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 4 +--
3 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100644 package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
diff --git a/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch b/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
deleted file mode 100644
index 2d85f6bc6f..0000000000
--- a/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 13 May 2017 20:22:08 +0200
-Subject: [PATCH] src/CWatchdog.h: Fix gcc7 build
-
-Building with gcc7 is broken:
-
-src/CWatchdog.h:31:58: error: 'std::function' has not been declared
- CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback);
- ^~~~~~~~
-
-Submitted-upstream: https://github.com/kodi-pvr/pvr.stalker/pull/93
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/CWatchdog.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CWatchdog.h b/src/CWatchdog.h
-index c465e91..239d95d 100644
---- a/src/CWatchdog.h
-+++ b/src/CWatchdog.h
-@@ -22,6 +22,7 @@
- */
-
- #include <thread>
-+#include <functional>
-
- #include "SAPI.h"
-
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
index 07c768f252..d3cd685fd2 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139 kodi-pvr-stalker-2.8.6-Krypton.tar.gz
+sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
index 32ac2cad0e..1b1592320c 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_STALKER_VERSION = 2.8.6-Krypton
+KODI_PVR_STALKER_VERSION = 3.4.10-Leia
KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
KODI_PVR_STALKER_LICENSE = GPL-2.0+
KODI_PVR_STALKER_LICENSE_FILES = src/client.h
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 12/20] package/kodi-pvr-vuplus: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (10 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 11/20] package/kodi-pvr-stalker: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 13/20] package/kodi-pvr-*: mass version bump Bernd Kuhls
` (8 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Added dependency to json-for-modern-cpp after upstream commit:
https://github.com/kodi-pvr/pvr.vuplus/commit/07480b96fc674317ccbb792b03b811edec143e0c
Also added missing dependency to tinyxml.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-pvr-vuplus/Config.in | 2 ++
package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +-
package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 6 ++----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/kodi-pvr-vuplus/Config.in b/package/kodi-pvr-vuplus/Config.in
index a56c4ede93..96320f6fcb 100644
--- a/package/kodi-pvr-vuplus/Config.in
+++ b/package/kodi-pvr-vuplus/Config.in
@@ -1,6 +1,8 @@
config BR2_PACKAGE_KODI_PVR_VUPLUS
bool "kodi-pvr-vuplus"
+ select BR2_PACKAGE_JSON_FOR_MODERN_CPP
select BR2_PACKAGE_KODI_PLATFORM
+ select BR2_PACKAGE_TINYXML
help
VuPlus PVR client addon for Kodi
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
index f4f6756931..eb0408db8a 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 a8c7345e4e2e415e29c21f14460b257dfbe08ed5ecf1cc2dc6bc393a10f95cf3 kodi-pvr-vuplus-2.4.12-Krypton.tar.gz
+sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
index 581d884caa..34ec5d2384 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
@@ -4,12 +4,10 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VUPLUS_VERSION = 2.4.12-Krypton
+KODI_PVR_VUPLUS_VERSION = 3.28.9-Leia
KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
KODI_PVR_VUPLUS_LICENSE = GPL-2.0+
KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h
-KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform
+KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi-platform tinyxml
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 13/20] package/kodi-pvr-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (11 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 12/20] package/kodi-pvr-vuplus: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 14/20] package/kodi-screensaver-asteroids: bump version Bernd Kuhls
` (7 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +-
package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 4 +---
package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +-
package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 4 +---
package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 2 +-
package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 4 +---
package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +-
package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 4 +---
package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +-
package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 4 +---
package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +-
package/kodi-pvr-hts/kodi-pvr-hts.mk | 4 +---
package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +-
package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 4 +---
package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +-
package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 4 +---
package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +-
package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 4 +---
package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +-
package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 4 +---
package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +-
package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 4 +---
package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +-
package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 4 +---
package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +-
package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 4 +---
26 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
index 138efa1d05..2eae694354 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 ba9e4d76b9e6d2d879e95eeda0d919ca5eabc0d6f59037f173cd9294b2ce8e4a kodi-pvr-argustv-2.5.6-Krypton.tar.gz
+sha256 2d0fae3721715a17e1c1454dd7029eb8d18e7f761ed65e00f8c488c7c08433e8 kodi-pvr-argustv-3.5.4-Leia.tar.gz
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
index 2cf4d75293..f59f4467ab 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_ARGUSTV_VERSION = 2.5.6-Krypton
+KODI_PVR_ARGUSTV_VERSION = 3.5.4-Leia
KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+
KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
index e9b867318d..d49a267b0f 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 a45fff0c1fe6d91fd957e2a4e62e9c72a5c36d796c41caa6b1e5a4814f82a503 kodi-pvr-dvblink-3.4.5v2-Krypton.tar.gz
+sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
index 9860b63b2a..423faf7633 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBLINK_VERSION = 3.4.5v2-Krypton
+KODI_PVR_DVBLINK_VERSION = 4.7.2-Leia
KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
KODI_PVR_DVBLINK_LICENSE = GPL-2.0+
KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
index 017bd8360a..726def6dfe 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f1cd26234e33a027d1ef2f3ea7b5f33be3a8aff9a7bf0117ee4bdfcf1e18fd9f kodi-pvr-dvbviewer-2.4.14-Krypton.tar.gz
+sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
index bc37de7545..4c221c012f 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBVIEWER_VERSION = 2.4.14-Krypton
+KODI_PVR_DVBVIEWER_VERSION = 3.7.11-Leia
KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+
KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
index 7417b26723..8f15870dbc 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 0384db9cbcd8ab2e7b8b0eb8c22e8913e734e436234c43d357718c5273058605 kodi-pvr-filmon-1.4.8-Krypton.tar.gz
+sha256 763500fb4a7210569f05dba8307d400e532dd0e72b24f1a1d2cd516695145190 kodi-pvr-filmon-2.4.4-Leia.tar.gz
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
index daa3e39dfc..44f13909fa 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_FILMON_VERSION = 1.4.8-Krypton
+KODI_PVR_FILMON_VERSION = 2.4.4-Leia
KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
KODI_PVR_FILMON_LICENSE = GPL-2.0+
KODI_PVR_FILMON_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
index 8262f4e111..86a512dc0f 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 3c000b3ebab2b12f5635451f6a71ad01c4f4d7043623cfeebfe6b7c662e026d9 kodi-pvr-hdhomerun-2.4.7-Krypton.tar.gz
+sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
index 75fa48764a..6e6dd4dfaa 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HDHOMERUN_VERSION = 2.4.7-Krypton
+KODI_PVR_HDHOMERUN_VERSION = 3.5.0-Leia
KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION))
KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+
KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash
index 87eafac855..dc45e829ea 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.hash
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 96e949526ebf4af542da572e704c0c052ec807408dc0ea65603a15614b889dd1 kodi-pvr-hts-3211941dade740ad92581f488402146794798e74.tar.gz
+sha256 fcf2df3566b196addf99d8166fa5a8b77635ac905214c36071d9e778cc42978e kodi-pvr-hts-4.4.20-Leia.tar.gz
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk
index 7f43b04853..0184f77ec9 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.mk
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HTS_VERSION = 3211941dade740ad92581f488402146794798e74
+KODI_PVR_HTS_VERSION = 4.4.20-Leia
KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
KODI_PVR_HTS_LICENSE = GPL-2.0+
KODI_PVR_HTS_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
index 82923a89aa..4de1fda3fa 100644
--- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
+++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 fd60aba0dac25ab5885371495a5dfca53308c1fa23215299b0f62997c7391e1e kodi-pvr-mythtv-4.15.3.tar.gz
+sha256 36d9142e0e19b904e1c4a6d8cd67063d291e63971f80a98a6f24b7f4554bb2e3 kodi-pvr-mythtv-5.10.15-Leia.tar.gz
diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
index 8099ffae3e..e644f9bc7f 100644
--- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
+++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MYTHTV_VERSION = 4.15.3
+KODI_PVR_MYTHTV_VERSION = 5.10.15-Leia
KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
KODI_PVR_MYTHTV_LICENSE = GPL-2.0+
KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
index 3d10b5bbec..86e77b3281 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 b126943a6d48ea4d2df38951505f385c2a499e399201eccd798a34076d3c5842 kodi-pvr-nextpvr-2.4.13-Krypton.tar.gz
+sha256 f7b6ea2e79e469fc265d008d3ba8ebb7e286e789a8b4bc809681a254ff225775 kodi-pvr-nextpvr-3.3.18-Leia.tar.gz
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
index d0a04991d9..059430ebb4 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NEXTPVR_VERSION = 2.4.13-Krypton
+KODI_PVR_NEXTPVR_VERSION = 3.3.18-Leia
KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+
KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
index 261558ee3f..00aa98d9b6 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 e4e0a6bb1bf0c6f8ae011eba58c5f0ae19a6574bb35fc6a7fbdbb99d20242a2c kodi-pvr-njoy-2.4.3-Krypton.tar.gz
+sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
index e946e6783d..1099e66212 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NJOY_VERSION = 2.4.3-Krypton
+KODI_PVR_NJOY_VERSION = 3.4.2-Leia
KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
KODI_PVR_NJOY_LICENSE = GPL-2.0+
KODI_PVR_NJOY_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
index 5044806761..bcf920aabf 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 95f95f39739baf6013bb6c9188743f842f6ba3e1fa541907067f795e1a3c66a1 kodi-pvr-pctv-1.4.7-Krypton.tar.gz
+sha256 a9f1c5596786cf4cfa279d0b4477839ef7f5bb7267c65152dbcf7ae0bda56679 kodi-pvr-pctv-2.4.5-Leia.tar.gz
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
index 6c7a03049d..014d1d3f97 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_PCTV_VERSION = 1.4.7-Krypton
+KODI_PVR_PCTV_VERSION = 2.4.5-Leia
KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
KODI_PVR_PCTV_LICENSE = GPL-2.0+
KODI_PVR_PCTV_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
index 5f2c78f0fa..92ebd9ee0f 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 78065a46b95b3988b1e49fe05da249a1896f54a2c30116a9446f7c4f55db743b kodi-pvr-vbox-3.6.10-Krypton.tar.gz
+sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
index 2c54e14937..8c8382a1d2 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VBOX_VERSION = 3.6.10-Krypton
+KODI_PVR_VBOX_VERSION = 4.7.0-Leia
KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
KODI_PVR_VBOX_LICENSE = GPL-2.0+
KODI_PVR_VBOX_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
index 6d42583a9b..8d03a823ee 100644
--- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
+++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 b65acb7ade6eaac395ea357158a4aae5ccd141612acfd834b72fbdf8db4e8b0e kodi-pvr-vdr-vnsi-4ed7d602924dbfcdd2770c0e13423092e829460d.tar.gz
+sha256 6afaf1f3f1e0670edb9dc01581a0d6c3f57502c791e19283eb63807e8936a768 kodi-pvr-vdr-vnsi-3.6.3-Leia.tar.gz
diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
index e068641c0d..ec8fc7fc76 100644
--- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
+++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VDR_VNSI_VERSION = 4ed7d602924dbfcdd2770c0e13423092e829460d
+KODI_PVR_VDR_VNSI_VERSION = 3.6.3-Leia
KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION))
KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+
KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
index 4c050fb654..0707ce5839 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 7f5dfb88f54d511d575b7aabd94e1a862afb7e8a0b89fa957db6a135c31846eb kodi-pvr-wmc-1.4.9v2-Krypton.tar.gz
+sha256 4cb81f29cba23172d042e50bbab00cd64cd5670ad7350fd9d25301f63178e5f7 kodi-pvr-wmc-2.4.5-Leia.tar.gz
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
index b6e3d43256..82397163fe 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'Krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_WMC_VERSION = 1.4.9v2-Krypton
+KODI_PVR_WMC_VERSION = 2.4.5-Leia
KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
KODI_PVR_WMC_LICENSE = GPL-2.0+
KODI_PVR_WMC_LICENSE_FILES = src/client.h
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 14/20] package/kodi-screensaver-asteroids: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (12 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 13/20] package/kodi-pvr-*: mass version bump Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: " Bernd Kuhls
` (6 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Package was moved to xbmc repo:
https://github.com/xbmc/repo-binary-addons/commit/57b8ed5fb9b5f0368738260b762cc0bab1147172#diff-4fa94ef50ebd8df4af5fd4eed5e693b6
Added dependency to glm:
https://github.com/xbmc/screensaver.asteroids/commit/360a02fc20925fa17179f3298dd4515b4354e266
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-screensaver-asteroids/Config.in | 3 ++-
.../kodi-screensaver-asteroids.hash | 2 +-
.../kodi-screensaver-asteroids.mk | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/kodi-screensaver-asteroids/Config.in b/package/kodi-screensaver-asteroids/Config.in
index ccc2aba6aa..3d66c3dcc3 100644
--- a/package/kodi-screensaver-asteroids/Config.in
+++ b/package/kodi-screensaver-asteroids/Config.in
@@ -1,10 +1,11 @@
config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS
bool "kodi-screensaver-asteroids"
depends on BR2_PACKAGE_HAS_LIBGL
+ select BR2_PACKAGE_GLM
help
Asteroids screensaver for Kodi
- https://github.com/notspiff/screensaver.asteroids
+ https://github.com/xbmc/screensaver.asteroids
comment "kodi-screensaver-asteroids needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
index d62032c076..b01580a62e 100644
--- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
+++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 2e072e6aad12f707dec1e70b7df26c590bb41fed8880dcfdbe6c99949b7e287a kodi-screensaver-asteroids-1.1.2.tar.gz
+sha256 fa7671a1c88b75e6d26a172fdffdad4fdbd78f000f54632c47e38c17cd0da460 kodi-screensaver-asteroids-2.3.1-Leia.tar.gz
diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
index 378da74be1..70d9d8e48b 100644
--- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
+++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
@@ -4,10 +4,10 @@
#
################################################################################
-KODI_SCREENSAVER_ASTEROIDS_VERSION = 1.1.2
-KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,v$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
+KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.1-Leia
+KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp
-KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi
+KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = glm kodi
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (13 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 14/20] package/kodi-screensaver-asteroids: bump version Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 22:14 ` Yann E. MORIN
2020-01-18 20:06 ` [Buildroot] [PATCH v8 16/20] package/kodi-screensaver-*: mass version bump Bernd Kuhls
` (5 subsequent siblings)
20 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Updated dependencies after upstream commit
https://github.com/xbmc/screensavers.rsxs/commit/dbb88536964dc0ca4144016eb12f7307b60cb1fa
Also removed patch 0002 because this package has no direct dependency
for X libraries anymore.
Removed patch 0001 which was applied upstream
https://github.com/xbmc/screensavers.rsxs/commit/b9dda499db62944d9a95f4690d67101eca539ca7
Added patch to disable building the drempels screensaver which depends
on imagemagick6.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-Disable-drempels.patch | 40 +++++++++++++++++++
.../0001-cross-compile.patch | 37 -----------------
.../0002-fix-default-include-dir.patch | 28 -------------
package/kodi-screensaver-rsxs/Config.in | 14 ++++---
.../kodi-screensaver-rsxs.hash | 2 +-
.../kodi-screensaver-rsxs.mk | 7 ++--
6 files changed, 53 insertions(+), 75 deletions(-)
create mode 100644 package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
delete mode 100644 package/kodi-screensaver-rsxs/0001-cross-compile.patch
delete mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
diff --git a/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch b/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
new file mode 100644
index 0000000000..e76a9b9943
--- /dev/null
+++ b/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
@@ -0,0 +1,40 @@
+From 28c01686ba0d67d317e058776f01efba5e6471bd Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 13 Jul 2019 14:18:12 +0200
+Subject: [PATCH] Disable drempels
+
+Does not build with ImageMagick 7.x:
+
+src/drempels/TexMgr.cpp:31:10: fatal error: magick/api.h:
+ No such file or directory
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a86ccd0..b5ca03f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,8 +40,7 @@ include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Ko
+ if(ImageMagick_FOUND AND NOT ${OWN_IMAGE_MAGICK})
+ message(STATUS "ImageMagick found in the system and is used")
+ else()
+- message(STATUS "ImageMagick not found or forced and add custom created")
+- add_subdirectory(lib/ImageMagick)
++ message(STATUS "ImageMagick not found")
+ endif()
+ add_subdirectory(lib/kodi/gui/gl)
+ add_subdirectory(lib/Implicit)
+@@ -70,7 +69,6 @@ include(src/biof/CMakeLists.txt)
+ include(src/busyspheres/CMakeLists.txt)
+ include(src/colorfire/CMakeLists.txt)
+ include(src/cyclone/CMakeLists.txt)
+-include(src/drempels/CMakeLists.txt)
+ include(src/euphoria/CMakeLists.txt)
+ include(src/feedback/CMakeLists.txt)
+ include(src/fieldlines/CMakeLists.txt)
+--
+2.20.1
+
diff --git a/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
deleted file mode 100644
index a7b2053d76..0000000000
--- a/package/kodi-screensaver-rsxs/0001-cross-compile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix cross-compilation
-
-Use the cross-compiler and not the host version.
-
-Patch sent upstream:
-https://github.com/notspiff/screensavers.rsxs/pull/5
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt
---- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt 2015-03-19 12:20:23.000000000 +0100
-+++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt 2015-07-19 20:26:16.660481032 +0200
-@@ -33,6 +33,11 @@
- ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket
- ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds)
-
-+
-+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME )
-+string( REGEX REPLACE "-[^-]+$" ""
-+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" )
-+
- include(ExternalProject)
- set(update_command "")
- if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE)
-@@ -46,8 +51,11 @@
- endif()
- endif()
- externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
-- CONFIGURE_COMMAND ${configure_start}
-+ CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes
-+ ac_cv_func_malloc_0_nonnull=yes
-+ ${configure_start}
- --prefix=<INSTALL_DIR>
-+ --host=${TOOLCHAIN_NAME}
- --without-xscreensaver
- --disable-cyclone
- --disable-euphoria
diff --git a/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
deleted file mode 100644
index a7e7c74b0f..0000000000
--- a/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix X include path to prevent error during configure
-
-Downloaded from
-https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
---- screensavers.rsxs-3241d29.orig/CMakeLists.txt 2015-10-22 23:59:38.187280475 -0700
-+++ screensavers.rsxs-3241d29/CMakeLists.txt 2015-10-23 00:00:27.228113829 -0700
-@@ -17,7 +17,7 @@
- include_directories(${OpenGL_INCLUDE_DIR}
- ${PNG_INCLUDE_DIR}
- ${KODI_INCLUDE_DIR}
-- ${X_INCLUDE_DIRS}
-+ ${X_INCLUDE_DIR}
- ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build
- ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src
- ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib
-@@ -67,7 +67,7 @@
- --disable-skyrocket
- --disable-solarwinds
- --disable-sound
-- --x-includes=${X_INCLUDE_DIRS}
-+ --x-includes=${X_INCLUDE_DIR}
- --x-libraries=${X_LIBRARIES}
- ${PNG_PATH}
- ${EXTRA_FLAGS}
diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
index c523ce5a1c..076c7effa0 100644
--- a/package/kodi-screensaver-rsxs/Config.in
+++ b/package/kodi-screensaver-rsxs/Config.in
@@ -1,13 +1,17 @@
config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
bool "kodi-screensaver-rsxs"
depends on BR2_PACKAGE_HAS_LIBGL # libglu
- depends on BR2_PACKAGE_XORG7 # xlib_libXmu
+ select BR2_PACKAGE_BZIP2
+ select BR2_PACKAGE_GLI
+ select BR2_PACKAGE_GLM
+ select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBPNG
- select BR2_PACKAGE_XLIB_LIBXMU
+ select BR2_PACKAGE_LIBTOOL
+ select BR2_PACKAGE_TIFF
help
RSXS screensaver add-ons for Kodi
- https://github.com/notspiff/screensavers.rsxs
+ https://github.com/xbmc/screensavers.rsxs
-comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL"
- depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
+comment "kodi-screensaver-rsxs needs an OpenGL backend"
+ depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
index e80c972ebb..b2d9e33a57 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6 kodi-screensaver-rsxs-1.3.0.tar.gz
+sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index 64ffb4fba6..e208698797 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -4,10 +4,9 @@
#
################################################################################
-KODI_SCREENSAVER_RSXS_VERSION = 1.3.0
-KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,v$(KODI_SCREENSAVER_RSXS_VERSION))
+KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe
+KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
-KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
-KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff
$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: bump version
2020-01-18 20:06 ` [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: " Bernd Kuhls
@ 2020-01-18 22:14 ` Yann E. MORIN
2020-01-18 22:42 ` Bernd Kuhls
0 siblings, 1 reply; 29+ messages in thread
From: Yann E. MORIN @ 2020-01-18 22:14 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-01-18 21:06 +0100, Bernd Kuhls spake thusly:
> Updated dependencies after upstream commit
> https://github.com/xbmc/screensavers.rsxs/commit/dbb88536964dc0ca4144016eb12f7307b60cb1fa
> Also removed patch 0002 because this package has no direct dependency
> for X libraries anymore.
>
> Removed patch 0001 which was applied upstream
> https://github.com/xbmc/screensavers.rsxs/commit/b9dda499db62944d9a95f4690d67101eca539ca7
>
> Added patch to disable building the drempels screensaver which depends
> on imagemagick6.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
[--SNIP--]
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index a86ccd0..b5ca03f 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -40,8 +40,7 @@ include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Ko
> + if(ImageMagick_FOUND AND NOT ${OWN_IMAGE_MAGICK})
> + message(STATUS "ImageMagick found in the system and is used")
Ideally, upstream should also add a check for the ImageMagick version
that was found.
> + else()
> +- message(STATUS "ImageMagick not found or forced and add custom created")
> +- add_subdirectory(lib/ImageMagick)
> ++ message(STATUS "ImageMagick not found")
Why can't we use the bundled minimal ImageMagick?
Note: I am fine with disabling entirely, but I'd prefer this is
explictly stated, like:
Even though rsxs has a minimal bundled imagemagick, we simply
disable drempels to avoidusing a bundled library.
[--SNIP--]
> diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
> index c523ce5a1c..076c7effa0 100644
> --- a/package/kodi-screensaver-rsxs/Config.in
> +++ b/package/kodi-screensaver-rsxs/Config.in
> @@ -1,13 +1,17 @@
> config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
> bool "kodi-screensaver-rsxs"
> depends on BR2_PACKAGE_HAS_LIBGL # libglu
> - depends on BR2_PACKAGE_XORG7 # xlib_libXmu
> + select BR2_PACKAGE_BZIP2
> + select BR2_PACKAGE_GLI
> + select BR2_PACKAGE_GLM
> + select BR2_PACKAGE_JPEG
> select BR2_PACKAGE_LIBPNG
> - select BR2_PACKAGE_XLIB_LIBXMU
> + select BR2_PACKAGE_LIBTOOL
> + select BR2_PACKAGE_TIFF
You're adding a few dependencies, some of whihch are not ovious, like
libtool.
Additionally, you're not propagating the dependency of glm (needs
libstdc++). That's OK because Kodi does need C++, and thus rsxs already
implicitly has that dependency, but I don;t like it much, though...
Your commit logs are more about 'what' is done, which is OK to recap a
big patch, but the really interesting part in a commit log is the 'why'.
Again, if all it takes are a few sentences or bullet points to be added
to the commit log, no need to respin: I can add them locally before
applying.
Regards,
Yann E. MORIN.
> help
> RSXS screensaver add-ons for Kodi
>
> - https://github.com/notspiff/screensavers.rsxs
> + https://github.com/xbmc/screensavers.rsxs
>
> -comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL"
> - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
> +comment "kodi-screensaver-rsxs needs an OpenGL backend"
> + depends on !BR2_PACKAGE_HAS_LIBGL
> diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> index e80c972ebb..b2d9e33a57 100644
> --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> @@ -1,2 +1,2 @@
> # Locally computed
> -sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6 kodi-screensaver-rsxs-1.3.0.tar.gz
> +sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz
> diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> index 64ffb4fba6..e208698797 100644
> --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> @@ -4,10 +4,9 @@
> #
> ################################################################################
>
> -KODI_SCREENSAVER_RSXS_VERSION = 1.3.0
> -KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,v$(KODI_SCREENSAVER_RSXS_VERSION))
> +KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe
> +KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
> KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
> -KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
> -KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
> +KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff
>
> $(eval $(cmake-package))
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: bump version
2020-01-18 22:14 ` Yann E. MORIN
@ 2020-01-18 22:42 ` Bernd Kuhls
2020-01-19 8:53 ` Yann E. MORIN
0 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 22:42 UTC (permalink / raw)
To: buildroot
Hi Yann,
Am Sat, 18 Jan 2020 23:14:42 +0100 schrieb Yann E. MORIN:
> Note: I am fine with disabling entirely, but I'd prefer this is
> explictly stated, like:
>
> Even though rsxs has a minimal bundled imagemagick, we simply
> disable drempels to avoid using a bundled library.
ok, you can add this sentence to the commit log because this was my
intention.
> You're adding a few dependencies, some of whihch are not ovious, like
> libtool.
They are all lined-up in CMakeLists.txt, including ltdl:
https://github.com/xbmc/screensavers.rsxs/blob/Leia/CMakeLists.txt#L15
> Additionally, you're not propagating the dependency of glm (needs
> libstdc++). That's OK because Kodi does need C++, and thus rsxs already
> implicitly has that dependency, but I don;t like it much, though...
True, but there will never be a time when Kodi will not depend on c++ so
I did not add this dependency to all the subpackages of kodi.
> Again, if all it takes are a few sentences or bullet points to be added
> to the commit log, no need to respin: I can add them locally before
> applying.
If you consider my explanations sufficient you are free to add them to
the commit log ;)
> Regards,
> Yann E. MORIN.
Regards, Bernd
PS: Please note that you will not receive emails from me because your
provider blocks my provider for several years now:
<yann.morin.1998@free.fr>: delivery temporarily suspended: host
mx2.free.fr[212.27.42.59] refused to talk to me: 421 Too many errors from
your IP (194.25.134.85), please visit http://postmaster.free.fr/
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: bump version
2020-01-18 22:42 ` Bernd Kuhls
@ 2020-01-19 8:53 ` Yann E. MORIN
0 siblings, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2020-01-19 8:53 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-01-18 23:42 +0100, Bernd Kuhls spake thusly:
> Am Sat, 18 Jan 2020 23:14:42 +0100 schrieb Yann E. MORIN:
> > Note: I am fine with disabling entirely, but I'd prefer this is
> > explictly stated, like:
> >
> > Even though rsxs has a minimal bundled imagemagick, we simply
> > disable drempels to avoid using a bundled library.
> ok, you can add this sentence to the commit log because this was my
> intention.
>
> > You're adding a few dependencies, some of whihch are not ovious, like
> > libtool.
>
> They are all lined-up in CMakeLists.txt, including ltdl:
> https://github.com/xbmc/screensavers.rsxs/blob/Leia/CMakeLists.txt#L15
>
> > Additionally, you're not propagating the dependency of glm (needs
> > libstdc++). That's OK because Kodi does need C++, and thus rsxs already
> > implicitly has that dependency, but I don;t like it much, though...
>
> True, but there will never be a time when Kodi will not depend on c++ so
> I did not add this dependency to all the subpackages of kodi.
Yeah, but seeing new 'select' for whjich the dependencies are not
propagated at least warrant a note in the commit log, if at all to show
the reviewers/committers that you accoutned for the deepndency in some
way (and that it is not just an oversight).
Thanks for the feedback. :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v8 16/20] package/kodi-screensaver-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (14 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 15/20] package/kodi-screensaver-rsxs: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 17/20] package/kodi-skin-confluence: bump version Bernd Kuhls
` (4 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Most screensaver repos were moved to the xbmc project:
https://github.com/xbmc/repo-binary-addons/commit/57b8ed5fb9b5f0368738260b762cc0bab1147172
https://github.com/xbmc/repo-binary-addons/commit/29c23f8e0cbfab6c39eb910ebc4f23f7afdec87e
https://github.com/xbmc/repo-binary-addons/commit/98e71315026fd163de7cc15dad8e2c0398851499
https://github.com/xbmc/repo-binary-addons/commit/994b0d5b73118e6dc5cece534daffb6a176fa426
https://github.com/xbmc/repo-binary-addons/commit/21b0c96d7fbff7853aadf63868b79384cdb40394
Add patches to fix missing cstddef include.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-screensaver-asterwave/Config.in | 2 +-
.../kodi-screensaver-asterwave.hash | 2 +-
.../kodi-screensaver-asterwave.mk | 4 +--
.../0001-Add-missing-stddef-include.patch | 25 +++++++++++++++
package/kodi-screensaver-biogenesis/Config.in | 2 +-
.../kodi-screensaver-biogenesis.hash | 2 +-
.../kodi-screensaver-biogenesis.mk | 4 +--
package/kodi-screensaver-cpblobs/Config.in | 2 +-
.../kodi-screensaver-cpblobs.hash | 2 +-
.../kodi-screensaver-cpblobs.mk | 4 +--
.../kodi-screensaver-crystalmorph.hash | 2 +-
.../kodi-screensaver-crystalmorph.mk | 2 +-
package/kodi-screensaver-greynetic/Config.in | 2 +-
.../kodi-screensaver-greynetic.hash | 2 +-
.../kodi-screensaver-greynetic.mk | 4 +--
.../0001-Add-missing-stddef-include.patch | 25 +++++++++++++++
.../kodi-screensaver-matrixtrails/Config.in | 2 +-
.../kodi-screensaver-matrixtrails.hash | 2 +-
.../kodi-screensaver-matrixtrails.mk | 5 ++-
...ackport-Add-missing-cstddef-includes.patch | 32 +++++++++++++++++++
package/kodi-screensaver-pingpong/Config.in | 2 +-
.../kodi-screensaver-pingpong.hash | 2 +-
.../kodi-screensaver-pingpong.mk | 4 +--
.../0001-Add-missing-stddef-include.patch | 25 +++++++++++++++
package/kodi-screensaver-pyro/Config.in | 2 +-
.../kodi-screensaver-pyro.hash | 2 +-
.../kodi-screensaver-pyro.mk | 4 +--
package/kodi-screensaver-stars/Config.in | 2 +-
.../kodi-screensaver-stars.hash | 2 +-
.../kodi-screensaver-stars.mk | 4 +--
30 files changed, 141 insertions(+), 35 deletions(-)
create mode 100644 package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
create mode 100644 package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
create mode 100644 package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
create mode 100644 package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
diff --git a/package/kodi-screensaver-asterwave/Config.in b/package/kodi-screensaver-asterwave/Config.in
index bd5db738ca..b5e80cc535 100644
--- a/package/kodi-screensaver-asterwave/Config.in
+++ b/package/kodi-screensaver-asterwave/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE
help
AsterWave screensaver for Kodi
- https://github.com/notspiff/screensaver.asterwave
+ https://github.com/xbmc/screensaver.asterwave
comment "kodi-screensaver-asterwave needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
index 40c8f9b28c..b05c9a1803 100644
--- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
+++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 48cd459b60b2407b8bae9107760a013d04ee29e00fddbce9550291896d42ef64 kodi-screensaver-asterwave-1.1.0.tar.gz
+sha256 ff018b5bdd353747a4e962c72ec622a74232e05eae1742a116259273f1db0552 kodi-screensaver-asterwave-3.0.3-Leia.tar.gz
diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
index 8f6d583829..82996bc3e2 100644
--- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
+++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_ASTERWAVE_VERSION = 1.1.0
-KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,notspiff,screensaver.asterwave,v$(KODI_SCREENSAVER_ASTERWAVE_VERSION))
+KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.3-Leia
+KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION))
KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil
$(eval $(cmake-package))
diff --git a/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch b/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
new file mode 100644
index 0000000000..378b3ad1de
--- /dev/null
+++ b/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
@@ -0,0 +1,25 @@
+From 86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sun, 24 Mar 2019 10:53:31 +0100
+Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro
+
+Downloaded from upstream commit:
+https://github.com/xbmc/screensaver.biogenesis/commit/86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/Life.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Life.cpp b/src/Life.cpp
+index 762ad7d..68be133 100644
+--- a/src/Life.cpp
++++ b/src/Life.cpp
+@@ -24,6 +24,7 @@
+
+ #include "types.h"
+ #include <memory.h>
++#include <stddef.h>
+ #ifdef WIN32
+ #include <d3d11.h>
+ #else
diff --git a/package/kodi-screensaver-biogenesis/Config.in b/package/kodi-screensaver-biogenesis/Config.in
index cdc2d91951..9703e9091b 100644
--- a/package/kodi-screensaver-biogenesis/Config.in
+++ b/package/kodi-screensaver-biogenesis/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS
help
BioGenesis screensaver for Kodi
- https://github.com/notspiff/screensaver.biogenesis
+ https://github.com/xbmc/screensaver.biogenesis
comment "kodi-screensaver-biogenesis needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
index 81b57e4265..c0e03d2375 100644
--- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
+++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 b97dc804261b19df725e0a9f1af3be6903226ae616fcac170f7b9c1a67bf811a kodi-screensaver-biogenesis-1.1.0.tar.gz
+sha256 1d1edff918d2a94ba0efd329a45294be47e73eef65f700d62b311eb750d0fef7 kodi-screensaver-biogenesis-2.2.2-Leia.tar.gz
diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
index fe0d284448..3888f2996e 100644
--- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
+++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_BIOGENESIS_VERSION = 1.1.0
-KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,v$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
+KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.2-Leia
+KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp
KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-cpblobs/Config.in b/package/kodi-screensaver-cpblobs/Config.in
index e80ea0ebb3..4e0003bddc 100644
--- a/package/kodi-screensaver-cpblobs/Config.in
+++ b/package/kodi-screensaver-cpblobs/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS
help
CpBlobs screensaver for Kodi
- https://github.com/notspiff/screensaver.cpblobs
+ https://github.com/xbmc/screensaver.cpblobs
comment "kodi-screensaver-cpblobs needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
index bc1228c55f..88fdca45c8 100644
--- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
+++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 1ca5e4de61251de7e420dc6ded3156960f9bb52ed7ff0243f305768147d470e3 kodi-screensaver-cpblobs-1.1.0.tar.gz
+sha256 6d7a0036a118778117d1d1ebeca96903e66f49a166848a1c884aaf3ed65fdd46 kodi-screensaver-cpblobs-e65b34fb75ac258a8563169b9c00ebf739dbc7ca.tar.gz
diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
index 09dc6c16fc..bb6811dab3 100644
--- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
+++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_CPBLOBS_VERSION = 1.1.0
-KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,v$(KODI_SCREENSAVER_CPBLOBS_VERSION))
+KODI_SCREENSAVER_CPBLOBS_VERSION = e65b34fb75ac258a8563169b9c00ebf739dbc7ca
+KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION))
KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0
KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE
KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil
diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
index ff9d6d0244..6442b4d5bc 100644
--- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
+++ b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 a8400c8d8be0fe0ba616ad1d0ef5fd798980a9dd4e38ef88bee9bf74a06975d5 kodi-screensaver-crystalmorph-1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e.tar.gz
+sha256 d8ed548222f1118964104fefc8ac3056dfe6c9d2ee35cd7c8355c9ea9fcaffc5 kodi-screensaver-crystalmorph-4439c84c38abf889e19a1863e745942c0d7f8203.tar.gz
diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
index 83629e41ca..35642d5580 100644
--- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
+++ b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e
+KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 4439c84c38abf889e19a1863e745942c0d7f8203
KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION))
KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+
KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp
diff --git a/package/kodi-screensaver-greynetic/Config.in b/package/kodi-screensaver-greynetic/Config.in
index ce636b8271..685feb8872 100644
--- a/package/kodi-screensaver-greynetic/Config.in
+++ b/package/kodi-screensaver-greynetic/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC
help
Greynetic screensaver for Kodi
- https://github.com/notspiff/screensaver.greynetic
+ https://github.com/xbmc/screensaver.greynetic
comment "kodi-screensaver-greynetic needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
index 5ca0f66d58..28c669d831 100644
--- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
+++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 55a77487f02d282e8431e64de3cb263489037c2374a4b9cdd7aa189093e7621f kodi-screensaver-greynetic-1.1.0.tar.gz
+sha256 d95bc93d022b12fbfcbaedf1128292b40dd16276b65a3ffecb90707055e1d55f kodi-screensaver-greynetic-2.2.1-Leia.tar.gz
diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
index ef95dc7505..f9b0be1ad5 100644
--- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
+++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_GREYNETIC_VERSION = 1.1.0
-KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,v$(KODI_SCREENSAVER_GREYNETIC_VERSION))
+KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.1-Leia
+KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION))
KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+
KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp
KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch b/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
new file mode 100644
index 0000000000..75cadfcb1e
--- /dev/null
+++ b/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
@@ -0,0 +1,25 @@
+From 404763f096a312e12c0dc4764834987797411745 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sun, 24 Mar 2019 11:44:05 +0100
+Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro
+
+Downloaded from upstream commit:
+https://github.com/xbmc/screensaver.matrixtrails/commit/404763f096a312e12c0dc4764834987797411745
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/matrixtrails.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/matrixtrails.cpp b/src/matrixtrails.cpp
+index 220855a..2817dbe 100644
+--- a/src/matrixtrails.cpp
++++ b/src/matrixtrails.cpp
+@@ -25,6 +25,7 @@
+ #include "matrixtrails.h"
+ #include "SOIL2/SOIL2.h"
+
++#include <stddef.h>
+ #include <vector>
+
+ ////////////////////////////////////////////////////////////////////////////
diff --git a/package/kodi-screensaver-matrixtrails/Config.in b/package/kodi-screensaver-matrixtrails/Config.in
index e2d3f71acf..270a51c9f4 100644
--- a/package/kodi-screensaver-matrixtrails/Config.in
+++ b/package/kodi-screensaver-matrixtrails/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS
help
Matrix trails screensaver for Kodi
- https://github.com/notspiff/screensaver.matrixtrails
+ https://github.com/xbmc/screensaver.matrixtrails
comment "kodi-screensaver-matrixtrails needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
index 6ba6d542b0..737c522715 100644
--- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
+++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 2b531f51b86536df2a5268547e3d1b7fabc8a1dc930808b46685afcc455bb8fa kodi-screensaver-matrixtrails-1.1.0.tar.gz
+sha256 2d2c795853c5a72184bb6720247d79c48b1d9fbc97e9c2913003a707d612e3ac kodi-screensaver-matrixtrails-v2.2.1-Leia.tar.gz
diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
index ff64ccb17f..670cec3efb 100644
--- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
+++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
@@ -4,11 +4,10 @@
#
################################################################################
-KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 1.1.0
-KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
+KODI_SCREENSAVER_MATRIXTRAILS_VERSION = v2.2.1-Leia
+KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp
-
KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil
$(eval $(cmake-package))
diff --git a/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch b/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
new file mode 100644
index 0000000000..f71e1899ae
--- /dev/null
+++ b/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
@@ -0,0 +1,32 @@
+From 6ca75e7d421a49b6124d0e1cd37a529c66a701cb Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 18 Jan 2020 20:01:21 +0100
+Subject: [PATCH] [Backport] Add missing cstddef includes
+
+Fixes build error with gcc 5.5.0.
+
+Backported from https://github.com/xbmc/screensaver.pingpong/pull/21
+
+Patch sent upstream:
+https://github.com/xbmc/screensaver.pingpong/pull/22
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/pingpong.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pingpong.cpp b/src/pingpong.cpp
+index e1df353..9cd9fb5 100644
+--- a/src/pingpong.cpp
++++ b/src/pingpong.cpp
+@@ -24,6 +24,7 @@
+ #include "main.h"
+ #include "pingpong.h"
+
++#include <cstddef>
+ #include <vector>
+
+ #define NUMQUADS 3
+--
+2.20.1
+
diff --git a/package/kodi-screensaver-pingpong/Config.in b/package/kodi-screensaver-pingpong/Config.in
index 3971052b94..bc76fffd6e 100644
--- a/package/kodi-screensaver-pingpong/Config.in
+++ b/package/kodi-screensaver-pingpong/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG
help
Ping-pong screensaver for Kodi
- https://github.com/notspiff/screensaver.pingpong
+ https://github.com/xbmc/screensaver.pingpong
comment "kodi-screensaver-pingpong needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
index 12049cf989..0a6ab63954 100644
--- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
+++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 99e9cbc3815d4e3dad964b2d233dbf6acc4416121398f7fca75f3811cb04d88f kodi-screensaver-pingpong-1.1.0.tar.gz
+sha256 d4e09509bf036b7d5c381cd4ecac926a59396fb481347a4056d843ae68d3a20d kodi-screensaver-pingpong-2.1.1-Leia.tar.gz
diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
index f8830f24fd..45f2d23039 100644
--- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
+++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_PINGPONG_VERSION = 1.1.0
-KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,v$(KODI_SCREENSAVER_PINGPONG_VERSION))
+KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.1-Leia
+KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION))
KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+
KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt
KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch b/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
new file mode 100644
index 0000000000..c463d42d58
--- /dev/null
+++ b/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
@@ -0,0 +1,25 @@
+From e1dbe7822b35b889fdc5ea54114ad3f9669d440e Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sun, 24 Mar 2019 10:55:44 +0100
+Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro
+
+Downloaded from upstream commit in master branch:
+https://github.com/xbmc/screensaver.pyro/commit/e1dbe7822b35b889fdc5ea54114ad3f9669d440e
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/Pyro.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Pyro.cpp b/src/Pyro.cpp
+index 3f873a2..6dfa764 100644
+--- a/src/Pyro.cpp
++++ b/src/Pyro.cpp
+@@ -34,6 +34,7 @@
+ #include "Pyro.h"
+ #include <stdio.h>
+ #include <math.h>
++#include <stddef.h>
+ #include <stdlib.h>
+
+ #ifdef WIN32
diff --git a/package/kodi-screensaver-pyro/Config.in b/package/kodi-screensaver-pyro/Config.in
index 982542d5a3..e2d1988ec5 100644
--- a/package/kodi-screensaver-pyro/Config.in
+++ b/package/kodi-screensaver-pyro/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PYRO
help
Pyro screensaver for Kodi
- https://github.com/notspiff/screensaver.pyro
+ https://github.com/xbmc/screensaver.pyro
comment "kodi-screensaver-pyro needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
index be29ca3bef..8e8dee0ade 100644
--- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
+++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 0dcaed581ffe5595878338a8c9c55bd7acc87e03d30a4d3ca4a03c3f8db66ddc kodi-screensaver-pyro-1.1.0.tar.gz
+sha256 55f867b703e5cf409f8e0a8a2c34373f896feb990004b5901b4efaee905d42e5 kodi-screensaver-pyro-3.0.0-Leia.tar.gz
diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
index 4d6b1f72d3..7b3b63ab7f 100644
--- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
+++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_PYRO_VERSION = 1.1.0
-KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,v$(KODI_SCREENSAVER_PYRO_VERSION))
+KODI_SCREENSAVER_PYRO_VERSION = 3.0.0-Leia
+KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION))
KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+
KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp
KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-stars/Config.in b/package/kodi-screensaver-stars/Config.in
index bcfb47b2cc..a2e435c0f6 100644
--- a/package/kodi-screensaver-stars/Config.in
+++ b/package/kodi-screensaver-stars/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_STARS
help
Starfield screensaver for Kodi
- https://github.com/notspiff/screensaver.stars
+ https://github.com/xbmc/screensaver.stars
comment "kodi-screensaver-stars needs OpenGL"
depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
index 63335742b2..e3e0ca933a 100644
--- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
+++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 525caac94fd2bd858daf9fa7719eea4181c168e5c692bb896689625bf4437d32 kodi-screensaver-stars-1.1.0.tar.gz
+sha256 dca39e68d803cca3c1d9524df17feb3e12fc7eeae4166c6311a97dc68c29f523 kodi-screensaver-stars-2.1.3-Leia.tar.gz
diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
index 19e9db7194..a23f4d93f7 100644
--- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
+++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_SCREENSAVER_STARS_VERSION = 1.1.0
-KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,v$(KODI_SCREENSAVER_STARS_VERSION))
+KODI_SCREENSAVER_STARS_VERSION = 2.1.3-Leia
+KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION))
KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp
KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 17/20] package/kodi-skin-confluence: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (15 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 16/20] package/kodi-screensaver-*: mass version bump Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 18/20] package/kodi-visualisation-goom: " Bernd Kuhls
` (3 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Added license hash.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-skin-confluence/kodi-skin-confluence.hash | 3 ++-
package/kodi-skin-confluence/kodi-skin-confluence.mk | 4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash
index 2dabbbd4c2..113548bf64 100644
--- a/package/kodi-skin-confluence/kodi-skin-confluence.hash
+++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha256 1fa8ebeec269e678111f64bec373d98e34b4ba1b32e583a505431b2562910ba0 kodi-skin-confluence-37bba429adc16d49a07add08de406682e1cc673a.tar.gz
+sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz
+sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt
diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk
index e9cdf3fbf7..d9bd10bdfa 100644
--- a/package/kodi-skin-confluence/kodi-skin-confluence.mk
+++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk
@@ -4,9 +4,7 @@
#
################################################################################
-# This cset is on the branch 'krypton'
-# When Kodi is updated, then this should be updated to the corresponding branch
-KODI_SKIN_CONFLUENCE_VERSION = 37bba429adc16d49a07add08de406682e1cc673a
+KODI_SKIN_CONFLUENCE_VERSION = cffcb8320003e6048abe4b26316e5d5f3d50eac9
KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION))
KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0
KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 18/20] package/kodi-visualisation-goom: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (16 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 17/20] package/kodi-skin-confluence: bump version Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 20:06 ` [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump Bernd Kuhls
` (2 subsequent siblings)
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Removed 0001-cross-compile.patch, not needed anymore:
https://github.com/xbmc/visualization.goom/pull/4#issuecomment-537987594
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-cross-compile.patch | 32 -------------------
.../kodi-visualisation-goom.hash | 2 +-
.../kodi-visualisation-goom.mk | 4 +--
3 files changed, 3 insertions(+), 35 deletions(-)
delete mode 100644 package/kodi-visualisation-goom/0001-cross-compile.patch
diff --git a/package/kodi-visualisation-goom/0001-cross-compile.patch b/package/kodi-visualisation-goom/0001-cross-compile.patch
deleted file mode 100644
index 8dd0fe9109..0000000000
--- a/package/kodi-visualisation-goom/0001-cross-compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix cross-compilation
-
-Use the cross-compiler and not the host version.
-
-Patch sent upstream:
-https://github.com/notspiff/visualization.goom/pull/4
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt
---- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt 2014-10-31 11:34:21.000000000 +0100
-+++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt 2015-07-19 19:49:43.340054342 +0200
-@@ -13,6 +13,10 @@
- ${KODI_INCLUDE_DIR}
- ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src)
-
-+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME )
-+string( REGEX REPLACE "-[^-]+$" ""
-+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" )
-+
- include(ExternalProject)
- set(update_command "")
- if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE)
-@@ -20,7 +24,7 @@
- endif()
- externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0
- "${update_command}"
-- CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR>
-+ CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR> --host=${TOOLCHAIN_NAME}
- BUILD_COMMAND ${MAKE}
- INSTALL_COMMAND "")
-
diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
index fa5fbf6c37..37d203224a 100644
--- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
+++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 501b8b1d5bd174ec71d57894293ae5eb0c1f41c3b725ab5e7b5a1c5eeea77a7f kodi-visualisation-goom-54da35870930acd1a3a36195dd2c1498ac336b90.tar.gz
+sha256 49f193d32a14b26a39d6572fcbdd8b69a9e559f453bca017086336e985bf6b2c kodi-visualisation-goom-2.1.0-Leia.tar.gz
diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
index a7503a97d8..487a520220 100644
--- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
+++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_VISUALISATION_GOOM_VERSION = 54da35870930acd1a3a36195dd2c1498ac336b90
-KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
+KODI_VISUALISATION_GOOM_VERSION = 2.1.0-Leia
+KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+
KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (17 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 18/20] package/kodi-visualisation-goom: " Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 22:03 ` Yann E. MORIN
2020-01-18 20:06 ` [Buildroot] [PATCH v8 20/20] package/kodi-vfs-sftp: bump version Bernd Kuhls
2020-01-18 22:02 ` [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Yann E. MORIN
20 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Rebased
package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
Added patch to fix cstddef include and license hash for
kodi-visualisation-spectrum.
Visualisation repos were moved to the xbmc project:
https://github.com/xbmc/repo-binary-addons/commit/38166cbdfa18d361e5b6009296a78c69a1172879
https://github.com/xbmc/repo-binary-addons/commit/57b8ed5fb9b5f0368738260b762cc0bab1147172
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../kodi-visualisation-fishbmc.hash | 2 +-
.../kodi-visualisation-fishbmc.mk | 4 +-
...-also-search-for-egl-with-pkg-config.patch | 44 -------------------
.../kodi-visualisation-shadertoy.hash | 2 +-
.../kodi-visualisation-shadertoy.mk | 4 +-
...Backport-Add-missing-cstddef-include.patch | 30 +++++++++++++
.../kodi-visualisation-spectrum.hash | 3 +-
.../kodi-visualisation-spectrum.mk | 4 +-
.../kodi-visualisation-waveform.hash | 2 +-
.../kodi-visualisation-waveform.mk | 4 +-
10 files changed, 43 insertions(+), 56 deletions(-)
delete mode 100644 package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
create mode 100644 package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
index 21d80a31cb..cd4734eaab 100644
--- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
+++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 cf42a21978578cb5ecb10c20fe09791183d8ef2998ff9d956a84142a7dda8f72 kodi-visualisation-fishbmc-4.1.0.tar.gz
+sha256 8142fe4a32c0c113945c5fc9745e54639ca73308371d292e3422730bfad1d064 kodi-visualisation-fishbmc-5.1.2-Leia.tar.gz
diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
index 8360660ef4..a89c559d26 100644
--- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
+++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_VISUALISATION_FISHBMC_VERSION = 4.1.0
-KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,v$(KODI_VISUALISATION_FISHBMC_VERSION))
+KODI_VISUALISATION_FISHBMC_VERSION = 5.1.2-Leia
+KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION))
KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+
KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE
KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
deleted file mode 100644
index 8de96a6de3..0000000000
--- a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9c428c3c9f120a11468f98546bcc754d2c3302af Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 30 Jul 2015 10:02:15 +0200
-Subject: [PATCH] FindOpenGLES2: also search for egl with pkg-config
-
-The non-pkg-config path looks for both EGL *and* OpenGL ES, but not
-the pkg-config path, which might lead to missing libraries/headers if
-egl.pc has more header paths or libraries than glesv2.pc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- CMakeLists.txt | 2 +-
- FindOpenGLES2.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b084cf..81bbe27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,7 +35,7 @@
- endif()
- endif()
-
-- include_directories(${OpenGL_INCLUDE_DIR}
-+ include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS}
- ${KODI_INCLUDE_DIR}
- ${p8-platform_INCLUDE_DIRS}
- ${PROJECT_SOURCE_DIR}/lib/kissfft
-diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake
-index e1b7d21..2a9ce0d 100644
---- a/FindOpenGLES2.cmake
-+++ b/FindOpenGLES2.cmake
-@@ -7,7 +7,7 @@
-
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(OpenGLES2 glesv2)
-+ pkg_check_modules(OpenGLES2 glesv2 egl)
- endif(PKG_CONFIG_FOUND)
-
- if(NOT OPENGLES2_FOUND)
---
-2.5.0
-
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
index ae8c59ddb0..cf3e06daa7 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd kodi-visualisation-shadertoy-1.1.5.tar.gz
+sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
index a2b1b14d9f..b928e64d9b 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_VISUALISATION_SHADERTOY_VERSION = 1.1.5
-KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,v$(KODI_VISUALISATION_SHADERTOY_VERSION))
+KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia
+KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
diff --git a/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch b/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
new file mode 100644
index 0000000000..5b1bb0c47c
--- /dev/null
+++ b/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
@@ -0,0 +1,30 @@
+From b2c54c1043c2396678005b578e85db30bdf5ccb9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 18 Jan 2020 20:22:41 +0100
+Subject: [PATCH] [Backport] Add missing cstddef include
+
+Backported from https://github.com/xbmc/visualization.spectrum/pull/37
+
+Patch sent upstream:
+https://github.com/xbmc/visualization.spectrum/pull/38
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/opengl_spectrum.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/opengl_spectrum.cpp b/src/opengl_spectrum.cpp
+index 05409ea..2441fd6 100644
+--- a/src/opengl_spectrum.cpp
++++ b/src/opengl_spectrum.cpp
+@@ -38,6 +38,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <stdint.h>
++#include <cstddef>
+
+ #include <glm/glm.hpp>
+ #include <glm/gtc/type_ptr.hpp>
+--
+2.20.1
+
diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
index 2d9ab0f3cf..4064184a75 100644
--- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
+++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha256 7ee78ff5c24e3f81b6e2a9208237f34667cb9faa5453d7bdb900ab65245973f1 kodi-visualisation-spectrum-1.1.1.tar.gz
+sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
index 016f405e40..c3d61c1ef4 100644
--- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
+++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_VISUALISATION_SPECTRUM_VERSION = 1.1.1
-KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,v$(KODI_VISUALISATION_SPECTRUM_VERSION))
+KODI_VISUALISATION_SPECTRUM_VERSION = 3.0.2-Leia
+KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+
KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
index 271dc4a9e0..af6fd37a03 100644
--- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
+++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 cf10d8d78cb2bde4a0a21bb7e467445617b46593c093ef05f336f95a048f2d54 kodi-visualisation-waveform-1.1.0.tar.gz
+sha256 c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b kodi-visualisation-waveform-3.1.1-Leia.tar.gz
diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
index 13a621edb0..2d65df8538 100644
--- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
+++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
@@ -4,8 +4,8 @@
#
################################################################################
-KODI_VISUALISATION_WAVEFORM_VERSION = 1.1.0
-KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,v$(KODI_VISUALISATION_WAVEFORM_VERSION))
+KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.1-Leia
+KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+
KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump
2020-01-18 20:06 ` [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump Bernd Kuhls
@ 2020-01-18 22:03 ` Yann E. MORIN
2020-01-18 22:35 ` Bernd Kuhls
0 siblings, 1 reply; 29+ messages in thread
From: Yann E. MORIN @ 2020-01-18 22:03 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-01-18 21:06 +0100, Bernd Kuhls spake thusly:
> Rebased
> package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
You said "rebased" but you removed it altogether. It has however never
been upstreamed, AFAICS... Care to comment/explai, please?
Note: if onlt the commit log needes to be fixed, no need to respin the
series, I can fix locally before applying.
Thanks! :-)
Regards,
Yann E. MORIN.
> Added patch to fix cstddef include and license hash for
> kodi-visualisation-spectrum.
>
> Visualisation repos were moved to the xbmc project:
> https://github.com/xbmc/repo-binary-addons/commit/38166cbdfa18d361e5b6009296a78c69a1172879
> https://github.com/xbmc/repo-binary-addons/commit/57b8ed5fb9b5f0368738260b762cc0bab1147172
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> .../kodi-visualisation-fishbmc.hash | 2 +-
> .../kodi-visualisation-fishbmc.mk | 4 +-
> ...-also-search-for-egl-with-pkg-config.patch | 44 -------------------
> .../kodi-visualisation-shadertoy.hash | 2 +-
> .../kodi-visualisation-shadertoy.mk | 4 +-
> ...Backport-Add-missing-cstddef-include.patch | 30 +++++++++++++
> .../kodi-visualisation-spectrum.hash | 3 +-
> .../kodi-visualisation-spectrum.mk | 4 +-
> .../kodi-visualisation-waveform.hash | 2 +-
> .../kodi-visualisation-waveform.mk | 4 +-
> 10 files changed, 43 insertions(+), 56 deletions(-)
> delete mode 100644 package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
> create mode 100644 package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
>
> diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
> index 21d80a31cb..cd4734eaab 100644
> --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
> +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
> @@ -1,2 +1,2 @@
> # Locally computed
> -sha256 cf42a21978578cb5ecb10c20fe09791183d8ef2998ff9d956a84142a7dda8f72 kodi-visualisation-fishbmc-4.1.0.tar.gz
> +sha256 8142fe4a32c0c113945c5fc9745e54639ca73308371d292e3422730bfad1d064 kodi-visualisation-fishbmc-5.1.2-Leia.tar.gz
> diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
> index 8360660ef4..a89c559d26 100644
> --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
> +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -KODI_VISUALISATION_FISHBMC_VERSION = 4.1.0
> -KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,v$(KODI_VISUALISATION_FISHBMC_VERSION))
> +KODI_VISUALISATION_FISHBMC_VERSION = 5.1.2-Leia
> +KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION))
> KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+
> KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE
> KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi
> diff --git a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
> deleted file mode 100644
> index 8de96a6de3..0000000000
> --- a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From 9c428c3c9f120a11468f98546bcc754d2c3302af Mon Sep 17 00:00:00 2001
> -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -Date: Thu, 30 Jul 2015 10:02:15 +0200
> -Subject: [PATCH] FindOpenGLES2: also search for egl with pkg-config
> -
> -The non-pkg-config path looks for both EGL *and* OpenGL ES, but not
> -the pkg-config path, which might lead to missing libraries/headers if
> -egl.pc has more header paths or libraries than glesv2.pc.
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ----
> - CMakeLists.txt | 2 +-
> - FindOpenGLES2.cmake | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 8b084cf..81bbe27 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -35,7 +35,7 @@
> - endif()
> - endif()
> -
> -- include_directories(${OpenGL_INCLUDE_DIR}
> -+ include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS}
> - ${KODI_INCLUDE_DIR}
> - ${p8-platform_INCLUDE_DIRS}
> - ${PROJECT_SOURCE_DIR}/lib/kissfft
> -diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake
> -index e1b7d21..2a9ce0d 100644
> ---- a/FindOpenGLES2.cmake
> -+++ b/FindOpenGLES2.cmake
> -@@ -7,7 +7,7 @@
> -
> - find_package(PkgConfig)
> - if(PKG_CONFIG_FOUND)
> -- pkg_check_modules(OpenGLES2 glesv2)
> -+ pkg_check_modules(OpenGLES2 glesv2 egl)
> - endif(PKG_CONFIG_FOUND)
> -
> - if(NOT OPENGLES2_FOUND)
> ---
> -2.5.0
> -
> diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
> index ae8c59ddb0..cf3e06daa7 100644
> --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
> +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
> @@ -1,2 +1,2 @@
> # Locally computed
> -sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd kodi-visualisation-shadertoy-1.1.5.tar.gz
> +sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz
> diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
> index a2b1b14d9f..b928e64d9b 100644
> --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
> +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -KODI_VISUALISATION_SHADERTOY_VERSION = 1.1.5
> -KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,v$(KODI_VISUALISATION_SHADERTOY_VERSION))
> +KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia
> +KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
> KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
> KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
> KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
> diff --git a/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch b/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
> new file mode 100644
> index 0000000000..5b1bb0c47c
> --- /dev/null
> +++ b/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
> @@ -0,0 +1,30 @@
> +From b2c54c1043c2396678005b578e85db30bdf5ccb9 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
> +Date: Sat, 18 Jan 2020 20:22:41 +0100
> +Subject: [PATCH] [Backport] Add missing cstddef include
> +
> +Backported from https://github.com/xbmc/visualization.spectrum/pull/37
> +
> +Patch sent upstream:
> +https://github.com/xbmc/visualization.spectrum/pull/38
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + src/opengl_spectrum.cpp | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/opengl_spectrum.cpp b/src/opengl_spectrum.cpp
> +index 05409ea..2441fd6 100644
> +--- a/src/opengl_spectrum.cpp
> ++++ b/src/opengl_spectrum.cpp
> +@@ -38,6 +38,7 @@
> + #include <string.h>
> + #include <math.h>
> + #include <stdint.h>
> ++#include <cstddef>
> +
> + #include <glm/glm.hpp>
> + #include <glm/gtc/type_ptr.hpp>
> +--
> +2.20.1
> +
> diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
> index 2d9ab0f3cf..4064184a75 100644
> --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
> +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
> @@ -1,2 +1,3 @@
> # Locally computed
> -sha256 7ee78ff5c24e3f81b6e2a9208237f34667cb9faa5453d7bdb900ab65245973f1 kodi-visualisation-spectrum-1.1.1.tar.gz
> +sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz
> +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
> diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
> index 016f405e40..c3d61c1ef4 100644
> --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
> +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -KODI_VISUALISATION_SPECTRUM_VERSION = 1.1.1
> -KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,v$(KODI_VISUALISATION_SPECTRUM_VERSION))
> +KODI_VISUALISATION_SPECTRUM_VERSION = 3.0.2-Leia
> +KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
> KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+
> KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
> KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi
> diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
> index 271dc4a9e0..af6fd37a03 100644
> --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
> +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
> @@ -1,2 +1,2 @@
> # Locally computed
> -sha256 cf10d8d78cb2bde4a0a21bb7e467445617b46593c093ef05f336f95a048f2d54 kodi-visualisation-waveform-1.1.0.tar.gz
> +sha256 c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b kodi-visualisation-waveform-3.1.1-Leia.tar.gz
> diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
> index 13a621edb0..2d65df8538 100644
> --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
> +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -KODI_VISUALISATION_WAVEFORM_VERSION = 1.1.0
> -KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,v$(KODI_VISUALISATION_WAVEFORM_VERSION))
> +KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.1-Leia
> +KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
> KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+
> KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
> KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump
2020-01-18 22:03 ` Yann E. MORIN
@ 2020-01-18 22:35 ` Bernd Kuhls
2020-01-19 8:44 ` Yann E. MORIN
0 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 22:35 UTC (permalink / raw)
To: buildroot
Am Sat, 18 Jan 2020 23:03:58 +0100 schrieb Yann E. MORIN:
> Bernd, All,
>
> On 2020-01-18 21:06 +0100, Bernd Kuhls spake thusly:
>> Rebased
>> package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-
for-egl-with-pkg-config.patch
>
> You said "rebased" but you removed it altogether. It has however never
> been upstreamed, AFAICS... Care to comment/explai, please?
>
> Note: if onlt the commit log needes to be fixed, no need to respin the
> series, I can fix locally before applying.
Hi Yann,
you are right, the commit log needs to be rephrased:
Removed patch kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-
for-egl-with-pkg-config.patch because upstream removed glesv2 support:
https://github.com/xbmc/visualization.shadertoy/commit/
d880b98b932efc0c57670ec3f2def947664b60b0
Regards, Bernd
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump
2020-01-18 22:35 ` Bernd Kuhls
@ 2020-01-19 8:44 ` Yann E. MORIN
2020-01-19 9:02 ` Bernd Kuhls
0 siblings, 1 reply; 29+ messages in thread
From: Yann E. MORIN @ 2020-01-19 8:44 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-01-18 23:35 +0100, Bernd Kuhls spake thusly:
> Am Sat, 18 Jan 2020 23:03:58 +0100 schrieb Yann E. MORIN:
> > On 2020-01-18 21:06 +0100, Bernd Kuhls spake thusly:
> >> Rebased
> >> package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-
> for-egl-with-pkg-config.patch
> > You said "rebased" but you removed it altogether. It has however never
> > been upstreamed, AFAICS... Care to comment/explai, please?
> >
> > Note: if onlt the commit log needes to be fixed, no need to respin the
> > series, I can fix locally before applying.
>
> Hi Yann,
>
> you are right, the commit log needs to be rephrased:
>
> Removed patch kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-
> for-egl-with-pkg-config.patch because upstream removed glesv2 support:
>
> https://github.com/xbmc/visualization.shadertoy/commit/
> d880b98b932efc0c57670ec3f2def947664b60b0
Actualy, they did not remove gles2 support at all, as far as I can see
in that comit log; exceprts:
find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
PATHS ${PC_OPENGLES_INCLUDEDIR})
find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
PATHS ${PC_OPENGLES_LIBDIR})
[...]
if(OPENGLES_FOUND)
set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
if(OPENGLES3_INCLUDE_DIR)
set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
else()
set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
set(OPENGLES_DEFINITIONS -DHAS_GLES=2)
mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
endif()
endif()
So they still support gles2, and they additionally added support for
gles3.
But OK, they rewrote the code. However, looking at the [atch you remove,
and looking at the new code, I am not sure what we tried to fix is not
broken again. For example, the pkg-config check was changed (in our
patch):
-pkg_check_modules(OpenGLES2 glesv2)
+pkg_check_modules(OpenGLES2 glesv2 egl)
And their new code does something that is equivalent to the original
line we patched:
pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
So I wonder if we do not still need something similar to our patch...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump
2020-01-19 8:44 ` Yann E. MORIN
@ 2020-01-19 9:02 ` Bernd Kuhls
0 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-19 9:02 UTC (permalink / raw)
To: buildroot
Am Sun, 19 Jan 2020 09:44:06 +0100 schrieb Yann E. MORIN:
> But OK, they rewrote the code. However, looking at the [atch you remove,
> and looking at the new code, I am not sure what we tried to fix is not
> broken again. For example, the pkg-config check was changed (in our
> patch):
>
> -pkg_check_modules(OpenGLES2 glesv2) +pkg_check_modules(OpenGLES2
> glesv2 egl)
>
> And their new code does something that is equivalent to the original
> line we patched:
>
> pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
>
> So I wonder if we do not still need something similar to our patch...
Hi Yann,
the patch I removed existed to fix "The non-pkg-config path looks for
both EGL *and* OpenGL ES".
This was true with package version 1.1.5:
https://github.com/xbmc/visualization.shadertoy/blob/
e88fd6ee830bb2ec7c35239a90d1e03155a5c6d7/FindOpenGLES2.cmake#L21
find_library(OPENGLES2_egl_LIBRARY NAMES EGL)
Current version https://github.com/xbmc/visualization.shadertoy/blob/Leia/
FindOpenGLES.cmake however does not look for egl at all anymore, neither
do FindOpenGl.cmake and CMakeLists.txt, so I doubt that our fix is still
needed.
Regards, Bernd
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v8 20/20] package/kodi-vfs-sftp: bump version
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (18 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 19/20] package/kodi-visualisation-*: mass version bump Bernd Kuhls
@ 2020-01-18 20:06 ` Bernd Kuhls
2020-01-18 22:02 ` [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Yann E. MORIN
20 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2020-01-18 20:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 3 +--
package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
index dbf8231038..ba7804b3ce 100644
--- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
+++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
@@ -1,3 +1,2 @@
# Locally computed
-sha256 f78561c460c7bf67be476eb485eaa0ac4497a6d1831b9955da46daa11219f53b kodi-vfs-sftp-1.0.3-Leia.tar.gz
-sha256 2b1cdc44ec0b52abc2e4b61f827d407388dad49e4fdc25370824b5c21aadeb17 src/SFTPFile.cpp
+sha256 6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9 kodi-vfs-sftp-1.0.5-Leia.tar.gz
diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
index eaaf7a2cb2..8657ebdcef 100644
--- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
+++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KODI_VFS_SFTP_VERSION = 1.0.3-Leia
+KODI_VFS_SFTP_VERSION = 1.0.5-Leia
KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION))
KODI_VFS_SFTP_LICENSE = GPL-2.0+
KODI_VFS_SFTP_LICENSE_FILES = src/SFTPFile.cpp
--
2.20.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia
2020-01-18 20:06 [Buildroot] [PATCH v8 00/20] package/kodi: bump to version 18.5-Leia Bernd Kuhls
` (19 preceding siblings ...)
2020-01-18 20:06 ` [Buildroot] [PATCH v8 20/20] package/kodi-vfs-sftp: bump version Bernd Kuhls
@ 2020-01-18 22:02 ` Yann E. MORIN
20 siblings, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2020-01-18 22:02 UTC (permalink / raw)
To: buildroot
Bernd, All,
I was about to apply the whole series in batch, but there are two
commits that made me raise an eyebrow, so I'll reply to both in a
separate email.
Regards,
Yann E. MORIN.
On 2020-01-18 21:06 +0100, Bernd Kuhls spake thusly:
> Bernd Kuhls (20):
> package/kodi-platform: bump version
> package/kodi: bump to version 18.5-Leia
> package/kodi-audiodecoder-*: mass version bump
> package/kodi-audioencoder-*: mass version bump
> package/kodi-inputstream-adaptive: bump version
> package/kodi-inputstream-rtmp: bump version
> package/kodi-peripheral-joystick: bump version
> package/kodi-peripheral-*: mass version bump
> package/kodi-pvr-iptvsimple: bump version
> package/kodi-pvr-mediaportal-tvserver: bump version
> package/kodi-pvr-stalker: bump version
> package/kodi-pvr-vuplus: bump version
> package/kodi-pvr-*: mass version bump
> package/kodi-screensaver-asteroids: bump version
> package/kodi-screensaver-rsxs: bump version
> package/kodi-screensaver-*: mass version bump
> package/kodi-skin-confluence: bump version
> package/kodi-visualisation-goom: bump version
> package/kodi-visualisation-*: mass version bump
> package/kodi-vfs-sftp: bump version
>
> package/kodi-audiodecoder-modplug/Config.in | 3 +-
> .../kodi-audiodecoder-modplug.hash | 2 +-
> .../kodi-audiodecoder-modplug.mk | 6 +-
> package/kodi-audiodecoder-nosefart/Config.in | 3 +-
> .../kodi-audiodecoder-nosefart.hash | 2 +-
> .../kodi-audiodecoder-nosefart.mk | 6 +-
> package/kodi-audiodecoder-sidplay/Config.in | 3 +-
> .../kodi-audiodecoder-sidplay.hash | 2 +-
> .../kodi-audiodecoder-sidplay.mk | 6 +-
> package/kodi-audiodecoder-snesapu/Config.in | 3 +-
> .../kodi-audiodecoder-snesapu.hash | 2 +-
> .../kodi-audiodecoder-snesapu.mk | 6 +-
> package/kodi-audiodecoder-stsound/Config.in | 3 +-
> .../kodi-audiodecoder-stsound.hash | 2 +-
> .../kodi-audiodecoder-stsound.mk | 6 +-
> package/kodi-audiodecoder-timidity/Config.in | 2 +-
> .../kodi-audiodecoder-timidity.hash | 2 +-
> .../kodi-audiodecoder-timidity.mk | 4 +-
> package/kodi-audiodecoder-vgmstream/Config.in | 3 +-
> .../kodi-audiodecoder-vgmstream.hash | 2 +-
> .../kodi-audiodecoder-vgmstream.mk | 6 +-
> .../kodi-audioencoder-flac.hash | 2 +-
> .../kodi-audioencoder-flac.mk | 4 +-
> .../kodi-audioencoder-lame.hash | 2 +-
> .../kodi-audioencoder-lame.mk | 4 +-
> .../kodi-audioencoder-vorbis.hash | 2 +-
> .../kodi-audioencoder-vorbis.mk | 2 +-
> .../kodi-audioencoder-wav.hash | 2 +-
> .../kodi-audioencoder-wav.mk | 4 +-
> package/kodi-inputstream-adaptive/Config.in | 2 -
> .../kodi-inputstream-adaptive.hash | 2 +-
> .../kodi-inputstream-adaptive.mk | 6 +-
> package/kodi-inputstream-rtmp/Config.in | 2 +-
> .../kodi-inputstream-rtmp.hash | 2 +-
> .../kodi-inputstream-rtmp.mk | 4 +-
> .../kodi-jsonschemabuilder.mk | 4 +-
> package/kodi-peripheral-joystick/Config.in | 2 +-
> .../kodi-peripheral-joystick.hash | 2 +-
> .../kodi-peripheral-joystick.mk | 8 +-
> .../kodi-peripheral-steamcontroller.hash | 2 +-
> .../kodi-peripheral-steamcontroller.mk | 2 +-
> .../kodi-peripheral-xarcade.hash | 2 +-
> .../kodi-peripheral-xarcade.mk | 2 +-
> package/kodi-platform/kodi-platform.hash | 2 +-
> package/kodi-platform/kodi-platform.mk | 2 +-
> .../kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +-
> package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 4 +-
> .../kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +-
> package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 4 +-
> .../kodi-pvr-dvbviewer.hash | 2 +-
> .../kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 4 +-
> package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +-
> package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 4 +-
> .../kodi-pvr-hdhomerun.hash | 2 +-
> .../kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 4 +-
> package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +-
> package/kodi-pvr-hts/kodi-pvr-hts.mk | 4 +-
> package/kodi-pvr-iptvsimple/Config.in | 1 +
> .../kodi-pvr-iptvsimple.hash | 2 +-
> .../kodi-pvr-iptvsimple.mk | 6 +-
> ...e555-remove-xlocale.h-from-Locale.hh.patch | 33 ----
> .../kodi-pvr-mediaportal-tvserver.hash | 2 +-
> .../kodi-pvr-mediaportal-tvserver.mk | 4 +-
> package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +-
> package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 4 +-
> .../kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +-
> package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 4 +-
> package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +-
> package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 4 +-
> package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +-
> package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 4 +-
> .../0001-src-CWatchdog.h-Fix-gcc7-build.patch | 29 ---
> .../kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +-
> package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 4 +-
> package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +-
> package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 4 +-
> .../kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +-
> .../kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 4 +-
> package/kodi-pvr-vuplus/Config.in | 2 +
> package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +-
> package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 6 +-
> package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +-
> package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 4 +-
> package/kodi-screensaver-asteroids/Config.in | 3 +-
> .../kodi-screensaver-asteroids.hash | 2 +-
> .../kodi-screensaver-asteroids.mk | 6 +-
> package/kodi-screensaver-asterwave/Config.in | 2 +-
> .../kodi-screensaver-asterwave.hash | 2 +-
> .../kodi-screensaver-asterwave.mk | 4 +-
> .../0001-Add-missing-stddef-include.patch | 25 +++
> package/kodi-screensaver-biogenesis/Config.in | 2 +-
> .../kodi-screensaver-biogenesis.hash | 2 +-
> .../kodi-screensaver-biogenesis.mk | 4 +-
> package/kodi-screensaver-cpblobs/Config.in | 2 +-
> .../kodi-screensaver-cpblobs.hash | 2 +-
> .../kodi-screensaver-cpblobs.mk | 4 +-
> .../kodi-screensaver-crystalmorph.hash | 2 +-
> .../kodi-screensaver-crystalmorph.mk | 2 +-
> package/kodi-screensaver-greynetic/Config.in | 2 +-
> .../kodi-screensaver-greynetic.hash | 2 +-
> .../kodi-screensaver-greynetic.mk | 4 +-
> .../0001-Add-missing-stddef-include.patch | 25 +++
> .../kodi-screensaver-matrixtrails/Config.in | 2 +-
> .../kodi-screensaver-matrixtrails.hash | 2 +-
> .../kodi-screensaver-matrixtrails.mk | 5 +-
> ...ackport-Add-missing-cstddef-includes.patch | 32 ++++
> package/kodi-screensaver-pingpong/Config.in | 2 +-
> .../kodi-screensaver-pingpong.hash | 2 +-
> .../kodi-screensaver-pingpong.mk | 4 +-
> .../0001-Add-missing-stddef-include.patch | 25 +++
> package/kodi-screensaver-pyro/Config.in | 2 +-
> .../kodi-screensaver-pyro.hash | 2 +-
> .../kodi-screensaver-pyro.mk | 4 +-
> .../0001-Disable-drempels.patch | 40 +++++
> .../0001-cross-compile.patch | 37 ----
> .../0002-fix-default-include-dir.patch | 28 ---
> package/kodi-screensaver-rsxs/Config.in | 14 +-
> .../kodi-screensaver-rsxs.hash | 2 +-
> .../kodi-screensaver-rsxs.mk | 7 +-
> package/kodi-screensaver-stars/Config.in | 2 +-
> .../kodi-screensaver-stars.hash | 2 +-
> .../kodi-screensaver-stars.mk | 4 +-
> .../kodi-skin-confluence.hash | 3 +-
> .../kodi-skin-confluence.mk | 4 +-
> ...-fix-texture-packer-cmake-source-dir.patch | 27 +++
> .../0002-fix_reallocarray.patch | 170 ------------------
> .../kodi-texturepacker/kodi-texturepacker.mk | 7 +-
> package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 3 +-
> package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +-
> .../kodi-visualisation-fishbmc.hash | 2 +-
> .../kodi-visualisation-fishbmc.mk | 4 +-
> .../0001-cross-compile.patch | 32 ----
> .../kodi-visualisation-goom.hash | 2 +-
> .../kodi-visualisation-goom.mk | 4 +-
> ...-also-search-for-egl-with-pkg-config.patch | 44 -----
> .../kodi-visualisation-shadertoy.hash | 2 +-
> .../kodi-visualisation-shadertoy.mk | 4 +-
> ...Backport-Add-missing-cstddef-include.patch | 30 ++++
> .../kodi-visualisation-spectrum.hash | 3 +-
> .../kodi-visualisation-spectrum.mk | 4 +-
> .../kodi-visualisation-waveform.hash | 2 +-
> .../kodi-visualisation-waveform.mk | 4 +-
> ...e-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 8 +-
> ...endency-on-gmp-and-libintl-from-Find.patch | 39 ----
> ...h => 0002-Fix-crosscompiling-issues.patch} | 29 ++-
> .../0003-Add-missing-cassert-includes.patch | 50 ++++++
> ...cmake-iconv-is-a-required-dependency.patch | 92 ----------
> ...ackport-Add-missing-cstddef-includes.patch | 44 +++++
> .../kodi/0004-Fix-ffmpeg-build-for-mips.patch | 43 -----
> package/kodi/Config.in | 24 +--
> package/kodi/kodi.hash | 13 +-
> package/kodi/kodi.mk | 82 ++++-----
> 152 files changed, 537 insertions(+), 868 deletions(-)
> delete mode 100644 package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
> delete mode 100644 package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
> create mode 100644 package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
> create mode 100644 package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
> create mode 100644 package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
> create mode 100644 package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
> create mode 100644 package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
> delete mode 100644 package/kodi-screensaver-rsxs/0001-cross-compile.patch
> delete mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
> create mode 100644 package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
> delete mode 100644 package/kodi-texturepacker/0002-fix_reallocarray.patch
> delete mode 100644 package/kodi-visualisation-goom/0001-cross-compile.patch
> delete mode 100644 package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
> create mode 100644 package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
> delete mode 100644 package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
> rename package/kodi/{0005-Fix-crosscompiling-issues.patch => 0002-Fix-crosscompiling-issues.patch} (86%)
> create mode 100644 package/kodi/0003-Add-missing-cassert-includes.patch
> delete mode 100644 package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
> create mode 100644 package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
> delete mode 100644 package/kodi/0004-Fix-ffmpeg-build-for-mips.patch
>
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread