Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #844

Merged
merged 4 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion depends/common/pugixml/pugixml.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a
2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015
2 changes: 1 addition & 1 deletion depends/common/pugixml/pugixml.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pugixml http://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz
pugixml https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz
24 changes: 24 additions & 0 deletions depends/common/xz-utils/01-enable-uwp-builds.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--- a/src/common/tuklib_physmem.c
+++ b/src/common/tuklib_physmem.c
@@ -79,6 +79,13 @@ tuklib_physmem(void)
uint64_t ret = 0;

#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+ MEMORYSTATUSEX ms;
+ ms.dwLength = sizeof(ms);
+ if(!GlobalMemoryStatusEx(&ms))
+ return 0;
+ return ms.ullTotalPhys;
+#else
if ((GetVersion() & 0xFF) >= 5) {
// Windows 2000 and later have GlobalMemoryStatusEx() which
// supports reporting values greater than 4 GiB. To keep the
@@ -107,6 +114,7 @@ tuklib_physmem(void)
GlobalMemoryStatus(&meminfo);
ret = meminfo.dwTotalPhys;
}
+#endif

#elif defined(__OS2__)
unsigned long mem;
17 changes: 0 additions & 17 deletions depends/common/xz-utils/CMakeLists.txt

This file was deleted.

1 change: 1 addition & 0 deletions depends/common/xz-utils/flags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-DBUILD_TESTING=OFF -DCREATE_XZ_SYMLINKS=OFF -DCREATE_LZMA_SYMLINKS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
2 changes: 1 addition & 1 deletion depends/common/xz-utils/xz-utils.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c
2 changes: 1 addition & 1 deletion depends/common/xz-utils/xz-utils.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xz-utils https://tukaani.org/xz/xz-5.2.4.tar.xz
xz-utils https://tukaani.org/xz/xz-5.4.3.tar.xz
12 changes: 6 additions & 6 deletions depends/common/zlib/01-build-static.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,10 +183,11 @@
@@ -147,10 +147,11 @@
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)

-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+if(BUILD_SHARED_LIBS)
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+endif()

if(NOT CYGWIN)
# This property causes shared libraries on Linux to have the full version
@@ -201,7 +202,7 @@
@@ -165,7 +166,7 @@

if(UNIX)
# On unix-like platforms the library is almost always called libz
Expand All @@ -25,7 +25,7 @@
if(NOT APPLE)
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
endif()
@@ -211,7 +212,7 @@
@@ -175,7 +176,7 @@
endif()

if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
Expand Down
28 changes: 28 additions & 0 deletions depends/common/zlib/02-disable-example-binaries.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,25 +226,3 @@ endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
- add_executable(example64 test/example.c)
- target_link_libraries(example64 zlib)
- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
- add_test(example64 example64)
-
- add_executable(minigzip64 test/minigzip.c)
- target_link_libraries(minigzip64 zlib)
- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()
12 changes: 12 additions & 0 deletions depends/common/zlib/03-install-pkgconfig-in-lib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")

include(CheckTypeSize)
include(CheckFunctionExists)

2 changes: 1 addition & 1 deletion depends/common/zlib/zlib.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
2 changes: 1 addition & 1 deletion depends/common/zlib/zlib.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.11.tar.gz
zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.13.tar.xz
1 change: 1 addition & 0 deletions depends/windows/xz-utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ add_library(lzma
src/liblzma/lz/lz_encoder_mf.c
src/liblzma/rangecoder/price_table.c
src/liblzma/simple/arm.c
src/liblzma/simple/arm64.c
src/liblzma/simple/armthumb.c
src/liblzma/simple/ia64.c
src/liblzma/simple/powerpc.c
Expand Down
2 changes: 1 addition & 1 deletion depends/windows/xz-utils/xz-utils.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c
2 changes: 1 addition & 1 deletion depends/windows/xz-utils/xz-utils.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xz-utils https://tukaani.org/xz/xz-5.2.4.tar.xz
xz-utils https://tukaani.org/xz/xz-5.4.3.tar.xz
1 change: 1 addition & 0 deletions depends/windowsstore/xz-utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ add_library(lzma
src/liblzma/lz/lz_encoder_mf.c
src/liblzma/rangecoder/price_table.c
src/liblzma/simple/arm.c
src/liblzma/simple/arm64.c
src/liblzma/simple/armthumb.c
src/liblzma/simple/ia64.c
src/liblzma/simple/powerpc.c
Expand Down
2 changes: 1 addition & 1 deletion depends/windowsstore/xz-utils/xz-utils.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c
2 changes: 1 addition & 1 deletion depends/windowsstore/xz-utils/xz-utils.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xz-utils https://tukaani.org/xz/xz-5.2.4.tar.xz
xz-utils https://tukaani.org/xz/xz-5.4.3.tar.xz
2 changes: 1 addition & 1 deletion pvr.iptvsimple/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.iptvsimple"
version="21.8.0"
version="21.8.1"
name="IPTV Simple Client"
provider-name="nightik and Ross Nicholson">
<requires>@ADDON_DEPENDS@
Expand Down
5 changes: 5 additions & 0 deletions pvr.iptvsimple/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v21.8.1
- Update zlib to v1.2.13
- Update pugixml to v1.14
- Update xz-utils to 5.4.3

v21.8.0
- Support catchup-id for live URLs where possible
- Support the Y, m, d, H, M, S specifiers for live URLs, useful for plugins and debugging
Expand Down