diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 0281a95193..b042165a3c 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc-theme-Confluence" PKG_VERSION="12.2.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="795a693" + PKG_VERSION="f81d56e" fi PKG_REV="1" PKG_ARCH="any" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 131baef68c..98e8faf7dc 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc" PKG_VERSION="12.2.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="795a693" + PKG_VERSION="f81d56e" fi PKG_REV="1" PKG_ARCH="any" diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-990.13-RPB-Fix_for_hang_following_seek_after_eos.patch b/packages/mediacenter/xbmc/patches/795a693/xbmc-990.13-RPB-Fix_for_hang_following_seek_after_eos.patch deleted file mode 100644 index b259666b75..0000000000 --- a/packages/mediacenter/xbmc/patches/795a693/xbmc-990.13-RPB-Fix_for_hang_following_seek_after_eos.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5b75f44b448bcefb9b802a3a28d0e6846284d22e Mon Sep 17 00:00:00 2001 -From: popcornmix -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 - diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-990.08-PR2637.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-990.08-PR2637.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-990.08-PR2637.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-990.08-PR2637.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch similarity index 94% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch index 4eeb6cd461..7e78fbb3b9 100644 --- a/packages/mediacenter/xbmc/patches/795a693/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch +++ b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch @@ -8,10 +8,9 @@ otherwise they get stripped when enabling dead code stripping xbmc/cores/DllLoader/exports/wrapper.c | 138 ++++++++++++++++----------------- 1 file changed, 69 insertions(+), 69 deletions(-) -diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c -index cb7bbf7..67189e9 100644 ---- 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 +--- xbmc-f81d56e/xbmc/cores/DllLoader/exports/wrapper.c 2013-05-18 12:30:19.000000000 +0200 ++++ xbmc-f81d56e.patch/xbmc/cores/DllLoader/exports/wrapper.c 2013-05-18 16:55:55.222087716 +0200 @@ -115,7 +115,7 @@ int dll_setvbuf(FILE *stream, char *buf, int type, size_t size); struct mntent *dll_getmntent(FILE *fp); @@ -21,7 +20,7 @@ index cb7bbf7..67189e9 100644 { #if defined(TARGET_ANDROID) return dll_dlopen(filename, flag); -@@ -124,213 +124,213 @@ void *__wrap_dlopen(const char *filename, int flag) +@@ -124,213 +124,213 @@ #endif } @@ -277,7 +276,7 @@ index cb7bbf7..67189e9 100644 { int res; va_list va; -@@ -340,12 +340,12 @@ int __wrap_fprintf(FILE *stream, const char *format, ...) +@@ -340,12 +340,12 @@ return res; } @@ -292,7 +291,7 @@ index cb7bbf7..67189e9 100644 { int res; va_list va; -@@ -355,42 +355,42 @@ int __wrap_printf(const char *format, ...) +@@ -355,42 +355,42 @@ return res; } @@ -343,7 +342,7 @@ index cb7bbf7..67189e9 100644 { int res; va_list va; -@@ -400,52 +400,52 @@ int __wrap_ioctl(int d, unsigned long int request, ...) +@@ -400,57 +400,57 @@ return res; } @@ -353,6 +352,12 @@ index cb7bbf7..67189e9 100644 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) +__attribute__((used)) int __wrap___xstat64(int __ver, const char *__filename, struct stat64 *__stat_buf) { @@ -406,7 +411,7 @@ index cb7bbf7..67189e9 100644 { #ifdef _LINUX 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. #if _FORTIFY_SOURCE > 1 @@ -421,7 +426,7 @@ index cb7bbf7..67189e9 100644 { int res; va_list va; -@@ -474,12 +474,12 @@ int __wrap___printf_chk(int flag, const char *format, ...) +@@ -479,12 +479,12 @@ return res; } @@ -436,7 +441,7 @@ index cb7bbf7..67189e9 100644 { int res; va_list va; -@@ -489,12 +489,12 @@ int __wrap___fprintf_chk(FILE * stream, int flag, const char *format, ...) +@@ -494,12 +494,12 @@ return res; } @@ -451,6 +456,3 @@ index cb7bbf7..67189e9 100644 { return dll_read(fd, buf, nbytes); } --- -1.8.1.6 - diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-995.01-xvba_support-2318747.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-995.01-xvba_support-2318747.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-995.01-xvba_support-2318747.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-995.01-xvba_support-2318747.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-995.10-disable-alt-tab.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-999.01-automake-1.13.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.01-automake-1.13.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-999.01-automake-1.13.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.01-automake-1.13.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-999.07-PR2572.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.07-PR2572.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-999.07-PR2572.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.07-PR2572.patch diff --git a/packages/mediacenter/xbmc/patches/795a693/xbmc-999.08-PR2572-1.patch b/packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.08-PR2572-1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/795a693/xbmc-999.08-PR2572-1.patch rename to packages/mediacenter/xbmc/patches/f81d56e/xbmc-999.08-PR2572-1.patch