* [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus
@ 2023-05-03 16:44 Bernd Kuhls
2023-05-03 16:44 ` [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus Bernd Kuhls
` (11 more replies)
0 siblings, 12 replies; 15+ messages in thread
From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw)
To: buildroot
Switch to kodi fork, remove all kodi-related patches.
Needed by upcoming bump of kodi-inputstream-adaptive.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-Add-support-for-cmake-install.patch | 130 ----
...-methods-funtions-and-passing-poolid.patch | 634 ------------------
.../0003-Backport-Smmothstream-changes.patch | 99 ---
package/bento4/0004-more-SPS-parameters.patch | 219 ------
...0005-AVC-extract-VUI-values-from-SPS.patch | 96 ---
.../0006-Implement-SPS-Frame-parser.patch | 67 --
...-Fix-segfault-when-AP4_Sample-s-seek.patch | 25 -
package/bento4/0008-Hack-HBO.patch | 214 ------
.../bento4/0009-Android-32-ftello-fix.patch | 31 -
...0010-Dazn-sample-duration-workaround.patch | 30 -
...ent-to-reuse-single-sample-decrypter.patch | 179 -----
.../0012-Static-ReadGolomb-SignedGolomb.patch | 54 --
.../bento4/0013-Add-GetChannels-method.patch | 40 --
...ampleIndexForTimeStamp-GetNearestSyn.patch | 59 --
...015-Avoid-set-next-fragment-position.patch | 43 --
...ault-in-AP4_LinearReader-ProcessMoof.patch | 27 -
package/bento4/bento4.hash | 2 +-
package/bento4/bento4.mk | 4 +-
18 files changed, 3 insertions(+), 1950 deletions(-)
delete mode 100644 package/bento4/0001-Add-support-for-cmake-install.patch
delete mode 100644 package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch
delete mode 100644 package/bento4/0003-Backport-Smmothstream-changes.patch
delete mode 100644 package/bento4/0004-more-SPS-parameters.patch
delete mode 100644 package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch
delete mode 100644 package/bento4/0006-Implement-SPS-Frame-parser.patch
delete mode 100644 package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch
delete mode 100644 package/bento4/0008-Hack-HBO.patch
delete mode 100644 package/bento4/0009-Android-32-ftello-fix.patch
delete mode 100644 package/bento4/0010-Dazn-sample-duration-workaround.patch
delete mode 100644 package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch
delete mode 100644 package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch
delete mode 100644 package/bento4/0013-Add-GetChannels-method.patch
delete mode 100644 package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch
delete mode 100644 package/bento4/0015-Avoid-set-next-fragment-position.patch
delete mode 100644 package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch
diff --git a/package/bento4/0001-Add-support-for-cmake-install.patch b/package/bento4/0001-Add-support-for-cmake-install.patch
deleted file mode 100644
index cec0cb18b9..0000000000
--- a/package/bento4/0001-Add-support-for-cmake-install.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From ba95f55c495c4c34c75a95de843acfa00f6afe24 Mon Sep 17 00:00:00 2001
-From: Harry Mallon <harry.mallon@codex.online>
-Date: Fri, 9 Jul 2021 15:50:26 +0100
-Subject: [PATCH] Add support for cmake install
-
-Downloaded from upstream commit
-https://github.com/axiomatic-systems/Bento4/commit/ba95f55c495c4c34c75a95de843acfa00f6afe24
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Build/cmake/Config.cmake.in | 4 ++
- CMakeLists.txt | 73 ++++++++++++++++++++++++++++++++++---
- 2 files changed, 71 insertions(+), 6 deletions(-)
- create mode 100644 Build/cmake/Config.cmake.in
-
-diff --git a/Build/cmake/Config.cmake.in b/Build/cmake/Config.cmake.in
-new file mode 100644
-index 00000000..38bbde7b
---- /dev/null
-+++ b/Build/cmake/Config.cmake.in
-@@ -0,0 +1,4 @@
-+@PACKAGE_INIT@
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-+check_required_components("@PROJECT_NAME@")
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6de3bfe1..6ebf127f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,14 @@ else()
- cmake_minimum_required(VERSION 3.10)
- endif()
-
--project(bento4)
-+function(get_bento4_version)
-+ file(STRINGS "Source/C++/Core/Ap4Version.h" _temp REGEX "AP4_VERSION_STRING")
-+ string(REGEX MATCH "\"([^\"]+)\"" _temp "${_temp}")
-+ set(BENTO4_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE)
-+endfunction()
-+
-+get_bento4_version()
-+project(bento4 VERSION "${BENTO4_VERSION}")
-
- # Variables
- set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Source/C++)
-@@ -51,14 +58,22 @@ endif()
-
- # Includes
- set(AP4_INCLUDE_DIRS
-- ${SOURCE_CORE}
-- ${SOURCE_CODECS}
-- ${SOURCE_CRYPTO}
-- ${SOURCE_METADATA}
-+ $<BUILD_INTERFACE:${SOURCE_CORE}>
-+ $<BUILD_INTERFACE:${SOURCE_CODECS}>
-+ $<BUILD_INTERFACE:${SOURCE_CRYPTO}>
-+ $<BUILD_INTERFACE:${SOURCE_METADATA}>
-+)
-+file(GLOB AP4_HEADERS
-+ ${SOURCE_CORE}/*.h
-+ ${SOURCE_CODECS}/*.h
-+ ${SOURCE_CRYPTO}/*.h
-+ ${SOURCE_METADATA}/*.h
- )
-
- add_library(ap4 STATIC ${AP4_SOURCES})
--target_include_directories(ap4 PUBLIC ${AP4_INCLUDE_DIRS})
-+target_include_directories(ap4 PUBLIC
-+ ${AP4_INCLUDE_DIRS}
-+)
-
- # Use the statically linked C runtime library
- if(MSVC)
-@@ -72,6 +87,7 @@ if(BUILD_APPS)
- file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*)
- foreach(app ${BENTO4_APPS})
- string(TOLOWER ${app} binary_name)
-+ list(APPEND BENTO4_APPS_LOWERCASE ${binary_name})
- add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp)
- target_link_libraries(${binary_name} ap4)
-
-@@ -81,3 +97,48 @@ foreach(app ${BENTO4_APPS})
- endif()
- endforeach()
- endif(BUILD_APPS)
-+
-+# Install
-+include(GNUInstallDirs)
-+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-+set(namespace "${PROJECT_NAME}::")
-+
-+include(CMakePackageConfigHelpers)
-+write_basic_package_version_file(
-+ "${version_config}" COMPATIBILITY SameMajorVersion
-+)
-+
-+configure_package_config_file(
-+ "Build/cmake/Config.cmake.in"
-+ "${project_config}"
-+ INSTALL_DESTINATION "${config_install_dir}"
-+)
-+
-+install(
-+ TARGETS ap4 ${BENTO4_APPS_LOWERCASE}
-+ EXPORT "${TARGETS_EXPORT_NAME}"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+)
-+
-+install(
-+ FILES ${AP4_HEADERS}
-+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bento4"
-+)
-+
-+install(
-+ FILES "${project_config}" "${version_config}"
-+ DESTINATION "${config_install_dir}"
-+)
-+
-+install(
-+ EXPORT "${TARGETS_EXPORT_NAME}"
-+ NAMESPACE "${namespace}"
-+ DESTINATION "${config_install_dir}"
-+)
diff --git a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch b/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch
deleted file mode 100644
index 22ac657a3f..0000000000
--- a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch
+++ /dev/null
@@ -1,634 +0,0 @@
-From b2027d354ef5d52efd525730fa5e6beccb88d33f Mon Sep 17 00:00:00 2001
-From: Glenn Guy <glennguy83@gmail.com>
-Date: Thu, 22 Jul 2021 10:00:44 +0200
-Subject: [PATCH] Add additional methods/funtions and passing poolid
-
-Added back:
-* SSD - > ParentIsOwner functionality
-* LinearReader: GetSample, SeekSample, Reset
-* Ap4Movie -> GetPsshAtoms
-* Uuid/VppC -> GetData
-* Ap4Protection -> WVTT atom type
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4ByteStream.h | 1 -
- Source/C++/Core/Ap4CommonEncryption.cpp | 15 ++--
- Source/C++/Core/Ap4CommonEncryption.h | 24 +++++--
- Source/C++/Core/Ap4IsmaCryp.cpp | 5 +-
- Source/C++/Core/Ap4IsmaCryp.h | 3 +-
- Source/C++/Core/Ap4LinearReader.cpp | 94 ++++++++++++++++++++++++-
- Source/C++/Core/Ap4LinearReader.h | 4 ++
- Source/C++/Core/Ap4Marlin.cpp | 5 +-
- Source/C++/Core/Ap4Marlin.h | 3 +-
- Source/C++/Core/Ap4MoovAtom.cpp | 28 +++++++-
- Source/C++/Core/Ap4MoovAtom.h | 5 ++
- Source/C++/Core/Ap4Movie.cpp | 10 +++
- Source/C++/Core/Ap4Movie.h | 4 ++
- Source/C++/Core/Ap4OmaDcf.cpp | 8 ++-
- Source/C++/Core/Ap4OmaDcf.h | 6 +-
- Source/C++/Core/Ap4Protection.h | 3 +-
- Source/C++/Core/Ap4SampleDescription.h | 1 +
- Source/C++/Core/Ap4UuidAtom.h | 1 +
- Source/C++/Core/Ap4VpccAtom.h | 3 +
- 19 files changed, 197 insertions(+), 26 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4ByteStream.h b/Source/C++/Core/Ap4ByteStream.h
-index 0a59e63..93ac80f 100644
---- a/Source/C++/Core/Ap4ByteStream.h
-+++ b/Source/C++/Core/Ap4ByteStream.h
-@@ -195,7 +195,6 @@ public:
- AP4_UI08* UseData() { return m_Buffer->UseData(); }
- AP4_Size GetDataSize() { return m_Buffer->GetDataSize(); }
-
--protected:
- virtual ~AP4_MemoryByteStream();
-
- private:
-diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp
-index acd6361..5308200 100644
---- a/Source/C++/Core/Ap4CommonEncryption.cpp
-+++ b/Source/C++/Core/Ap4CommonEncryption.cpp
-@@ -1859,7 +1859,8 @@ AP4_CencSingleSampleDecrypter::~AP4_CencSingleSampleDecrypter() {
- | AP4_CencSingleSampleDecrypter::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv,
- unsigned int subsample_count,
-@@ -2094,8 +2095,9 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table,
- +---------------------------------------------------------------------*/
- AP4_CencSampleDecrypter::~AP4_CencSampleDecrypter()
- {
-- delete m_SampleInfoTable;
-- delete m_SingleSampleDecrypter;
-+ delete m_SampleInfoTable;
-+ if (m_SingleSampleDecrypter->GetParentIsOwner())
-+ delete m_SingleSampleDecrypter;
- }
-
- /*----------------------------------------------------------------------
-@@ -2112,7 +2114,8 @@ AP4_CencSampleDecrypter::SetSampleIndex(AP4_Ordinal sample_index)
- | AP4_CencSampleDecrypter::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_CencSampleDecrypter::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv)
- {
-@@ -2139,7 +2142,7 @@ AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
- }
-
- // decrypt the sample
-- return m_SingleSampleDecrypter->DecryptSampleData(data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data);
-+ return m_SingleSampleDecrypter->DecryptSampleData(poolid, data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data);
- }
-
- /*----------------------------------------------------------------------
-@@ -2323,7 +2326,7 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out)
- {
- // decrypt the sample
-- return m_SampleDecrypter->DecryptSampleData(data_in, data_out, NULL);
-+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out, NULL);
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h
-index 80db456..580de66 100644
---- a/Source/C++/Core/Ap4CommonEncryption.h
-+++ b/Source/C++/Core/Ap4CommonEncryption.h
-@@ -691,9 +691,18 @@ public:
- // methods
- AP4_CencSingleSampleDecrypter(AP4_StreamCipher* cipher) :
- m_Cipher(cipher),
-- m_FullBlocksOnly(false) {}
-+ m_FullBlocksOnly(false),
-+ m_ParentIsOwner(true) {}
- virtual ~AP4_CencSingleSampleDecrypter();
-- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ virtual AP4_Result SetFragmentInfo(AP4_UI32 poolid, const AP4_UI08* keyid, const AP4_UI08 nalu_length_size,
-+ AP4_DataBuffer &annexb_sps_pps, AP4_UI32 flags) {
-+ return AP4_ERROR_NOT_SUPPORTED;
-+ };
-+ virtual AP4_UI32 AddPool() { return 0; };
-+ virtual void RemovePool(AP4_UI32 poolid) {};
-+ virtual const char* GetSessionId() { return nullptr; };
-+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
-
- // always 16 bytes
-@@ -706,7 +715,9 @@ public:
- const AP4_UI16* bytes_of_cleartext_data,
-
- // array of <subsample_count> integers. NULL if subsample_count is 0
-- const AP4_UI32* bytes_of_encrypted_data);
-+ const AP4_UI32* bytes_of_encrypted_data);
-+ bool GetParentIsOwner()const { return m_ParentIsOwner; };
-+ void SetParentIsOwner(bool parent_is_owner) { m_ParentIsOwner = parent_is_owner; };
-
- private:
- // constructor
-@@ -715,12 +726,14 @@ private:
- bool reset_iv_at_each_subsample) :
- m_Cipher(cipher),
- m_FullBlocksOnly(full_blocks_only),
-- m_ResetIvAtEachSubsample(reset_iv_at_each_subsample) {}
-+ m_ResetIvAtEachSubsample(reset_iv_at_each_subsample),
-+ m_ParentIsOwner(true) {}
-
- // members
- AP4_StreamCipher* m_Cipher;
- bool m_FullBlocksOnly;
- bool m_ResetIvAtEachSubsample;
-+ bool m_ParentIsOwner;
- };
-
- /*----------------------------------------------------------------------
-@@ -766,7 +779,8 @@ public:
- m_SampleCursor(0) {}
- virtual ~AP4_CencSampleDecrypter();
- virtual AP4_Result SetSampleIndex(AP4_Ordinal sample_index);
-- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv);
-
-diff --git a/Source/C++/Core/Ap4IsmaCryp.cpp b/Source/C++/Core/Ap4IsmaCryp.cpp
-index dfb59a4..442ad49 100644
---- a/Source/C++/Core/Ap4IsmaCryp.cpp
-+++ b/Source/C++/Core/Ap4IsmaCryp.cpp
-@@ -142,7 +142,8 @@ AP4_IsmaCipher::GetDecryptedSampleSize(AP4_Sample& sample)
- | AP4_IsmaCipher::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_IsmaCipher::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_IsmaCipher::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* /*iv*/)
- {
-@@ -333,7 +334,7 @@ AP4_Result
- AP4_IsmaTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out)
- {
-- return m_Cipher->DecryptSampleData(data_in, data_out);
-+ return m_Cipher->DecryptSampleData(0, data_in, data_out);
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4IsmaCryp.h b/Source/C++/Core/Ap4IsmaCryp.h
-index 4b9c60e..970dac8 100644
---- a/Source/C++/Core/Ap4IsmaCryp.h
-+++ b/Source/C++/Core/Ap4IsmaCryp.h
-@@ -74,7 +74,8 @@ public:
- AP4_Result EncryptSampleData(AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- AP4_UI32 block_counter);
-- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv = NULL);
- AP4_Size GetDecryptedSampleSize(AP4_Sample& sample);
-diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
-index 08b55ee..7cc3ebd 100644
---- a/Source/C++/Core/Ap4LinearReader.cpp
-+++ b/Source/C++/Core/Ap4LinearReader.cpp
-@@ -117,6 +117,29 @@ AP4_LinearReader::FlushQueues()
- }
- }
-
-+/*----------------------------------------------------------------------
-+| AP4_LinearReader::Reset
-++---------------------------------------------------------------------*/
-+void
-+AP4_LinearReader::Reset()
-+{
-+ // flush any queued samples
-+ FlushQueues();
-+
-+ // reset tracker states
-+ for (unsigned int i = 0; i < m_Trackers.ItemCount(); i++) {
-+ if (m_Trackers[i]->m_SampleTableIsOwned) {
-+ delete m_Trackers[i]->m_SampleTable;
-+ }
-+ delete m_Trackers[i]->m_NextSample;
-+ m_Trackers[i]->m_SampleTable = NULL;
-+ m_Trackers[i]->m_NextSample = NULL;
-+ m_Trackers[i]->m_NextSampleIndex = 0;
-+ m_Trackers[i]->m_Eos = false;
-+ }
-+ m_NextFragmentPosition = 0;
-+}
-+
- /*----------------------------------------------------------------------
- | AP4_LinearReader::SetSampleIndex
- +---------------------------------------------------------------------*/
-@@ -591,6 +614,75 @@ AP4_LinearReader::ReadNextSample(AP4_Sample& sample,
- return ReadNextSample(sample, &sample_data, track_id);
- }
-
-+/*----------------------------------------------------------------------
-+| AP4_LinearReader::GetSample
-++---------------------------------------------------------------------*/
-+AP4_Result AP4_LinearReader::GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index)
-+{
-+ // look for a sample from a specific track
-+ Tracker* tracker = FindTracker(track_id);
-+ if (tracker == NULL)
-+ return AP4_ERROR_INVALID_PARAMETERS;
-+
-+ // don't continue if we've reached the end of that tracker
-+ if (tracker->m_Eos)
-+ return AP4_ERROR_EOS;
-+
-+ return tracker->m_SampleTable->GetSample(sample_index, sample);
-+}
-+
-+/*----------------------------------------------------------------------
-+| AP4_LinearReader::SeekSample
-++---------------------------------------------------------------------*/
-+AP4_Result
-+AP4_LinearReader::SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync)
-+{
-+ // we only support fragmented sources for now
-+ if (!m_HasFragments)
-+ return AP4_ERROR_NOT_SUPPORTED;
-+
-+ if (m_Trackers.ItemCount() == 0) {
-+ return AP4_ERROR_NO_SUCH_ITEM;
-+ }
-+
-+ // look for a sample from a specific track
-+ Tracker* tracker = FindTracker(track_id);
-+ if (tracker == NULL)
-+ return AP4_ERROR_INVALID_PARAMETERS;
-+
-+ // don't continue if we've reached the end of that tracker
-+ if (tracker->m_Eos)
-+ return AP4_ERROR_EOS;
-+
-+ AP4_Result result;
-+
-+ if (!tracker->m_SampleTable && AP4_FAILED(result = Advance()))
-+ return result;
-+
-+ while (AP4_FAILED(result = tracker->m_SampleTable->GetSampleIndexForTimeStamp(ts, sample_index)))
-+ {
-+ if (result == AP4_ERROR_NOT_ENOUGH_DATA)
-+ {
-+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount();
-+ if (AP4_FAILED(result = Advance()))
-+ return result;
-+ continue;
-+ }
-+ return result;
-+ }
-+
-+ sample_index = tracker->m_SampleTable->GetNearestSyncSampleIndex(sample_index, preceedingSync);
-+ //we have reached the end -> go for the first sample of the next segment
-+ if (sample_index == tracker->m_SampleTable->GetSampleCount())
-+ {
-+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount();
-+ if (AP4_FAILED(result = Advance()))
-+ return result;
-+ sample_index = 0;
-+ }
-+ return SetSampleIndex(tracker->m_Track->GetId(), sample_index);
-+}
-+
- /*----------------------------------------------------------------------
- | AP4_LinearReader::GetNextSample
- +---------------------------------------------------------------------*/
-@@ -633,5 +725,5 @@ AP4_DecryptingSampleReader::ReadSampleData(AP4_Sample& sample,
- AP4_Result result = sample.ReadData(m_DataBuffer);
- if (AP4_FAILED(result)) return result;
-
-- return m_Decrypter->DecryptSampleData(m_DataBuffer, sample_data);
-+ return m_Decrypter->DecryptSampleData(0, m_DataBuffer, sample_data);
- }
-diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h
-index 549cb5f..21f4871 100644
---- a/Source/C++/Core/Ap4LinearReader.h
-+++ b/Source/C++/Core/Ap4LinearReader.h
-@@ -85,6 +85,8 @@ public:
- AP4_Result SetSampleIndex(AP4_UI32 track_id, AP4_UI32 sample_index);
-
- AP4_Result SeekTo(AP4_UI32 time_ms, AP4_UI32* actual_time_ms = 0);
-+
-+ AP4_Result SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync);
-
- // accessors
- AP4_Size GetBufferFullness() { return m_BufferFullness; }
-@@ -169,8 +171,10 @@ protected:
- AP4_Result ReadNextSample(AP4_Sample& sample,
- AP4_DataBuffer* sample_data,
- AP4_UI32& track_id);
-+ AP4_Result GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index);
- void FlushQueue(Tracker* tracker);
- void FlushQueues();
-+ void Reset();
-
- // members
- AP4_Movie& m_Movie;
-diff --git a/Source/C++/Core/Ap4Marlin.cpp b/Source/C++/Core/Ap4Marlin.cpp
-index d0ddd3f..c1aa8b6 100644
---- a/Source/C++/Core/Ap4Marlin.cpp
-+++ b/Source/C++/Core/Ap4Marlin.cpp
-@@ -431,7 +431,8 @@ AP4_MarlinIpmpSampleDecrypter::GetDecryptedSampleSize(AP4_Sample& sample)
- | AP4_MarlinIpmpSampleDecrypter::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* /*iv*/)
- {
-@@ -630,7 +631,7 @@ AP4_Result
- AP4_MarlinIpmpTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out)
- {
-- return m_SampleDecrypter->DecryptSampleData(data_in, data_out);
-+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out);
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4Marlin.h b/Source/C++/Core/Ap4Marlin.h
-index 774e04f..9280ad6 100644
---- a/Source/C++/Core/Ap4Marlin.h
-+++ b/Source/C++/Core/Ap4Marlin.h
-@@ -118,7 +118,8 @@ public:
-
- // AP4_SampleDecrypter methods
- AP4_Size GetDecryptedSampleSize(AP4_Sample& sample);
-- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv = NULL);
-
-diff --git a/Source/C++/Core/Ap4MoovAtom.cpp b/Source/C++/Core/Ap4MoovAtom.cpp
-index 1ceab49..fbeee4f 100644
---- a/Source/C++/Core/Ap4MoovAtom.cpp
-+++ b/Source/C++/Core/Ap4MoovAtom.cpp
-@@ -31,6 +31,7 @@
- +---------------------------------------------------------------------*/
- #include "Ap4MoovAtom.h"
- #include "Ap4TrakAtom.h"
-+#include "Ap4PsshAtom.h"
- #include "Ap4AtomFactory.h"
-
- /*----------------------------------------------------------------------
-@@ -61,6 +62,29 @@ private:
- AP4_List<AP4_TrakAtom>* m_TrakAtoms;
- };
-
-+/*----------------------------------------------------------------------
-+| AP4_PsshAtomCollector
-++---------------------------------------------------------------------*/
-+class AP4_PsshAtomCollector : public AP4_List<AP4_Atom>::Item::Operator
-+{
-+public:
-+ AP4_PsshAtomCollector(AP4_List<AP4_PsshAtom>* pssh_atoms) :
-+ m_PsshAtoms(pssh_atoms) {}
-+
-+ AP4_Result Action(AP4_Atom* atom) const {
-+ if (atom->GetType() == AP4_ATOM_TYPE_PSSH) {
-+ AP4_PsshAtom* pssh = AP4_DYNAMIC_CAST(AP4_PsshAtom, atom);
-+ if (pssh) {
-+ m_PsshAtoms->Add(pssh);
-+ }
-+ }
-+ return AP4_SUCCESS;
-+ }
-+
-+private:
-+ AP4_List<AP4_PsshAtom>* m_PsshAtoms;
-+};
-+
- /*----------------------------------------------------------------------
- | AP4_MoovAtom::AP4_MoovAtom
- +---------------------------------------------------------------------*/
-@@ -80,7 +104,9 @@ AP4_MoovAtom::AP4_MoovAtom(AP4_UI32 size,
- m_TimeScale(0)
- {
- // collect all trak atoms
-- m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms));
-+ m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms));
-+ // collect all pssh atoms
-+ m_Children.Apply(AP4_PsshAtomCollector(&m_PsshAtoms));
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4MoovAtom.h b/Source/C++/Core/Ap4MoovAtom.h
-index f06b2a1..d1a0147 100644
---- a/Source/C++/Core/Ap4MoovAtom.h
-+++ b/Source/C++/Core/Ap4MoovAtom.h
-@@ -40,6 +40,7 @@
- +---------------------------------------------------------------------*/
- class AP4_AtomFactory;
- class AP4_TrakAtom;
-+class AP4_PsshAtom;
-
- /*----------------------------------------------------------------------
- | AP4_MoovAtom
-@@ -61,6 +62,9 @@ public:
- AP4_List<AP4_TrakAtom>& GetTrakAtoms() {
- return m_TrakAtoms;
- }
-+ AP4_List<AP4_PsshAtom>& GetPsshAtoms() {
-+ return m_PsshAtoms;
-+ }
- AP4_UI32 GetTimeScale() {
- return m_TimeScale;
- }
-@@ -77,6 +81,7 @@ private:
- AP4_AtomFactory& atom_factory);
-
- // members
-+ AP4_List<AP4_PsshAtom> m_PsshAtoms;
- AP4_List<AP4_TrakAtom> m_TrakAtoms;
- AP4_UI32 m_TimeScale;
- };
-diff --git a/Source/C++/Core/Ap4Movie.cpp b/Source/C++/Core/Ap4Movie.cpp
-index b080b53..9617494 100644
---- a/Source/C++/Core/Ap4Movie.cpp
-+++ b/Source/C++/Core/Ap4Movie.cpp
-@@ -32,6 +32,7 @@
- #include "Ap4File.h"
- #include "Ap4Atom.h"
- #include "Ap4TrakAtom.h"
-+#include "Ap4PsshAtom.h"
- #include "Ap4MoovAtom.h"
- #include "Ap4MvhdAtom.h"
- #include "Ap4AtomFactory.h"
-@@ -110,6 +111,15 @@ AP4_Movie::AP4_Movie(AP4_MoovAtom* moov, AP4_ByteStream& sample_stream, bool tra
- time_scale = 0;
- }
-
-+ // get the pssh atoms
-+ AP4_List<AP4_PsshAtom>* pssh_atoms;
-+ pssh_atoms = &moov->GetPsshAtoms();
-+ AP4_List<AP4_PsshAtom>::Item* pssh_item = pssh_atoms->FirstItem();
-+ while (pssh_item) {
-+ m_PsshAtoms.Append(*pssh_item->GetData());
-+ pssh_item = pssh_item->GetNext();
-+ }
-+
- // get all tracks
- AP4_List<AP4_TrakAtom>* trak_atoms;
- trak_atoms = &moov->GetTrakAtoms();
-diff --git a/Source/C++/Core/Ap4Movie.h b/Source/C++/Core/Ap4Movie.h
-index 21ef173..04992a4 100644
---- a/Source/C++/Core/Ap4Movie.h
-+++ b/Source/C++/Core/Ap4Movie.h
-@@ -37,6 +37,7 @@
- #include "Ap4MvhdAtom.h"
- #include "Ap4Track.h"
- #include "Ap4List.h"
-+#include "Ap4PsshAtom.h"
-
- /*----------------------------------------------------------------------
- | class references
-@@ -60,6 +61,8 @@ public:
- AP4_Result Inspect(AP4_AtomInspector& inspector);
-
- AP4_MoovAtom* GetMoovAtom() { return m_MoovAtom;}
-+ void SetMoovAtom(AP4_MoovAtom* atom) { m_MoovAtom = atom; }
-+ AP4_Array<AP4_PsshAtom>& GetPsshAtoms() { return m_PsshAtoms; }
- AP4_MvhdAtom* GetMvhdAtom() { return m_MvhdAtom;}
- AP4_List<AP4_Track>& GetTracks() { return m_Tracks; }
- AP4_Track* GetTrack(AP4_UI32 track_id);
-@@ -75,6 +78,7 @@ private:
- AP4_MoovAtom* m_MoovAtom;
- bool m_MoovAtomIsOwned;
- AP4_MvhdAtom* m_MvhdAtom;
-+ AP4_Array<AP4_PsshAtom> m_PsshAtoms;
- AP4_List<AP4_Track> m_Tracks;
- };
-
-diff --git a/Source/C++/Core/Ap4OmaDcf.cpp b/Source/C++/Core/Ap4OmaDcf.cpp
-index 17099a1..4eefbaf 100644
---- a/Source/C++/Core/Ap4OmaDcf.cpp
-+++ b/Source/C++/Core/Ap4OmaDcf.cpp
-@@ -436,7 +436,8 @@ AP4_OmaDcfCtrSampleDecrypter::~AP4_OmaDcfCtrSampleDecrypter()
- | AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* /*iv*/)
- {
-@@ -531,7 +532,8 @@ AP4_OmaDcfCbcSampleDecrypter::~AP4_OmaDcfCbcSampleDecrypter()
- | AP4_OmaDbcCbcSampleDecrypter::DecryptSampleData
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in,
-+AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* /*iv*/)
- {
-@@ -853,7 +855,7 @@ AP4_Result
- AP4_OmaDcfTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out)
- {
-- return m_Cipher->DecryptSampleData(data_in, data_out);
-+ return m_Cipher->DecryptSampleData(0, data_in, data_out);
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4OmaDcf.h b/Source/C++/Core/Ap4OmaDcf.h
-index 23f10ed..bb7b3d6 100644
---- a/Source/C++/Core/Ap4OmaDcf.h
-+++ b/Source/C++/Core/Ap4OmaDcf.h
-@@ -133,7 +133,8 @@ public:
- ~AP4_OmaDcfCtrSampleDecrypter();
-
- // methods
-- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv = NULL);
- virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample);
-@@ -155,7 +156,8 @@ public:
- ~AP4_OmaDcfCbcSampleDecrypter();
-
- // methods
-- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv = NULL);
- virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample);
-diff --git a/Source/C++/Core/Ap4Protection.h b/Source/C++/Core/Ap4Protection.h
-index 856f1f3..4080584 100644
---- a/Source/C++/Core/Ap4Protection.h
-+++ b/Source/C++/Core/Ap4Protection.h
-@@ -393,7 +393,8 @@ public:
- // methods
- virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample) { return sample.GetSize(); }
- virtual AP4_Result SetSampleIndex(AP4_Ordinal /*index*/) { return AP4_SUCCESS; }
-- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in,
-+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid,
-+ AP4_DataBuffer& data_in,
- AP4_DataBuffer& data_out,
- const AP4_UI08* iv = NULL) = 0;
- };
-diff --git a/Source/C++/Core/Ap4SampleDescription.h b/Source/C++/Core/Ap4SampleDescription.h
-index 27f3136..d493f96 100644
---- a/Source/C++/Core/Ap4SampleDescription.h
-+++ b/Source/C++/Core/Ap4SampleDescription.h
-@@ -101,6 +101,7 @@ const AP4_UI32 AP4_SAMPLE_FORMAT_TX3G = AP4_ATOM_TYPE('t','x','3','g');
- const AP4_UI32 AP4_SAMPLE_FORMAT_VC_1 = AP4_ATOM_TYPE('v','c','-','1');
- const AP4_UI32 AP4_SAMPLE_FORMAT_XML_ = AP4_ATOM_TYPE('x','m','l',' ');
- const AP4_UI32 AP4_SAMPLE_FORMAT_STPP = AP4_ATOM_TYPE('s','t','p','p');
-+const AP4_UI32 AP4_SAMPLE_FORMAT_WVTT = AP4_ATOM_TYPE('w','v','t','t');
- const AP4_UI32 AP4_SAMPLE_FORMAT_FLAC = AP4_ATOM_TYPE('f','L','a','C');
- const AP4_UI32 AP4_SAMPLE_FORMAT_OPUS = AP4_ATOM_TYPE('O','p','u','s');
- const AP4_UI32 AP4_SAMPLE_FORMAT_VP8 = AP4_ATOM_TYPE('v','p','0','8');
-diff --git a/Source/C++/Core/Ap4UuidAtom.h b/Source/C++/Core/Ap4UuidAtom.h
-index b9771bd..0ec3b08 100644
---- a/Source/C++/Core/Ap4UuidAtom.h
-+++ b/Source/C++/Core/Ap4UuidAtom.h
-@@ -90,6 +90,7 @@ public:
-
- // methods
- virtual AP4_Result WriteFields(AP4_ByteStream& stream);
-+ const AP4_DataBuffer &GetData() { return m_Data; };
-
- protected:
- // members
-diff --git a/Source/C++/Core/Ap4VpccAtom.h b/Source/C++/Core/Ap4VpccAtom.h
-index 9fb60bc..929048a 100644
---- a/Source/C++/Core/Ap4VpccAtom.h
-+++ b/Source/C++/Core/Ap4VpccAtom.h
-@@ -79,10 +79,13 @@ public:
- AP4_UI08 GetTransferCharacteristics() { return m_TransferCharacteristics; }
- AP4_UI08 GetMatrixCoefficients() { return m_MatrixCoefficients; }
- const AP4_DataBuffer& GetCodecInitializationData() { return m_CodecIntializationData; }
-+ const AP4_DataBuffer& GetData() { return m_Data; }
-
- // helpers
- AP4_Result GetCodecString(AP4_UI32 container_type, AP4_String& codec);
-
-+protected:
-+ AP4_DataBuffer m_Data;
- private:
- // methods
- AP4_VpccAtom(AP4_UI32 size, const AP4_UI08* payload);
---
-2.30.2
-
diff --git a/package/bento4/0003-Backport-Smmothstream-changes.patch b/package/bento4/0003-Backport-Smmothstream-changes.patch
deleted file mode 100644
index a9a577a2d9..0000000000
--- a/package/bento4/0003-Backport-Smmothstream-changes.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 97088e7bd7e84a493bea7e5fe4e808c8ac3e00ff Mon Sep 17 00:00:00 2001
-From: CastagnaIT <gottardo.stefano.83@gmail.com>
-Date: Thu, 22 Jul 2021 10:09:24 +0200
-Subject: [PATCH] Backport Smmothstream changes
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4File.cpp | 14 ++++++++------
- Source/C++/Core/Ap4File.h | 6 ++++--
- Source/C++/Core/Ap4FragmentSampleTable.cpp | 2 +-
- 3 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4File.cpp b/Source/C++/Core/Ap4File.cpp
-index cb20c3e..f1d2727 100644
---- a/Source/C++/Core/Ap4File.cpp
-+++ b/Source/C++/Core/Ap4File.cpp
-@@ -55,13 +55,14 @@ AP4_File::AP4_File(AP4_Movie* movie) :
- +---------------------------------------------------------------------*/
- AP4_File::AP4_File(AP4_ByteStream& stream,
- AP4_AtomFactory& atom_factory,
-- bool moov_only) :
-- m_Movie(NULL),
-+ bool moov_only,
-+ AP4_Movie* movie) :
-+ m_Movie(movie),
- m_FileType(NULL),
- m_MetaData(NULL),
- m_MoovIsBeforeMdat(true)
- {
-- ParseStream(stream, atom_factory, moov_only);
-+ ParseStream(stream, atom_factory, moov_only, movie);
- }
-
- /*----------------------------------------------------------------------
-@@ -75,7 +76,7 @@ AP4_File::AP4_File(AP4_ByteStream& stream,
- m_MoovIsBeforeMdat(true)
- {
- AP4_DefaultAtomFactory atom_factory;
-- ParseStream(stream, atom_factory, moov_only);
-+ ParseStream(stream, atom_factory, moov_only, m_Movie);
- }
-
- /*----------------------------------------------------------------------
-@@ -93,12 +94,13 @@ AP4_File::~AP4_File()
- void
- AP4_File::ParseStream(AP4_ByteStream& stream,
- AP4_AtomFactory& atom_factory,
-- bool moov_only)
-+ bool moov_only,
-+ AP4_Movie* movie)
- {
- // parse top-level atoms
- AP4_Atom* atom;
- AP4_Position stream_position;
-- bool keep_parsing = true;
-+ bool keep_parsing = movie == 0;
- while (keep_parsing &&
- AP4_SUCCEEDED(stream.Tell(stream_position)) &&
- AP4_SUCCEEDED(atom_factory.CreateAtomFromStream(stream, atom))) {
-diff --git a/Source/C++/Core/Ap4File.h b/Source/C++/Core/Ap4File.h
-index 9375258..2f00187 100644
---- a/Source/C++/Core/Ap4File.h
-+++ b/Source/C++/Core/Ap4File.h
-@@ -101,7 +101,8 @@ public:
- */
- AP4_File(AP4_ByteStream& stream,
- AP4_AtomFactory& atom_factory,
-- bool moov_only);
-+ bool moov_only,
-+ AP4_Movie* movie = NULL);
-
- /**
- * Constructs an AP4_File from a stream using the default atom factory
-@@ -161,7 +162,8 @@ private:
- // methods
- void ParseStream(AP4_ByteStream& stream,
- AP4_AtomFactory& atom_factory,
-- bool moov_only);
-+ bool moov_only,
-+ AP4_Movie* movie);
-
- // members
- AP4_Movie* m_Movie;
-diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-index 84e5ded..3fbb53e 100644
---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp
-+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-@@ -130,7 +130,7 @@ AP4_FragmentSampleTable::AddTrun(AP4_TrunAtom* trun,
- data_offset += trun->GetDataOffset();
- }
- // MS hack
-- if (data_offset == moof_offset) {
-+ if (data_offset < payload_offset) {
- data_offset = payload_offset;
- } else {
- payload_offset = data_offset;
---
-2.30.2
-
diff --git a/package/bento4/0004-more-SPS-parameters.patch b/package/bento4/0004-more-SPS-parameters.patch
deleted file mode 100644
index 7034739815..0000000000
--- a/package/bento4/0004-more-SPS-parameters.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 25df596f009514b213c5eaf5d5eb94072391c1be Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:22:39 +0200
-Subject: [PATCH] more SPS parameters
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Codecs/Ap4AvcParser.cpp | 100 ++++++++++++++++++++++++++++-
- Source/C++/Codecs/Ap4AvcParser.h | 22 +++++++
- Source/C++/Core/Ap4Utils.cpp | 8 +++
- Source/C++/Core/Ap4Utils.h | 2 +-
- 4 files changed, 129 insertions(+), 3 deletions(-)
-
-diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp
-index b95398b..7efb5c9 100644
---- a/Source/C++/Codecs/Ap4AvcParser.cpp
-+++ b/Source/C++/Codecs/Ap4AvcParser.cpp
-@@ -30,7 +30,6 @@
- | includes
- +---------------------------------------------------------------------*/
- #include "Ap4AvcParser.h"
--#include "Ap4Utils.h"
-
- /*----------------------------------------------------------------------
- | debugging
-@@ -123,6 +122,25 @@ AP4_AvcNalParser::SliceTypeName(unsigned int slice_type)
- }
- }
-
-+const int SAR[17][2] = {
-+ { 0, 1 },
-+ { 1, 1 },
-+ { 12, 11 },
-+ { 10, 11 },
-+ { 16, 11 },
-+ { 40, 33 },
-+ { 24, 11 },
-+ { 20, 11 },
-+ { 32, 11 },
-+ { 80, 33 },
-+ { 18, 11 },
-+ { 15, 11 },
-+ { 64, 33 },
-+ { 160, 99 },
-+ { 4, 3 },
-+ { 3, 2 },
-+ { 2, 1 },
-+};
- /*----------------------------------------------------------------------
- | AP4_AvcNalParser::AP4_AvcNalParser
- +---------------------------------------------------------------------*/
-@@ -236,7 +254,28 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() :
- frame_crop_left_offset(0),
- frame_crop_right_offset(0),
- frame_crop_top_offset(0),
-- frame_crop_bottom_offset(0)
-+ frame_crop_bottom_offset(0),
-+ vui_parameters_present_flag(0),
-+ aspect_ratio_info_present_flag(0),
-+ aspect_ratio_idc(0),
-+ sar_width(0),
-+ sar_height(0),
-+ overscan_info_present_flag(0),
-+ overscan_appropriate_flag(0),
-+ video_signal_type_present_flag(0),
-+ video_format(0),
-+ video_full_range_flag(0),
-+ colour_description_present_flag(0),
-+ colour_primaries(0),
-+ transfer_characteristics(0),
-+ matrix_coefficients(0),
-+ chroma_loc_info_present_flag(0),
-+ chroma_sample_loc_type_top_field(0),
-+ chroma_sample_loc_type_bottom_field(0),
-+ timing_info_present_flag(0),
-+ num_units_in_tick(0),
-+ time_scale(0),
-+ fixed_frame_rate_flag(0)
- {
- AP4_SetMemory(scaling_list_4x4, 0, sizeof(scaling_list_4x4));
- AP4_SetMemory(use_default_scaling_matrix_4x4, 0, sizeof(use_default_scaling_matrix_4x4));
-@@ -372,7 +411,64 @@ AP4_AvcFrameParser::ParseSPS(const unsigned char* data,
- sps.frame_crop_top_offset = ReadGolomb(bits);
- sps.frame_crop_bottom_offset = ReadGolomb(bits);
- }
-+ sps.vui_parameters_present_flag = bits.ReadBit();
-+ if (sps.vui_parameters_present_flag) {
-+ sps.aspect_ratio_info_present_flag = bits.ReadBit();
-+ if (sps.aspect_ratio_info_present_flag) {
-+ sps.aspect_ratio_idc = bits.ReadBits(8);
-+ if (sps.aspect_ratio_idc == 0xFF)
-+ {
-+ sps.sar_width = bits.ReadBits(16);
-+ sps.sar_height = bits.ReadBits(16);
-+ }
-+ else if (sps.aspect_ratio_idc < 17)
-+ {
-+ sps.sar_width = SAR[sps.aspect_ratio_idc][0];
-+ sps.sar_height = SAR[sps.aspect_ratio_idc][1];
-+ }
-+ }
-+ sps.overscan_info_present_flag = bits.ReadBit();
-+ if (sps.overscan_info_present_flag)
-+ sps.overscan_appropriate_flag = bits.ReadBit();
-+
-+ sps.video_signal_type_present_flag = bits.ReadBit();
-+ if (sps.video_signal_type_present_flag) {
-+ sps.video_format = bits.ReadBits(3);
-+ sps.video_full_range_flag = bits.ReadBit();
-+ sps.colour_description_present_flag = bits.ReadBit();
-+ if (sps.colour_description_present_flag) {
-+ sps.colour_primaries = bits.ReadBits(8);
-+ sps.transfer_characteristics = bits.ReadBits(8);
-+ sps.matrix_coefficients = bits.ReadBits(8);
-+ }
-+ }
-+
-
-+ sps.chroma_loc_info_present_flag = bits.ReadBit();
-+ if (sps.chroma_loc_info_present_flag) {
-+ sps.chroma_sample_loc_type_top_field = ReadGolomb(bits);
-+ sps.chroma_sample_loc_type_bottom_field = ReadGolomb(bits);
-+ }
-+
-+ if (bits.PeekBit() && bits.BitsLeft() < 10)
-+ return AP4_SUCCESS;
-+
-+ sps.timing_info_present_flag = bits.ReadBit();
-+ if (sps.timing_info_present_flag) {
-+#if AP4_PLATFORM_BYTE_ORDER == AP4_PLATFORM_BYTE_ORDER_BIG_ENDIAN
-+ sps.num_units_in_tick = bits.ReadBits(32);
-+ sps.time_scale = bits.ReadBits(32);
-+#else
-+ sps.num_units_in_tick = bits.ReadBits(16) << 16;
-+ sps.num_units_in_tick |= bits.ReadBits(16);
-+ sps.time_scale = bits.ReadBits(16) << 16;
-+ sps.time_scale |= bits.ReadBits(16);
-+#endif
-+ if (!sps.num_units_in_tick || !sps.time_scale)
-+ sps.timing_info_present_flag = 0;
-+ sps.fixed_frame_rate_flag = bits.ReadBit();
-+ }
-+ }
- return AP4_SUCCESS;
- }
-
-diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h
-index 8f9cd6c..9f97892 100644
---- a/Source/C++/Codecs/Ap4AvcParser.h
-+++ b/Source/C++/Codecs/Ap4AvcParser.h
-@@ -37,6 +37,7 @@
- #include "Ap4DataBuffer.h"
- #include "Ap4NalParser.h"
- #include "Ap4Array.h"
-+#include "Ap4Utils.h"
-
- /*----------------------------------------------------------------------
- | constants
-@@ -131,6 +132,27 @@ struct AP4_AvcSequenceParameterSet {
- unsigned int frame_crop_right_offset;
- unsigned int frame_crop_top_offset;
- unsigned int frame_crop_bottom_offset;
-+ unsigned int vui_parameters_present_flag;
-+ unsigned int aspect_ratio_info_present_flag;
-+ unsigned int aspect_ratio_idc;
-+ unsigned int sar_width;
-+ unsigned int sar_height;
-+ unsigned int overscan_info_present_flag;
-+ unsigned int overscan_appropriate_flag;
-+ unsigned int video_signal_type_present_flag;
-+ unsigned int video_format;
-+ unsigned int video_full_range_flag;
-+ unsigned int colour_description_present_flag;
-+ unsigned int colour_primaries;
-+ unsigned int transfer_characteristics;
-+ unsigned int matrix_coefficients;
-+ unsigned int chroma_loc_info_present_flag;
-+ unsigned int chroma_sample_loc_type_top_field;
-+ unsigned int chroma_sample_loc_type_bottom_field;
-+ unsigned int timing_info_present_flag;
-+ unsigned int num_units_in_tick;
-+ unsigned int time_scale;
-+ unsigned int fixed_frame_rate_flag;
- };
-
- struct AP4_AvcPictureParameterSet {
-diff --git a/Source/C++/Core/Ap4Utils.cpp b/Source/C++/Core/Ap4Utils.cpp
-index 96def27..6de4dba 100644
---- a/Source/C++/Core/Ap4Utils.cpp
-+++ b/Source/C++/Core/Ap4Utils.cpp
-@@ -581,4 +581,12 @@ AP4_BitReader::SkipBit()
- }
- }
-
-+/*----------------------------------------------------------------------
-+| AP4_BitReader::BitsLeft
-++---------------------------------------------------------------------*/
-+AP4_UI32
-+AP4_BitReader::BitsLeft()
-+{
-+ return (m_Buffer.GetDataSize() - m_Position) * 8 + m_BitsCached;
-+}
-
-diff --git a/Source/C++/Core/Ap4Utils.h b/Source/C++/Core/Ap4Utils.h
-index 475bff3..e66bafa 100644
---- a/Source/C++/Core/Ap4Utils.h
-+++ b/Source/C++/Core/Ap4Utils.h
-@@ -262,7 +262,7 @@ public:
- AP4_Result SkipBytes(AP4_Size byte_count);
- void SkipBit();
- void SkipBits(unsigned int bit_count);
--
-+ AP4_UI32 BitsLeft();
- unsigned int GetBitsRead();
-
- private:
---
-2.30.2
-
diff --git a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch b/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch
deleted file mode 100644
index 27b9572269..0000000000
--- a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 56e0acde44adbc5503da20dd96c31db33f744bd7 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:27:50 +0200
-Subject: [PATCH] AVC extract VUI values from SPS
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Codecs/Ap4AvcParser.cpp | 54 +++++++++++++++++++++++++-----
- Source/C++/Codecs/Ap4AvcParser.h | 3 +-
- 2 files changed, 47 insertions(+), 10 deletions(-)
-
-diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp
-index 7efb5c9..7f4fc34 100644
---- a/Source/C++/Codecs/Ap4AvcParser.cpp
-+++ b/Source/C++/Codecs/Ap4AvcParser.cpp
-@@ -287,18 +287,54 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() :
- /*----------------------------------------------------------------------
- | AP4_AvcSequenceParameterSet::GetInfo
- +---------------------------------------------------------------------*/
--void
-+bool
- AP4_AvcSequenceParameterSet::GetInfo(unsigned int& width, unsigned int& height)
- {
-- width = (pic_width_in_mbs_minus1+1) * 16;
-- height = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16;
-+ unsigned int nwidth = (pic_width_in_mbs_minus1+1) * 16;
-+ unsigned int nheight = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16;
-
-- if (frame_cropping_flag) {
-- unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset);
-- unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag);
-- if (crop_h < width) width -= crop_h;
-- if (crop_v < height) height -= crop_v;
-- }
-+ if (frame_cropping_flag) {
-+ unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset);
-+ unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag);
-+ if (crop_h < nwidth) nwidth -= crop_h;
-+ if (crop_v < nheight) nheight -= crop_v;
-+ }
-+ if (nwidth != width || nheight != height)
-+ {
-+ width = nwidth;
-+ height = nheight;
-+ return true;
-+ }
-+ return false;
-+}
-+
-+/*----------------------------------------------------------------------
-+| AP4_AvcSequenceParameterSet::GetVUIInfo
-++---------------------------------------------------------------------*/
-+bool
-+AP4_AvcSequenceParameterSet::GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect)
-+{
-+ bool ret(false);
-+ if (timing_info_present_flag && fixed_frame_rate_flag)
-+ {
-+ if (fps_scale != (num_units_in_tick << 1) || fps_ticks != time_scale)
-+ {
-+ fps_scale = num_units_in_tick << 1;
-+ fps_ticks = time_scale;
-+ ret = true;
-+ }
-+ }
-+ unsigned int w, h;
-+ if (aspect_ratio_info_present_flag && GetInfo(w, h))
-+ {
-+ float a((float)(sar_width * w) / (sar_height * h));
-+ if (a != aspect)
-+ {
-+ aspect = a;
-+ ret = true;
-+ }
-+ }
-+ return ret;
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h
-index 9f97892..431a294 100644
---- a/Source/C++/Codecs/Ap4AvcParser.h
-+++ b/Source/C++/Codecs/Ap4AvcParser.h
-@@ -91,7 +91,8 @@ typedef struct {
- struct AP4_AvcSequenceParameterSet {
- AP4_AvcSequenceParameterSet();
-
-- void GetInfo(unsigned int& width, unsigned int& height);
-+ bool GetInfo(unsigned int& width, unsigned int& height);
-+ bool GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect);
-
- AP4_DataBuffer raw_bytes;
-
---
-2.30.2
-
diff --git a/package/bento4/0006-Implement-SPS-Frame-parser.patch b/package/bento4/0006-Implement-SPS-Frame-parser.patch
deleted file mode 100644
index d2c224ccf9..0000000000
--- a/package/bento4/0006-Implement-SPS-Frame-parser.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 441247d84e8493a49d234fe062100b049956de90 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:34:42 +0200
-Subject: [PATCH] Implement SPS Frame parser
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Codecs/Ap4AvcParser.cpp | 26 ++++++++++++++++++++++++++
- Source/C++/Codecs/Ap4AvcParser.h | 5 +++++
- 2 files changed, 31 insertions(+)
-
-diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp
-index 7f4fc34..cfa841d 100644
---- a/Source/C++/Codecs/Ap4AvcParser.cpp
-+++ b/Source/C++/Codecs/Ap4AvcParser.cpp
-@@ -1112,6 +1112,32 @@ AP4_AvcFrameParser::AppendNalUnitData(const unsigned char* data, unsigned int da
- m_AccessUnitData.Append(new AP4_DataBuffer(data, data_size));
- }
-
-+/*----------------------------------------------------------------------
-+| AP4_AvcFrameParser::Feed
-++---------------------------------------------------------------------*/
-+AP4_Result AP4_AvcFrameParser::ParseFrameForSPS(const AP4_Byte* data, AP4_Size data_size, AP4_UI08 naluLengthSize, AP4_AvcSequenceParameterSet &sps)
-+{
-+ if (data_size < naluLengthSize)
-+ return AP4_ERROR_EOS;
-+
-+ while (data_size > naluLengthSize)
-+ {
-+ AP4_Size nalSize(0);
-+ for (unsigned int i(0); i < naluLengthSize; ++i) { nalSize = (nalSize << 8) + *data++; };
-+ data_size -= naluLengthSize;
-+ if (nalSize > data_size)
-+ return AP4_ERROR_INVALID_PARAMETERS;
-+
-+ if ((*data & 0x1F) == AP4_AVC_NAL_UNIT_TYPE_SPS)
-+ {
-+ AP4_AvcFrameParser fp;
-+ return fp.ParseSPS(data, data_size, sps);
-+ }
-+ data_size -= nalSize;
-+ }
-+ return AP4_SUCCESS;
-+}
-+
- /*----------------------------------------------------------------------
- | AP4_AvcFrameParser::Feed
- +---------------------------------------------------------------------*/
-diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h
-index 431a294..99c5320 100644
---- a/Source/C++/Codecs/Ap4AvcParser.h
-+++ b/Source/C++/Codecs/Ap4AvcParser.h
-@@ -258,6 +258,11 @@ public:
- AP4_AvcFrameParser();
- ~AP4_AvcFrameParser();
-
-+ static AP4_Result ParseFrameForSPS(const AP4_Byte* data,
-+ AP4_Size data_size,
-+ AP4_UI08 naluLengthSize,
-+ AP4_AvcSequenceParameterSet &sps);
-+
- /**
- * Feed some data to the parser and look for the next NAL Unit.
- *
---
-2.30.2
-
diff --git a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch b/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch
deleted file mode 100644
index bd7f434652..0000000000
--- a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b36f3c02a93029308654f77c01c3c04259449c5c Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:35:48 +0200
-Subject: [PATCH] Fix segfault when AP4_Sample's seek
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4LinearReader.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
-index 7cc3ebd..61dd60e 100644
---- a/Source/C++/Core/Ap4LinearReader.cpp
-+++ b/Source/C++/Core/Ap4LinearReader.cpp
-@@ -482,6 +482,7 @@ AP4_LinearReader::Advance(bool read_data)
- result = buffer->m_Sample->ReadData(buffer->m_Data);
- }
- if (AP4_FAILED(result)) {
-+ buffer->m_Sample = nullptr;
- delete buffer;
- return result;
- }
---
-2.30.2
-
diff --git a/package/bento4/0008-Hack-HBO.patch b/package/bento4/0008-Hack-HBO.patch
deleted file mode 100644
index ed297574a8..0000000000
--- a/package/bento4/0008-Hack-HBO.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 37e54320f2822bdc7eab50eb54b1fc4a452c7f60 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 11:18:14 +0200
-Subject: [PATCH] Hack HBO
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4FragmentSampleTable.cpp | 8 +++++++-
- Source/C++/Core/Ap4FragmentSampleTable.h | 1 +
- Source/C++/Core/Ap4LinearReader.cpp | 20 +++++++++++++-------
- Source/C++/Core/Ap4LinearReader.h | 3 ++-
- Source/C++/Core/Ap4MovieFragment.cpp | 5 ++++-
- Source/C++/Core/Ap4MovieFragment.h | 2 ++
- Source/C++/Core/Ap4Processor.cpp | 3 ++-
- 7 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-index 3fbb53e..cea5c7d 100644
---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp
-+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-@@ -47,6 +47,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf,
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset,
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin) :
- m_Duration(0)
- {
-@@ -73,6 +74,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf,
- }
-
- // process all the trun atoms
-+ AP4_UI32 trun_flags(0);
- for (AP4_List<AP4_Atom>::Item* item = traf->GetChildren().FirstItem();
- item;
- item = item->GetNext()) {
-@@ -88,9 +90,13 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf,
- mdat_payload_offset,
- dts_origin);
- if (AP4_FAILED(result)) return;
-+ trun_flags |= trun->GetFlags();
- }
- }
-- }
-+ }
-+ // Hack if we have a single sample and default sample size is wrong (hbo ttml)
-+ if (m_Samples.ItemCount() == 1 && (trun_flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) == 0)
-+ m_Samples[0].SetSize(mdat_payload_size);
- }
-
- /*----------------------------------------------------------------------
-diff --git a/Source/C++/Core/Ap4FragmentSampleTable.h b/Source/C++/Core/Ap4FragmentSampleTable.h
-index 67192de..29fa4a9 100644
---- a/Source/C++/Core/Ap4FragmentSampleTable.h
-+++ b/Source/C++/Core/Ap4FragmentSampleTable.h
-@@ -57,6 +57,7 @@ class AP4_FragmentSampleTable : public AP4_SampleTable
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec correctly
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin=0);
- virtual ~AP4_FragmentSampleTable();
-
-diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
-index 61dd60e..eabeacf 100644
---- a/Source/C++/Core/Ap4LinearReader.cpp
-+++ b/Source/C++/Core/Ap4LinearReader.cpp
-@@ -309,7 +309,8 @@ AP4_LinearReader::ProcessTrack(AP4_Track* track)
- AP4_Result
- AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof,
- AP4_Position moof_offset,
-- AP4_Position mdat_payload_offset)
-+ AP4_Position mdat_payload_offset,
-+ AP4_UI64 mdat_payload_size)
- {
- AP4_Result result;
-
-@@ -334,7 +335,8 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof,
- ids[j],
- m_FragmentStream,
- moof_offset,
-- mdat_payload_offset,
-+ mdat_payload_offset,
-+ mdat_payload_size,
- tracker->m_NextDts,
- sample_table);
- if (AP4_FAILED(result)) return result;
-@@ -382,13 +384,11 @@ AP4_LinearReader::AdvanceFragment()
- AP4_Position position = 0;
- m_FragmentStream->Tell(position);
-
-- // process the movie fragment
-- result = ProcessMoof(moof, position-atom->GetSize(), position+8);
-- if (AP4_FAILED(result)) return result;
--
- // compute where the next fragment will be
- AP4_UI32 size;
- AP4_UI32 type;
-+ AP4_UI64 size_64 = 0;
-+
- m_FragmentStream->Tell(position);
- result = m_FragmentStream->ReadUI32(size);
- if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more
-@@ -397,13 +397,19 @@ AP4_LinearReader::AdvanceFragment()
- if (size == 0) {
- m_NextFragmentPosition = 0;
- } else if (size == 1) {
-- AP4_UI64 size_64 = 0;
- result = m_FragmentStream->ReadUI64(size_64);
- if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more
- m_NextFragmentPosition = position+size_64;
-+ size_64 -= 8;
- } else {
- m_NextFragmentPosition = position+size;
-+ size_64 = size;
- }
-+
-+ // process the movie fragment
-+ result = ProcessMoof(moof, position - atom->GetSize(), position + 8, size_64 - 8);
-+ if (AP4_FAILED(result)) return result;
-+
- return AP4_SUCCESS;
- } else {
- delete atom;
-diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h
-index 21f4871..929b4e1 100644
---- a/Source/C++/Core/Ap4LinearReader.h
-+++ b/Source/C++/Core/Ap4LinearReader.h
-@@ -161,7 +161,8 @@ protected:
- virtual AP4_Result ProcessTrack(AP4_Track* track);
- virtual AP4_Result ProcessMoof(AP4_ContainerAtom* moof,
- AP4_Position moof_offset,
-- AP4_Position mdat_payload_offset);
-+ AP4_Position mdat_payload_offset,
-+ AP4_UI64 mdat_payload_size);
-
- // methods
- Tracker* FindTracker(AP4_UI32 track_id);
-diff --git a/Source/C++/Core/Ap4MovieFragment.cpp b/Source/C++/Core/Ap4MovieFragment.cpp
-index 028d42d..c2ead25 100644
---- a/Source/C++/Core/Ap4MovieFragment.cpp
-+++ b/Source/C++/Core/Ap4MovieFragment.cpp
-@@ -127,6 +127,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov,
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset,
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin,
- AP4_FragmentSampleTable*& sample_table)
- {
-@@ -158,6 +159,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov,
- sample_stream,
- moof_offset,
- mdat_payload_offset,
-+ mdat_payload_size,
- dts_origin);
- return AP4_SUCCESS;
- }
-@@ -174,9 +176,10 @@ AP4_MovieFragment::CreateSampleTable(AP4_Movie* movie,
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset,
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin,
- AP4_FragmentSampleTable*& sample_table)
- {
- AP4_MoovAtom* moov = movie?movie->GetMoovAtom():NULL;
-- return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, dts_origin, sample_table);
-+ return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, mdat_payload_size, dts_origin, sample_table);
- }
-diff --git a/Source/C++/Core/Ap4MovieFragment.h b/Source/C++/Core/Ap4MovieFragment.h
-index f829411..de59c42 100644
---- a/Source/C++/Core/Ap4MovieFragment.h
-+++ b/Source/C++/Core/Ap4MovieFragment.h
-@@ -70,6 +70,7 @@ public:
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin,
- AP4_FragmentSampleTable*& sample_table);
- AP4_Result CreateSampleTable(AP4_Movie* movie,
-@@ -77,6 +78,7 @@ public:
- AP4_ByteStream* sample_stream,
- AP4_Position moof_offset,
- AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly
-+ AP4_UI64 mdat_payload_size,
- AP4_UI64 dts_origin,
- AP4_FragmentSampleTable*& sample_table);
-
-diff --git a/Source/C++/Core/Ap4Processor.cpp b/Source/C++/Core/Ap4Processor.cpp
-index c4e1d78..365d955 100644
---- a/Source/C++/Core/Ap4Processor.cpp
-+++ b/Source/C++/Core/Ap4Processor.cpp
-@@ -156,6 +156,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov,
- AP4_Atom* atom = locator->m_Atom;
- AP4_UI64 atom_offset = locator->m_Offset;
- AP4_UI64 mdat_payload_offset = atom_offset+atom->GetSize()+AP4_ATOM_HEADER_SIZE;
-+ AP4_UI64 mdat_payload_size = atom->GetSize();
- AP4_Sample sample;
- AP4_DataBuffer sample_data_in;
- AP4_DataBuffer sample_data_out;
-@@ -226,7 +227,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov,
-
- // create a sample table object so we can read the sample data
- AP4_FragmentSampleTable* sample_table = NULL;
-- result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, 0, sample_table);
-+ result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, mdat_payload_size, 0, sample_table);
- if (AP4_FAILED(result)) return result;
- sample_tables.Append(sample_table);
-
---
-2.30.2
-
diff --git a/package/bento4/0009-Android-32-ftello-fix.patch b/package/bento4/0009-Android-32-ftello-fix.patch
deleted file mode 100644
index 0adca20ed0..0000000000
--- a/package/bento4/0009-Android-32-ftello-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f12fbb6f54b8302db2ab7c926a26f9189cf86532 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:41:35 +0200
-Subject: [PATCH] Android 32 ftello fix
-
-ref: https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4Config.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4Config.h b/Source/C++/Core/Ap4Config.h
-index 422069e..c859a03 100644
---- a/Source/C++/Core/Ap4Config.h
-+++ b/Source/C++/Core/Ap4Config.h
-@@ -141,10 +141,10 @@
- #endif
-
- #if !defined(AP4_fseek)
--#define AP4_fseek fseeko
-+#define AP4_fseek fseek
- #endif
- #if !defined(AP4_ftell)
--#define AP4_ftell ftello
-+#define AP4_ftell ftell
- #endif
-
- /* some compilers (ex: MSVC 8) deprecate those, so we rename them */
---
-2.30.2
-
diff --git a/package/bento4/0010-Dazn-sample-duration-workaround.patch b/package/bento4/0010-Dazn-sample-duration-workaround.patch
deleted file mode 100644
index 5c64210324..0000000000
--- a/package/bento4/0010-Dazn-sample-duration-workaround.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10f931c703c68b4fc856e09788dfe64579252bb8 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 10:48:36 +0200
-Subject: [PATCH] Dazn sample duration workaround
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4TrunAtom.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/Source/C++/Core/Ap4TrunAtom.cpp b/Source/C++/Core/Ap4TrunAtom.cpp
-index c51f21d..77b7c6d 100644
---- a/Source/C++/Core/Ap4TrunAtom.cpp
-+++ b/Source/C++/Core/Ap4TrunAtom.cpp
-@@ -128,6 +128,12 @@ AP4_TrunAtom::AP4_TrunAtom(AP4_UI32 size,
- for (unsigned int i=0; i<sample_count; i++) {
- if (flags & AP4_TRUN_FLAG_SAMPLE_DURATION_PRESENT) {
- stream.ReadUI32(m_Entries[i].sample_duration);
-+ // Workaround for dazn streams, which provide 24 -> 1 sequences
-+ if (i && m_Entries[i].sample_duration == 1 && m_Entries[i - 1].sample_duration > 1)
-+ {
-+ m_Entries[i].sample_duration = m_Entries[i - 1].sample_duration >> 1;
-+ m_Entries[i - 1].sample_duration -= m_Entries[i].sample_duration;
-+ }
- --record_fields_count;
- }
- if (flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) {
---
-2.30.2
-
diff --git a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch b/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch
deleted file mode 100644
index 15159af892..0000000000
--- a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 7bb5120b52814e4471a165e295acdc6b6155259e Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 11:01:12 +0200
-Subject: [PATCH] Add argument to reuse single sample decrypter
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4CommonEncryption.cpp | 36 ++++++++++++++++++-------
- Source/C++/Core/Ap4CommonEncryption.h | 8 +++++-
- Source/C++/Core/Ap4Protection.cpp | 3 ++-
- 3 files changed, 35 insertions(+), 12 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp
-index 5308200..cb5c328 100644
---- a/Source/C++/Core/Ap4CommonEncryption.cpp
-+++ b/Source/C++/Core/Ap4CommonEncryption.cpp
-@@ -1967,6 +1967,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti
- const AP4_UI08* key,
- AP4_Size key_size,
- AP4_BlockCipherFactory* block_cipher_factory,
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter)
- {
- AP4_SaioAtom* saio = NULL;
-@@ -1982,6 +1983,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti
- saio,
- saiz,
- sample_encryption_atom,
-+ singlesample_decrypter,
- decrypter);
- }
-
-@@ -1999,6 +2001,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti
- AP4_SaioAtom*& saio,
- AP4_SaizAtom*& saiz,
- AP4_CencSampleEncryption*& sample_encryption_atom,
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter)
- {
- // default return values
-@@ -2032,6 +2035,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti
- key_size,
- block_cipher_factory,
- reset_iv_at_each_subsample,
-+ singlesample_decrypter,
- decrypter);
- }
-
-@@ -2045,6 +2049,7 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table,
- AP4_Size key_size,
- AP4_BlockCipherFactory* block_cipher_factory,
- bool reset_iv_at_each_subsample,
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter)
- {
- // default return value
-@@ -2074,15 +2079,23 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table,
-
- // create a single-sample decrypter
- AP4_CencSingleSampleDecrypter* single_sample_decrypter = NULL;
-- AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type,
-- key,
-- key_size,
-- sample_info_table->GetCryptByteBlock(),
-- sample_info_table->GetSkipByteBlock(),
-- block_cipher_factory,
-- reset_iv_at_each_subsample,
-- single_sample_decrypter);
-- if (AP4_FAILED(result)) return result;
-+ if (!singlesample_decrypter)
-+ {
-+ AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type,
-+ key,
-+ key_size,
-+ sample_info_table->GetCryptByteBlock(),
-+ sample_info_table->GetSkipByteBlock(),
-+ block_cipher_factory,
-+ reset_iv_at_each_subsample,
-+ single_sample_decrypter);
-+
-+ if (AP4_FAILED(result)) return result;
-+ }
-+ else
-+ {
-+ single_sample_decrypter = singlesample_decrypter;
-+ }
-
- // create the decrypter
- decrypter = new AP4_CencSampleDecrypter(single_sample_decrypter, sample_info_table);
-@@ -2333,7 +2346,9 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in,
- | AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor
- +---------------------------------------------------------------------*/
- AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map,
-- AP4_BlockCipherFactory* block_cipher_factory) :
-+ AP4_BlockCipherFactory* block_cipher_factory,
-+ AP4_CencSingleSampleDecrypter *cenc_singlesample_decrypter) :
-+ m_CencSingleSampleDecrypter(cenc_singlesample_decrypter),
- m_KeyMap(key_map)
- {
- if (block_cipher_factory) {
-@@ -2483,6 +2498,7 @@ AP4_CencDecryptingProcessor::CreateFragmentHandler(AP4_TrakAtom* trak,
- saio,
- saiz,
- sample_encryption_atom,
-+ m_CencSingleSampleDecrypter,
- sample_decrypter);
- if (AP4_FAILED(result)) return NULL;
-
-diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h
-index 580de66..a6b20ce 100644
---- a/Source/C++/Core/Ap4CommonEncryption.h
-+++ b/Source/C++/Core/Ap4CommonEncryption.h
-@@ -48,6 +48,7 @@ class AP4_SaioAtom;
- class AP4_CencSampleInfoTable;
- class AP4_AvcFrameParser;
- class AP4_HevcFrameParser;
-+class AP4_CencSingleSampleDecrypter;
-
- /*----------------------------------------------------------------------
- | constants
-@@ -654,7 +655,8 @@ class AP4_CencDecryptingProcessor : public AP4_Processor
- public:
- // constructor
- AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map,
-- AP4_BlockCipherFactory* block_cipher_factory = NULL);
-+ AP4_BlockCipherFactory* block_cipher_factory = NULL,
-+ AP4_CencSingleSampleDecrypter* cenc_singlesample_decrypter = NULL);
-
- // AP4_Processor methods
- virtual AP4_Processor::TrackHandler* CreateTrackHandler(AP4_TrakAtom* trak);
-@@ -670,6 +672,7 @@ protected:
-
- // members
- AP4_BlockCipherFactory* m_BlockCipherFactory;
-+ AP4_CencSingleSampleDecrypter* m_CencSingleSampleDecrypter;
- const AP4_ProtectionKeyMap* m_KeyMap;
- };
-
-@@ -752,6 +755,7 @@ public:
- AP4_SaioAtom*& saio_atom, // [out]
- AP4_SaizAtom*& saiz_atom, // [out]
- AP4_CencSampleEncryption*& sample_encryption_atom, // [out]
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter);
-
- static AP4_Result Create(AP4_ProtectedSampleDescription* sample_description,
-@@ -761,6 +765,7 @@ public:
- const AP4_UI08* key,
- AP4_Size key_size,
- AP4_BlockCipherFactory* block_cipher_factory,
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter);
-
- static AP4_Result Create(AP4_CencSampleInfoTable* sample_info_table,
-@@ -769,6 +774,7 @@ public:
- AP4_Size key_size,
- AP4_BlockCipherFactory* block_cipher_factory,
- bool reset_iv_at_each_subsample,
-+ AP4_CencSingleSampleDecrypter* singlesample_decrypter,
- AP4_CencSampleDecrypter*& decrypter);
-
- // methods
-diff --git a/Source/C++/Core/Ap4Protection.cpp b/Source/C++/Core/Ap4Protection.cpp
-index fd421e9..80bb9f0 100644
---- a/Source/C++/Core/Ap4Protection.cpp
-+++ b/Source/C++/Core/Ap4Protection.cpp
-@@ -812,7 +812,8 @@ AP4_SampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_description,
- aux_info_data_offset,
- key,
- key_size,
-- block_cipher_factory,
-+ block_cipher_factory,
-+ NULL,
- decrypter);
- if (AP4_FAILED(result)) return NULL;
- return decrypter;
---
-2.30.2
-
diff --git a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch b/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch
deleted file mode 100644
index d20e1191bf..0000000000
--- a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 91e148a9c53811447d35c36d9f11f767d49477a0 Mon Sep 17 00:00:00 2001
-From: Glenn Guy <glennguy83@gmail.com>
-Date: Thu, 22 Jul 2021 11:04:26 +0200
-Subject: [PATCH] Static ReadGolomb/SignedGolomb
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Codecs/Ap4AvcParser.cpp | 8 ++++----
- Source/C++/Codecs/Ap4AvcParser.h | 3 +++
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp
-index cfa841d..a17b698 100644
---- a/Source/C++/Codecs/Ap4AvcParser.cpp
-+++ b/Source/C++/Codecs/Ap4AvcParser.cpp
-@@ -191,8 +191,8 @@ AP4_AvcFrameParser::~AP4_AvcFrameParser()
- /*----------------------------------------------------------------------
- | ReadGolomb
- +---------------------------------------------------------------------*/
--static unsigned int
--ReadGolomb(AP4_BitReader& bits)
-+unsigned int
-+AP4_AvcFrameParser::ReadGolomb(AP4_BitReader& bits)
- {
- unsigned int leading_zeros = 0;
- while (bits.ReadBit() == 0) {
-@@ -209,8 +209,8 @@ ReadGolomb(AP4_BitReader& bits)
- /*----------------------------------------------------------------------
- | SignedGolomb
- +---------------------------------------------------------------------*/
--static int
--SignedGolomb(unsigned int code_num)
-+int
-+AP4_AvcFrameParser::SignedGolomb(unsigned int code_num)
- {
- if (code_num % 2) {
- return (code_num+1)/2;
-diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h
-index 99c5320..0c74c0e 100644
---- a/Source/C++/Codecs/Ap4AvcParser.h
-+++ b/Source/C++/Codecs/Ap4AvcParser.h
-@@ -321,6 +321,9 @@ public:
- unsigned int nal_ref_idc,
- AP4_AvcSliceHeader& slice_header);
-
-+ static unsigned int ReadGolomb(AP4_BitReader& bits);
-+ static int SignedGolomb(unsigned int code_num);
-+
- private:
- // methods
- bool SameFrame(unsigned int nal_unit_type_1, unsigned int nal_ref_idc_1, AP4_AvcSliceHeader& sh1,
---
-2.30.2
-
diff --git a/package/bento4/0013-Add-GetChannels-method.patch b/package/bento4/0013-Add-GetChannels-method.patch
deleted file mode 100644
index 7e3f6e69ac..0000000000
--- a/package/bento4/0013-Add-GetChannels-method.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15e31e3641e4f85475984bf4d9ebf8ae47303a8a Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 11:07:13 +0200
-Subject: [PATCH] Add GetChannels method
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4Dac3Atom.cpp | 6 ++++++
- Source/C++/Core/Ap4Dac3Atom.h | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/Source/C++/Core/Ap4Dac3Atom.cpp b/Source/C++/Core/Ap4Dac3Atom.cpp
-index 80a511e..a9ea78a 100644
---- a/Source/C++/Core/Ap4Dac3Atom.cpp
-+++ b/Source/C++/Core/Ap4Dac3Atom.cpp
-@@ -143,3 +143,9 @@ AP4_Dac3Atom::InspectFields(AP4_AtomInspector& inspector)
- inspector.AddField("lfeon", m_StreamInfo.lfeon);
- return AP4_SUCCESS;
- }
-+
-+AP4_UI08 AP4_Dac3Atom::GetChannels() const
-+{
-+ static const AP4_UI08 CC[] = { 2, 1, 2, 3, 3, 4, 4, 5 };
-+ return CC[m_StreamInfo.acmod] + m_StreamInfo.lfeon;
-+}
-diff --git a/Source/C++/Core/Ap4Dac3Atom.h b/Source/C++/Core/Ap4Dac3Atom.h
-index 2532ef2..78e2875 100644
---- a/Source/C++/Core/Ap4Dac3Atom.h
-+++ b/Source/C++/Core/Ap4Dac3Atom.h
-@@ -73,6 +73,7 @@ public:
- const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes; }
- unsigned int GetDataRate() const { return m_DataRate; }
- const StreamInfo& GetStreamInfo() const { return m_StreamInfo; }
-+ AP4_UI08 GetChannels() const;
-
- private:
- // methods
---
-2.30.2
-
diff --git a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch b/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch
deleted file mode 100644
index a2bc7aefeb..0000000000
--- a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f673675843144785658a010bab455972d83af004 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 11:09:37 +0200
-Subject: [PATCH] Implemented
- GetSampleIndexForTimeStamp/GetNearestSyncSampleIndex
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4FragmentSampleTable.cpp | 25 ++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-index cea5c7d..1c62f24 100644
---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp
-+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp
-@@ -297,10 +297,19 @@ AP4_FragmentSampleTable::GetSampleChunkPosition(AP4_Ordinal sample_index,
- | AP4_FragmentSampleTable::GetSampleIndexForTimeStamp
- +---------------------------------------------------------------------*/
- AP4_Result
--AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/,
-+AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 ts,
- AP4_Ordinal& sample_index)
- {
-- sample_index = 0; // TODO
-+ if (!m_Samples.ItemCount())
-+ return AP4_ERROR_NOT_ENOUGH_DATA;
-+
-+ sample_index = 0;
-+ while (sample_index < m_Samples.ItemCount() && m_Samples[sample_index].GetCts() + m_Samples[sample_index].GetDuration() < ts)
-+ ++sample_index;
-+
-+ if (sample_index == m_Samples.ItemCount())
-+ return AP4_ERROR_NOT_ENOUGH_DATA;
-+
- return AP4_SUCCESS;
- }
-
-@@ -308,8 +317,16 @@ AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/,
- | AP4_FragmentSampleTable::GetNearestSyncSampleIndex
- +---------------------------------------------------------------------*/
- AP4_Ordinal
--AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal /*sample_index*/, bool /*before*/)
-+AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal sample_index, bool before)
- {
-- return 0; // TODO
-+ if (sample_index >= m_Samples.ItemCount())
-+ return sample_index;
-+
-+ AP4_Ordinal end(before ? 0 : m_Samples.ItemCount());
-+
-+ while (sample_index != end && !m_Samples[sample_index].IsSync())
-+ sample_index = sample_index + (before ? -1 : 1);
-+
-+ return sample_index;
- }
-
---
-2.30.2
-
diff --git a/package/bento4/0015-Avoid-set-next-fragment-position.patch b/package/bento4/0015-Avoid-set-next-fragment-position.patch
deleted file mode 100644
index ded33ffdaf..0000000000
--- a/package/bento4/0015-Avoid-set-next-fragment-position.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0658d38be16c88585b248b237895b4dc63f28e79 Mon Sep 17 00:00:00 2001
-From: peak3d <pfau@peak3d.de>
-Date: Thu, 22 Jul 2021 11:23:13 +0200
-Subject: [PATCH] Avoid set next fragment position
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4LinearReader.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
-index eabeacf..61c3a9d 100644
---- a/Source/C++/Core/Ap4LinearReader.cpp
-+++ b/Source/C++/Core/Ap4LinearReader.cpp
-@@ -54,8 +54,8 @@ AP4_LinearReader::AP4_LinearReader(AP4_Movie& movie,
- m_HasFragments = movie.HasFragments();
- if (fragment_stream) {
- fragment_stream->AddReference();
-- fragment_stream->Tell(m_CurrentFragmentPosition);
-- m_NextFragmentPosition = m_CurrentFragmentPosition;
-+ //fragment_stream->Tell(m_CurrentFragmentPosition);
-+ //m_NextFragmentPosition = m_CurrentFragmentPosition;
- }
- }
-
-@@ -360,9 +360,11 @@ AP4_LinearReader::AdvanceFragment()
- AP4_Result result;
-
- // go the the start of the next fragment
-- result = m_FragmentStream->Seek(m_NextFragmentPosition);
-- if (AP4_FAILED(result)) return result;
-- m_CurrentFragmentPosition = m_NextFragmentPosition;
-+ if (m_NextFragmentPosition) {
-+ result = m_FragmentStream->Seek(m_NextFragmentPosition);
-+ if (AP4_FAILED(result)) return result;
-+ m_CurrentFragmentPosition = m_NextFragmentPosition;
-+ }
-
- // read atoms until we find a moof
- assert(m_HasFragments);
---
-2.30.2
-
diff --git a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch b/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch
deleted file mode 100644
index cbcc62f982..0000000000
--- a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e5b37c1e0a7a84fdc7b403c5e30a5e93706104b8 Mon Sep 17 00:00:00 2001
-From: Dobroslaw Kijowski <dobo90@gmail.com>
-Date: Tue, 19 Oct 2021 14:17:11 +0200
-Subject: [PATCH] Fix segfault in Ap4LinearReader ProcessMoof
-
-Downloaded from https://github.com/xbmc/inputstream.adaptive/pull/856
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- Source/C++/Core/Ap4LinearReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp
-index 61c3a9d..2464865 100644
---- a/Source/C++/Core/Ap4LinearReader.cpp
-+++ b/Source/C++/Core/Ap4LinearReader.cpp
-@@ -329,7 +329,7 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof,
- tracker->m_SampleTable = NULL;
- tracker->m_NextSampleIndex = 0;
- for (unsigned int j=0; j<ids.ItemCount(); j++) {
-- if (ids[j] == tracker->m_Track->GetId()) {
-+ if (ids.ItemCount()==1 || ids[j] == tracker->m_Track->GetId()) {
- AP4_FragmentSampleTable* sample_table = NULL;
- result = m_Fragment->CreateSampleTable(&m_Movie,
- ids[j],
---
-2.33.1
diff --git a/package/bento4/bento4.hash b/package/bento4/bento4.hash
index 8b9ec610f5..8e2033dc98 100644
--- a/package/bento4/bento4.hash
+++ b/package/bento4/bento4.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 9f3eb912207d7ed9c1e6e05315083404b32a11f8aacd604a9b2bdcb10bf79eb9 bento4-1.6.0-639.tar.gz
+sha256 8afa4ae07a7629a65e0d5014750960ced33a8771d363652f3913261fb5d0c84f bento4-1.6.0-639-6-Nexus.tar.gz
sha256 7daae92c8628ada28def8d096fe2fde298b72ec3e2d64a3c408afce38edb361b Documents/LICENSE.txt
diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk
index 89ff2e4b85..a2e0805c17 100644
--- a/package/bento4/bento4.mk
+++ b/package/bento4/bento4.mk
@@ -4,8 +4,8 @@
#
################################################################################
-BENTO4_VERSION = 1.6.0-639
-BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION))
+BENTO4_VERSION = 1.6.0-639-6-Nexus
+BENTO4_SITE = $(call github,xbmc,Bento4,$(BENTO4_VERSION))
BENTO4_INSTALL_STAGING = YES
BENTO4_LICENSE = GPL-2.0+
BENTO4_LICENSE_FILES = Documents/LICENSE.txt
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-07 10:40 ` Yann E. MORIN 2023-05-03 16:44 ` [Buildroot] [PATCH 03/11] package/kodi-audiodecoder-*: mass version bump to Nexus Bernd Kuhls ` (10 subsequent siblings) 11 siblings, 1 reply; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Replaced patch 0002 to fix python detection with new version due to upstream changes: https://github.com/xbmc/xbmc/pull/21597#issuecomment-1166365667 Removed patches which were applied upstream. Bump gcc requirement as kodi depends on C++17. Rework configure options. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/0002-cmake-findpython.patch | 135 ------------------ package/kodi/0002-fix-findpython.patch | 16 +++ ...-cmake-search-for-python-interpreter.patch | 48 ------- ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 ----- package/kodi/Config.in | 6 +- package/kodi/kodi.hash | 8 +- package/kodi/kodi.mk | 16 ++- 9 files changed, 35 insertions(+), 237 deletions(-) delete mode 100644 package/kodi/0002-cmake-findpython.patch create mode 100644 package/kodi/0002-fix-findpython.patch delete mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch delete mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index a13fb91afe..72a2f05bd6 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 20.1-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 9432e4bbd6..cb6b04d069 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.5-Matrix +KODI_TEXTUREPACKER_VERSION = 20.1-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch deleted file mode 100644 index 60728aa465..0000000000 --- a/package/kodi/0002-cmake-findpython.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 -From: fuzzard <fuzzard@kodi.tv> -Date: Sat, 31 Jul 2021 19:22:08 +1000 -Subject: [PATCH] [cmake] findpython - -use cmakes (3.12+) FindPython3 module. -Provide cmake vars for user to overide specific version, and search path - -Backport of https://github.com/xbmc/xbmc/pull/20045 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - CMakeLists.txt | 4 +- - cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- - 2 files changed, 56 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d5369798d..9bed54ef40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.12) - if(WIN32) - # Version 3.15 is required to use "PREPEND" for dependencies - cmake_minimum_required(VERSION 3.15) -@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) - find_package(TexturePacker REQUIRED) - find_package(JsonSchemaBuilder REQUIRED) - --SET(PYTHON_VERSION 3.8) -- - if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) - MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") - elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index c40e12d551..35220b5426 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -1,17 +1,56 @@ --# - Try to find python --# Once done this will define -+# FindPython -+# -------- -+# Finds Python3 libraries -+# -+# This module will search for the required python libraries on the system -+# If multiple versions are found, the highest version will be used. -+# -+# -------- -+# -+# the following variables influence behaviour: -+# -+# PYTHON_PATH - use external python not found in system paths -+# usage: -DPYTHON_PATH=/path/to/python/lib -+# PYTHON_VER - use exact python version, fail if not found -+# usage: -DPYTHON_VER=3.8 -+# -+# -------- -+# -+# This module will define the following variables: - # - # PYTHON_FOUND - system has PYTHON -+# PYTHON_VERSION - Python version number (Major.Minor) - # PYTHON_INCLUDE_DIRS - the python include directory - # PYTHON_LIBRARIES - The python libraries -+# PYTHON_LDFLAGS - Python provided link options -+# -+# -------- -+# -+ -+# for Depends builds, set search root dir to depends path -+if(KODI_DEPENDSBUILD) -+ set(Python3_USE_STATIC_LIBS TRUE) -+ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) -+endif() -+ -+# Provide root dir to search for Python if provided -+if(PYTHON_PATH) -+ set(Python3_ROOT_DIR ${PYTHON_PATH}) -+ -+ # unset cache var so we can generate again with a different dir (or none) if desired -+ unset(PYTHON_PATH CACHE) -+endif() -+ -+# Set specific version of Python to find if provided -+if(PYTHON_VER) -+ set(VERSION ${PYTHON_VER}) -+ set(EXACT_VER "EXACT") - --if(PKG_CONFIG_FOUND) -- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) -+ # unset cache var so we can generate again with a different ver (or none) if desired -+ unset(PYTHON_VER CACHE) - endif() - --find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) --find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) --find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) -+find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) - - if(KODI_DEPENDSBUILD) - find_library(FFI_LIBRARY ffi REQUIRED) -@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) - endif() - endif() - -- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) --else() -- find_package(PythonLibs 3.5 REQUIRED) -- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) -+ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) - endif() - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) --if(PYTHON_FOUND) -- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) -+if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) -+ # These are all set for easy integration with the rest of our build system -+ set(PYTHON_FOUND ${Python3_FOUND}) -+ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) -+ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) -+ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) -+ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) - 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_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) --- -2.30.2 - diff --git a/package/kodi/0002-fix-findpython.patch b/package/kodi/0002-fix-findpython.patch new file mode 100644 index 0000000000..03926e7b85 --- /dev/null +++ b/package/kodi/0002-fix-findpython.patch @@ -0,0 +1,16 @@ +Fix python detection + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> + +diff -uNr xbmc-20.0rc1-Nexus.orig/cmake/modules/FindPython.cmake xbmc-20.0rc1-Nexus/cmake/modules/FindPython.cmake +--- xbmc-20.0rc1-Nexus.orig/cmake/modules/FindPython.cmake 2022-12-10 05:39:56.000000000 +0100 ++++ xbmc-20.0rc1-Nexus/cmake/modules/FindPython.cmake 2022-12-10 10:43:25.796686397 +0100 +@@ -60,7 +60,7 @@ + + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) + if(CORE_SYSTEM_NAME STREQUAL linux) +- if(HOST_CAN_EXECUTE_TARGET) ++ if(HOST_CAN_EXECUTE_TARGET OR DEFINED PYTHON_EXECUTABLE) + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) + else() + find_package(Python3 COMPONENTS Interpreter) diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch deleted file mode 100644 index 158345a212..0000000000 --- a/package/kodi/0003-cmake-search-for-python-interpreter.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 -From: wsnipex <wsnipex@a1.net> -Date: Thu, 19 Aug 2021 08:50:05 +0200 -Subject: [PATCH] [cmake] search for python interpreter fixes installing - eventclients on linux - -Backport of https://github.com/xbmc/xbmc/pull/20058 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - cmake/modules/FindPython.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index 35220b5426..c469ed9fb6 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -20,6 +20,7 @@ - # - # PYTHON_FOUND - system has PYTHON - # PYTHON_VERSION - Python version number (Major.Minor) -+# PYTHON_EXECUTABLE - Python interpreter binary - # PYTHON_INCLUDE_DIRS - the python include directory - # PYTHON_LIBRARIES - The python libraries - # PYTHON_LDFLAGS - Python provided link options -@@ -51,6 +52,9 @@ if(PYTHON_VER) - endif() - - find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) -+if(CORE_SYSTEM_NAME STREQUAL linux) -+ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) -+endif() - - if(KODI_DEPENDSBUILD) - find_library(FFI_LIBRARY ffi REQUIRED) -@@ -73,6 +77,7 @@ if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) - # These are all set for easy integration with the rest of our build system - set(PYTHON_FOUND ${Python3_FOUND}) -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) --- -2.30.2 - diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch deleted file mode 100644 index d1e9b3f25f..0000000000 --- a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec <jernej.skrabec@gmail.com> -Date: Sat, 25 Sep 2021 07:41:10 +0200 -Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE - -If Kodi is being build for distro which has different python version -than host, PYTHON_EXECUTABLE must be overriden and point to distro -version. Otherwise, eventclients will be installed in wrong location and -be thus unusable. - -Use case: Cross compiling Kodi for LibreELEC - -Backport of https://github.com/xbmc/xbmc/pull/20171 - -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - cmake/modules/FindPython.cmake | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index c469ed9fb6..87b8368705 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -77,7 +77,9 @@ if(Python3_FOUND) - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) - # These are all set for easy integration with the rest of our build system - set(PYTHON_FOUND ${Python3_FOUND}) -- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) -+ if(NOT PYTHON_EXECUTABLE) -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) -+ endif() - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) --- -2.30.2 - diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 283e25561c..e7488316dd 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) depends on BR2_USE_MMU # libcdio, and others -comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" +comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 9.x" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || BR2_TOOLCHAIN_USES_MUSL \ || !BR2_PACKAGE_PYTHON3 \ || BR2_PACKAGE_PYTHON3_PYC_ONLY @@ -55,7 +55,7 @@ menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_WCHAR diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index e0f548879e..ea9a588aeb 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-Matrix.tar.gz -sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz -sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz -sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz +sha256 cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e kodi-20.1-Nexus.tar.gz +sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz +sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz +sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index d8c1130ea4..5cbb257161 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,8 +6,8 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.5 -KODI_VERSION_NAME = Matrix +KODI_VERSION_MAJOR = 20.1 +KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 @@ -57,9 +57,9 @@ KODI_DEPENDENCIES = \ zlib # taken from tools/depends/target/*/*-VERSION -KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 -KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 -KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 +KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 +KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 +KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 KODI_EXTRA_DOWNLOADS += \ $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ @@ -74,11 +74,15 @@ KODI_CONF_OPTS += \ -DWITH_FFMPEG=$(STAGING_DIR)/usr \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc \ + -DENABLE_INTERNAL_RapidJSON=OFF \ + -DENABLE_INTERNAL_SPDLOG=OFF \ -DKODI_DEPENDSBUILD=OFF \ - -DENABLE_LDGOLD=OFF \ + -DENABLE_GOLD=OFF \ + -DHOST_CAN_EXECUTE_TARGET=FALSE \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ -DENABLE_TESTING=OFF \ + -DENABLE_DEBUGFISSION=OFF \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus 2023-05-03 16:44 ` [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus Bernd Kuhls @ 2023-05-07 10:40 ` Yann E. MORIN 0 siblings, 0 replies; 15+ messages in thread From: Yann E. MORIN @ 2023-05-07 10:40 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Bernd, All, On 2023-05-03 18:44 +0200, Bernd Kuhls spake thusly: > Replaced patch 0002 to fix python detection with new version due to > upstream changes: > https://github.com/xbmc/xbmc/pull/21597#issuecomment-1166365667 > > Removed patches which were applied upstream. > > Bump gcc requirement as kodi depends on C++17. > Rework configure options. > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > .../kodi-jsonschemabuilder.mk | 2 +- > .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- > package/kodi/0002-cmake-findpython.patch | 135 ------------------ > package/kodi/0002-fix-findpython.patch | 16 +++ $ ./utils/docker-run make check-package package/kodi/0002-fix-findpython.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) So, I've fixed that and also made it a git-formatted patch. Please send it upstream. I've also regenerated .checkpackageignore with the removed/renamed patches. Applied to master, thanks. Regards, Yann E. MORIN. > ...-cmake-search-for-python-interpreter.patch | 48 ------- > ...-allow-to-override-PYTHON_EXECUTABLE.patch | 39 ----- > package/kodi/Config.in | 6 +- > package/kodi/kodi.hash | 8 +- > package/kodi/kodi.mk | 16 ++- > 9 files changed, 35 insertions(+), 237 deletions(-) > delete mode 100644 package/kodi/0002-cmake-findpython.patch > create mode 100644 package/kodi/0002-fix-findpython.patch > delete mode 100644 package/kodi/0003-cmake-search-for-python-interpreter.patch > delete mode 100644 package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > > diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > index a13fb91afe..72a2f05bd6 100644 > --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix > +KODI_JSONSCHEMABUILDER_VERSION = 20.1-Nexus > KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) > KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz > KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi > diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk > index 9432e4bbd6..cb6b04d069 100644 > --- a/package/kodi-texturepacker/kodi-texturepacker.mk > +++ b/package/kodi-texturepacker/kodi-texturepacker.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_TEXTUREPACKER_VERSION = 19.5-Matrix > +KODI_TEXTUREPACKER_VERSION = 20.1-Nexus > KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) > KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz > KODI_TEXTUREPACKER_DL_SUBDIR = kodi > diff --git a/package/kodi/0002-cmake-findpython.patch b/package/kodi/0002-cmake-findpython.patch > deleted file mode 100644 > index 60728aa465..0000000000 > --- a/package/kodi/0002-cmake-findpython.patch > +++ /dev/null > @@ -1,135 +0,0 @@ > -From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001 > -From: fuzzard <fuzzard@kodi.tv> > -Date: Sat, 31 Jul 2021 19:22:08 +1000 > -Subject: [PATCH] [cmake] findpython > - > -use cmakes (3.12+) FindPython3 module. > -Provide cmake vars for user to overide specific version, and search path > - > -Backport of https://github.com/xbmc/xbmc/pull/20045 > - > -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - CMakeLists.txt | 4 +- > - cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++-------- > - 2 files changed, 56 insertions(+), 19 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 2d5369798d..9bed54ef40 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -1,4 +1,4 @@ > --cmake_minimum_required(VERSION 3.4) > -+cmake_minimum_required(VERSION 3.12) > - if(WIN32) > - # Version 3.15 is required to use "PREPEND" for dependencies > - cmake_minimum_required(VERSION 3.15) > -@@ -187,8 +187,6 @@ core_require_dep(${required_deps}) > - find_package(TexturePacker REQUIRED) > - find_package(JsonSchemaBuilder REQUIRED) > - > --SET(PYTHON_VERSION 3.8) > -- > - if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > - MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") > - elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) > -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > -index c40e12d551..35220b5426 100644 > ---- a/cmake/modules/FindPython.cmake > -+++ b/cmake/modules/FindPython.cmake > -@@ -1,17 +1,56 @@ > --# - Try to find python > --# Once done this will define > -+# FindPython > -+# -------- > -+# Finds Python3 libraries > -+# > -+# This module will search for the required python libraries on the system > -+# If multiple versions are found, the highest version will be used. > -+# > -+# -------- > -+# > -+# the following variables influence behaviour: > -+# > -+# PYTHON_PATH - use external python not found in system paths > -+# usage: -DPYTHON_PATH=/path/to/python/lib > -+# PYTHON_VER - use exact python version, fail if not found > -+# usage: -DPYTHON_VER=3.8 > -+# > -+# -------- > -+# > -+# This module will define the following variables: > - # > - # PYTHON_FOUND - system has PYTHON > -+# PYTHON_VERSION - Python version number (Major.Minor) > - # PYTHON_INCLUDE_DIRS - the python include directory > - # PYTHON_LIBRARIES - The python libraries > -+# PYTHON_LDFLAGS - Python provided link options > -+# > -+# -------- > -+# > -+ > -+# for Depends builds, set search root dir to depends path > -+if(KODI_DEPENDSBUILD) > -+ set(Python3_USE_STATIC_LIBS TRUE) > -+ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib) > -+endif() > -+ > -+# Provide root dir to search for Python if provided > -+if(PYTHON_PATH) > -+ set(Python3_ROOT_DIR ${PYTHON_PATH}) > -+ > -+ # unset cache var so we can generate again with a different dir (or none) if desired > -+ unset(PYTHON_PATH CACHE) > -+endif() > -+ > -+# Set specific version of Python to find if provided > -+if(PYTHON_VER) > -+ set(VERSION ${PYTHON_VER}) > -+ set(EXACT_VER "EXACT") > - > --if(PKG_CONFIG_FOUND) > -- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET) > -+ # unset cache var so we can generate again with a different ver (or none) if desired > -+ unset(PYTHON_VER CACHE) > - endif() > - > --find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) > --find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) > --find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) > -+find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > - > - if(KODI_DEPENDSBUILD) > - find_library(FFI_LIBRARY ffi REQUIRED) > -@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD) > - endif() > - endif() > - > -- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > --else() > -- find_package(PythonLibs 3.5 REQUIRED) > -- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) > -+ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) > - endif() > - > --include(FindPackageHandleStandardArgs) > --find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) > --if(PYTHON_FOUND) > -- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) > -+if(Python3_FOUND) > - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > -+ # These are all set for easy integration with the rest of our build system > -+ set(PYTHON_FOUND ${Python3_FOUND}) > -+ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > -+ set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > -+ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > -+ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS}) > - 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_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) > --- > -2.30.2 > - > diff --git a/package/kodi/0002-fix-findpython.patch b/package/kodi/0002-fix-findpython.patch > new file mode 100644 > index 0000000000..03926e7b85 > --- /dev/null > +++ b/package/kodi/0002-fix-findpython.patch > @@ -0,0 +1,16 @@ > +Fix python detection > + > +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > + > +diff -uNr xbmc-20.0rc1-Nexus.orig/cmake/modules/FindPython.cmake xbmc-20.0rc1-Nexus/cmake/modules/FindPython.cmake > +--- xbmc-20.0rc1-Nexus.orig/cmake/modules/FindPython.cmake 2022-12-10 05:39:56.000000000 +0100 > ++++ xbmc-20.0rc1-Nexus/cmake/modules/FindPython.cmake 2022-12-10 10:43:25.796686397 +0100 > +@@ -60,7 +60,7 @@ > + > + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > + if(CORE_SYSTEM_NAME STREQUAL linux) > +- if(HOST_CAN_EXECUTE_TARGET) > ++ if(HOST_CAN_EXECUTE_TARGET OR DEFINED PYTHON_EXECUTABLE) > + find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) > + else() > + find_package(Python3 COMPONENTS Interpreter) > diff --git a/package/kodi/0003-cmake-search-for-python-interpreter.patch b/package/kodi/0003-cmake-search-for-python-interpreter.patch > deleted file mode 100644 > index 158345a212..0000000000 > --- a/package/kodi/0003-cmake-search-for-python-interpreter.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001 > -From: wsnipex <wsnipex@a1.net> > -Date: Thu, 19 Aug 2021 08:50:05 +0200 > -Subject: [PATCH] [cmake] search for python interpreter fixes installing > - eventclients on linux > - > -Backport of https://github.com/xbmc/xbmc/pull/20058 > - > -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - cmake/modules/FindPython.cmake | 5 +++++ > - 1 file changed, 5 insertions(+) > - > -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > -index 35220b5426..c469ed9fb6 100644 > ---- a/cmake/modules/FindPython.cmake > -+++ b/cmake/modules/FindPython.cmake > -@@ -20,6 +20,7 @@ > - # > - # PYTHON_FOUND - system has PYTHON > - # PYTHON_VERSION - Python version number (Major.Minor) > -+# PYTHON_EXECUTABLE - Python interpreter binary > - # PYTHON_INCLUDE_DIRS - the python include directory > - # PYTHON_LIBRARIES - The python libraries > - # PYTHON_LDFLAGS - Python provided link options > -@@ -51,6 +52,9 @@ if(PYTHON_VER) > - endif() > - > - find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) > -+if(CORE_SYSTEM_NAME STREQUAL linux) > -+ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) > -+endif() > - > - if(KODI_DEPENDSBUILD) > - find_library(FFI_LIBRARY ffi REQUIRED) > -@@ -73,6 +77,7 @@ if(Python3_FOUND) > - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > - # These are all set for easy integration with the rest of our build system > - set(PYTHON_FOUND ${Python3_FOUND}) > -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > --- > -2.30.2 > - > diff --git a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch b/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > deleted file mode 100644 > index d1e9b3f25f..0000000000 > --- a/package/kodi/0004-cmake-allow-to-override-PYTHON_EXECUTABLE.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001 > -From: Jernej Skrabec <jernej.skrabec@gmail.com> > -Date: Sat, 25 Sep 2021 07:41:10 +0200 > -Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE > - > -If Kodi is being build for distro which has different python version > -than host, PYTHON_EXECUTABLE must be overriden and point to distro > -version. Otherwise, eventclients will be installed in wrong location and > -be thus unusable. > - > -Use case: Cross compiling Kodi for LibreELEC > - > -Backport of https://github.com/xbmc/xbmc/pull/20171 > - > -Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989 > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - cmake/modules/FindPython.cmake | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake > -index c469ed9fb6..87b8368705 100644 > ---- a/cmake/modules/FindPython.cmake > -+++ b/cmake/modules/FindPython.cmake > -@@ -77,7 +77,9 @@ if(Python3_FOUND) > - list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) > - # These are all set for easy integration with the rest of our build system > - set(PYTHON_FOUND ${Python3_FOUND}) > -- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > -+ if(NOT PYTHON_EXECUTABLE) > -+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE) > -+ endif() > - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) > - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) > - set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE) > --- > -2.30.2 > - > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index 283e25561c..e7488316dd 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -5,12 +5,12 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS > depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) > depends on BR2_USE_MMU # libcdio, and others > > -comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" > +comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 9.x" > depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ > || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ > - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ > + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ > || BR2_TOOLCHAIN_USES_MUSL \ > || !BR2_PACKAGE_PYTHON3 \ > || BR2_PACKAGE_PYTHON3_PYC_ONLY > @@ -55,7 +55,7 @@ menuconfig BR2_PACKAGE_KODI > bool "kodi" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # C++17 > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_TOOLCHAIN_USES_MUSL > depends on BR2_USE_WCHAR > diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash > index e0f548879e..ea9a588aeb 100644 > --- a/package/kodi/kodi.hash > +++ b/package/kodi/kodi.hash > @@ -1,6 +1,6 @@ > # Locally computed > -sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-Matrix.tar.gz > -sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz > -sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz > -sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz > +sha256 cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e kodi-20.1-Nexus.tar.gz > +sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz > +sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz > +sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz > sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index d8c1130ea4..5cbb257161 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -6,8 +6,8 @@ > > # When updating the version, please also update kodi-jsonschemabuilder > # and kodi-texturepacker > -KODI_VERSION_MAJOR = 19.5 > -KODI_VERSION_NAME = Matrix > +KODI_VERSION_MAJOR = 20.1 > +KODI_VERSION_NAME = Nexus > KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) > KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) > KODI_LICENSE = GPL-2.0 > @@ -57,9 +57,9 @@ KODI_DEPENDENCIES = \ > zlib > > # taken from tools/depends/target/*/*-VERSION > -KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 > -KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 > -KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 > +KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 > +KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 > +KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 > KODI_EXTRA_DOWNLOADS += \ > $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ > $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ > @@ -74,11 +74,15 @@ KODI_CONF_OPTS += \ > -DWITH_FFMPEG=$(STAGING_DIR)/usr \ > -DENABLE_INTERNAL_FLATBUFFERS=OFF \ > -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc \ > + -DENABLE_INTERNAL_RapidJSON=OFF \ > + -DENABLE_INTERNAL_SPDLOG=OFF \ > -DKODI_DEPENDSBUILD=OFF \ > - -DENABLE_LDGOLD=OFF \ > + -DENABLE_GOLD=OFF \ > + -DHOST_CAN_EXECUTE_TARGET=FALSE \ > -DNATIVEPREFIX=$(HOST_DIR) \ > -DDEPENDS_PATH=$(STAGING_DIR)/usr \ > -DENABLE_TESTING=OFF \ > + -DENABLE_DEBUGFISSION=OFF \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ > -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 03/11] package/kodi-audiodecoder-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 04/11] package/kodi-audioencoder-*: " Bernd Kuhls ` (9 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- .../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash | 2 +- package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 2 +- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- .../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash | 2 +- package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk | 2 +- .../kodi-audiodecoder-vgmstream.hash | 2 +- .../kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index e2bfe09928..20f13e95f7 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz +sha256 619ba20ea19dd9aea15e7d30aa12a146b412c7fcd9e709528f6758e82a3d85e7 kodi-audiodecoder-modplug-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index f5736e7db7..bbbada01da 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 9d1c9a2a76..4012353b0b 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz +sha256 2f7a92bfaddcd5aa63e2ea7348ae9eeefd07dee2aba46840ce5376677e2abc19 kodi-audiodecoder-nosefart-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index fbf327032b..8954da18de 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 28999afb7b..caf9390eaa 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a4fe4f0c48649222930c8c574156c5c3b2ad82fc97de2bdbd0c5e510402853ec kodi-audiodecoder-sidplay-19.0.1-Matrix.tar.gz +sha256 ab1f89237c91bc7157557f42dadcff50a7191eb7285ee668543defce9f1efcf2 kodi-audiodecoder-sidplay-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 173a2b10ca..c30be0774b 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SIDPLAY_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index 1a0227f415..3ed7483fdb 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz +sha256 f216a7d25c864986618118236c575687ab62d129a16cb1f73c15860948d9ac92 kodi-audiodecoder-snesapu-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index ff988dffce..577adc0bc3 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index 5f8d4564c8..c4d6a68ef9 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c740e69047d93d34cfe8c574f923f8dd205adb997fb5d1444a55a6b9d9f0f75 kodi-audiodecoder-stsound-19.0.1-Matrix.tar.gz +sha256 a8138fb075a480c59d7041a9408eca6e52dc88f188daed519cd9e684b430f333 kodi-audiodecoder-stsound-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index 491be3a7ba..0fa9a654e4 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_STSOUND_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index b1131ff43d..d8c1535395 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d9aa6f00315d227a39cb67089c64671987fd9167766f37c28a91168cb8e230e kodi-audiodecoder-timidity-19.0.2-Matrix.tar.gz +sha256 ef1b384090df3c2c78d00ed33de1d989ce802702b0a9aa13575946409a5cd0f1 kodi-audiodecoder-timidity-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index d10fd161cb..6ec66fab9b 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 19.0.2-Matrix +KODI_AUDIODECODER_TIMIDITY_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index 152f1a6eb5..d861b5957e 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0e349225f35ce4bae3026c669b13c696cec2399ec34c0f7726527d19503e14d4 kodi-audiodecoder-vgmstream-19.0.0-Matrix.tar.gz +sha256 72367d7196f8049ef1fae426d32d3de1eac56bd4cb5a8fc38a6ba0c3da1b23d8 kodi-audiodecoder-vgmstream-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 15cfdcded9..78e7a9f1a2 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_VGMSTREAM_VERSION = 20.2.0-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 04/11] package/kodi-audioencoder-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 03/11] package/kodi-audiodecoder-*: mass version bump to Nexus Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version " Bernd Kuhls ` (8 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 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 | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- package/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 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 5784c2585b..e54eafcdf8 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fdc70c68b10e28469c8d20f5a0dcc1c24fdddda81afe98dd031bff58c8e184e8 kodi-audioencoder-flac-19.0.1-Matrix.tar.gz +sha256 71daf8c35bbf644591600fef93412cd068a6bf6173d2258dc243ee04c8e5b091 kodi-audioencoder-flac-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 65d5ff4aee..d14843cb53 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 19.0.1-Matrix +KODI_AUDIOENCODER_FLAC_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index a9cb12af6a..f66db7d680 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz +sha256 90f36ee0b4972669ed2876eae2502e58d86287aacdbf4bb25180aca01385e1c1 kodi-audioencoder-lame-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index fbc7489782..ce891f1838 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 02e976f2d4..2b551a81df 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 26f5b3e60ec3d3e17ea81a009fc91886159335fb8eec56e874e357901c90deeb kodi-audioencoder-vorbis-19.0.1-Matrix.tar.gz +sha256 359e972ddcc498727620ff224a82f970fa2ae22b71ea6ab30b96898dffe6f1f9 kodi-audioencoder-vorbis-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index 66faba19f3..451884d0bc 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 = 19.0.1-Matrix +KODI_AUDIOENCODER_VORBIS_VERSION = 20.2.0-Nexus KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index f616d76992..9318b69e48 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 32069979efb02daaa79b8ce09e060eed73f3fa73a4614b6c67e50ee33f1b096f kodi-audioencoder-wav-19.0.1-Matrix.tar.gz +sha256 1baf69cca688ebd389705ea2bef2c5285ba75dcfd0d0b534b6ab1e61c0020979 kodi-audioencoder-wav-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index d8c7b1a694..b13ee8ea4c 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 19.0.1-Matrix +KODI_AUDIOENCODER_WAV_VERSION = 20.2.0-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (2 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 04/11] package/kodi-audioencoder-*: " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-07 10:44 ` Yann E. MORIN 2023-05-03 16:44 ` [Buildroot] [PATCH 06/11] package/kodi-inputstream-*: mass version bump " Bernd Kuhls ` (7 subsequent siblings) 11 siblings, 1 reply; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Added dependency to bento4 needed after upstream commit https://github.com/xbmc/inputstream.adaptive/commit/70625e76702186c73ddb43440f44262c48e14755 License file renamed https://github.com/xbmc/inputstream.adaptive/commit/b555973d98e15bb40022dd1ab704d8d42efd7686 and updated upstream https://github.com/xbmc/inputstream.adaptive/commit/4b62e9e3257526e0359e0b797902ba9119633c16 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/kodi-inputstream-adaptive/Config.in | 1 + .../kodi-inputstream-adaptive.hash | 4 ++-- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in index f0a24b7043..3efe3aa114 100644 --- a/package/kodi-inputstream-adaptive/Config.in +++ b/package/kodi-inputstream-adaptive/Config.in @@ -3,6 +3,7 @@ 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_BENTO4 select BR2_PACKAGE_EXPAT 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 a36095c38c..18df044c62 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b208313fd50442cabd339a16a3beec8cfa41c1b6bf19617ffeb269144c5f65fe kodi-inputstream-adaptive-19.0.7-Matrix.tar.gz -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL +sha256 907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328 kodi-inputstream-adaptive-20.3.6-Nexus.tar.gz +sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 9da87e0e38..1f3e86bb27 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.7-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.6-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi +KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = bento4 expat kodi $(eval $(cmake-package)) -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version to Nexus 2023-05-03 16:44 ` [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version " Bernd Kuhls @ 2023-05-07 10:44 ` Yann E. MORIN 0 siblings, 0 replies; 15+ messages in thread From: Yann E. MORIN @ 2023-05-07 10:44 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Bernd, All, On 2023-05-03 18:44 +0200, Bernd Kuhls spake thusly: > Added dependency to bento4 needed after upstream commit > https://github.com/xbmc/inputstream.adaptive/commit/70625e76702186c73ddb43440f44262c48e14755 > > License file renamed > https://github.com/xbmc/inputstream.adaptive/commit/b555973d98e15bb40022dd1ab704d8d42efd7686 > and updated upstream > https://github.com/xbmc/inputstream.adaptive/commit/4b62e9e3257526e0359e0b797902ba9119633c16 > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- [--SNIP--] > diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > index 9da87e0e38..1f3e86bb27 100644 > --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.7-Matrix > +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.6-Nexus > KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) > KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ It turns ot that this update also uncovered that the licensing is more complex than just "GPL-2.0-or-later". Indeed, in https://github.com/xbmc/inputstream.adaptive/blob/Nexus/LICENSES/README.md: InputStream Adaptive currently contains files and code licensed under: BSD-2-Clause-Views: BSD 2-Clause with views sentence License BSD-3-Clause: BSD 3-clause "New" or "Revised" License google-patent-license-webm: Google Patent License for WebM GPL-2.0-or-later: GNU General Public License v2.0 or later RSA-MD5: RSA Message-Digest License So those licenses should also be added to the list. Normally, I would have done that (or requested a respin of the patch), but the issue was already present before the version bump, so it is not a regression. Applied to master, thanks. Can you please send a followup patch that fixes the licensing for kodi-inputstream-adaptive? Also, could you assess the situation for the other kodi related packages, please? Regards, Yann E. MORIN. > -KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL > -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi > +KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.md > +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = bento4 expat kodi > > $(eval $(cmake-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 06/11] package/kodi-inputstream-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (3 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 07/11] package/kodi-peripheral-*: " Bernd Kuhls ` (6 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../kodi-inputstream-ffmpegdirect.hash | 2 +- .../kodi-inputstream-ffmpegdirect.mk | 2 +- package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash | 2 +- package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 888c0ca918..7dbcee6585 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4693793a44b54204884c676a285bd371b354c426162736e5adae4ad2aa6088cf kodi-inputstream-ffmpegdirect-19.0.3-Matrix.tar.gz +sha256 a849b6b4d5ce740ec3552d244acc4c7a4d64792358428f5154236052473d5734 kodi-inputstream-ffmpegdirect-20.5.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 39347010b5..ff66f13e14 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.3-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 20.5.0-Nexus KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index 62a1c261a2..affe8b5171 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ed3db36f9ef667295fbce8fb2be6f032039e3d0e18e34677ed17de11be8a6e8 kodi-inputstream-rtmp-19.0.1-Matrix.tar.gz +sha256 6a6129dca822e1447c0945ddf9cc6dbff1203dab313395d27efb4669a0ef3370 kodi-inputstream-rtmp-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index b719a6ab2e..f496fd3881 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_RTMP_VERSION = 20.3.0-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 07/11] package/kodi-peripheral-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (4 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 06/11] package/kodi-inputstream-*: mass version bump " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 08/11] package/kodi-pvr-*: " Bernd Kuhls ` (5 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.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-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 0b483f70bf..1ccb528526 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5c7c6b8b1f39c92d00289bd602ea2db13a3d3f73a50bd3f95ec08cf110a570e kodi-peripheral-joystick-19.0.4-Matrix.tar.gz +sha256 6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160 kodi-peripheral-joystick-20.1.8-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index db1bc2c50f..c893ae1247 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.4-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.8-Nexus 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 = LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 5467513a0b..1d9579615b 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11f746cfeeffdfc1de6829d17aad999c8b598ca2239fcddb64801738546be6c9 kodi-peripheral-xarcade-19.0.5-Matrix.tar.gz +sha256 e6be386ebba44e214b91784ba6e1560020daac82024c18bea7be4719340b12bd kodi-peripheral-xarcade-20.1.3-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 2d9e33b625..3af3f2f4ff 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 = 19.0.5-Matrix +KODI_PERIPHERAL_XARCADE_VERSION = 20.1.3-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 08/11] package/kodi-pvr-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (5 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 07/11] package/kodi-peripheral-*: " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 09/11] package/kodi-screensaver-*: " Bernd Kuhls ` (4 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 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 | 2 +- package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 2 +- package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- package/kodi-pvr-octonet/kodi-pvr-octonet.hash | 2 +- package/kodi-pvr-octonet/kodi-pvr-octonet.mk | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 2 +- package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 33de7d6ca0..e2f73c70c4 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz +sha256 c4b18a0abf4ba0a797509d79c4291c4e69589a6482c6ec85f5d9bdae63ea3f35 kodi-pvr-argustv-20.5.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 90d0a53002..fac90dfeb6 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 20.5.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index de429ebf15..9d914fdbf2 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 77f425d3521332e06ff758cfd1c63eb26f73990391ddb04f0ea6f9f3f0d114cf kodi-pvr-dvblink-19.0.1-Matrix.tar.gz +sha256 71a9fa64bdf7d784afc28f8b686fcdc00d9fea536c2aad1464e76e3b7648ed41 kodi-pvr-dvblink-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index e58711cb11..8c0b178f75 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 19.0.1-Matrix +KODI_PVR_DVBLINK_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index e3ff5bd1c1..516366d7b2 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ccb4fa952c8909169dddd0a4c8f393ef8c1e8d35b9df0332f66a5f6442d6e85 kodi-pvr-dvbviewer-19.1.0-Matrix.tar.gz +sha256 dc79db0486c7ef75b4b23c4dfe94115cb12e1903c3700ef4eef04fc517fcd039 kodi-pvr-dvbviewer-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index e4b00c06b5..914de3c72d 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 19.1.0-Matrix +KODI_PVR_DVBVIEWER_VERSION = 20.4.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index ce6fb8f385..7a4d5d3364 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5853a69455847da87ed0aebad4121f47c7a1aeb80cda6dbe20f069d33a02720b kodi-pvr-filmon-19.0.1-Matrix.tar.gz +sha256 dfd2a7b64d2b647ba3f7bfba05676a593c3284e2298becfed68b82e441a69b33 kodi-pvr-filmon-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index c5705670f8..50dad3c47f 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 19.0.1-Matrix +KODI_PVR_FILMON_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index f177eabd53..3bcfa23593 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz +sha256 3872265e00fc748ba327aaa91beece747936f55d16356051cdd04b0b70a353c0 kodi-pvr-hdhomerun-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index a4a448c51e..cc6e097efa 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix +KODI_PVR_HDHOMERUN_VERSION = 20.4.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 40cd8fd62f..7b55eb88fd 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb kodi-pvr-hts-19.0.6-Matrix.tar.gz +sha256 e77bd87f1f4d1abc06e32d0347a0bb635bc129bec43a07864cb8a9e6b0e4d374 kodi-pvr-hts-20.6.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index caa90b7af6..d32ce87388 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.6-Matrix +KODI_PVR_HTS_VERSION = 20.6.2-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index de71703c53..6be0623a5a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz +sha256 91ed962a4f77a2aa5df820ce57cf744c2a8ea02a356dafc2da270cf813c2d669 kodi-pvr-iptvsimple-20.10.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index e5976a7d3a..1182ea517a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 20.10.1-Nexus 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 = LICENSE.md 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 9f4bd97366..37489de7dc 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz +sha256 a61efdadb56c65e081f8b2e99f2d5b32b3c932ca1954243548710be57c8b70b8 kodi-pvr-mediaportal-tvserver-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md 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 1db0dca618..dfc7c2873b 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 81270ca7d2..d0d6331364 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27c2546bf512f87f230e8312abeccd61d6bbb52ec1fbd7751f19d8df3c3afd4e kodi-pvr-mythtv-19.0.11-Matrix.tar.gz +sha256 b1ad428bec882d3e852240cbef2378803635b530545a08421ff3baf0611a29e7 kodi-pvr-mythtv-20.3.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 8475249e51..f67457480c 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.11-Matrix +KODI_PVR_MYTHTV_VERSION = 20.3.2-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 17d9817053..b89320d9c0 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.tar.gz +sha256 bad9e7dd4f67348015f8fc477e0c4c8447e00dbd38b9f6548d1ce04f0845b1fd kodi-pvr-nextpvr-20.4.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 6b3590a6d6..7b11407954 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix +KODI_PVR_NEXTPVR_VERSION = 20.4.1-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index ec78e7c84a..bb7f4218cf 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz +sha256 0e8dc8ddce7830878c816da0836bdf5558c0dd388c48019012735a518eeefb04 kodi-pvr-njoy-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index 4808974c31..d0cfc006d7 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.1-Matrix +KODI_PVR_NJOY_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash index 1dc9636e63..2342f0c836 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b95a4f1d7381ebee1c9be9fca582bb0b70144271a47223ba06fc046ea595aaa kodi-pvr-octonet-19.0.0-Matrix.tar.gz +sha256 cc83ada3b3d1dbf3d42fa41f2b221c640cdc9fd505a1c76e7b479f99fe1ec8c5 kodi-pvr-octonet-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk index e2699bc44d..84950d2514 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_OCTONET_VERSION = 19.0.0-Matrix +KODI_PVR_OCTONET_VERSION = 20.3.0-Nexus KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) KODI_PVR_OCTONET_LICENSE = GPL-2.0+ KODI_PVR_OCTONET_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 04919af7d2..d0c340fe78 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz +sha256 c99d3ef085c4900e0c03e5e37047dc136efced78ed245d07bc286468a31e8a65 kodi-pvr-pctv-20.4.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 6f8dca4b23..4ae7bd0bc6 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.1-Matrix +KODI_PVR_PCTV_VERSION = 20.4.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 4673bbbf88..36a9dd4187 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79e753d7329a4e61e56618c0e821cdd5dccb81c3659838a9de2df407a5bd7c10 kodi-pvr-plutotv-19.0.3-Matrix.tar.gz +sha256 d38a6bf4debc442849d01faedadcccb1b07debe850cd3c9a5789508233d22256 kodi-pvr-plutotv-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index a9ac03a007..b05c452854 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 19.0.3-Matrix +KODI_PVR_PLUTOTV_VERSION = 20.3.0-Nexus KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 167905f637..ed8668b2c9 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 191b2bd2dcbe15de29c1b867c127668784991e43817b00947cf955e569cf148e kodi-pvr-stalker-19.0.4-Matrix.tar.gz +sha256 8fdd4ab4cf28d7255550b4c351a397b7ce8eb1aa1f12e93bce7d61a951fbd6f3 kodi-pvr-stalker-20.3.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index f306c3a51b..763f7054ad 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.4-Matrix +KODI_PVR_STALKER_VERSION = 20.3.1-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index ce3397fad5..1aff2dd985 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a87926702c51e52043e595ceae530a9101761cc15e8e3cadec85ac8cc9ba8f2b kodi-pvr-vbox-19.0.0-Matrix.tar.gz +sha256 04c50eba71426f062339491e7567545ec8c910b17c7055b28285eab14f26ca6f kodi-pvr-vbox-20.4.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index fd83ffef37..60a8a819b0 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 19.0.0-Matrix +KODI_PVR_VBOX_VERSION = 20.4.2-Nexus 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 = LICENSE.md 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 3e17fd553d..64ecb17b14 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 521add432b7fe38b6019f99547a440b1a2927d10f1420d518235c1c6d2e95b6b kodi-pvr-vdr-vnsi-19.0.5-Matrix.tar.gz +sha256 f26e2a9f1e9d83c5b44a8875b1f9cd37a0dbe59faf08002f083a4db95c9f84e0 kodi-pvr-vdr-vnsi-20.4.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md 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 ebb5f117b8..02a2e2e456 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.5-Matrix +KODI_PVR_VDR_VNSI_VERSION = 20.4.1-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index b2a4031bd3..7f051071f1 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd5658c5e40d42bc02e5c99b47c28cb24bdda4b6dd49029131ff147405d4c8a8 kodi-pvr-vuplus-19.0.1-Matrix.tar.gz +sha256 467363d7015d426f05fac3f514222d7ec03aa4b61a0935fd7f00e95e9c443514 kodi-pvr-vuplus-20.5.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 81159e05f3..80b57f2510 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 19.0.1-Matrix +KODI_PVR_VUPLUS_VERSION = 20.5.1-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index b80ca10ae5..cdcaeeff9d 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 67ae49e516dfe4328587ea36439b3f48b099d1784dd57acebe1e49e137d75b56 kodi-pvr-waipu-19.3.1-Matrix.tar.gz +sha256 5dfe9f891edefd5334c7a45593651634b43e1fdbea5a1b396131a45f5928f4aa kodi-pvr-waipu-20.8.1-Nexus.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index b20f1c6414..41f9e82814 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.3.1-Matrix +KODI_PVR_WAIPU_VERSION = 20.8.1-Nexus KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 4a04c07ac8..232750db33 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz +sha256 f045d871789ef3d36e1a7c7361ea35be4e14a395e75446519e937be70d2433b4 kodi-pvr-wmc-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 3bf21b3440..fd96731764 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.2-Matrix +KODI_PVR_WMC_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index c1d3b476b9..1af86d4de0 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac09db721e51b47f1ca7f4c2201833dbcd69040fd19b09c194fa7491ff4dad41 kodi-pvr-zattoo-19.7.16-Matrix.tar.gz +sha256 c75ba4710d7e85cf516005ee3eca6d677e2fc018abaf490c881bc6552eb32929 kodi-pvr-zattoo-20.3.7-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 49b33916ee..fa5e116fa0 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.16-Matrix +KODI_PVR_ZATTOO_VERSION = 20.3.7-Nexus KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 09/11] package/kodi-screensaver-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (6 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 08/11] package/kodi-pvr-*: " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 10/11] package/kodi-vfs-*: " Bernd Kuhls ` (3 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash | 2 +- .../kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk | 2 +- .../kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash | 2 +- .../kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk | 2 +- .../kodi-screensaver-biogenesis.hash | 2 +- .../kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk | 2 +- package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash | 2 +- package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk | 2 +- .../kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash | 2 +- .../kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk | 2 +- .../kodi-screensaver-matrixtrails.hash | 2 +- .../kodi-screensaver-matrixtrails.mk | 2 +- .../kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash | 2 +- package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk | 2 +- package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash | 2 +- package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk | 2 +- package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash | 2 +- package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk | 2 +- package/kodi-screensaver-stars/kodi-screensaver-stars.hash | 2 +- package/kodi-screensaver-stars/kodi-screensaver-stars.mk | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 0f1d77e814..3f1163fe1b 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 189b4f45ac2c0920445db0240f080203041c77053430595e764d773fdcd8604a kodi-screensaver-asteroids-19.0.1-Matrix.tar.gz +sha256 492d826efa7a252ce62a1bebf075fe9b0c0cf452929f4cd6f228003f6e445b82 kodi-screensaver-asteroids-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 0c660e9556..d91779610b 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_ASTEROIDS_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index 95c37a8e69..79815b3cba 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1d97cf5628dd844745d152a2b3633a22c720c35ef0e81aa61857f47a78003aa kodi-screensaver-asterwave-19.0.1-Matrix.tar.gz +sha256 2c07219218fad17ef285577ff8309f7b6503302e52048d12ee20459dbcedf89c kodi-screensaver-asterwave-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index 2ae243eba0..c721f21cc0 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_ASTERWAVE_VERSION = 20.2.0-Nexus KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index 314c067878..5426cb3f6c 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ef90c940f70ae9ffb4e5b6928993f053c24de2180566a5fdb21eea359a6c61df kodi-screensaver-biogenesis-19.0.1-Matrix.tar.gz +sha256 dfc291fbafe16444f3a5a5f886ba562b5d7b16ed77f4302017fbbe5f5ef9a82d kodi-screensaver-biogenesis-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index 70e4cdc0bd..f25ad9c666 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_BIOGENESIS_VERSION = 20.1.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index 80dfbad357..6ca36c0d32 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f281efde421cfe9d5f251520853e43e8b1ee128de216af760fcafb80861f504b kodi-screensaver-cpblobs-19.0.1-Matrix.tar.gz +sha256 0e398a30aac0e6316778d7bb93256b9a3758ac11bc42388ac4367417bf82ea55 kodi-screensaver-cpblobs-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 9ca6718c92..49b510f229 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_CPBLOBS_VERSION = 20.1.0-Nexus 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.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 2268b2e52c..27b5a0f712 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5428bc2bf17132dbc98ef0f9df0c98ab5abcbe4bf6e9040460cbf5be58ea3058 kodi-screensaver-greynetic-19.0.1-Matrix.tar.gz +sha256 e060f69a7c403a5d7bb59058dc38e8c6a6ea1aa7bc9b82f8ffa7c5e94ede0866 kodi-screensaver-greynetic-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 3e91cfb03a..4c3f358894 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_GREYNETIC_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 2c4de82049..4f0c3f4746 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a7054eedcf7b614f5a9cf584ac1f92225b5b960ff5f8d846372e920319a47d30 kodi-screensaver-matrixtrails-19.0.1-Matrix.tar.gz +sha256 929af1a5a08399449497a13c2eb9761b4770b41445a13ee61d78b82677978ea5 kodi-screensaver-matrixtrails-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 230977bb94..b9a3e8d681 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 20.1.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index 20e725f07a..39853836fb 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d8d87943bfb795fc66565d06197a6b3a12b2cdc2b60269197ddccf295217b776 kodi-screensaver-pingpong-19.0.1-Matrix.tar.gz +sha256 72b3c9be5b65afe7fbc6d496eb7700786d88811bfafcd131a3219a646d30805d kodi-screensaver-pingpong-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index fffdc82d88..3801515329 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_PINGPONG_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index 9b0effef15..aa48d490e5 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a68904ff6915a7b908126d1336f5ad78e0791680fae14c71d5a187b13ce3730 kodi-screensaver-pyro-19.0.1-Matrix.tar.gz +sha256 ec981d070cccdfaa9116244e80a63d86c37f67dccd11aacfcc66dcfcbb608ce1 kodi-screensaver-pyro-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index 3ab7234370..e33c09ab97 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = 19.0.1-Matrix +KODI_SCREENSAVER_PYRO_VERSION = 20.1.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 073a1b2702..c66d3b2cd3 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8bd1012dc2ae10d2c3b7920214616b0bca5278e4e78f8b0e41fa9cf14569273c kodi-screensaver-rsxs-19.0.2-Matrix.tar.gz +sha256 e135408812b8c267554e3881a05396d4286c1f47b20416b4e5d88b632367ace7 kodi-screensaver-rsxs-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index 59ec30b868..adf7451723 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = 19.0.2-Matrix +KODI_SCREENSAVER_RSXS_VERSION = 20.1.0-Nexus KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index 9cf978bbbc..4641296596 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c65bd9baa351ba4c5d443205b9e125303e341bd85e99aaf36793f95395372bf kodi-screensaver-stars-19.0.0-Matrix.tar.gz +sha256 5ea0d19c3ef94e9603a0e06c78ae01cd6f9227da7b505eaa7d4527ca6018ea03 kodi-screensaver-stars-20.1.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index 06c77331af..a38ad5c7db 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = 19.0.0-Matrix +KODI_SCREENSAVER_STARS_VERSION = 20.1.0-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 10/11] package/kodi-vfs-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (7 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 09/11] package/kodi-screensaver-*: " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 11/11] package/kodi-visualisation-*: " Bernd Kuhls ` (2 subsequent siblings) 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- package/kodi-vfs-rar/kodi-vfs-rar.hash | 2 +- package/kodi-vfs-rar/kodi-vfs-rar.mk | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index c0468517f2..d395ba2d42 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 957c76d3327b618396d9530394b235cebb73090b53afdeb2bd0d87f9677622d9 kodi-vfs-libarchive-19.2.0-Matrix.tar.gz +sha256 06be9bfcda3e676e0757ea9602351d67f2bf0aa9aa9e408b14d947772a615e4f kodi-vfs-libarchive-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 1f79bad71f..975e28485a 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.2.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 20.3.0-Nexus KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.hash b/package/kodi-vfs-rar/kodi-vfs-rar.hash index 845d7516ee..4d7f800acf 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a2c97c478e20efcf1aef2db652ad3c1f9cfc95a89d7ae77b706121c56fb0feca kodi-vfs-rar-19.0.1-Matrix.tar.gz +sha256 50870b24a3663f8d8d88802b327a8fd2fec441a9fed952baf71faba6854a8e1b kodi-vfs-rar-20.1.0-Nexus.tar.gz # License files sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.mk b/package/kodi-vfs-rar/kodi-vfs-rar.mk index 12b7b266c0..4322e41abd 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 19.0.1-Matrix +KODI_VFS_RAR_VERSION = 20.1.0-Nexus KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 1f3cc4978f..2f439e8e0d 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz +sha256 66f139d3d06c06d03ceccdcee12b79d3886bd0ea7aec662341736f1c9bdd63e2 kodi-vfs-sftp-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index 6415fcb1de..c050b4bc20 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 = 19.0.1-Matrix +KODI_VFS_SFTP_VERSION = 20.2.0-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 11/11] package/kodi-visualisation-*: mass version bump to Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (8 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 10/11] package/kodi-vfs-*: " Bernd Kuhls @ 2023-05-03 16:44 ` Bernd Kuhls 2023-05-07 10:37 ` [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Yann E. MORIN 2023-05-07 10:38 ` Yann E. MORIN 11 siblings, 0 replies; 15+ messages in thread From: Bernd Kuhls @ 2023-05-03 16:44 UTC (permalink / raw) To: buildroot Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- package/kodi-visualisation-goom/kodi-visualisation-goom.hash | 2 +- package/kodi-visualisation-goom/kodi-visualisation-goom.mk | 2 +- .../kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- .../kodi-visualisation-shadertoy.hash | 2 +- .../kodi-visualisation-shadertoy.mk | 2 +- .../kodi-visualisation-spectrum.hash | 2 +- .../kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk | 2 +- .../kodi-visualisation-starburst.hash | 2 +- .../kodi-visualisation-starburst.mk | 2 +- .../kodi-visualisation-waveform.hash | 2 +- .../kodi-visualisation-waveform/kodi-visualisation-waveform.mk | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index 449b2a4817..5edb2b9ac2 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz +sha256 168788d7cd292edf9c13c0e0e0148f19b2ecd35edd8f65f24240dff99f01677a kodi-visualisation-fishbmc-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 060e1d9b69..58087d4f0d 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index f49fff77de..cc82b1f59a 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1936aaacdf0b3b032e848f8e7b7694111e1c78ce16efdb063263d543d70f003a kodi-visualisation-goom-19.0.2-Matrix.tar.gz +sha256 75102a8c3f066a889493b77fbe26070be78c6dff8e7d44ebda89295ddb2da3b0 kodi-visualisation-goom-20.1.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index 8b258e19c2..b7b048f165 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 19.0.2-Matrix +KODI_VISUALISATION_GOOM_VERSION = 20.1.1-Nexus 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 = LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 9a5652a2d9..abc97a892f 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz +sha256 f0b76edf45df7161d8525fa2ba623dee64ca66d515342e942100dc46c8220553 kodi-visualisation-matrix-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index f8959facbd..8cd5ea2045 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 20.2.0-Nexus KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index d3f489e4f9..c38931f2dd 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz +sha256 2f97a34f74ee3e3e1d9fe8cfd37796564f8f88eb4c07d60b27ff635d64a5a724 kodi-visualisation-shadertoy-20.3.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index 5c644bb3ee..a056c3481d 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 20.3.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 1198dd1eab..4b8a1f7e71 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 524a740db973673c0038bcc9f73fbae9af497c6699dd3c34527683f29824a5c9 kodi-visualisation-spectrum-19.0.2-Matrix.tar.gz +sha256 1c405ea9b6f43ba5f24df13ebce12cb428369279336deb97790917aa675c809f kodi-visualisation-spectrum-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index 0da5f22bae..67d02ab38a 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = 19.0.2-Matrix +KODI_VISUALISATION_SPECTRUM_VERSION = 20.2.0-Nexus 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 = LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash index 7f335ed9e2..3e1669f776 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2b3ad0473d1ae40c3ecc81f9631c7d956fd4ec3edc7ef43eaeefec242fa79e5 kodi-visualisation-starburst-19.0.1-Matrix.tar.gz +sha256 0d63b38ba8d5b3bac542546b1ecfb7d722b79652da485d75b22086e26ef4f825 kodi-visualisation-starburst-20.2.0-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk index afa1fb1aef..3e876797b6 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_STARBURST_VERSION = 19.0.1-Matrix +KODI_VISUALISATION_STARBURST_VERSION = 20.2.0-Nexus KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ KODI_VISUALISATION_STARBURST_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 3265477050..fe9d164234 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a89b7d82afaa3bb279ecf32a2c04e6c7653f536b0df6fee2b7389c15340a01c7 kodi-visualisation-waveform-19.0.3-Matrix.tar.gz +sha256 865e72a5f2ed8fd53469518280cbe26f9516467d091009fe5e012ea0d85d5edd kodi-visualisation-waveform-20.2.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 9d75f79a87..92e46b8997 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = 19.0.3-Matrix +KODI_VISUALISATION_WAVEFORM_VERSION = 20.2.1-Nexus 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 = LICENSE.md -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (9 preceding siblings ...) 2023-05-03 16:44 ` [Buildroot] [PATCH 11/11] package/kodi-visualisation-*: " Bernd Kuhls @ 2023-05-07 10:37 ` Yann E. MORIN 2023-05-07 10:38 ` Yann E. MORIN 11 siblings, 0 replies; 15+ messages in thread From: Yann E. MORIN @ 2023-05-07 10:37 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Bernd, All, On 2023-05-03 18:44 +0200, Bernd Kuhls spake thusly: > Switch to kodi fork, remove all kodi-related patches. > > Needed by upcoming bump of kodi-inputstream-adaptive. > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Whole series applied to master, thanks. I'll have some feedback on a few individual patches, so I'll reply to those independently. Regards, Yann E. MORIN. > --- > .../0001-Add-support-for-cmake-install.patch | 130 ---- > ...-methods-funtions-and-passing-poolid.patch | 634 ------------------ > .../0003-Backport-Smmothstream-changes.patch | 99 --- > package/bento4/0004-more-SPS-parameters.patch | 219 ------ > ...0005-AVC-extract-VUI-values-from-SPS.patch | 96 --- > .../0006-Implement-SPS-Frame-parser.patch | 67 -- > ...-Fix-segfault-when-AP4_Sample-s-seek.patch | 25 - > package/bento4/0008-Hack-HBO.patch | 214 ------ > .../bento4/0009-Android-32-ftello-fix.patch | 31 - > ...0010-Dazn-sample-duration-workaround.patch | 30 - > ...ent-to-reuse-single-sample-decrypter.patch | 179 ----- > .../0012-Static-ReadGolomb-SignedGolomb.patch | 54 -- > .../bento4/0013-Add-GetChannels-method.patch | 40 -- > ...ampleIndexForTimeStamp-GetNearestSyn.patch | 59 -- > ...015-Avoid-set-next-fragment-position.patch | 43 -- > ...ault-in-AP4_LinearReader-ProcessMoof.patch | 27 - > package/bento4/bento4.hash | 2 +- > package/bento4/bento4.mk | 4 +- > 18 files changed, 3 insertions(+), 1950 deletions(-) > delete mode 100644 package/bento4/0001-Add-support-for-cmake-install.patch > delete mode 100644 package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch > delete mode 100644 package/bento4/0003-Backport-Smmothstream-changes.patch > delete mode 100644 package/bento4/0004-more-SPS-parameters.patch > delete mode 100644 package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch > delete mode 100644 package/bento4/0006-Implement-SPS-Frame-parser.patch > delete mode 100644 package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch > delete mode 100644 package/bento4/0008-Hack-HBO.patch > delete mode 100644 package/bento4/0009-Android-32-ftello-fix.patch > delete mode 100644 package/bento4/0010-Dazn-sample-duration-workaround.patch > delete mode 100644 package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch > delete mode 100644 package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch > delete mode 100644 package/bento4/0013-Add-GetChannels-method.patch > delete mode 100644 package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch > delete mode 100644 package/bento4/0015-Avoid-set-next-fragment-position.patch > delete mode 100644 package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch > > diff --git a/package/bento4/0001-Add-support-for-cmake-install.patch b/package/bento4/0001-Add-support-for-cmake-install.patch > deleted file mode 100644 > index cec0cb18b9..0000000000 > --- a/package/bento4/0001-Add-support-for-cmake-install.patch > +++ /dev/null > @@ -1,130 +0,0 @@ > -From ba95f55c495c4c34c75a95de843acfa00f6afe24 Mon Sep 17 00:00:00 2001 > -From: Harry Mallon <harry.mallon@codex.online> > -Date: Fri, 9 Jul 2021 15:50:26 +0100 > -Subject: [PATCH] Add support for cmake install > - > -Downloaded from upstream commit > -https://github.com/axiomatic-systems/Bento4/commit/ba95f55c495c4c34c75a95de843acfa00f6afe24 > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Build/cmake/Config.cmake.in | 4 ++ > - CMakeLists.txt | 73 ++++++++++++++++++++++++++++++++++--- > - 2 files changed, 71 insertions(+), 6 deletions(-) > - create mode 100644 Build/cmake/Config.cmake.in > - > -diff --git a/Build/cmake/Config.cmake.in b/Build/cmake/Config.cmake.in > -new file mode 100644 > -index 00000000..38bbde7b > ---- /dev/null > -+++ b/Build/cmake/Config.cmake.in > -@@ -0,0 +1,4 @@ > -+@PACKAGE_INIT@ > -+ > -+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") > -+check_required_components("@PROJECT_NAME@") > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 6de3bfe1..6ebf127f 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -7,7 +7,14 @@ else() > - cmake_minimum_required(VERSION 3.10) > - endif() > - > --project(bento4) > -+function(get_bento4_version) > -+ file(STRINGS "Source/C++/Core/Ap4Version.h" _temp REGEX "AP4_VERSION_STRING") > -+ string(REGEX MATCH "\"([^\"]+)\"" _temp "${_temp}") > -+ set(BENTO4_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) > -+endfunction() > -+ > -+get_bento4_version() > -+project(bento4 VERSION "${BENTO4_VERSION}") > - > - # Variables > - set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Source/C++) > -@@ -51,14 +58,22 @@ endif() > - > - # Includes > - set(AP4_INCLUDE_DIRS > -- ${SOURCE_CORE} > -- ${SOURCE_CODECS} > -- ${SOURCE_CRYPTO} > -- ${SOURCE_METADATA} > -+ $<BUILD_INTERFACE:${SOURCE_CORE}> > -+ $<BUILD_INTERFACE:${SOURCE_CODECS}> > -+ $<BUILD_INTERFACE:${SOURCE_CRYPTO}> > -+ $<BUILD_INTERFACE:${SOURCE_METADATA}> > -+) > -+file(GLOB AP4_HEADERS > -+ ${SOURCE_CORE}/*.h > -+ ${SOURCE_CODECS}/*.h > -+ ${SOURCE_CRYPTO}/*.h > -+ ${SOURCE_METADATA}/*.h > - ) > - > - add_library(ap4 STATIC ${AP4_SOURCES}) > --target_include_directories(ap4 PUBLIC ${AP4_INCLUDE_DIRS}) > -+target_include_directories(ap4 PUBLIC > -+ ${AP4_INCLUDE_DIRS} > -+) > - > - # Use the statically linked C runtime library > - if(MSVC) > -@@ -72,6 +87,7 @@ if(BUILD_APPS) > - file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*) > - foreach(app ${BENTO4_APPS}) > - string(TOLOWER ${app} binary_name) > -+ list(APPEND BENTO4_APPS_LOWERCASE ${binary_name}) > - add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp) > - target_link_libraries(${binary_name} ap4) > - > -@@ -81,3 +97,48 @@ foreach(app ${BENTO4_APPS}) > - endif() > - endforeach() > - endif(BUILD_APPS) > -+ > -+# Install > -+include(GNUInstallDirs) > -+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") > -+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") > -+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") > -+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") > -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") > -+set(namespace "${PROJECT_NAME}::") > -+ > -+include(CMakePackageConfigHelpers) > -+write_basic_package_version_file( > -+ "${version_config}" COMPATIBILITY SameMajorVersion > -+) > -+ > -+configure_package_config_file( > -+ "Build/cmake/Config.cmake.in" > -+ "${project_config}" > -+ INSTALL_DESTINATION "${config_install_dir}" > -+) > -+ > -+install( > -+ TARGETS ap4 ${BENTO4_APPS_LOWERCASE} > -+ EXPORT "${TARGETS_EXPORT_NAME}" > -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" > -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" > -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" > -+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" > -+) > -+ > -+install( > -+ FILES ${AP4_HEADERS} > -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/bento4" > -+) > -+ > -+install( > -+ FILES "${project_config}" "${version_config}" > -+ DESTINATION "${config_install_dir}" > -+) > -+ > -+install( > -+ EXPORT "${TARGETS_EXPORT_NAME}" > -+ NAMESPACE "${namespace}" > -+ DESTINATION "${config_install_dir}" > -+) > diff --git a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch b/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch > deleted file mode 100644 > index 22ac657a3f..0000000000 > --- a/package/bento4/0002-Add-additional-methods-funtions-and-passing-poolid.patch > +++ /dev/null > @@ -1,634 +0,0 @@ > -From b2027d354ef5d52efd525730fa5e6beccb88d33f Mon Sep 17 00:00:00 2001 > -From: Glenn Guy <glennguy83@gmail.com> > -Date: Thu, 22 Jul 2021 10:00:44 +0200 > -Subject: [PATCH] Add additional methods/funtions and passing poolid > - > -Added back: > -* SSD - > ParentIsOwner functionality > -* LinearReader: GetSample, SeekSample, Reset > -* Ap4Movie -> GetPsshAtoms > -* Uuid/VppC -> GetData > -* Ap4Protection -> WVTT atom type > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4ByteStream.h | 1 - > - Source/C++/Core/Ap4CommonEncryption.cpp | 15 ++-- > - Source/C++/Core/Ap4CommonEncryption.h | 24 +++++-- > - Source/C++/Core/Ap4IsmaCryp.cpp | 5 +- > - Source/C++/Core/Ap4IsmaCryp.h | 3 +- > - Source/C++/Core/Ap4LinearReader.cpp | 94 ++++++++++++++++++++++++- > - Source/C++/Core/Ap4LinearReader.h | 4 ++ > - Source/C++/Core/Ap4Marlin.cpp | 5 +- > - Source/C++/Core/Ap4Marlin.h | 3 +- > - Source/C++/Core/Ap4MoovAtom.cpp | 28 +++++++- > - Source/C++/Core/Ap4MoovAtom.h | 5 ++ > - Source/C++/Core/Ap4Movie.cpp | 10 +++ > - Source/C++/Core/Ap4Movie.h | 4 ++ > - Source/C++/Core/Ap4OmaDcf.cpp | 8 ++- > - Source/C++/Core/Ap4OmaDcf.h | 6 +- > - Source/C++/Core/Ap4Protection.h | 3 +- > - Source/C++/Core/Ap4SampleDescription.h | 1 + > - Source/C++/Core/Ap4UuidAtom.h | 1 + > - Source/C++/Core/Ap4VpccAtom.h | 3 + > - 19 files changed, 197 insertions(+), 26 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4ByteStream.h b/Source/C++/Core/Ap4ByteStream.h > -index 0a59e63..93ac80f 100644 > ---- a/Source/C++/Core/Ap4ByteStream.h > -+++ b/Source/C++/Core/Ap4ByteStream.h > -@@ -195,7 +195,6 @@ public: > - AP4_UI08* UseData() { return m_Buffer->UseData(); } > - AP4_Size GetDataSize() { return m_Buffer->GetDataSize(); } > - > --protected: > - virtual ~AP4_MemoryByteStream(); > - > - private: > -diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp > -index acd6361..5308200 100644 > ---- a/Source/C++/Core/Ap4CommonEncryption.cpp > -+++ b/Source/C++/Core/Ap4CommonEncryption.cpp > -@@ -1859,7 +1859,8 @@ AP4_CencSingleSampleDecrypter::~AP4_CencSingleSampleDecrypter() { > - | AP4_CencSingleSampleDecrypter::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_CencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv, > - unsigned int subsample_count, > -@@ -2094,8 +2095,9 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, > - +---------------------------------------------------------------------*/ > - AP4_CencSampleDecrypter::~AP4_CencSampleDecrypter() > - { > -- delete m_SampleInfoTable; > -- delete m_SingleSampleDecrypter; > -+ delete m_SampleInfoTable; > -+ if (m_SingleSampleDecrypter->GetParentIsOwner()) > -+ delete m_SingleSampleDecrypter; > - } > - > - /*---------------------------------------------------------------------- > -@@ -2112,7 +2114,8 @@ AP4_CencSampleDecrypter::SetSampleIndex(AP4_Ordinal sample_index) > - | AP4_CencSampleDecrypter::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_CencSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv) > - { > -@@ -2139,7 +2142,7 @@ AP4_CencSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > - } > - > - // decrypt the sample > -- return m_SingleSampleDecrypter->DecryptSampleData(data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data); > -+ return m_SingleSampleDecrypter->DecryptSampleData(poolid, data_in, data_out, iv_block, subsample_count, bytes_of_cleartext_data, bytes_of_encrypted_data); > - } > - > - /*---------------------------------------------------------------------- > -@@ -2323,7 +2326,7 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out) > - { > - // decrypt the sample > -- return m_SampleDecrypter->DecryptSampleData(data_in, data_out, NULL); > -+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out, NULL); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h > -index 80db456..580de66 100644 > ---- a/Source/C++/Core/Ap4CommonEncryption.h > -+++ b/Source/C++/Core/Ap4CommonEncryption.h > -@@ -691,9 +691,18 @@ public: > - // methods > - AP4_CencSingleSampleDecrypter(AP4_StreamCipher* cipher) : > - m_Cipher(cipher), > -- m_FullBlocksOnly(false) {} > -+ m_FullBlocksOnly(false), > -+ m_ParentIsOwner(true) {} > - virtual ~AP4_CencSingleSampleDecrypter(); > -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ virtual AP4_Result SetFragmentInfo(AP4_UI32 poolid, const AP4_UI08* keyid, const AP4_UI08 nalu_length_size, > -+ AP4_DataBuffer &annexb_sps_pps, AP4_UI32 flags) { > -+ return AP4_ERROR_NOT_SUPPORTED; > -+ }; > -+ virtual AP4_UI32 AddPool() { return 0; }; > -+ virtual void RemovePool(AP4_UI32 poolid) {}; > -+ virtual const char* GetSessionId() { return nullptr; }; > -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - > - // always 16 bytes > -@@ -706,7 +715,9 @@ public: > - const AP4_UI16* bytes_of_cleartext_data, > - > - // array of <subsample_count> integers. NULL if subsample_count is 0 > -- const AP4_UI32* bytes_of_encrypted_data); > -+ const AP4_UI32* bytes_of_encrypted_data); > -+ bool GetParentIsOwner()const { return m_ParentIsOwner; }; > -+ void SetParentIsOwner(bool parent_is_owner) { m_ParentIsOwner = parent_is_owner; }; > - > - private: > - // constructor > -@@ -715,12 +726,14 @@ private: > - bool reset_iv_at_each_subsample) : > - m_Cipher(cipher), > - m_FullBlocksOnly(full_blocks_only), > -- m_ResetIvAtEachSubsample(reset_iv_at_each_subsample) {} > -+ m_ResetIvAtEachSubsample(reset_iv_at_each_subsample), > -+ m_ParentIsOwner(true) {} > - > - // members > - AP4_StreamCipher* m_Cipher; > - bool m_FullBlocksOnly; > - bool m_ResetIvAtEachSubsample; > -+ bool m_ParentIsOwner; > - }; > - > - /*---------------------------------------------------------------------- > -@@ -766,7 +779,8 @@ public: > - m_SampleCursor(0) {} > - virtual ~AP4_CencSampleDecrypter(); > - virtual AP4_Result SetSampleIndex(AP4_Ordinal sample_index); > -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv); > - > -diff --git a/Source/C++/Core/Ap4IsmaCryp.cpp b/Source/C++/Core/Ap4IsmaCryp.cpp > -index dfb59a4..442ad49 100644 > ---- a/Source/C++/Core/Ap4IsmaCryp.cpp > -+++ b/Source/C++/Core/Ap4IsmaCryp.cpp > -@@ -142,7 +142,8 @@ AP4_IsmaCipher::GetDecryptedSampleSize(AP4_Sample& sample) > - | AP4_IsmaCipher::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_IsmaCipher::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_IsmaCipher::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* /*iv*/) > - { > -@@ -333,7 +334,7 @@ AP4_Result > - AP4_IsmaTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out) > - { > -- return m_Cipher->DecryptSampleData(data_in, data_out); > -+ return m_Cipher->DecryptSampleData(0, data_in, data_out); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4IsmaCryp.h b/Source/C++/Core/Ap4IsmaCryp.h > -index 4b9c60e..970dac8 100644 > ---- a/Source/C++/Core/Ap4IsmaCryp.h > -+++ b/Source/C++/Core/Ap4IsmaCryp.h > -@@ -74,7 +74,8 @@ public: > - AP4_Result EncryptSampleData(AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - AP4_UI32 block_counter); > -- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv = NULL); > - AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); > -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp > -index 08b55ee..7cc3ebd 100644 > ---- a/Source/C++/Core/Ap4LinearReader.cpp > -+++ b/Source/C++/Core/Ap4LinearReader.cpp > -@@ -117,6 +117,29 @@ AP4_LinearReader::FlushQueues() > - } > - } > - > -+/*---------------------------------------------------------------------- > -+| AP4_LinearReader::Reset > -++---------------------------------------------------------------------*/ > -+void > -+AP4_LinearReader::Reset() > -+{ > -+ // flush any queued samples > -+ FlushQueues(); > -+ > -+ // reset tracker states > -+ for (unsigned int i = 0; i < m_Trackers.ItemCount(); i++) { > -+ if (m_Trackers[i]->m_SampleTableIsOwned) { > -+ delete m_Trackers[i]->m_SampleTable; > -+ } > -+ delete m_Trackers[i]->m_NextSample; > -+ m_Trackers[i]->m_SampleTable = NULL; > -+ m_Trackers[i]->m_NextSample = NULL; > -+ m_Trackers[i]->m_NextSampleIndex = 0; > -+ m_Trackers[i]->m_Eos = false; > -+ } > -+ m_NextFragmentPosition = 0; > -+} > -+ > - /*---------------------------------------------------------------------- > - | AP4_LinearReader::SetSampleIndex > - +---------------------------------------------------------------------*/ > -@@ -591,6 +614,75 @@ AP4_LinearReader::ReadNextSample(AP4_Sample& sample, > - return ReadNextSample(sample, &sample_data, track_id); > - } > - > -+/*---------------------------------------------------------------------- > -+| AP4_LinearReader::GetSample > -++---------------------------------------------------------------------*/ > -+AP4_Result AP4_LinearReader::GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index) > -+{ > -+ // look for a sample from a specific track > -+ Tracker* tracker = FindTracker(track_id); > -+ if (tracker == NULL) > -+ return AP4_ERROR_INVALID_PARAMETERS; > -+ > -+ // don't continue if we've reached the end of that tracker > -+ if (tracker->m_Eos) > -+ return AP4_ERROR_EOS; > -+ > -+ return tracker->m_SampleTable->GetSample(sample_index, sample); > -+} > -+ > -+/*---------------------------------------------------------------------- > -+| AP4_LinearReader::SeekSample > -++---------------------------------------------------------------------*/ > -+AP4_Result > -+AP4_LinearReader::SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync) > -+{ > -+ // we only support fragmented sources for now > -+ if (!m_HasFragments) > -+ return AP4_ERROR_NOT_SUPPORTED; > -+ > -+ if (m_Trackers.ItemCount() == 0) { > -+ return AP4_ERROR_NO_SUCH_ITEM; > -+ } > -+ > -+ // look for a sample from a specific track > -+ Tracker* tracker = FindTracker(track_id); > -+ if (tracker == NULL) > -+ return AP4_ERROR_INVALID_PARAMETERS; > -+ > -+ // don't continue if we've reached the end of that tracker > -+ if (tracker->m_Eos) > -+ return AP4_ERROR_EOS; > -+ > -+ AP4_Result result; > -+ > -+ if (!tracker->m_SampleTable && AP4_FAILED(result = Advance())) > -+ return result; > -+ > -+ while (AP4_FAILED(result = tracker->m_SampleTable->GetSampleIndexForTimeStamp(ts, sample_index))) > -+ { > -+ if (result == AP4_ERROR_NOT_ENOUGH_DATA) > -+ { > -+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount(); > -+ if (AP4_FAILED(result = Advance())) > -+ return result; > -+ continue; > -+ } > -+ return result; > -+ } > -+ > -+ sample_index = tracker->m_SampleTable->GetNearestSyncSampleIndex(sample_index, preceedingSync); > -+ //we have reached the end -> go for the first sample of the next segment > -+ if (sample_index == tracker->m_SampleTable->GetSampleCount()) > -+ { > -+ tracker->m_NextSampleIndex = tracker->m_SampleTable->GetSampleCount(); > -+ if (AP4_FAILED(result = Advance())) > -+ return result; > -+ sample_index = 0; > -+ } > -+ return SetSampleIndex(tracker->m_Track->GetId(), sample_index); > -+} > -+ > - /*---------------------------------------------------------------------- > - | AP4_LinearReader::GetNextSample > - +---------------------------------------------------------------------*/ > -@@ -633,5 +725,5 @@ AP4_DecryptingSampleReader::ReadSampleData(AP4_Sample& sample, > - AP4_Result result = sample.ReadData(m_DataBuffer); > - if (AP4_FAILED(result)) return result; > - > -- return m_Decrypter->DecryptSampleData(m_DataBuffer, sample_data); > -+ return m_Decrypter->DecryptSampleData(0, m_DataBuffer, sample_data); > - } > -diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h > -index 549cb5f..21f4871 100644 > ---- a/Source/C++/Core/Ap4LinearReader.h > -+++ b/Source/C++/Core/Ap4LinearReader.h > -@@ -85,6 +85,8 @@ public: > - AP4_Result SetSampleIndex(AP4_UI32 track_id, AP4_UI32 sample_index); > - > - AP4_Result SeekTo(AP4_UI32 time_ms, AP4_UI32* actual_time_ms = 0); > -+ > -+ AP4_Result SeekSample(AP4_UI32 track_id, AP4_UI64 ts, AP4_Ordinal &sample_index, bool preceedingSync); > - > - // accessors > - AP4_Size GetBufferFullness() { return m_BufferFullness; } > -@@ -169,8 +171,10 @@ protected: > - AP4_Result ReadNextSample(AP4_Sample& sample, > - AP4_DataBuffer* sample_data, > - AP4_UI32& track_id); > -+ AP4_Result GetSample(AP4_UI32 track_id, AP4_Sample &sample, AP4_Ordinal sample_index); > - void FlushQueue(Tracker* tracker); > - void FlushQueues(); > -+ void Reset(); > - > - // members > - AP4_Movie& m_Movie; > -diff --git a/Source/C++/Core/Ap4Marlin.cpp b/Source/C++/Core/Ap4Marlin.cpp > -index d0ddd3f..c1aa8b6 100644 > ---- a/Source/C++/Core/Ap4Marlin.cpp > -+++ b/Source/C++/Core/Ap4Marlin.cpp > -@@ -431,7 +431,8 @@ AP4_MarlinIpmpSampleDecrypter::GetDecryptedSampleSize(AP4_Sample& sample) > - | AP4_MarlinIpmpSampleDecrypter::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_MarlinIpmpSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* /*iv*/) > - { > -@@ -630,7 +631,7 @@ AP4_Result > - AP4_MarlinIpmpTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out) > - { > -- return m_SampleDecrypter->DecryptSampleData(data_in, data_out); > -+ return m_SampleDecrypter->DecryptSampleData(0, data_in, data_out); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4Marlin.h b/Source/C++/Core/Ap4Marlin.h > -index 774e04f..9280ad6 100644 > ---- a/Source/C++/Core/Ap4Marlin.h > -+++ b/Source/C++/Core/Ap4Marlin.h > -@@ -118,7 +118,8 @@ public: > - > - // AP4_SampleDecrypter methods > - AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); > -- AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv = NULL); > - > -diff --git a/Source/C++/Core/Ap4MoovAtom.cpp b/Source/C++/Core/Ap4MoovAtom.cpp > -index 1ceab49..fbeee4f 100644 > ---- a/Source/C++/Core/Ap4MoovAtom.cpp > -+++ b/Source/C++/Core/Ap4MoovAtom.cpp > -@@ -31,6 +31,7 @@ > - +---------------------------------------------------------------------*/ > - #include "Ap4MoovAtom.h" > - #include "Ap4TrakAtom.h" > -+#include "Ap4PsshAtom.h" > - #include "Ap4AtomFactory.h" > - > - /*---------------------------------------------------------------------- > -@@ -61,6 +62,29 @@ private: > - AP4_List<AP4_TrakAtom>* m_TrakAtoms; > - }; > - > -+/*---------------------------------------------------------------------- > -+| AP4_PsshAtomCollector > -++---------------------------------------------------------------------*/ > -+class AP4_PsshAtomCollector : public AP4_List<AP4_Atom>::Item::Operator > -+{ > -+public: > -+ AP4_PsshAtomCollector(AP4_List<AP4_PsshAtom>* pssh_atoms) : > -+ m_PsshAtoms(pssh_atoms) {} > -+ > -+ AP4_Result Action(AP4_Atom* atom) const { > -+ if (atom->GetType() == AP4_ATOM_TYPE_PSSH) { > -+ AP4_PsshAtom* pssh = AP4_DYNAMIC_CAST(AP4_PsshAtom, atom); > -+ if (pssh) { > -+ m_PsshAtoms->Add(pssh); > -+ } > -+ } > -+ return AP4_SUCCESS; > -+ } > -+ > -+private: > -+ AP4_List<AP4_PsshAtom>* m_PsshAtoms; > -+}; > -+ > - /*---------------------------------------------------------------------- > - | AP4_MoovAtom::AP4_MoovAtom > - +---------------------------------------------------------------------*/ > -@@ -80,7 +104,9 @@ AP4_MoovAtom::AP4_MoovAtom(AP4_UI32 size, > - m_TimeScale(0) > - { > - // collect all trak atoms > -- m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms)); > -+ m_Children.Apply(AP4_TrakAtomCollector(&m_TrakAtoms)); > -+ // collect all pssh atoms > -+ m_Children.Apply(AP4_PsshAtomCollector(&m_PsshAtoms)); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4MoovAtom.h b/Source/C++/Core/Ap4MoovAtom.h > -index f06b2a1..d1a0147 100644 > ---- a/Source/C++/Core/Ap4MoovAtom.h > -+++ b/Source/C++/Core/Ap4MoovAtom.h > -@@ -40,6 +40,7 @@ > - +---------------------------------------------------------------------*/ > - class AP4_AtomFactory; > - class AP4_TrakAtom; > -+class AP4_PsshAtom; > - > - /*---------------------------------------------------------------------- > - | AP4_MoovAtom > -@@ -61,6 +62,9 @@ public: > - AP4_List<AP4_TrakAtom>& GetTrakAtoms() { > - return m_TrakAtoms; > - } > -+ AP4_List<AP4_PsshAtom>& GetPsshAtoms() { > -+ return m_PsshAtoms; > -+ } > - AP4_UI32 GetTimeScale() { > - return m_TimeScale; > - } > -@@ -77,6 +81,7 @@ private: > - AP4_AtomFactory& atom_factory); > - > - // members > -+ AP4_List<AP4_PsshAtom> m_PsshAtoms; > - AP4_List<AP4_TrakAtom> m_TrakAtoms; > - AP4_UI32 m_TimeScale; > - }; > -diff --git a/Source/C++/Core/Ap4Movie.cpp b/Source/C++/Core/Ap4Movie.cpp > -index b080b53..9617494 100644 > ---- a/Source/C++/Core/Ap4Movie.cpp > -+++ b/Source/C++/Core/Ap4Movie.cpp > -@@ -32,6 +32,7 @@ > - #include "Ap4File.h" > - #include "Ap4Atom.h" > - #include "Ap4TrakAtom.h" > -+#include "Ap4PsshAtom.h" > - #include "Ap4MoovAtom.h" > - #include "Ap4MvhdAtom.h" > - #include "Ap4AtomFactory.h" > -@@ -110,6 +111,15 @@ AP4_Movie::AP4_Movie(AP4_MoovAtom* moov, AP4_ByteStream& sample_stream, bool tra > - time_scale = 0; > - } > - > -+ // get the pssh atoms > -+ AP4_List<AP4_PsshAtom>* pssh_atoms; > -+ pssh_atoms = &moov->GetPsshAtoms(); > -+ AP4_List<AP4_PsshAtom>::Item* pssh_item = pssh_atoms->FirstItem(); > -+ while (pssh_item) { > -+ m_PsshAtoms.Append(*pssh_item->GetData()); > -+ pssh_item = pssh_item->GetNext(); > -+ } > -+ > - // get all tracks > - AP4_List<AP4_TrakAtom>* trak_atoms; > - trak_atoms = &moov->GetTrakAtoms(); > -diff --git a/Source/C++/Core/Ap4Movie.h b/Source/C++/Core/Ap4Movie.h > -index 21ef173..04992a4 100644 > ---- a/Source/C++/Core/Ap4Movie.h > -+++ b/Source/C++/Core/Ap4Movie.h > -@@ -37,6 +37,7 @@ > - #include "Ap4MvhdAtom.h" > - #include "Ap4Track.h" > - #include "Ap4List.h" > -+#include "Ap4PsshAtom.h" > - > - /*---------------------------------------------------------------------- > - | class references > -@@ -60,6 +61,8 @@ public: > - AP4_Result Inspect(AP4_AtomInspector& inspector); > - > - AP4_MoovAtom* GetMoovAtom() { return m_MoovAtom;} > -+ void SetMoovAtom(AP4_MoovAtom* atom) { m_MoovAtom = atom; } > -+ AP4_Array<AP4_PsshAtom>& GetPsshAtoms() { return m_PsshAtoms; } > - AP4_MvhdAtom* GetMvhdAtom() { return m_MvhdAtom;} > - AP4_List<AP4_Track>& GetTracks() { return m_Tracks; } > - AP4_Track* GetTrack(AP4_UI32 track_id); > -@@ -75,6 +78,7 @@ private: > - AP4_MoovAtom* m_MoovAtom; > - bool m_MoovAtomIsOwned; > - AP4_MvhdAtom* m_MvhdAtom; > -+ AP4_Array<AP4_PsshAtom> m_PsshAtoms; > - AP4_List<AP4_Track> m_Tracks; > - }; > - > -diff --git a/Source/C++/Core/Ap4OmaDcf.cpp b/Source/C++/Core/Ap4OmaDcf.cpp > -index 17099a1..4eefbaf 100644 > ---- a/Source/C++/Core/Ap4OmaDcf.cpp > -+++ b/Source/C++/Core/Ap4OmaDcf.cpp > -@@ -436,7 +436,8 @@ AP4_OmaDcfCtrSampleDecrypter::~AP4_OmaDcfCtrSampleDecrypter() > - | AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_OmaDcfCtrSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* /*iv*/) > - { > -@@ -531,7 +532,8 @@ AP4_OmaDcfCbcSampleDecrypter::~AP4_OmaDcfCbcSampleDecrypter() > - | AP4_OmaDbcCbcSampleDecrypter::DecryptSampleData > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_DataBuffer& data_in, > -+AP4_OmaDcfCbcSampleDecrypter::DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* /*iv*/) > - { > -@@ -853,7 +855,7 @@ AP4_Result > - AP4_OmaDcfTrackDecrypter::ProcessSample(AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out) > - { > -- return m_Cipher->DecryptSampleData(data_in, data_out); > -+ return m_Cipher->DecryptSampleData(0, data_in, data_out); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4OmaDcf.h b/Source/C++/Core/Ap4OmaDcf.h > -index 23f10ed..bb7b3d6 100644 > ---- a/Source/C++/Core/Ap4OmaDcf.h > -+++ b/Source/C++/Core/Ap4OmaDcf.h > -@@ -133,7 +133,8 @@ public: > - ~AP4_OmaDcfCtrSampleDecrypter(); > - > - // methods > -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv = NULL); > - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); > -@@ -155,7 +156,8 @@ public: > - ~AP4_OmaDcfCbcSampleDecrypter(); > - > - // methods > -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv = NULL); > - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample); > -diff --git a/Source/C++/Core/Ap4Protection.h b/Source/C++/Core/Ap4Protection.h > -index 856f1f3..4080584 100644 > ---- a/Source/C++/Core/Ap4Protection.h > -+++ b/Source/C++/Core/Ap4Protection.h > -@@ -393,7 +393,8 @@ public: > - // methods > - virtual AP4_Size GetDecryptedSampleSize(AP4_Sample& sample) { return sample.GetSize(); } > - virtual AP4_Result SetSampleIndex(AP4_Ordinal /*index*/) { return AP4_SUCCESS; } > -- virtual AP4_Result DecryptSampleData(AP4_DataBuffer& data_in, > -+ virtual AP4_Result DecryptSampleData(AP4_UI32 poolid, > -+ AP4_DataBuffer& data_in, > - AP4_DataBuffer& data_out, > - const AP4_UI08* iv = NULL) = 0; > - }; > -diff --git a/Source/C++/Core/Ap4SampleDescription.h b/Source/C++/Core/Ap4SampleDescription.h > -index 27f3136..d493f96 100644 > ---- a/Source/C++/Core/Ap4SampleDescription.h > -+++ b/Source/C++/Core/Ap4SampleDescription.h > -@@ -101,6 +101,7 @@ const AP4_UI32 AP4_SAMPLE_FORMAT_TX3G = AP4_ATOM_TYPE('t','x','3','g'); > - const AP4_UI32 AP4_SAMPLE_FORMAT_VC_1 = AP4_ATOM_TYPE('v','c','-','1'); > - const AP4_UI32 AP4_SAMPLE_FORMAT_XML_ = AP4_ATOM_TYPE('x','m','l',' '); > - const AP4_UI32 AP4_SAMPLE_FORMAT_STPP = AP4_ATOM_TYPE('s','t','p','p'); > -+const AP4_UI32 AP4_SAMPLE_FORMAT_WVTT = AP4_ATOM_TYPE('w','v','t','t'); > - const AP4_UI32 AP4_SAMPLE_FORMAT_FLAC = AP4_ATOM_TYPE('f','L','a','C'); > - const AP4_UI32 AP4_SAMPLE_FORMAT_OPUS = AP4_ATOM_TYPE('O','p','u','s'); > - const AP4_UI32 AP4_SAMPLE_FORMAT_VP8 = AP4_ATOM_TYPE('v','p','0','8'); > -diff --git a/Source/C++/Core/Ap4UuidAtom.h b/Source/C++/Core/Ap4UuidAtom.h > -index b9771bd..0ec3b08 100644 > ---- a/Source/C++/Core/Ap4UuidAtom.h > -+++ b/Source/C++/Core/Ap4UuidAtom.h > -@@ -90,6 +90,7 @@ public: > - > - // methods > - virtual AP4_Result WriteFields(AP4_ByteStream& stream); > -+ const AP4_DataBuffer &GetData() { return m_Data; }; > - > - protected: > - // members > -diff --git a/Source/C++/Core/Ap4VpccAtom.h b/Source/C++/Core/Ap4VpccAtom.h > -index 9fb60bc..929048a 100644 > ---- a/Source/C++/Core/Ap4VpccAtom.h > -+++ b/Source/C++/Core/Ap4VpccAtom.h > -@@ -79,10 +79,13 @@ public: > - AP4_UI08 GetTransferCharacteristics() { return m_TransferCharacteristics; } > - AP4_UI08 GetMatrixCoefficients() { return m_MatrixCoefficients; } > - const AP4_DataBuffer& GetCodecInitializationData() { return m_CodecIntializationData; } > -+ const AP4_DataBuffer& GetData() { return m_Data; } > - > - // helpers > - AP4_Result GetCodecString(AP4_UI32 container_type, AP4_String& codec); > - > -+protected: > -+ AP4_DataBuffer m_Data; > - private: > - // methods > - AP4_VpccAtom(AP4_UI32 size, const AP4_UI08* payload); > --- > -2.30.2 > - > diff --git a/package/bento4/0003-Backport-Smmothstream-changes.patch b/package/bento4/0003-Backport-Smmothstream-changes.patch > deleted file mode 100644 > index a9a577a2d9..0000000000 > --- a/package/bento4/0003-Backport-Smmothstream-changes.patch > +++ /dev/null > @@ -1,99 +0,0 @@ > -From 97088e7bd7e84a493bea7e5fe4e808c8ac3e00ff Mon Sep 17 00:00:00 2001 > -From: CastagnaIT <gottardo.stefano.83@gmail.com> > -Date: Thu, 22 Jul 2021 10:09:24 +0200 > -Subject: [PATCH] Backport Smmothstream changes > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4File.cpp | 14 ++++++++------ > - Source/C++/Core/Ap4File.h | 6 ++++-- > - Source/C++/Core/Ap4FragmentSampleTable.cpp | 2 +- > - 3 files changed, 13 insertions(+), 9 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4File.cpp b/Source/C++/Core/Ap4File.cpp > -index cb20c3e..f1d2727 100644 > ---- a/Source/C++/Core/Ap4File.cpp > -+++ b/Source/C++/Core/Ap4File.cpp > -@@ -55,13 +55,14 @@ AP4_File::AP4_File(AP4_Movie* movie) : > - +---------------------------------------------------------------------*/ > - AP4_File::AP4_File(AP4_ByteStream& stream, > - AP4_AtomFactory& atom_factory, > -- bool moov_only) : > -- m_Movie(NULL), > -+ bool moov_only, > -+ AP4_Movie* movie) : > -+ m_Movie(movie), > - m_FileType(NULL), > - m_MetaData(NULL), > - m_MoovIsBeforeMdat(true) > - { > -- ParseStream(stream, atom_factory, moov_only); > -+ ParseStream(stream, atom_factory, moov_only, movie); > - } > - > - /*---------------------------------------------------------------------- > -@@ -75,7 +76,7 @@ AP4_File::AP4_File(AP4_ByteStream& stream, > - m_MoovIsBeforeMdat(true) > - { > - AP4_DefaultAtomFactory atom_factory; > -- ParseStream(stream, atom_factory, moov_only); > -+ ParseStream(stream, atom_factory, moov_only, m_Movie); > - } > - > - /*---------------------------------------------------------------------- > -@@ -93,12 +94,13 @@ AP4_File::~AP4_File() > - void > - AP4_File::ParseStream(AP4_ByteStream& stream, > - AP4_AtomFactory& atom_factory, > -- bool moov_only) > -+ bool moov_only, > -+ AP4_Movie* movie) > - { > - // parse top-level atoms > - AP4_Atom* atom; > - AP4_Position stream_position; > -- bool keep_parsing = true; > -+ bool keep_parsing = movie == 0; > - while (keep_parsing && > - AP4_SUCCEEDED(stream.Tell(stream_position)) && > - AP4_SUCCEEDED(atom_factory.CreateAtomFromStream(stream, atom))) { > -diff --git a/Source/C++/Core/Ap4File.h b/Source/C++/Core/Ap4File.h > -index 9375258..2f00187 100644 > ---- a/Source/C++/Core/Ap4File.h > -+++ b/Source/C++/Core/Ap4File.h > -@@ -101,7 +101,8 @@ public: > - */ > - AP4_File(AP4_ByteStream& stream, > - AP4_AtomFactory& atom_factory, > -- bool moov_only); > -+ bool moov_only, > -+ AP4_Movie* movie = NULL); > - > - /** > - * Constructs an AP4_File from a stream using the default atom factory > -@@ -161,7 +162,8 @@ private: > - // methods > - void ParseStream(AP4_ByteStream& stream, > - AP4_AtomFactory& atom_factory, > -- bool moov_only); > -+ bool moov_only, > -+ AP4_Movie* movie); > - > - // members > - AP4_Movie* m_Movie; > -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -index 84e5ded..3fbb53e 100644 > ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp > -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -@@ -130,7 +130,7 @@ AP4_FragmentSampleTable::AddTrun(AP4_TrunAtom* trun, > - data_offset += trun->GetDataOffset(); > - } > - // MS hack > -- if (data_offset == moof_offset) { > -+ if (data_offset < payload_offset) { > - data_offset = payload_offset; > - } else { > - payload_offset = data_offset; > --- > -2.30.2 > - > diff --git a/package/bento4/0004-more-SPS-parameters.patch b/package/bento4/0004-more-SPS-parameters.patch > deleted file mode 100644 > index 7034739815..0000000000 > --- a/package/bento4/0004-more-SPS-parameters.patch > +++ /dev/null > @@ -1,219 +0,0 @@ > -From 25df596f009514b213c5eaf5d5eb94072391c1be Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:22:39 +0200 > -Subject: [PATCH] more SPS parameters > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Codecs/Ap4AvcParser.cpp | 100 ++++++++++++++++++++++++++++- > - Source/C++/Codecs/Ap4AvcParser.h | 22 +++++++ > - Source/C++/Core/Ap4Utils.cpp | 8 +++ > - Source/C++/Core/Ap4Utils.h | 2 +- > - 4 files changed, 129 insertions(+), 3 deletions(-) > - > -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp > -index b95398b..7efb5c9 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.cpp > -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp > -@@ -30,7 +30,6 @@ > - | includes > - +---------------------------------------------------------------------*/ > - #include "Ap4AvcParser.h" > --#include "Ap4Utils.h" > - > - /*---------------------------------------------------------------------- > - | debugging > -@@ -123,6 +122,25 @@ AP4_AvcNalParser::SliceTypeName(unsigned int slice_type) > - } > - } > - > -+const int SAR[17][2] = { > -+ { 0, 1 }, > -+ { 1, 1 }, > -+ { 12, 11 }, > -+ { 10, 11 }, > -+ { 16, 11 }, > -+ { 40, 33 }, > -+ { 24, 11 }, > -+ { 20, 11 }, > -+ { 32, 11 }, > -+ { 80, 33 }, > -+ { 18, 11 }, > -+ { 15, 11 }, > -+ { 64, 33 }, > -+ { 160, 99 }, > -+ { 4, 3 }, > -+ { 3, 2 }, > -+ { 2, 1 }, > -+}; > - /*---------------------------------------------------------------------- > - | AP4_AvcNalParser::AP4_AvcNalParser > - +---------------------------------------------------------------------*/ > -@@ -236,7 +254,28 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() : > - frame_crop_left_offset(0), > - frame_crop_right_offset(0), > - frame_crop_top_offset(0), > -- frame_crop_bottom_offset(0) > -+ frame_crop_bottom_offset(0), > -+ vui_parameters_present_flag(0), > -+ aspect_ratio_info_present_flag(0), > -+ aspect_ratio_idc(0), > -+ sar_width(0), > -+ sar_height(0), > -+ overscan_info_present_flag(0), > -+ overscan_appropriate_flag(0), > -+ video_signal_type_present_flag(0), > -+ video_format(0), > -+ video_full_range_flag(0), > -+ colour_description_present_flag(0), > -+ colour_primaries(0), > -+ transfer_characteristics(0), > -+ matrix_coefficients(0), > -+ chroma_loc_info_present_flag(0), > -+ chroma_sample_loc_type_top_field(0), > -+ chroma_sample_loc_type_bottom_field(0), > -+ timing_info_present_flag(0), > -+ num_units_in_tick(0), > -+ time_scale(0), > -+ fixed_frame_rate_flag(0) > - { > - AP4_SetMemory(scaling_list_4x4, 0, sizeof(scaling_list_4x4)); > - AP4_SetMemory(use_default_scaling_matrix_4x4, 0, sizeof(use_default_scaling_matrix_4x4)); > -@@ -372,7 +411,64 @@ AP4_AvcFrameParser::ParseSPS(const unsigned char* data, > - sps.frame_crop_top_offset = ReadGolomb(bits); > - sps.frame_crop_bottom_offset = ReadGolomb(bits); > - } > -+ sps.vui_parameters_present_flag = bits.ReadBit(); > -+ if (sps.vui_parameters_present_flag) { > -+ sps.aspect_ratio_info_present_flag = bits.ReadBit(); > -+ if (sps.aspect_ratio_info_present_flag) { > -+ sps.aspect_ratio_idc = bits.ReadBits(8); > -+ if (sps.aspect_ratio_idc == 0xFF) > -+ { > -+ sps.sar_width = bits.ReadBits(16); > -+ sps.sar_height = bits.ReadBits(16); > -+ } > -+ else if (sps.aspect_ratio_idc < 17) > -+ { > -+ sps.sar_width = SAR[sps.aspect_ratio_idc][0]; > -+ sps.sar_height = SAR[sps.aspect_ratio_idc][1]; > -+ } > -+ } > -+ sps.overscan_info_present_flag = bits.ReadBit(); > -+ if (sps.overscan_info_present_flag) > -+ sps.overscan_appropriate_flag = bits.ReadBit(); > -+ > -+ sps.video_signal_type_present_flag = bits.ReadBit(); > -+ if (sps.video_signal_type_present_flag) { > -+ sps.video_format = bits.ReadBits(3); > -+ sps.video_full_range_flag = bits.ReadBit(); > -+ sps.colour_description_present_flag = bits.ReadBit(); > -+ if (sps.colour_description_present_flag) { > -+ sps.colour_primaries = bits.ReadBits(8); > -+ sps.transfer_characteristics = bits.ReadBits(8); > -+ sps.matrix_coefficients = bits.ReadBits(8); > -+ } > -+ } > -+ > - > -+ sps.chroma_loc_info_present_flag = bits.ReadBit(); > -+ if (sps.chroma_loc_info_present_flag) { > -+ sps.chroma_sample_loc_type_top_field = ReadGolomb(bits); > -+ sps.chroma_sample_loc_type_bottom_field = ReadGolomb(bits); > -+ } > -+ > -+ if (bits.PeekBit() && bits.BitsLeft() < 10) > -+ return AP4_SUCCESS; > -+ > -+ sps.timing_info_present_flag = bits.ReadBit(); > -+ if (sps.timing_info_present_flag) { > -+#if AP4_PLATFORM_BYTE_ORDER == AP4_PLATFORM_BYTE_ORDER_BIG_ENDIAN > -+ sps.num_units_in_tick = bits.ReadBits(32); > -+ sps.time_scale = bits.ReadBits(32); > -+#else > -+ sps.num_units_in_tick = bits.ReadBits(16) << 16; > -+ sps.num_units_in_tick |= bits.ReadBits(16); > -+ sps.time_scale = bits.ReadBits(16) << 16; > -+ sps.time_scale |= bits.ReadBits(16); > -+#endif > -+ if (!sps.num_units_in_tick || !sps.time_scale) > -+ sps.timing_info_present_flag = 0; > -+ sps.fixed_frame_rate_flag = bits.ReadBit(); > -+ } > -+ } > - return AP4_SUCCESS; > - } > - > -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h > -index 8f9cd6c..9f97892 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.h > -+++ b/Source/C++/Codecs/Ap4AvcParser.h > -@@ -37,6 +37,7 @@ > - #include "Ap4DataBuffer.h" > - #include "Ap4NalParser.h" > - #include "Ap4Array.h" > -+#include "Ap4Utils.h" > - > - /*---------------------------------------------------------------------- > - | constants > -@@ -131,6 +132,27 @@ struct AP4_AvcSequenceParameterSet { > - unsigned int frame_crop_right_offset; > - unsigned int frame_crop_top_offset; > - unsigned int frame_crop_bottom_offset; > -+ unsigned int vui_parameters_present_flag; > -+ unsigned int aspect_ratio_info_present_flag; > -+ unsigned int aspect_ratio_idc; > -+ unsigned int sar_width; > -+ unsigned int sar_height; > -+ unsigned int overscan_info_present_flag; > -+ unsigned int overscan_appropriate_flag; > -+ unsigned int video_signal_type_present_flag; > -+ unsigned int video_format; > -+ unsigned int video_full_range_flag; > -+ unsigned int colour_description_present_flag; > -+ unsigned int colour_primaries; > -+ unsigned int transfer_characteristics; > -+ unsigned int matrix_coefficients; > -+ unsigned int chroma_loc_info_present_flag; > -+ unsigned int chroma_sample_loc_type_top_field; > -+ unsigned int chroma_sample_loc_type_bottom_field; > -+ unsigned int timing_info_present_flag; > -+ unsigned int num_units_in_tick; > -+ unsigned int time_scale; > -+ unsigned int fixed_frame_rate_flag; > - }; > - > - struct AP4_AvcPictureParameterSet { > -diff --git a/Source/C++/Core/Ap4Utils.cpp b/Source/C++/Core/Ap4Utils.cpp > -index 96def27..6de4dba 100644 > ---- a/Source/C++/Core/Ap4Utils.cpp > -+++ b/Source/C++/Core/Ap4Utils.cpp > -@@ -581,4 +581,12 @@ AP4_BitReader::SkipBit() > - } > - } > - > -+/*---------------------------------------------------------------------- > -+| AP4_BitReader::BitsLeft > -++---------------------------------------------------------------------*/ > -+AP4_UI32 > -+AP4_BitReader::BitsLeft() > -+{ > -+ return (m_Buffer.GetDataSize() - m_Position) * 8 + m_BitsCached; > -+} > - > -diff --git a/Source/C++/Core/Ap4Utils.h b/Source/C++/Core/Ap4Utils.h > -index 475bff3..e66bafa 100644 > ---- a/Source/C++/Core/Ap4Utils.h > -+++ b/Source/C++/Core/Ap4Utils.h > -@@ -262,7 +262,7 @@ public: > - AP4_Result SkipBytes(AP4_Size byte_count); > - void SkipBit(); > - void SkipBits(unsigned int bit_count); > -- > -+ AP4_UI32 BitsLeft(); > - unsigned int GetBitsRead(); > - > - private: > --- > -2.30.2 > - > diff --git a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch b/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch > deleted file mode 100644 > index 27b9572269..0000000000 > --- a/package/bento4/0005-AVC-extract-VUI-values-from-SPS.patch > +++ /dev/null > @@ -1,96 +0,0 @@ > -From 56e0acde44adbc5503da20dd96c31db33f744bd7 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:27:50 +0200 > -Subject: [PATCH] AVC extract VUI values from SPS > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Codecs/Ap4AvcParser.cpp | 54 +++++++++++++++++++++++++----- > - Source/C++/Codecs/Ap4AvcParser.h | 3 +- > - 2 files changed, 47 insertions(+), 10 deletions(-) > - > -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp > -index 7efb5c9..7f4fc34 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.cpp > -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp > -@@ -287,18 +287,54 @@ AP4_AvcSequenceParameterSet::AP4_AvcSequenceParameterSet() : > - /*---------------------------------------------------------------------- > - | AP4_AvcSequenceParameterSet::GetInfo > - +---------------------------------------------------------------------*/ > --void > -+bool > - AP4_AvcSequenceParameterSet::GetInfo(unsigned int& width, unsigned int& height) > - { > -- width = (pic_width_in_mbs_minus1+1) * 16; > -- height = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16; > -+ unsigned int nwidth = (pic_width_in_mbs_minus1+1) * 16; > -+ unsigned int nheight = (2-frame_mbs_only_flag) * (pic_height_in_map_units_minus1+1) * 16; > - > -- if (frame_cropping_flag) { > -- unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset); > -- unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag); > -- if (crop_h < width) width -= crop_h; > -- if (crop_v < height) height -= crop_v; > -- } > -+ if (frame_cropping_flag) { > -+ unsigned int crop_h = 2*(frame_crop_left_offset+frame_crop_right_offset); > -+ unsigned int crop_v = 2*(frame_crop_top_offset+frame_crop_bottom_offset)*(2-frame_mbs_only_flag); > -+ if (crop_h < nwidth) nwidth -= crop_h; > -+ if (crop_v < nheight) nheight -= crop_v; > -+ } > -+ if (nwidth != width || nheight != height) > -+ { > -+ width = nwidth; > -+ height = nheight; > -+ return true; > -+ } > -+ return false; > -+} > -+ > -+/*---------------------------------------------------------------------- > -+| AP4_AvcSequenceParameterSet::GetVUIInfo > -++---------------------------------------------------------------------*/ > -+bool > -+AP4_AvcSequenceParameterSet::GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect) > -+{ > -+ bool ret(false); > -+ if (timing_info_present_flag && fixed_frame_rate_flag) > -+ { > -+ if (fps_scale != (num_units_in_tick << 1) || fps_ticks != time_scale) > -+ { > -+ fps_scale = num_units_in_tick << 1; > -+ fps_ticks = time_scale; > -+ ret = true; > -+ } > -+ } > -+ unsigned int w, h; > -+ if (aspect_ratio_info_present_flag && GetInfo(w, h)) > -+ { > -+ float a((float)(sar_width * w) / (sar_height * h)); > -+ if (a != aspect) > -+ { > -+ aspect = a; > -+ ret = true; > -+ } > -+ } > -+ return ret; > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h > -index 9f97892..431a294 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.h > -+++ b/Source/C++/Codecs/Ap4AvcParser.h > -@@ -91,7 +91,8 @@ typedef struct { > - struct AP4_AvcSequenceParameterSet { > - AP4_AvcSequenceParameterSet(); > - > -- void GetInfo(unsigned int& width, unsigned int& height); > -+ bool GetInfo(unsigned int& width, unsigned int& height); > -+ bool GetVUIInfo(unsigned int& fps_ticks, unsigned int& fps_scale, float &aspect); > - > - AP4_DataBuffer raw_bytes; > - > --- > -2.30.2 > - > diff --git a/package/bento4/0006-Implement-SPS-Frame-parser.patch b/package/bento4/0006-Implement-SPS-Frame-parser.patch > deleted file mode 100644 > index d2c224ccf9..0000000000 > --- a/package/bento4/0006-Implement-SPS-Frame-parser.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From 441247d84e8493a49d234fe062100b049956de90 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:34:42 +0200 > -Subject: [PATCH] Implement SPS Frame parser > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Codecs/Ap4AvcParser.cpp | 26 ++++++++++++++++++++++++++ > - Source/C++/Codecs/Ap4AvcParser.h | 5 +++++ > - 2 files changed, 31 insertions(+) > - > -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp > -index 7f4fc34..cfa841d 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.cpp > -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp > -@@ -1112,6 +1112,32 @@ AP4_AvcFrameParser::AppendNalUnitData(const unsigned char* data, unsigned int da > - m_AccessUnitData.Append(new AP4_DataBuffer(data, data_size)); > - } > - > -+/*---------------------------------------------------------------------- > -+| AP4_AvcFrameParser::Feed > -++---------------------------------------------------------------------*/ > -+AP4_Result AP4_AvcFrameParser::ParseFrameForSPS(const AP4_Byte* data, AP4_Size data_size, AP4_UI08 naluLengthSize, AP4_AvcSequenceParameterSet &sps) > -+{ > -+ if (data_size < naluLengthSize) > -+ return AP4_ERROR_EOS; > -+ > -+ while (data_size > naluLengthSize) > -+ { > -+ AP4_Size nalSize(0); > -+ for (unsigned int i(0); i < naluLengthSize; ++i) { nalSize = (nalSize << 8) + *data++; }; > -+ data_size -= naluLengthSize; > -+ if (nalSize > data_size) > -+ return AP4_ERROR_INVALID_PARAMETERS; > -+ > -+ if ((*data & 0x1F) == AP4_AVC_NAL_UNIT_TYPE_SPS) > -+ { > -+ AP4_AvcFrameParser fp; > -+ return fp.ParseSPS(data, data_size, sps); > -+ } > -+ data_size -= nalSize; > -+ } > -+ return AP4_SUCCESS; > -+} > -+ > - /*---------------------------------------------------------------------- > - | AP4_AvcFrameParser::Feed > - +---------------------------------------------------------------------*/ > -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h > -index 431a294..99c5320 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.h > -+++ b/Source/C++/Codecs/Ap4AvcParser.h > -@@ -258,6 +258,11 @@ public: > - AP4_AvcFrameParser(); > - ~AP4_AvcFrameParser(); > - > -+ static AP4_Result ParseFrameForSPS(const AP4_Byte* data, > -+ AP4_Size data_size, > -+ AP4_UI08 naluLengthSize, > -+ AP4_AvcSequenceParameterSet &sps); > -+ > - /** > - * Feed some data to the parser and look for the next NAL Unit. > - * > --- > -2.30.2 > - > diff --git a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch b/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch > deleted file mode 100644 > index bd7f434652..0000000000 > --- a/package/bento4/0007-Fix-segfault-when-AP4_Sample-s-seek.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From b36f3c02a93029308654f77c01c3c04259449c5c Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:35:48 +0200 > -Subject: [PATCH] Fix segfault when AP4_Sample's seek > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4LinearReader.cpp | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp > -index 7cc3ebd..61dd60e 100644 > ---- a/Source/C++/Core/Ap4LinearReader.cpp > -+++ b/Source/C++/Core/Ap4LinearReader.cpp > -@@ -482,6 +482,7 @@ AP4_LinearReader::Advance(bool read_data) > - result = buffer->m_Sample->ReadData(buffer->m_Data); > - } > - if (AP4_FAILED(result)) { > -+ buffer->m_Sample = nullptr; > - delete buffer; > - return result; > - } > --- > -2.30.2 > - > diff --git a/package/bento4/0008-Hack-HBO.patch b/package/bento4/0008-Hack-HBO.patch > deleted file mode 100644 > index ed297574a8..0000000000 > --- a/package/bento4/0008-Hack-HBO.patch > +++ /dev/null > @@ -1,214 +0,0 @@ > -From 37e54320f2822bdc7eab50eb54b1fc4a452c7f60 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 11:18:14 +0200 > -Subject: [PATCH] Hack HBO > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4FragmentSampleTable.cpp | 8 +++++++- > - Source/C++/Core/Ap4FragmentSampleTable.h | 1 + > - Source/C++/Core/Ap4LinearReader.cpp | 20 +++++++++++++------- > - Source/C++/Core/Ap4LinearReader.h | 3 ++- > - Source/C++/Core/Ap4MovieFragment.cpp | 5 ++++- > - Source/C++/Core/Ap4MovieFragment.h | 2 ++ > - Source/C++/Core/Ap4Processor.cpp | 3 ++- > - 7 files changed, 31 insertions(+), 11 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -index 3fbb53e..cea5c7d 100644 > ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp > -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -@@ -47,6 +47,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin) : > - m_Duration(0) > - { > -@@ -73,6 +74,7 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, > - } > - > - // process all the trun atoms > -+ AP4_UI32 trun_flags(0); > - for (AP4_List<AP4_Atom>::Item* item = traf->GetChildren().FirstItem(); > - item; > - item = item->GetNext()) { > -@@ -88,9 +90,13 @@ AP4_FragmentSampleTable::AP4_FragmentSampleTable(AP4_ContainerAtom* traf, > - mdat_payload_offset, > - dts_origin); > - if (AP4_FAILED(result)) return; > -+ trun_flags |= trun->GetFlags(); > - } > - } > -- } > -+ } > -+ // Hack if we have a single sample and default sample size is wrong (hbo ttml) > -+ if (m_Samples.ItemCount() == 1 && (trun_flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) == 0) > -+ m_Samples[0].SetSize(mdat_payload_size); > - } > - > - /*---------------------------------------------------------------------- > -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.h b/Source/C++/Core/Ap4FragmentSampleTable.h > -index 67192de..29fa4a9 100644 > ---- a/Source/C++/Core/Ap4FragmentSampleTable.h > -+++ b/Source/C++/Core/Ap4FragmentSampleTable.h > -@@ -57,6 +57,7 @@ class AP4_FragmentSampleTable : public AP4_SampleTable > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec correctly > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin=0); > - virtual ~AP4_FragmentSampleTable(); > - > -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp > -index 61dd60e..eabeacf 100644 > ---- a/Source/C++/Core/Ap4LinearReader.cpp > -+++ b/Source/C++/Core/Ap4LinearReader.cpp > -@@ -309,7 +309,8 @@ AP4_LinearReader::ProcessTrack(AP4_Track* track) > - AP4_Result > - AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, > - AP4_Position moof_offset, > -- AP4_Position mdat_payload_offset) > -+ AP4_Position mdat_payload_offset, > -+ AP4_UI64 mdat_payload_size) > - { > - AP4_Result result; > - > -@@ -334,7 +335,8 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, > - ids[j], > - m_FragmentStream, > - moof_offset, > -- mdat_payload_offset, > -+ mdat_payload_offset, > -+ mdat_payload_size, > - tracker->m_NextDts, > - sample_table); > - if (AP4_FAILED(result)) return result; > -@@ -382,13 +384,11 @@ AP4_LinearReader::AdvanceFragment() > - AP4_Position position = 0; > - m_FragmentStream->Tell(position); > - > -- // process the movie fragment > -- result = ProcessMoof(moof, position-atom->GetSize(), position+8); > -- if (AP4_FAILED(result)) return result; > -- > - // compute where the next fragment will be > - AP4_UI32 size; > - AP4_UI32 type; > -+ AP4_UI64 size_64 = 0; > -+ > - m_FragmentStream->Tell(position); > - result = m_FragmentStream->ReadUI32(size); > - if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more > -@@ -397,13 +397,19 @@ AP4_LinearReader::AdvanceFragment() > - if (size == 0) { > - m_NextFragmentPosition = 0; > - } else if (size == 1) { > -- AP4_UI64 size_64 = 0; > - result = m_FragmentStream->ReadUI64(size_64); > - if (AP4_FAILED(result)) return AP4_SUCCESS; // can't read more > - m_NextFragmentPosition = position+size_64; > -+ size_64 -= 8; > - } else { > - m_NextFragmentPosition = position+size; > -+ size_64 = size; > - } > -+ > -+ // process the movie fragment > -+ result = ProcessMoof(moof, position - atom->GetSize(), position + 8, size_64 - 8); > -+ if (AP4_FAILED(result)) return result; > -+ > - return AP4_SUCCESS; > - } else { > - delete atom; > -diff --git a/Source/C++/Core/Ap4LinearReader.h b/Source/C++/Core/Ap4LinearReader.h > -index 21f4871..929b4e1 100644 > ---- a/Source/C++/Core/Ap4LinearReader.h > -+++ b/Source/C++/Core/Ap4LinearReader.h > -@@ -161,7 +161,8 @@ protected: > - virtual AP4_Result ProcessTrack(AP4_Track* track); > - virtual AP4_Result ProcessMoof(AP4_ContainerAtom* moof, > - AP4_Position moof_offset, > -- AP4_Position mdat_payload_offset); > -+ AP4_Position mdat_payload_offset, > -+ AP4_UI64 mdat_payload_size); > - > - // methods > - Tracker* FindTracker(AP4_UI32 track_id); > -diff --git a/Source/C++/Core/Ap4MovieFragment.cpp b/Source/C++/Core/Ap4MovieFragment.cpp > -index 028d42d..c2ead25 100644 > ---- a/Source/C++/Core/Ap4MovieFragment.cpp > -+++ b/Source/C++/Core/Ap4MovieFragment.cpp > -@@ -127,6 +127,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov, > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin, > - AP4_FragmentSampleTable*& sample_table) > - { > -@@ -158,6 +159,7 @@ AP4_MovieFragment::CreateSampleTable(AP4_MoovAtom* moov, > - sample_stream, > - moof_offset, > - mdat_payload_offset, > -+ mdat_payload_size, > - dts_origin); > - return AP4_SUCCESS; > - } > -@@ -174,9 +176,10 @@ AP4_MovieFragment::CreateSampleTable(AP4_Movie* movie, > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin, > - AP4_FragmentSampleTable*& sample_table) > - { > - AP4_MoovAtom* moov = movie?movie->GetMoovAtom():NULL; > -- return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, dts_origin, sample_table); > -+ return CreateSampleTable(moov, track_id, sample_stream, moof_offset, mdat_payload_offset, mdat_payload_size, dts_origin, sample_table); > - } > -diff --git a/Source/C++/Core/Ap4MovieFragment.h b/Source/C++/Core/Ap4MovieFragment.h > -index f829411..de59c42 100644 > ---- a/Source/C++/Core/Ap4MovieFragment.h > -+++ b/Source/C++/Core/Ap4MovieFragment.h > -@@ -70,6 +70,7 @@ public: > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin, > - AP4_FragmentSampleTable*& sample_table); > - AP4_Result CreateSampleTable(AP4_Movie* movie, > -@@ -77,6 +78,7 @@ public: > - AP4_ByteStream* sample_stream, > - AP4_Position moof_offset, > - AP4_Position mdat_payload_offset, // hack because MS doesn't implement the spec properly > -+ AP4_UI64 mdat_payload_size, > - AP4_UI64 dts_origin, > - AP4_FragmentSampleTable*& sample_table); > - > -diff --git a/Source/C++/Core/Ap4Processor.cpp b/Source/C++/Core/Ap4Processor.cpp > -index c4e1d78..365d955 100644 > ---- a/Source/C++/Core/Ap4Processor.cpp > -+++ b/Source/C++/Core/Ap4Processor.cpp > -@@ -156,6 +156,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov, > - AP4_Atom* atom = locator->m_Atom; > - AP4_UI64 atom_offset = locator->m_Offset; > - AP4_UI64 mdat_payload_offset = atom_offset+atom->GetSize()+AP4_ATOM_HEADER_SIZE; > -+ AP4_UI64 mdat_payload_size = atom->GetSize(); > - AP4_Sample sample; > - AP4_DataBuffer sample_data_in; > - AP4_DataBuffer sample_data_out; > -@@ -226,7 +227,7 @@ AP4_Processor::ProcessFragments(AP4_MoovAtom* moov, > - > - // create a sample table object so we can read the sample data > - AP4_FragmentSampleTable* sample_table = NULL; > -- result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, 0, sample_table); > -+ result = fragment->CreateSampleTable(moov, tfhd->GetTrackId(), &input, atom_offset, mdat_payload_offset, mdat_payload_size, 0, sample_table); > - if (AP4_FAILED(result)) return result; > - sample_tables.Append(sample_table); > - > --- > -2.30.2 > - > diff --git a/package/bento4/0009-Android-32-ftello-fix.patch b/package/bento4/0009-Android-32-ftello-fix.patch > deleted file mode 100644 > index 0adca20ed0..0000000000 > --- a/package/bento4/0009-Android-32-ftello-fix.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From f12fbb6f54b8302db2ab7c926a26f9189cf86532 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:41:35 +0200 > -Subject: [PATCH] Android 32 ftello fix > - > -ref: https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4Config.h | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4Config.h b/Source/C++/Core/Ap4Config.h > -index 422069e..c859a03 100644 > ---- a/Source/C++/Core/Ap4Config.h > -+++ b/Source/C++/Core/Ap4Config.h > -@@ -141,10 +141,10 @@ > - #endif > - > - #if !defined(AP4_fseek) > --#define AP4_fseek fseeko > -+#define AP4_fseek fseek > - #endif > - #if !defined(AP4_ftell) > --#define AP4_ftell ftello > -+#define AP4_ftell ftell > - #endif > - > - /* some compilers (ex: MSVC 8) deprecate those, so we rename them */ > --- > -2.30.2 > - > diff --git a/package/bento4/0010-Dazn-sample-duration-workaround.patch b/package/bento4/0010-Dazn-sample-duration-workaround.patch > deleted file mode 100644 > index 5c64210324..0000000000 > --- a/package/bento4/0010-Dazn-sample-duration-workaround.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 10f931c703c68b4fc856e09788dfe64579252bb8 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 10:48:36 +0200 > -Subject: [PATCH] Dazn sample duration workaround > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4TrunAtom.cpp | 6 ++++++ > - 1 file changed, 6 insertions(+) > - > -diff --git a/Source/C++/Core/Ap4TrunAtom.cpp b/Source/C++/Core/Ap4TrunAtom.cpp > -index c51f21d..77b7c6d 100644 > ---- a/Source/C++/Core/Ap4TrunAtom.cpp > -+++ b/Source/C++/Core/Ap4TrunAtom.cpp > -@@ -128,6 +128,12 @@ AP4_TrunAtom::AP4_TrunAtom(AP4_UI32 size, > - for (unsigned int i=0; i<sample_count; i++) { > - if (flags & AP4_TRUN_FLAG_SAMPLE_DURATION_PRESENT) { > - stream.ReadUI32(m_Entries[i].sample_duration); > -+ // Workaround for dazn streams, which provide 24 -> 1 sequences > -+ if (i && m_Entries[i].sample_duration == 1 && m_Entries[i - 1].sample_duration > 1) > -+ { > -+ m_Entries[i].sample_duration = m_Entries[i - 1].sample_duration >> 1; > -+ m_Entries[i - 1].sample_duration -= m_Entries[i].sample_duration; > -+ } > - --record_fields_count; > - } > - if (flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) { > --- > -2.30.2 > - > diff --git a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch b/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch > deleted file mode 100644 > index 15159af892..0000000000 > --- a/package/bento4/0011-Add-argument-to-reuse-single-sample-decrypter.patch > +++ /dev/null > @@ -1,179 +0,0 @@ > -From 7bb5120b52814e4471a165e295acdc6b6155259e Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 11:01:12 +0200 > -Subject: [PATCH] Add argument to reuse single sample decrypter > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4CommonEncryption.cpp | 36 ++++++++++++++++++------- > - Source/C++/Core/Ap4CommonEncryption.h | 8 +++++- > - Source/C++/Core/Ap4Protection.cpp | 3 ++- > - 3 files changed, 35 insertions(+), 12 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp > -index 5308200..cb5c328 100644 > ---- a/Source/C++/Core/Ap4CommonEncryption.cpp > -+++ b/Source/C++/Core/Ap4CommonEncryption.cpp > -@@ -1967,6 +1967,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti > - const AP4_UI08* key, > - AP4_Size key_size, > - AP4_BlockCipherFactory* block_cipher_factory, > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter) > - { > - AP4_SaioAtom* saio = NULL; > -@@ -1982,6 +1983,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti > - saio, > - saiz, > - sample_encryption_atom, > -+ singlesample_decrypter, > - decrypter); > - } > - > -@@ -1999,6 +2001,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti > - AP4_SaioAtom*& saio, > - AP4_SaizAtom*& saiz, > - AP4_CencSampleEncryption*& sample_encryption_atom, > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter) > - { > - // default return values > -@@ -2032,6 +2035,7 @@ AP4_CencSampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_descripti > - key_size, > - block_cipher_factory, > - reset_iv_at_each_subsample, > -+ singlesample_decrypter, > - decrypter); > - } > - > -@@ -2045,6 +2049,7 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, > - AP4_Size key_size, > - AP4_BlockCipherFactory* block_cipher_factory, > - bool reset_iv_at_each_subsample, > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter) > - { > - // default return value > -@@ -2074,15 +2079,23 @@ AP4_CencSampleDecrypter::Create(AP4_CencSampleInfoTable* sample_info_table, > - > - // create a single-sample decrypter > - AP4_CencSingleSampleDecrypter* single_sample_decrypter = NULL; > -- AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type, > -- key, > -- key_size, > -- sample_info_table->GetCryptByteBlock(), > -- sample_info_table->GetSkipByteBlock(), > -- block_cipher_factory, > -- reset_iv_at_each_subsample, > -- single_sample_decrypter); > -- if (AP4_FAILED(result)) return result; > -+ if (!singlesample_decrypter) > -+ { > -+ AP4_Result result = AP4_CencSingleSampleDecrypter::Create(cipher_type, > -+ key, > -+ key_size, > -+ sample_info_table->GetCryptByteBlock(), > -+ sample_info_table->GetSkipByteBlock(), > -+ block_cipher_factory, > -+ reset_iv_at_each_subsample, > -+ single_sample_decrypter); > -+ > -+ if (AP4_FAILED(result)) return result; > -+ } > -+ else > -+ { > -+ single_sample_decrypter = singlesample_decrypter; > -+ } > - > - // create the decrypter > - decrypter = new AP4_CencSampleDecrypter(single_sample_decrypter, sample_info_table); > -@@ -2333,7 +2346,9 @@ AP4_CencFragmentDecrypter::ProcessSample(AP4_DataBuffer& data_in, > - | AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor > - +---------------------------------------------------------------------*/ > - AP4_CencDecryptingProcessor::AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map, > -- AP4_BlockCipherFactory* block_cipher_factory) : > -+ AP4_BlockCipherFactory* block_cipher_factory, > -+ AP4_CencSingleSampleDecrypter *cenc_singlesample_decrypter) : > -+ m_CencSingleSampleDecrypter(cenc_singlesample_decrypter), > - m_KeyMap(key_map) > - { > - if (block_cipher_factory) { > -@@ -2483,6 +2498,7 @@ AP4_CencDecryptingProcessor::CreateFragmentHandler(AP4_TrakAtom* trak, > - saio, > - saiz, > - sample_encryption_atom, > -+ m_CencSingleSampleDecrypter, > - sample_decrypter); > - if (AP4_FAILED(result)) return NULL; > - > -diff --git a/Source/C++/Core/Ap4CommonEncryption.h b/Source/C++/Core/Ap4CommonEncryption.h > -index 580de66..a6b20ce 100644 > ---- a/Source/C++/Core/Ap4CommonEncryption.h > -+++ b/Source/C++/Core/Ap4CommonEncryption.h > -@@ -48,6 +48,7 @@ class AP4_SaioAtom; > - class AP4_CencSampleInfoTable; > - class AP4_AvcFrameParser; > - class AP4_HevcFrameParser; > -+class AP4_CencSingleSampleDecrypter; > - > - /*---------------------------------------------------------------------- > - | constants > -@@ -654,7 +655,8 @@ class AP4_CencDecryptingProcessor : public AP4_Processor > - public: > - // constructor > - AP4_CencDecryptingProcessor(const AP4_ProtectionKeyMap* key_map, > -- AP4_BlockCipherFactory* block_cipher_factory = NULL); > -+ AP4_BlockCipherFactory* block_cipher_factory = NULL, > -+ AP4_CencSingleSampleDecrypter* cenc_singlesample_decrypter = NULL); > - > - // AP4_Processor methods > - virtual AP4_Processor::TrackHandler* CreateTrackHandler(AP4_TrakAtom* trak); > -@@ -670,6 +672,7 @@ protected: > - > - // members > - AP4_BlockCipherFactory* m_BlockCipherFactory; > -+ AP4_CencSingleSampleDecrypter* m_CencSingleSampleDecrypter; > - const AP4_ProtectionKeyMap* m_KeyMap; > - }; > - > -@@ -752,6 +755,7 @@ public: > - AP4_SaioAtom*& saio_atom, // [out] > - AP4_SaizAtom*& saiz_atom, // [out] > - AP4_CencSampleEncryption*& sample_encryption_atom, // [out] > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter); > - > - static AP4_Result Create(AP4_ProtectedSampleDescription* sample_description, > -@@ -761,6 +765,7 @@ public: > - const AP4_UI08* key, > - AP4_Size key_size, > - AP4_BlockCipherFactory* block_cipher_factory, > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter); > - > - static AP4_Result Create(AP4_CencSampleInfoTable* sample_info_table, > -@@ -769,6 +774,7 @@ public: > - AP4_Size key_size, > - AP4_BlockCipherFactory* block_cipher_factory, > - bool reset_iv_at_each_subsample, > -+ AP4_CencSingleSampleDecrypter* singlesample_decrypter, > - AP4_CencSampleDecrypter*& decrypter); > - > - // methods > -diff --git a/Source/C++/Core/Ap4Protection.cpp b/Source/C++/Core/Ap4Protection.cpp > -index fd421e9..80bb9f0 100644 > ---- a/Source/C++/Core/Ap4Protection.cpp > -+++ b/Source/C++/Core/Ap4Protection.cpp > -@@ -812,7 +812,8 @@ AP4_SampleDecrypter::Create(AP4_ProtectedSampleDescription* sample_description, > - aux_info_data_offset, > - key, > - key_size, > -- block_cipher_factory, > -+ block_cipher_factory, > -+ NULL, > - decrypter); > - if (AP4_FAILED(result)) return NULL; > - return decrypter; > --- > -2.30.2 > - > diff --git a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch b/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch > deleted file mode 100644 > index d20e1191bf..0000000000 > --- a/package/bento4/0012-Static-ReadGolomb-SignedGolomb.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From 91e148a9c53811447d35c36d9f11f767d49477a0 Mon Sep 17 00:00:00 2001 > -From: Glenn Guy <glennguy83@gmail.com> > -Date: Thu, 22 Jul 2021 11:04:26 +0200 > -Subject: [PATCH] Static ReadGolomb/SignedGolomb > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Codecs/Ap4AvcParser.cpp | 8 ++++---- > - Source/C++/Codecs/Ap4AvcParser.h | 3 +++ > - 2 files changed, 7 insertions(+), 4 deletions(-) > - > -diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp > -index cfa841d..a17b698 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.cpp > -+++ b/Source/C++/Codecs/Ap4AvcParser.cpp > -@@ -191,8 +191,8 @@ AP4_AvcFrameParser::~AP4_AvcFrameParser() > - /*---------------------------------------------------------------------- > - | ReadGolomb > - +---------------------------------------------------------------------*/ > --static unsigned int > --ReadGolomb(AP4_BitReader& bits) > -+unsigned int > -+AP4_AvcFrameParser::ReadGolomb(AP4_BitReader& bits) > - { > - unsigned int leading_zeros = 0; > - while (bits.ReadBit() == 0) { > -@@ -209,8 +209,8 @@ ReadGolomb(AP4_BitReader& bits) > - /*---------------------------------------------------------------------- > - | SignedGolomb > - +---------------------------------------------------------------------*/ > --static int > --SignedGolomb(unsigned int code_num) > -+int > -+AP4_AvcFrameParser::SignedGolomb(unsigned int code_num) > - { > - if (code_num % 2) { > - return (code_num+1)/2; > -diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h > -index 99c5320..0c74c0e 100644 > ---- a/Source/C++/Codecs/Ap4AvcParser.h > -+++ b/Source/C++/Codecs/Ap4AvcParser.h > -@@ -321,6 +321,9 @@ public: > - unsigned int nal_ref_idc, > - AP4_AvcSliceHeader& slice_header); > - > -+ static unsigned int ReadGolomb(AP4_BitReader& bits); > -+ static int SignedGolomb(unsigned int code_num); > -+ > - private: > - // methods > - bool SameFrame(unsigned int nal_unit_type_1, unsigned int nal_ref_idc_1, AP4_AvcSliceHeader& sh1, > --- > -2.30.2 > - > diff --git a/package/bento4/0013-Add-GetChannels-method.patch b/package/bento4/0013-Add-GetChannels-method.patch > deleted file mode 100644 > index 7e3f6e69ac..0000000000 > --- a/package/bento4/0013-Add-GetChannels-method.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From 15e31e3641e4f85475984bf4d9ebf8ae47303a8a Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 11:07:13 +0200 > -Subject: [PATCH] Add GetChannels method > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4Dac3Atom.cpp | 6 ++++++ > - Source/C++/Core/Ap4Dac3Atom.h | 1 + > - 2 files changed, 7 insertions(+) > - > -diff --git a/Source/C++/Core/Ap4Dac3Atom.cpp b/Source/C++/Core/Ap4Dac3Atom.cpp > -index 80a511e..a9ea78a 100644 > ---- a/Source/C++/Core/Ap4Dac3Atom.cpp > -+++ b/Source/C++/Core/Ap4Dac3Atom.cpp > -@@ -143,3 +143,9 @@ AP4_Dac3Atom::InspectFields(AP4_AtomInspector& inspector) > - inspector.AddField("lfeon", m_StreamInfo.lfeon); > - return AP4_SUCCESS; > - } > -+ > -+AP4_UI08 AP4_Dac3Atom::GetChannels() const > -+{ > -+ static const AP4_UI08 CC[] = { 2, 1, 2, 3, 3, 4, 4, 5 }; > -+ return CC[m_StreamInfo.acmod] + m_StreamInfo.lfeon; > -+} > -diff --git a/Source/C++/Core/Ap4Dac3Atom.h b/Source/C++/Core/Ap4Dac3Atom.h > -index 2532ef2..78e2875 100644 > ---- a/Source/C++/Core/Ap4Dac3Atom.h > -+++ b/Source/C++/Core/Ap4Dac3Atom.h > -@@ -73,6 +73,7 @@ public: > - const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes; } > - unsigned int GetDataRate() const { return m_DataRate; } > - const StreamInfo& GetStreamInfo() const { return m_StreamInfo; } > -+ AP4_UI08 GetChannels() const; > - > - private: > - // methods > --- > -2.30.2 > - > diff --git a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch b/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch > deleted file mode 100644 > index a2bc7aefeb..0000000000 > --- a/package/bento4/0014-Implemented-GetSampleIndexForTimeStamp-GetNearestSyn.patch > +++ /dev/null > @@ -1,59 +0,0 @@ > -From f673675843144785658a010bab455972d83af004 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 11:09:37 +0200 > -Subject: [PATCH] Implemented > - GetSampleIndexForTimeStamp/GetNearestSyncSampleIndex > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4FragmentSampleTable.cpp | 25 ++++++++++++++++++---- > - 1 file changed, 21 insertions(+), 4 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4FragmentSampleTable.cpp b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -index cea5c7d..1c62f24 100644 > ---- a/Source/C++/Core/Ap4FragmentSampleTable.cpp > -+++ b/Source/C++/Core/Ap4FragmentSampleTable.cpp > -@@ -297,10 +297,19 @@ AP4_FragmentSampleTable::GetSampleChunkPosition(AP4_Ordinal sample_index, > - | AP4_FragmentSampleTable::GetSampleIndexForTimeStamp > - +---------------------------------------------------------------------*/ > - AP4_Result > --AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/, > -+AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 ts, > - AP4_Ordinal& sample_index) > - { > -- sample_index = 0; // TODO > -+ if (!m_Samples.ItemCount()) > -+ return AP4_ERROR_NOT_ENOUGH_DATA; > -+ > -+ sample_index = 0; > -+ while (sample_index < m_Samples.ItemCount() && m_Samples[sample_index].GetCts() + m_Samples[sample_index].GetDuration() < ts) > -+ ++sample_index; > -+ > -+ if (sample_index == m_Samples.ItemCount()) > -+ return AP4_ERROR_NOT_ENOUGH_DATA; > -+ > - return AP4_SUCCESS; > - } > - > -@@ -308,8 +317,16 @@ AP4_FragmentSampleTable::GetSampleIndexForTimeStamp(AP4_UI64 /*ts*/, > - | AP4_FragmentSampleTable::GetNearestSyncSampleIndex > - +---------------------------------------------------------------------*/ > - AP4_Ordinal > --AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal /*sample_index*/, bool /*before*/) > -+AP4_FragmentSampleTable::GetNearestSyncSampleIndex(AP4_Ordinal sample_index, bool before) > - { > -- return 0; // TODO > -+ if (sample_index >= m_Samples.ItemCount()) > -+ return sample_index; > -+ > -+ AP4_Ordinal end(before ? 0 : m_Samples.ItemCount()); > -+ > -+ while (sample_index != end && !m_Samples[sample_index].IsSync()) > -+ sample_index = sample_index + (before ? -1 : 1); > -+ > -+ return sample_index; > - } > - > --- > -2.30.2 > - > diff --git a/package/bento4/0015-Avoid-set-next-fragment-position.patch b/package/bento4/0015-Avoid-set-next-fragment-position.patch > deleted file mode 100644 > index ded33ffdaf..0000000000 > --- a/package/bento4/0015-Avoid-set-next-fragment-position.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 0658d38be16c88585b248b237895b4dc63f28e79 Mon Sep 17 00:00:00 2001 > -From: peak3d <pfau@peak3d.de> > -Date: Thu, 22 Jul 2021 11:23:13 +0200 > -Subject: [PATCH] Avoid set next fragment position > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4LinearReader.cpp | 12 +++++++----- > - 1 file changed, 7 insertions(+), 5 deletions(-) > - > -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp > -index eabeacf..61c3a9d 100644 > ---- a/Source/C++/Core/Ap4LinearReader.cpp > -+++ b/Source/C++/Core/Ap4LinearReader.cpp > -@@ -54,8 +54,8 @@ AP4_LinearReader::AP4_LinearReader(AP4_Movie& movie, > - m_HasFragments = movie.HasFragments(); > - if (fragment_stream) { > - fragment_stream->AddReference(); > -- fragment_stream->Tell(m_CurrentFragmentPosition); > -- m_NextFragmentPosition = m_CurrentFragmentPosition; > -+ //fragment_stream->Tell(m_CurrentFragmentPosition); > -+ //m_NextFragmentPosition = m_CurrentFragmentPosition; > - } > - } > - > -@@ -360,9 +360,11 @@ AP4_LinearReader::AdvanceFragment() > - AP4_Result result; > - > - // go the the start of the next fragment > -- result = m_FragmentStream->Seek(m_NextFragmentPosition); > -- if (AP4_FAILED(result)) return result; > -- m_CurrentFragmentPosition = m_NextFragmentPosition; > -+ if (m_NextFragmentPosition) { > -+ result = m_FragmentStream->Seek(m_NextFragmentPosition); > -+ if (AP4_FAILED(result)) return result; > -+ m_CurrentFragmentPosition = m_NextFragmentPosition; > -+ } > - > - // read atoms until we find a moof > - assert(m_HasFragments); > --- > -2.30.2 > - > diff --git a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch b/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch > deleted file mode 100644 > index cbcc62f982..0000000000 > --- a/package/bento4/0016-Fix-segfault-in-AP4_LinearReader-ProcessMoof.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From e5b37c1e0a7a84fdc7b403c5e30a5e93706104b8 Mon Sep 17 00:00:00 2001 > -From: Dobroslaw Kijowski <dobo90@gmail.com> > -Date: Tue, 19 Oct 2021 14:17:11 +0200 > -Subject: [PATCH] Fix segfault in Ap4LinearReader ProcessMoof > - > -Downloaded from https://github.com/xbmc/inputstream.adaptive/pull/856 > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > ---- > - Source/C++/Core/Ap4LinearReader.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Source/C++/Core/Ap4LinearReader.cpp b/Source/C++/Core/Ap4LinearReader.cpp > -index 61c3a9d..2464865 100644 > ---- a/Source/C++/Core/Ap4LinearReader.cpp > -+++ b/Source/C++/Core/Ap4LinearReader.cpp > -@@ -329,7 +329,7 @@ AP4_LinearReader::ProcessMoof(AP4_ContainerAtom* moof, > - tracker->m_SampleTable = NULL; > - tracker->m_NextSampleIndex = 0; > - for (unsigned int j=0; j<ids.ItemCount(); j++) { > -- if (ids[j] == tracker->m_Track->GetId()) { > -+ if (ids.ItemCount()==1 || ids[j] == tracker->m_Track->GetId()) { > - AP4_FragmentSampleTable* sample_table = NULL; > - result = m_Fragment->CreateSampleTable(&m_Movie, > - ids[j], > --- > -2.33.1 > diff --git a/package/bento4/bento4.hash b/package/bento4/bento4.hash > index 8b9ec610f5..8e2033dc98 100644 > --- a/package/bento4/bento4.hash > +++ b/package/bento4/bento4.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 9f3eb912207d7ed9c1e6e05315083404b32a11f8aacd604a9b2bdcb10bf79eb9 bento4-1.6.0-639.tar.gz > +sha256 8afa4ae07a7629a65e0d5014750960ced33a8771d363652f3913261fb5d0c84f bento4-1.6.0-639-6-Nexus.tar.gz > sha256 7daae92c8628ada28def8d096fe2fde298b72ec3e2d64a3c408afce38edb361b Documents/LICENSE.txt > diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk > index 89ff2e4b85..a2e0805c17 100644 > --- a/package/bento4/bento4.mk > +++ b/package/bento4/bento4.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -BENTO4_VERSION = 1.6.0-639 > -BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) > +BENTO4_VERSION = 1.6.0-639-6-Nexus > +BENTO4_SITE = $(call github,xbmc,Bento4,$(BENTO4_VERSION)) > BENTO4_INSTALL_STAGING = YES > BENTO4_LICENSE = GPL-2.0+ > BENTO4_LICENSE_FILES = Documents/LICENSE.txt > -- > 2.39.2 > > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls ` (10 preceding siblings ...) 2023-05-07 10:37 ` [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Yann E. MORIN @ 2023-05-07 10:38 ` Yann E. MORIN 11 siblings, 0 replies; 15+ messages in thread From: Yann E. MORIN @ 2023-05-07 10:38 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Bernd, All, On 2023-05-03 18:44 +0200, Bernd Kuhls spake thusly: > Switch to kodi fork, remove all kodi-related patches. > > Needed by upcoming bump of kodi-inputstream-adaptive. > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > .../0001-Add-support-for-cmake-install.patch | 130 ---- > ...-methods-funtions-and-passing-poolid.patch | 634 ------------------ > .../0003-Backport-Smmothstream-changes.patch | 99 --- > package/bento4/0004-more-SPS-parameters.patch | 219 ------ > ...0005-AVC-extract-VUI-values-from-SPS.patch | 96 --- > .../0006-Implement-SPS-Frame-parser.patch | 67 -- > ...-Fix-segfault-when-AP4_Sample-s-seek.patch | 25 - > package/bento4/0008-Hack-HBO.patch | 214 ------ > .../bento4/0009-Android-32-ftello-fix.patch | 31 - > ...0010-Dazn-sample-duration-workaround.patch | 30 - > ...ent-to-reuse-single-sample-decrypter.patch | 179 ----- > .../0012-Static-ReadGolomb-SignedGolomb.patch | 54 -- > .../bento4/0013-Add-GetChannels-method.patch | 40 -- > ...ampleIndexForTimeStamp-GetNearestSyn.patch | 59 -- > ...015-Avoid-set-next-fragment-position.patch | 43 -- > ...ault-in-AP4_LinearReader-ProcessMoof.patch | 27 - I've regenerated .checkpackageignore with all thse removed files. 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. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-05-07 10:44 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-05-03 16:44 [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 02/11] package/kodi: bump version to 20.1-Nexus Bernd Kuhls 2023-05-07 10:40 ` Yann E. MORIN 2023-05-03 16:44 ` [Buildroot] [PATCH 03/11] package/kodi-audiodecoder-*: mass version bump to Nexus Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 04/11] package/kodi-audioencoder-*: " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 05/11] package/kodi-inputstream-adaptive: bump version " Bernd Kuhls 2023-05-07 10:44 ` Yann E. MORIN 2023-05-03 16:44 ` [Buildroot] [PATCH 06/11] package/kodi-inputstream-*: mass version bump " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 07/11] package/kodi-peripheral-*: " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 08/11] package/kodi-pvr-*: " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 09/11] package/kodi-screensaver-*: " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 10/11] package/kodi-vfs-*: " Bernd Kuhls 2023-05-03 16:44 ` [Buildroot] [PATCH 11/11] package/kodi-visualisation-*: " Bernd Kuhls 2023-05-07 10:37 ` [Buildroot] [PATCH 01/11] package/bento4: bump version to 1.6.0-639-6-Nexus Yann E. MORIN 2023-05-07 10:38 ` Yann E. MORIN
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox