Merge branch 'openelec-pvr' of https://github.com/Gujs/OpenELEC.tv into openelec-pvr

packages/mediacenter/xbmc-pvr-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-theme-Confluence"
-PKG_VERSION="b485416"
+PKG_VERSION="60222aa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-pvr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr"
-PKG_VERSION="b485416"
+PKG_VERSION="60222aa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-60222aa-201-let_select_XBMCProjectM-0.1.patch

@@ -1,6 +1,6 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
---- xbmc-pvr-3513480/configure.in	2011-04-25 03:08:17.936138616 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 03:24:35.056907267 +0200
+diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
+--- xbmc-30a9070/configure.in	2011-07-28 06:20:11.000000000 +0200
++++ xbmc-30a9070.patch/configure.in	2011-07-28 09:03:13.184376904 +0200
 @@ -66,6 +66,8 @@
  xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
  goom_enabled="== GOOM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
  pulse_disabled="== PulseAudio support manually disabled. =="
  dvdcss_enabled="== DVDCSS support enabled. =="
-@@ -204,6 +206,12 @@
+@@ -207,6 +209,12 @@
    [use_goom=$enableval],
    [use_goom=no])
  
@@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -807,6 +815,15 @@
+@@ -804,6 +812,15 @@
    fi
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  # libRTMP
  if test "$use_librtmp" != "no"; then
    AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-@@ -1216,6 +1233,12 @@
+@@ -1258,6 +1275,12 @@
    final_message="$final_message\n  GOOM:\t\tNo"
  fi
  
@@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  if test "$use_libbluray" = "yes"; then
    final_message="$final_message\n  Bluray:\tYes"
  else
-@@ -1422,6 +1445,7 @@
+@@ -1486,6 +1509,7 @@
  AC_SUBST(SDL_DEFINES)
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(DISABLE_GOOM)
@@ -60,8 +60,8 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(PYTHON_VERSION)
  AC_SUBST(OUTPUT_FILES)
-@@ -1647,7 +1671,7 @@
-       -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+@@ -1729,7 +1753,7 @@
+     fi
  set +x
  fi
 -], [0])
@@ -69,10 +69,10 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    ./configure  \
-diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in
---- xbmc-pvr-3513480/Makefile.in	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/Makefile.in	2011-04-25 03:15:20.988746910 +0200
-@@ -140,8 +140,11 @@
+diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in
+--- xbmc-30a9070/Makefile.in	2011-07-28 06:20:13.000000000 +0200
++++ xbmc-30a9070.patch/Makefile.in	2011-07-28 09:03:13.186376930 +0200
+@@ -143,8 +143,11 @@
  ifeq (@USE_OPENGL@,1)
  VIS_DIRS+=\
  	xbmc/visualizations/OpenGLSpectrum \

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-60222aa-202-let_select_RSXS-0.1.patch

@@ -1,6 +1,6 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
---- xbmc-pvr-3513480/configure.in	2011-04-25 04:31:28.000000000 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 04:45:06.195606164 +0200
+diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
+--- xbmc-30a9070/configure.in	2011-07-28 09:05:20.854037605 +0200
++++ xbmc-30a9070.patch/configure.in	2011-07-28 09:05:32.890194108 +0200
 @@ -68,6 +68,8 @@
  goom_disabled="== GOOM disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
  pulse_disabled="== PulseAudio support manually disabled. =="
  dvdcss_enabled="== DVDCSS support enabled. =="
-@@ -212,6 +214,12 @@
+@@ -215,6 +217,12 @@
    [use_xbmcprojectm=$enableval],
    [use_xbmcprojectm=yes])
  
@@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -824,6 +832,15 @@
+@@ -821,6 +829,15 @@
    DISABLE_XBMCPROJECTM=1
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  # libRTMP
  if test "$use_librtmp" != "no"; then
    AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-@@ -1239,6 +1256,12 @@
+@@ -1281,6 +1298,12 @@
    final_message="$final_message\n  XBMCProjectM:\tNo"
  fi
  
@@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  if test "$use_libbluray" = "yes"; then
    final_message="$final_message\n  Bluray:\tYes"
  else
-@@ -1445,6 +1468,7 @@
+@@ -1510,6 +1533,7 @@
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(DISABLE_GOOM)
  AC_SUBST(DISABLE_XBMCPROJECTM)
@@ -60,7 +60,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(PYTHON_VERSION)
  AC_SUBST(OUTPUT_FILES)
