mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
xbmc: update to xbmc-f81d56e
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
e3aa2d3923
commit
1d13eddff8
@ -21,7 +21,7 @@
|
|||||||
PKG_NAME="xbmc-theme-Confluence"
|
PKG_NAME="xbmc-theme-Confluence"
|
||||||
PKG_VERSION="12.2.0"
|
PKG_VERSION="12.2.0"
|
||||||
if [ "$XBMC" = "master" ]; then
|
if [ "$XBMC" = "master" ]; then
|
||||||
PKG_VERSION="795a693"
|
PKG_VERSION="f81d56e"
|
||||||
fi
|
fi
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="12.2.0"
|
PKG_VERSION="12.2.0"
|
||||||
if [ "$XBMC" = "master" ]; then
|
if [ "$XBMC" = "master" ]; then
|
||||||
PKG_VERSION="795a693"
|
PKG_VERSION="f81d56e"
|
||||||
fi
|
fi
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
From 5b75f44b448bcefb9b802a3a28d0e6846284d22e Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Mon, 6 May 2013 14:20:05 +0100
|
|
||||||
Subject: [PATCH] [rbp/omxplayer] Fix for hang following seek after eos
|
|
||||||
|
|
||||||
If you seek after the demuxer eof, the eof state is cleared, but we are not clearing the flags relating to sending eos stream to audio/video players
|
|
||||||
---
|
|
||||||
xbmc/cores/omxplayer/OMXPlayer.cpp | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
index 156a3ad..82d0024 100644
|
|
||||||
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
|
||||||
@@ -1178,7 +1178,13 @@ void COMXPlayer::Process()
|
|
||||||
CDVDDemuxUtils::FreeDemuxPacket(pPacket);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+ if (pPacket)
|
|
||||||
+ {
|
|
||||||
+ // reset eos state when we get a packet (e.g. for case of seek after eos)
|
|
||||||
+ bOmxWaitVideo = false;
|
|
||||||
+ bOmxWaitAudio = false;
|
|
||||||
+ bOmxSentEOFs = false;
|
|
||||||
+ }
|
|
||||||
if (!pPacket)
|
|
||||||
{
|
|
||||||
// when paused, demuxer could be be returning empty
|
|
||||||
--
|
|
||||||
1.8.1.6
|
|
||||||
|
|
@ -8,10 +8,9 @@ otherwise they get stripped when enabling dead code stripping
|
|||||||
xbmc/cores/DllLoader/exports/wrapper.c | 138 ++++++++++++++++-----------------
|
xbmc/cores/DllLoader/exports/wrapper.c | 138 ++++++++++++++++-----------------
|
||||||
1 file changed, 69 insertions(+), 69 deletions(-)
|
1 file changed, 69 insertions(+), 69 deletions(-)
|
||||||
|
|
||||||
diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
|
diff -Naur xbmc-f81d56e/xbmc/cores/DllLoader/exports/wrapper.c xbmc-f81d56e.patch/xbmc/cores/DllLoader/exports/wrapper.c
|
||||||
index cb7bbf7..67189e9 100644
|
--- xbmc-f81d56e/xbmc/cores/DllLoader/exports/wrapper.c 2013-05-18 12:30:19.000000000 +0200
|
||||||
--- a/xbmc/cores/DllLoader/exports/wrapper.c
|
+++ xbmc-f81d56e.patch/xbmc/cores/DllLoader/exports/wrapper.c 2013-05-18 16:55:55.222087716 +0200
|
||||||
+++ b/xbmc/cores/DllLoader/exports/wrapper.c
|
|
||||||
@@ -115,7 +115,7 @@
|
@@ -115,7 +115,7 @@
|
||||||
int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
|
int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
|
||||||
struct mntent *dll_getmntent(FILE *fp);
|
struct mntent *dll_getmntent(FILE *fp);
|
||||||
@ -21,7 +20,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
#if defined(TARGET_ANDROID)
|
#if defined(TARGET_ANDROID)
|
||||||
return dll_dlopen(filename, flag);
|
return dll_dlopen(filename, flag);
|
||||||
@@ -124,213 +124,213 @@ void *__wrap_dlopen(const char *filename, int flag)
|
@@ -124,213 +124,213 @@
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -277,7 +276,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
va_list va;
|
va_list va;
|
||||||
@@ -340,12 +340,12 @@ int __wrap_fprintf(FILE *stream, const char *format, ...)
|
@@ -340,12 +340,12 @@
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -292,7 +291,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
va_list va;
|
va_list va;
|
||||||
@@ -355,42 +355,42 @@ int __wrap_printf(const char *format, ...)
|
@@ -355,42 +355,42 @@
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -343,7 +342,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
va_list va;
|
va_list va;
|
||||||
@@ -400,52 +400,52 @@ int __wrap_ioctl(int d, unsigned long int request, ...)
|
@@ -400,57 +400,57 @@
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -353,6 +352,12 @@ index cb7bbf7..67189e9 100644
|
|||||||
return dll_stat(path, buffer);
|
return dll_stat(path, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-int __wrap_stat(const char *path, struct _stat *buffer)
|
||||||
|
+__attribute__((used)) int __wrap_stat(const char *path, struct _stat *buffer)
|
||||||
|
{
|
||||||
|
return dll_stat(path, buffer);
|
||||||
|
}
|
||||||
|
|
||||||
-int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf)
|
-int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf)
|
||||||
+__attribute__((used)) int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf)
|
+__attribute__((used)) int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf)
|
||||||
{
|
{
|
||||||
@ -406,7 +411,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
#ifdef _LINUX
|
#ifdef _LINUX
|
||||||
return dll_getmntent(fp);
|
return dll_getmntent(fp);
|
||||||
@@ -459,12 +459,12 @@ struct mntent *__wrap_getmntent(FILE *fp)
|
@@ -464,12 +464,12 @@
|
||||||
// thing to actually call our wrapped functions.
|
// thing to actually call our wrapped functions.
|
||||||
#if _FORTIFY_SOURCE > 1
|
#if _FORTIFY_SOURCE > 1
|
||||||
|
|
||||||
@ -421,7 +426,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
va_list va;
|
va_list va;
|
||||||
@@ -474,12 +474,12 @@ int __wrap___printf_chk(int flag, const char *format, ...)
|
@@ -479,12 +479,12 @@
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -436,7 +441,7 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
va_list va;
|
va_list va;
|
||||||
@@ -489,12 +489,12 @@ int __wrap___fprintf_chk(FILE * stream, int flag, const char *format, ...)
|
@@ -494,12 +494,12 @@
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -451,6 +456,3 @@ index cb7bbf7..67189e9 100644
|
|||||||
{
|
{
|
||||||
return dll_read(fd, buf, nbytes);
|
return dll_read(fd, buf, nbytes);
|
||||||
}
|
}
|
||||||
--
|
|
||||||
1.8.1.6
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user