-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
262 additions
and
288 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/BlurayStateSerializer.h b/xbmc/cores/VideoPlayer/DVDInputStreams/BlurayStateSerializer.h | ||
index ca808c0..186fdf2 100644 | ||
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/BlurayStateSerializer.h | ||
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/BlurayStateSerializer.h | ||
@@ -8,6 +8,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
|
||
class TiXmlElement; | ||
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | ||
index 4633757..c7a2faa 100644 | ||
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | ||
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | ||
@@ -8,6 +8,8 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
+ | ||
#include "FileItem.h" | ||
#include "URL.h" | ||
#include "cores/MenuType.h" | ||
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h | ||
index debba10..0dbdfc5 100644 | ||
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h | ||
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h | ||
@@ -8,6 +8,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
|
||
class TiXmlElement; | ||
diff --git a/xbmc/cores/VideoPlayer/Edl.h b/xbmc/cores/VideoPlayer/Edl.h | ||
index faf3e73..c8c4def 100644 | ||
--- a/xbmc/cores/VideoPlayer/Edl.h | ||
+++ b/xbmc/cores/VideoPlayer/Edl.h | ||
@@ -10,6 +10,7 @@ | ||
|
||
#include "cores/EdlEdit.h" | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <vector> | ||
|
||
diff --git a/xbmc/filesystem/ZipManager.h b/xbmc/filesystem/ZipManager.h | ||
index 3fba27f..7eb3f20 100644 | ||
--- a/xbmc/filesystem/ZipManager.h | ||
+++ b/xbmc/filesystem/ZipManager.h | ||
@@ -19,6 +19,7 @@ | ||
#define CHDR_SIZE 46 | ||
#define ECDREC_SIZE 22 | ||
|
||
+#include <cstdint> | ||
#include <cstring> | ||
#include <map> | ||
#include <string> | ||
|
11 changes: 0 additions & 11 deletions
11
srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
https://git.alpinelinux.org/aports/tree/community/kodi/fix-musl-incompability.patch | ||
|
||
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp | ||
index 1d5564c8c5..73c07fb586 100644 | ||
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp | ||
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp | ||
@@ -72,6 +72,13 @@ | ||
#include "platform/win32/CharsetConverter.h" | ||
#endif | ||
|
||
+#ifndef _PATH_MOUNTED | ||
+#define _PATH_MOUNTED "/proc/mounts" | ||
+#endif | ||
+#ifndef _PATH_MNTTAB | ||
+#define _PATH_MNTTAB "/etc/fstab" | ||
+#endif | ||
+ | ||
using namespace XFILE; | ||
|
||
struct SDirData | ||
@@ -124,7 +131,7 @@ extern "C" void __stdcall init_emu_environ() | ||
dll_putenv("OS=win10"); | ||
#elif defined(TARGET_DARWIN) | ||
dll_putenv("OS=darwin"); | ||
-#elif defined(TARGET_POSIX) | ||
+#elif defined(TARGET_POSIX) || !defined(__GLIBC__) | ||
dll_putenv("OS=linux"); | ||
#else | ||
dll_putenv("OS=unknown"); | ||
@@ -1480,7 +1487,7 @@ extern "C" | ||
int ret; | ||
|
||
ret = dll_fgetpos64(stream, &tmpPos); | ||
-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+#if !defined(__GLIBC__) || !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
*pos = (fpos_t)tmpPos; | ||
#else | ||
pos->__pos = (off_t)tmpPos.__pos; | ||
@@ -1493,8 +1500,9 @@ extern "C" | ||
CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); | ||
if (pFile != NULL) | ||
{ | ||
-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
- *pos = pFile->GetPosition(); | ||
+#if !defined(__GLIBC__) || !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+ uint64_t *ppos = (uint64_t *)pos; | ||
+ *ppos = pFile->GetPosition(); | ||
#else | ||
pos->__pos = pFile->GetPosition(); | ||
#endif | ||
@@ -1509,8 +1517,9 @@ extern "C" | ||
int fd = g_emuFileWrapper.GetDescriptorByStream(stream); | ||
if (fd >= 0) | ||
{ | ||
-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
- if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0) | ||
+#if !defined(TARGET_POSIX) || !defined(__GLIBC__) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+ const uint64_t *ppos = (const uint64_t *) pos; | ||
+ if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0) | ||
#else | ||
if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) | ||
#endif | ||
@@ -1532,7 +1541,7 @@ extern "C" | ||
if (fd >= 0) | ||
{ | ||
fpos64_t tmpPos; | ||
-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+#if !defined(__GLIBC__) || !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
tmpPos= *pos; | ||
#else | ||
tmpPos.__pos = (off64_t)(pos->__pos); | ||
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h | ||
index 7869dc221c..3b86d6b45b 100644 | ||
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h | ||
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h | ||
@@ -17,7 +17,7 @@ | ||
#define _onexit_t void* | ||
#endif | ||
|
||
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+#if !defined(__GLIBC__) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
typedef off_t __off_t; | ||
typedef int64_t off64_t; | ||
typedef off64_t __off64_t; | ||
diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c | ||
index 33ab3437c1..5a68de2c64 100644 | ||
--- a/xbmc/cores/DllLoader/exports/wrapper.c | ||
+++ b/xbmc/cores/DllLoader/exports/wrapper.c | ||
@@ -23,7 +23,7 @@ | ||
#include <dirent.h> | ||
#include <dlfcn.h> | ||
|
||
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
+#if !defined(__GLIBC__) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) | ||
typedef off_t __off_t; | ||
typedef int64_t off64_t; | ||
typedef off64_t __off64_t; |
Oops, something went wrong.