mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -1,29 +0,0 @@
|
||||
From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 13 May 2017 20:22:08 +0200
|
||||
Subject: [PATCH] src/CWatchdog.h: Fix gcc7 build
|
||||
|
||||
Building with gcc7 is broken:
|
||||
|
||||
src/CWatchdog.h:31:58: error: 'std::function' has not been declared
|
||||
CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback);
|
||||
^~~~~~~~
|
||||
|
||||
Submitted-upstream: https://github.com/kodi-pvr/pvr.stalker/pull/93
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/CWatchdog.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/CWatchdog.h b/src/CWatchdog.h
|
||||
index c465e91..239d95d 100644
|
||||
--- a/src/CWatchdog.h
|
||||
+++ b/src/CWatchdog.h
|
||||
@@ -22,6 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <thread>
|
||||
+#include <functional>
|
||||
|
||||
#include "SAPI.h"
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139 kodi-pvr-stalker-2.8.6-Krypton.tar.gz
|
||||
sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz
|
||||
sha256 f9fa34b2caa07376a7a976c1f0b1b9761b37449afd4ceb1e7afa283492054237 debian/copyright
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# This cset is on the branch 'Krypton'
|
||||
# When Kodi is updated, then this should be updated to the corresponding branch
|
||||
KODI_PVR_STALKER_VERSION = 2.8.6-Krypton
|
||||
KODI_PVR_STALKER_VERSION = 3.4.10-Leia
|
||||
KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
|
||||
KODI_PVR_STALKER_LICENSE = GPL-2.0+
|
||||
KODI_PVR_STALKER_LICENSE_FILES = src/client.h
|
||||
KODI_PVR_STALKER_LICENSE_FILES = debian/copyright
|
||||
KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform libxml2
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user