-@@ -1708,7 +1732,7 @@
+@@ -1791,7 +1815,7 @@
      --disable-lattice \
      --disable-skyrocket
  fi
@@ -69,30 +69,17 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
  
  XB_CONFIG_MODULE([lib/libapetag], [
    ./configure \
-diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in
---- xbmc-pvr-3513480/Makefile.in	2011-04-25 04:23:50.000000000 +0200
-+++ xbmc-pvr-3513480.patch/Makefile.in	2011-04-25 04:40:31.819562758 +0200
-@@ -133,8 +133,10 @@
- 	lib/xbmc-dll-symbols \
- 	lib/jsoncpp/src/lib_json
+diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in
+--- xbmc-30a9070/Makefile.in	2011-07-28 09:05:20.856037631 +0200
++++ xbmc-30a9070.patch/Makefile.in	2011-07-28 09:10:44.898247687 +0200
+@@ -136,8 +136,10 @@
  
--SS_DIRS=\
--	xbmc/screensavers/rsxs-0.9/xbmc
-+SS_DIRS=
+ SS_DIRS=
+ ifeq (@USE_OPENGL@,1)
 +ifneq (@DISABLE_RSXS@,1)
-+SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc
+ SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+ endif
 +endif
  
  VIS_DIRS=
  ifeq (@USE_OPENGL@,1)
-@@ -421,8 +423,10 @@
- 	$(MAKE) -C xbmc/pvrclients/tvheadend
- screensavers: exports
- ifeq (@USE_OPENGL@,1)
-+ifneq (@DISABLE_RSXS@,1)
- 	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
- endif
-+endif
- libaddon: exports
- 	$(MAKE) -C lib/addons/library.xbmc.addon
- 	$(MAKE) -C lib/addons/library.xbmc.gui

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-b485416-321-CrystalHD_use_yuy2_to_yv12-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
---- xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-04-25 05:07:26.043098079 +0200
-@@ -771,7 +771,7 @@
-           if (!pBuffer)
-           {
-             // No free pre-allocated buffers so make one
--#ifdef _WIN32
-+#if 1
-             // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
-             pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
- #else

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-b485416-903-pvr_fix_deadlock_when_switching_to_a_channel.patch

@@ -1,54 +0,0 @@
-From 5eb53947a50f951b019d16987630393ffabea008 Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Tue, 19 Jul 2011 01:35:30 +0200
-Subject: [PATCH] pvr: fix deadlock when switching to a channel that's unavailable
-
----
- xbmc/cores/dvdplayer/DVDPlayer.cpp |    5 +++++
- xbmc/pvr/PVRManager.cpp            |   14 ++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index 824391e..90bcc0c 100644
---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
-+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-@@ -2266,6 +2266,11 @@ void CDVDPlayer::HandleMessages()
-               SetCaching(CACHESTATE_PVR);
-             }
-           }
-+          else
-+          {
-+            CLog::Log(LOGWARNING, "%s - failed to switch channel. playback stopped", __FUNCTION__);
-+            CloseFile();
-+          }
-         }
-       }
-       else if (pMsg->IsType(CDVDMsg::GENERAL_GUI_ACTION))
-diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
-index cfc8d3d..6cad52b 100644
---- a/xbmc/pvr/PVRManager.cpp
-+++ b/xbmc/pvr/PVRManager.cpp
-@@ -676,12 +676,14 @@ void CPVRManager::SetPlayingGroup(CPVRChannelGroup *group)
- 
- CPVRChannelGroup *CPVRManager::GetPlayingGroup(bool bRadio /* = false */)
- {
--  CSingleLock lock(m_critSection);
--
--  if (bRadio && !m_currentRadioGroup)
--    SetPlayingGroup((CPVRChannelGroup *) m_channelGroups->GetGroupAllRadio());
--  else if (!bRadio &&!m_currentTVGroup)
--    SetPlayingGroup((CPVRChannelGroup *) m_channelGroups->GetGroupAllTV());
-+  CSingleTryLock tryLock(m_critSection);
-+  if(tryLock.IsOwner())
-+  {
-+    if (bRadio && !m_currentRadioGroup)
-+      SetPlayingGroup((CPVRChannelGroup *) m_channelGroups->GetGroupAllRadio());
-+    else if (!bRadio &&!m_currentTVGroup)
-+      SetPlayingGroup((CPVRChannelGroup *) m_channelGroups->GetGroupAllTV());
-+  }
- 
-   return bRadio ? m_currentRadioGroup : m_currentTVGroup;
- }
--- 
-1.7.4.1
-