xbmc: update to xbmc-14-3f20fb2

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="14-6f26fca"
+PKG_VERSION="14-3f20fb2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="14-6f26fca"
+PKG_VERSION="14-3f20fb2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch

@@ -1,6 +1,6 @@
-From 9c1dea43c9b9b66c48d057d3c0e44cd4a807e4dc Mon Sep 17 00:00:00 2001
+From 233c97d88577ae7758884386b5e8c49d52bdd22f Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
-Date: Fri, 20 Dec 2013 00:36:34 +0200
+Date: Sun, 3 Aug 2014 13:00:06 +0300
 Subject: [PATCH] service addons: use a wrapper to setup systemd
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH] service addons: use a wrapper to setup systemd
  3 files changed, 15 insertions(+)
 
 diff --git a/xbmc/addons/AddonDatabase.cpp b/xbmc/addons/AddonDatabase.cpp
-index 4202363..105749f 100644
+index 51a8da8..deedb04 100644
 --- a/xbmc/addons/AddonDatabase.cpp
 +++ b/xbmc/addons/AddonDatabase.cpp
 @@ -20,6 +20,7 @@
@@ -21,7 +21,7 @@ index 4202363..105749f 100644
  #include "utils/log.h"
  #include "utils/Variant.h"
  #include "utils/StringUtils.h"
