diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index c3bef99093..e6d6ae4c71 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.1.10" +PKG_VERSION="12.2.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.10/xbmc-theme-Confluence-990.07-PR2449-2.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/12.2.0/xbmc-theme-Confluence-990.07-PR2449-2.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/12.1.10/xbmc-theme-Confluence-990.07-PR2449-2.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/12.2.0/xbmc-theme-Confluence-990.07-PR2449-2.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 2ffb2c6c55..775ffb4129 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.1.10" +PKG_VERSION="12.2.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/12.1.10/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk b/packages/mediacenter/xbmc/patches/12.2.0/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk rename to packages/mediacenter/xbmc/patches/12.2.0/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-601-add_multithread_support_for_hi10p-0.1.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-601-add_multithread_support_for_hi10p-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-601-add_multithread_support_for_hi10p-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-601-add_multithread_support_for_hi10p-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.01-PR1934.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.01-PR1934.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.01-PR1934.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.01-PR1934.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.02-PR2193.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.02-PR2193.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.02-PR2193.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.02-PR2193.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.03-PR2449-1.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.03-PR2449-1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.03-PR2449-1.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.03-PR2449-1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.04-PR2231.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.04-PR2231.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.04-PR2231.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.04-PR2231.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.05-PR2403-01.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.05-PR2403-01.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.05-PR2403-01.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.05-PR2403-01.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.07-PR2435.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.07-PR2435.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.07-PR2435.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.07-PR2435.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.08-PR2637.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.08-PR2637.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-990.08-PR2637.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.08-PR2637.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.01-xvba_support-39f578c.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.01-xvba_support-39f578c.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.01-xvba_support-39f578c.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.01-xvba_support-39f578c.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.10/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-995.10-disable-alt-tab.patch diff --git a/packages/mediacenter/xbmc/patches/83b16d0/xbmc-990.09-PR2579.patch b/packages/mediacenter/xbmc/patches/83b16d0/xbmc-990.09-PR2579.patch deleted file mode 100644 index 464e333a67..0000000000 --- a/packages/mediacenter/xbmc/patches/83b16d0/xbmc-990.09-PR2579.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9c71540585608603a4a283997ce0e1c251876b1f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 9 Apr 2013 19:05:05 +0100 -Subject: [PATCH] [players] Fix dts time after seek - ---- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 +- - xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index cdf5876..69820d5 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -2066,7 +2066,7 @@ void CDVDPlayer::HandleMessages() - CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time); - } - // dts after successful seek -- m_StateInput.dts = start; -+ m_StateInput.dts = DVD_MSEC_TO_TIME(time); - - FlushBuffers(!msg.GetFlush(), start, msg.GetAccurate()); - } -diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 0f302ad..1ff2daa 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2133,7 +2133,7 @@ void COMXPlayer::HandleMessages() - CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time); - } - // dts after successful seek -- m_StateInput.dts = start; -+ m_StateInput.dts = DVD_MSEC_TO_TIME(time); - - FlushBuffers(!msg.GetFlush(), start, msg.GetAccurate()); - } --- -1.8.1.6 - diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo index 26b4d96e34..46f402b99f 100755 --- a/tools/mkpkg/mkpkg_xbmc-frodo +++ b/tools/mkpkg/mkpkg_xbmc-frodo @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.1.10" +PKG_VERSION="12.2.0" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-frodo"