diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/mediacenter/xbmc-addon-xvdr/meta index c99b4eae79..d8a6577875 100644 --- a/packages/mediacenter/xbmc-addon-xvdr/meta +++ b/packages/mediacenter/xbmc-addon-xvdr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-addon-xvdr" -PKG_VERSION="6c95579" +PKG_VERSION="f267086" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch b/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch deleted file mode 100644 index 3c5c091ffc..0000000000 --- a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 240760878f5ffdddeaa5eccd8df23ace2c176004 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Fri, 15 Nov 2013 18:53:24 +0200 -Subject: [PATCH] bump xbmc.gui - ---- - addons/library.xbmc.gui/libXBMC_gui.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/addons/library.xbmc.gui/libXBMC_gui.h b/addons/library.xbmc.gui/libXBMC_gui.h -index dd916f9..f52ad4c 100644 ---- a/addons/library.xbmc.gui/libXBMC_gui.h -+++ b/addons/library.xbmc.gui/libXBMC_gui.h -@@ -36,10 +36,10 @@ typedef void* GUIHANDLE; - #endif - - /* current ADDONGUI API version */ --#define XBMC_GUI_API_VERSION "1.0.0" -+#define XBMC_GUI_API_VERSION "5.0.1" - - /* min. ADDONGUI API version */ --#define XBMC_GUI_MIN_API_VERSION "1.0.0" -+#define XBMC_GUI_MIN_API_VERSION "5.0.1" - - #define ADDON_ACTION_PREVIOUS_MENU 10 - #define ADDON_ACTION_CLOSE_DIALOG 51 --- -1.7.2.5 - diff --git a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch b/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch deleted file mode 100644 index dd87a04bcb..0000000000 --- a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7c1bae9cc4819ed9148354fd878824b40bd7a6a5 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sun, 6 Oct 2013 17:48:50 +0300 -Subject: [PATCH] fix scrambled/hd channel scan - -from wirbelscan: - #define SCAN_TV ( 1 << 0 ) - #define SCAN_RADIO ( 1 << 1 ) - #define SCAN_FTA ( 1 << 2 ) - #define SCAN_SCRAMBLED ( 1 << 3 ) - #define SCAN_HD ( 1 << 4 ) ---- - src/libxvdr/include/xvdr/dataset.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libxvdr/include/xvdr/dataset.h b/src/libxvdr/include/xvdr/dataset.h -index 53b0540..36d9a94 100644 ---- a/src/libxvdr/include/xvdr/dataset.h -+++ b/src/libxvdr/include/xvdr/dataset.h -@@ -287,8 +287,8 @@ public: - FLAG_TV = 1, - FLAG_RADIO = 2, - FLAG_FTA = 4, -- FLAG_SCRAMBLED = 16, -- FLAG_HDTV = 32 -+ FLAG_SCRAMBLED = 8, -+ FLAG_HDTV = 16 - } Flags; - - Verbosity verbosity; --- -1.7.2.5 - diff --git a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch b/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch deleted file mode 100644 index d70b63e622..0000000000 --- a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 92dbf9fe433197f107c7a88f026c032546553d64 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Mon, 11 Nov 2013 22:02:24 +0200 -Subject: [PATCH] sync with xbmc. bump pvr api to 1.9.0 - ---- - src/xvdr/XBMCAddon.cpp | 3 +++ - src/xvdr/include/xbmc_pvr_dll.h | 23 +++++++++++++++++++++++ - src/xvdr/include/xbmc_pvr_types.h | 12 +++++++++--- - 3 files changed, 35 insertions(+), 3 deletions(-) - -diff --git a/src/xvdr/XBMCAddon.cpp b/src/xvdr/XBMCAddon.cpp -index 58fff40..709b43c 100644 ---- a/src/xvdr/XBMCAddon.cpp -+++ b/src/xvdr/XBMCAddon.cpp -@@ -902,4 +902,7 @@ const char * GetLiveStreamURL(const PVR_CHANNEL &channel) { return ""; } - unsigned int GetChannelSwitchDelay(void) { return 0; } - void SetSpeed(int speed) {}; - -+time_t GetPlayingTime() { return 0; } -+time_t GetBufferTimeStart() { return 0; } -+time_t GetBufferTimeEnd() { return 0; } - } -diff --git a/src/xvdr/include/xbmc_pvr_dll.h b/src/xvdr/include/xbmc_pvr_dll.h -index 39f52a0..50012b0 100644 ---- a/src/xvdr/include/xbmc_pvr_dll.h -+++ b/src/xvdr/include/xbmc_pvr_dll.h -@@ -576,6 +576,25 @@ extern "C" - void SetSpeed(int speed); - - /*! -+ * Get actual playing time from addon. With timeshift enabled this is -+ * different to live. -+ * @return time as UTC -+ */ -+ time_t GetPlayingTime(); -+ -+ /*! -+ * Get time of oldest packet in timeshift buffer -+ * @return time as UTC -+ */ -+ time_t GetBufferTimeStart(); -+ -+ /*! -+ * Get time of latest packet in timeshift buffer -+ * @return time as UTC -+ */ -+ time_t GetBufferTimeEnd(); -+ -+ /*! - * Called by XBMC to assign the function pointers of this add-on to pClient. - * @param pClient The struct to assign the function pointers to. - */ -@@ -651,6 +670,10 @@ extern "C" - pClient->DemuxAbort = DemuxAbort; - pClient->DemuxFlush = DemuxFlush; - pClient->DemuxRead = DemuxRead; -+ -+ pClient->GetPlayingTime = GetPlayingTime; -+ pClient->GetBufferTimeStart = GetBufferTimeStart; -+ pClient->GetBufferTimeEnd = GetBufferTimeEnd; - }; - }; - -diff --git a/src/xvdr/include/xbmc_pvr_types.h b/src/xvdr/include/xbmc_pvr_types.h -index e8dd903..94e1a59 100644 ---- a/src/xvdr/include/xbmc_pvr_types.h -+++ b/src/xvdr/include/xbmc_pvr_types.h -@@ -53,7 +53,7 @@ struct DemuxPacket; - #undef PRAGMA_PACK_BEGIN - #undef PRAGMA_PACK_END - --#if defined(__GNUC__) && !defined(__MINGW32__) -+#if defined(__GNUC__) - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) - #define ATTRIBUTE_PACKED __attribute__ ((packed)) - #define PRAGMA_PACK 0 -@@ -75,10 +75,10 @@ struct DemuxPacket; - #define PVR_STREAM_MAX_STREAMS 20 - - /* current PVR API version */ --#define XBMC_PVR_API_VERSION "1.8.1" -+#define XBMC_PVR_API_VERSION "1.9.0" - - /* min. PVR API version */ --#define XBMC_PVR_MIN_API_VERSION "1.8.0" -+#define XBMC_PVR_MIN_API_VERSION "1.9.0" - - #ifdef __cplusplus - extern "C" { -@@ -194,6 +194,9 @@ extern "C" { - { - char strAdapterName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the adapter that's being used */ - char strAdapterStatus[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) status of the adapter that's being used */ -+ char strServiceName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current service */ -+ char strProviderName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current service's provider */ -+ char strMuxName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current mux */ - int iSNR; /*!< @brief (optional) signal/noise ratio */ - int iSignal; /*!< @brief (optional) signal strength */ - long iBER; /*!< @brief (optional) bit error rate */ -@@ -392,6 +395,9 @@ extern "C" { - bool (__cdecl* CanSeekStream)(void); - bool (__cdecl* SeekTime)(int, bool, double*); - void (__cdecl* SetSpeed)(int); -+ time_t (__cdecl* GetPlayingTime)(void); -+ time_t (__cdecl* GetBufferTimeStart)(void); -+ time_t (__cdecl* GetBufferTimeEnd)(void); - } PVRClient; - - #ifdef __cplusplus --- -1.7.2.5 -