-@@ -581,6 +582,7 @@ bool CAddonDatabase::DisableAddon(const CStdString &addonID, bool disable /* = t
+@@ -596,6 +597,7 @@ bool CAddonDatabase::DisableAddon(const std::string &addonID, bool disable /* =
            boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(addon);
            if (service)
              service->Stop();
@@ -29,7 +29,7 @@ index 4202363..105749f 100644
          }
          // restart the pvr manager when disabling a pvr add-on with the pvr manager enabled
          else if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_PVRDLL, false) && addon &&
-@@ -601,6 +603,7 @@ bool CAddonDatabase::DisableAddon(const CStdString &addonID, bool disable /* = t
+@@ -616,6 +618,7 @@ bool CAddonDatabase::DisableAddon(const std::string &addonID, bool disable /* =
        // If the addon is a service, start it
        if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_SERVICE, false) && addon && disabled)
        {
@@ -38,7 +38,7 @@ index 4202363..105749f 100644
          if (service)
            service->Start();
 diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
-index 8c9f241..d2f4610 100644
+index b410d6c..d33f8a6 100644
 --- a/xbmc/addons/AddonInstaller.cpp
 +++ b/xbmc/addons/AddonInstaller.cpp
 @@ -70,6 +70,13 @@ CAddonInstaller &CAddonInstaller::Get()
@@ -55,23 +55,23 @@ index 8c9f241..d2f4610 100644
  void CAddonInstaller::OnJobComplete(unsigned int jobID, bool success, CJob* job)
  {
    if (success)
-@@ -586,6 +593,7 @@ bool CAddonInstallJob::OnPreInstall()
-     boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(addon);
-     if (service)
-       service->Stop();
-+    CAddonInstaller::Get().CallOEWrapper(m_addon->ID(), true);
-     CAddonMgr::Get().RemoveAddon(m_addon->ID()); // remove it
-     return running;
-   }
-@@ -713,6 +721,7 @@ void CAddonInstallJob::OnPostInstall(bool reloadAddon)
-       AddonPtr addon; 
-       CAddonMgr::Get().GetAddon(m_addon->ID(), addon);
-       boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(addon);
-+      CAddonInstaller::Get().CallOEWrapper(m_addon->ID(), false);
+@@ -644,6 +651,7 @@ bool CAddonInstallJob::OnPreInstall()
+       boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(localAddon);
        if (service)
-         service->Start();
+         service->Stop();
++      CAddonInstaller::Get().CallOEWrapper(m_addon->ID(), true);
      }
-@@ -794,6 +803,7 @@ bool CAddonUnInstallJob::DoWork()
+     return !CAddonMgr::Get().IsAddonDisabled(m_addon->ID());
+   }
+@@ -773,6 +781,7 @@ void CAddonInstallJob::OnPostInstall(bool reloadAddon)
+       if (CAddonMgr::Get().GetAddon(m_addon->ID(), localAddon, ADDON_SERVICE, false))
+       {
+         boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(localAddon);
++        CAddonInstaller::Get().CallOEWrapper(m_addon->ID(), false);
+         if (service)
+           service->Start();
+       }
+@@ -840,6 +849,7 @@ bool CAddonUnInstallJob::DoWork()
      boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(m_addon);
      if (service)
        service->Stop();
@@ -80,10 +80,10 @@ index 8c9f241..d2f4610 100644
  
    AddonPtr repoPtr = CAddonInstallJob::GetRepoForAddon(m_addon);
 diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h
-index 39cab93..2938c7f 100644
+index ab93a2f..7d62b5b 100644
 --- a/xbmc/addons/AddonInstaller.h
 +++ b/xbmc/addons/AddonInstaller.h
-@@ -29,6 +29,8 @@ class CAddonInstaller : public IJobCallback
+@@ -38,6 +38,8 @@ class CAddonInstaller : public IJobCallback
  public:
    static CAddonInstaller &Get();
  
@@ -91,7 +91,7 @@ index 39cab93..2938c7f 100644
 +
    bool IsDownloading() const;
    void GetInstallList(ADDON::VECADDONS &addons) const;
-   bool GetProgress(const CStdString &addonID, unsigned int &percent) const;
+   bool GetProgress(const std::string &addonID, unsigned int &percent) const;
 -- 
-1.8.3.2
+1.9.1
 

packages/mediacenter/xbmc/patches/xbmc-999.04-bye-bye-libflac.patch

@@ -1,16 +1,17 @@
-From 4b7c1455582ccb6f8979681b4baed93d2852140c Mon Sep 17 00:00:00 2001
+From 0e26e69497c0977f6a0efbf48d199f6313c539cf Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
-Date: Fri, 11 Jul 2014 19:37:12 +0300
+Date: Sun, 3 Aug 2014 13:03:44 +0300
 Subject: [PATCH] bye bye libflac
 
 ---
  configure.in | 3 ---
  1 file changed, 3 deletions(-)
 
-diff -Naur xbmc-14-67f025d/configure.in xbmc-14-67f025d.patch/configure.in
---- xbmc-14-67f025d/configure.in	2014-07-25 06:45:49.000000000 +0200
-+++ xbmc-14-67f025d.patch/configure.in	2014-07-25 06:54:20.396754173 +0200
-@@ -1056,7 +1056,6 @@
+diff --git a/configure.in b/configure.in
+index a9d5f46..702f086 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1056,7 +1056,6 @@ AC_CHECK_HEADER([jpeglib.h],,        AC_MSG_ERROR($missing_library))
  AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
  AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
  AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
@@ -18,7 +19,7 @@ diff -Naur xbmc-14-67f025d/configure.in xbmc-14-67f025d.patch/configure.in
  
  AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library))
  XB_FIND_SONAME([CURL], [curl])
-@@ -1219,7 +1218,6 @@
+@@ -1219,7 +1218,6 @@ fi
  fi
  
  XB_FIND_SONAME([OGG],         [ogg])
@@ -26,7 +27,7 @@ diff -Naur xbmc-14-67f025d/configure.in xbmc-14-67f025d.patch/configure.in
  XB_FIND_SONAME([VORBIS],      [vorbis])
  XB_FIND_SONAME([VORBISFILE],  [vorbisfile])
  XB_FIND_SONAME([MODPLUG],     [modplug])
-@@ -2596,7 +2594,6 @@
+@@ -2596,7 +2594,6 @@ AC_SUBST(OUTPUT_FILES)
  AC_SUBST(HAVE_XBMC_NONFREE)
  AC_SUBST(USE_ASAP_CODEC)
  AC_SUBST(LIBCURL_BASENAME)
@@ -34,3 +35,6 @@ diff -Naur xbmc-14-67f025d/configure.in xbmc-14-67f025d.patch/configure.in
  AC_SUBST(LIBVORBISFILE_BASENAME)
  AC_SUBST(LIBMODPLUG_BASENAME)
  AC_SUBST(LIBOGG_BASENAME)
+-- 
+1.9.1
+

packages/mediacenter/xbmc/patches/xbmc-999.99.01-PR5107.patch

@@ -1,36 +0,0 @@
-From e86491994f73d0d9fbf5087429ad122fc5fb9f5b Mon Sep 17 00:00:00 2001
-From: fritsch <Peter.Fruehberger@gmail.com>
-Date: Sun, 27 Jul 2014 17:46:42 +0200
-Subject: [PATCH] SWCodec: Add VP9 as pure sw decoder to use multithreading
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index 0d4dcd5..2db5d99 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -210,7 +210,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
-       break;
-     }
-   }
--  else if (hints.codec == AV_CODEC_ID_HEVC)
-+  else if (hints.codec == AV_CODEC_ID_HEVC
-+        || hints.codec == AV_CODEC_ID_VP9)
-     m_isSWCodec = true;
- 
-   if(pCodec == NULL)
-@@ -295,7 +296,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
-   if( num_threads > 1 && !hints.software && m_pHardware == NULL // thumbnail extraction fails when run threaded
-   && ( pCodec->id == AV_CODEC_ID_H264
-     || pCodec->id == AV_CODEC_ID_MPEG4
--    || pCodec->id == AV_CODEC_ID_HEVC))
-+    || pCodec->id == AV_CODEC_ID_HEVC
-+    || pCodec->id == AV_CODEC_ID_VP9))
-     m_pCodecContext->thread_count = num_threads;
- 
-   if (avcodec_open2(m_pCodecContext, pCodec, NULL) < 0)
--- 
-1.9.3
-