Merge pull request #1647 from Stane1983/libreelec-8.0-wetekdvb

wetekdvb: Use older WeTek proprietary DVB modules if building for WP1

config/issue

@@ -1 +0,0 @@
-Welcome to OpenELEC - the powerful Mediacenter4you

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="8.0.1"
+  LIBREELEC_VERSION="8.0.2"
 
 # OS_VERSION: OS Version
   OS_VERSION="8.0"

packages/addons/addon-depends/dvb-tools-depends/depends/bitstream/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bitstream"
-PKG_VERSION="1.1"
+PKG_VERSION="1.2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/depends/libev/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libev"
-PKG_VERSION="4.22"
+PKG_VERSION="4.24"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://software.schmorp.de/pkg/libev.html"

packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-fe-tool"
-PKG_VERSION="fa2f7d9"
+PKG_VERSION="1388a04"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"

packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvblast"
-PKG_VERSION="3.0"
+PKG_VERSION="3.1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/dvblast/patches/dvblast-ldflags.patch

@@ -1,17 +0,0 @@
-diff -Naur dvblast-3.0/Makefile dvblast-3.0.patch/Makefile
---- dvblast-3.0/Makefile	2015-10-05 17:51:14.000000000 +0200
-+++ dvblast-3.0.patch/Makefile	2016-03-26 22:54:59.953303040 +0100
-@@ -55,11 +55,11 @@
- 
- dvblast: $(OBJ_DVBLAST)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDFLAGS) $(LDLIBS_DVBLAST) $(LDLIBS)
- 
- dvblastctl: $(OBJ_DVBLASTCTL)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDFLAGS) $(LDLIBS)
- 
- clean:
- 	@echo "CLEAN   $(CLEAN_OBJS)"

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="mumudvb"
+PKG_VERSION="fa9ff6e"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://mumudvb.net/"
+PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="MuMuDVB-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain libdvbcsa"
+PKG_SECTION="tools"
+PKG_SHORTDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_AUTORECONF="yes"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20141122"
+PKG_VERSION="20170107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

packages/addons/addon-depends/emby-depends/ffmpegx/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="ffmpegx"
 PKG_VERSION="libreelec"
-PKG_REV="7"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"

packages/addons/addon-depends/emby-depends/x264/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20170228-2245-stable"
+PKG_VERSION="snapshot-20170327-2245-stable"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"

packages/addons/addon-depends/qtbase/patches/qtbase-001-stdlib-error.patch

@@ -0,0 +1,111 @@
+From 9f3efa796acb97ea4887468f1e8136e2e0711118 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Fri, 13 May 2016 20:04:00 -0400
+Subject: [PATCH] Remove -isystem from qmake due to QTBUG-53375
+
+Change-Id: If0595fc2f209a48585e7e9b9a61f11c0d4e0664f
+---
+ mkspecs/common/clang.conf             |  1 -
+ mkspecs/common/gcc-base.conf          |  1 -
+ mkspecs/linux-icc/qmake.conf          |  1 -
+ qmake/generators/unix/unixmake2.cpp   | 14 +++-----------
+ qmake/generators/win32/mingw_make.cpp |  8 +-------
+ 5 files changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
+index ee9c1b8..fbe370e 100644
+--- a/mkspecs/common/clang.conf
++++ b/mkspecs/common/clang.conf
+@@ -16,7 +16,6 @@ QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+ CONFIG                 += clang_pch_style
+ QMAKE_PCH_OUTPUT_EXT    = .pch
+ 
+-QMAKE_CFLAGS_ISYSTEM             = -isystem
+ QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_LTCG                = -flto
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 6e043f5..df8d314 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -44,7 +44,6 @@ QMAKE_CFLAGS_DEBUG         += -g
+ QMAKE_CFLAGS_SHLIB         += -fPIC
+ QMAKE_CFLAGS_STATIC_LIB    += -fPIC
+ QMAKE_CFLAGS_APP           += -fPIC
+-QMAKE_CFLAGS_ISYSTEM        = -isystem
+ QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
+ QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
+diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
+index 495fd15..935833b 100644
+--- a/mkspecs/linux-icc/qmake.conf
++++ b/mkspecs/linux-icc/qmake.conf
+@@ -21,7 +21,6 @@ QMAKE_CFLAGS_DEBUG      = -O0 -g
+ QMAKE_CFLAGS_SHLIB      = -fPIC
+ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CFLAGS_YACC       =
+-QMAKE_CFLAGS_ISYSTEM    = -isystem
+ QMAKE_CFLAGS_THREAD     = -D_REENTRANT
+ QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
+ QMAKE_CFLAGS_LTCG       = -ipo -fno-fat-lto-objects
+diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
+index 9312f19..009a674 100644
+--- a/qmake/generators/unix/unixmake2.cpp
++++ b/qmake/generators/unix/unixmake2.cpp
+@@ -176,16 +176,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+     t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
+     t << "INCPATH       =";
+     {
+-        QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
+         const ProStringList &incs = project->values("INCLUDEPATH");
+         for(int i = 0; i < incs.size(); ++i) {
+             const ProString &inc = incs.at(i);
+-            if (inc.isEmpty())
+-                continue;
+-
+-            if (!isystem.isEmpty() && isSystemInclude(inc.toQString()))
+-                t << ' ' << isystem << ' ';
+-            else
++            if (!inc.isEmpty())
+                 t << " -I";
+             t << escapeFilePath(inc);
+         }
+@@ -1328,10 +1322,8 @@ void UnixMakefileGenerator::init2()
+     }
+ 
+     if (include_deps && project->isActiveConfig("gcc_MD_depends")) {
+-        // use -MMD if we know about -isystem too
+-        ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD");
+-        project->values("QMAKE_CFLAGS") += MD_flag;
+-        project->values("QMAKE_CXXFLAGS") += MD_flag;
++        project->values("QMAKE_CFLAGS") += "-MD";
++        project->values("QMAKE_CXXFLAGS") += "-MD";
+     }
+ }
+ 
+diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
+index 382b10c..c9eebd8 100644
+--- a/qmake/generators/win32/mingw_make.cpp
++++ b/qmake/generators/win32/mingw_make.cpp
+@@ -249,17 +249,11 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t)
+ {
+     t << "INCPATH       = ";
+ 
+-    QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
+     const ProStringList &incs = project->values("INCLUDEPATH");
+     for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) {
+         QString inc = (*incit).toQString();
+         inc.replace(QRegExp("\\\\$"), "");
+-
+-        if (!isystem.isEmpty() && isSystemInclude(inc))
+-            t << isystem << ' ';
+-        else
+-            t << "-I";
+-        t << escapeFilePath(inc) << ' ';
++        t << "-I" << escapeFilePath(inc) << ' ';
+     }
+     t << endl;
+ }
+-- 
+2.7.4
+

packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="7a42b22"
+PKG_VERSION="d7c7587"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"

packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-satip"
-PKG_VERSION="6573c38"
+PKG_VERSION="ed99cfb"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"

packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="d6847c3"
+PKG_VERSION="615a077"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"

packages/addons/addon-depends/vdr/patches/vdr-40_caid-buffer-v3.patch

@@ -0,0 +1,153 @@
+Description: dynamically resize buffer for caids
+Forwarded: yes
+Author: Lars Hanisch <dvb@flensrocker.de>
+
+diff --git a/ci.c b/ci.c
+index ffc7ff7..8bfae23 100644
+--- a/ci.c
++++ b/ci.c
+@@ -25,6 +25,8 @@
+ #include "skins.h"
+ #include "tools.h"
+ 
++#define CAID_BUFSIZE 1024
++
+ // Set these to 'true' for debug output:
+ static bool DumpTPDUDataTransfer = false;
+ static bool DebugProtocol = false;
+@@ -763,9 +765,12 @@ private:
+   int transponder;
+   int programNumber;
+   int caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
++  uint8_t *caDescriptors;
++  int caBufSize;
+   void AddCaDescriptors(int Length, const uint8_t *Data);
+ public:
+   cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
++  ~cCiCaPmt(void);
+   uint8_t CmdId(void) { return cmdId; }
+   void SetListManagement(uint8_t ListManagement);
+   uint8_t ListManagement(void) { return capmt[0]; }
+@@ -784,8 +789,15 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
+          caSystemIds[i] = CaSystemIds[i];
+      }
+   caSystemIds[i] = 0;
+-  uint8_t caDescriptors[512];
+-  int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, 0);
++  caBufSize = CAID_BUFSIZE;
++  caDescriptors = new uint8_t[caBufSize];
++  int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, 0);
++  if (caDescriptorsLength < 0) {
++     delete [] caDescriptors;
++     caBufSize = -caDescriptorsLength + 8;
++     caDescriptors = new uint8_t[caBufSize];
++     caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, 0);
++     }
+   length = 0;
+   capmt[length++] = CPLM_ONLY;
+   capmt[length++] = (ProgramNumber >> 8) & 0xFF;
+@@ -797,6 +809,11 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
+   AddCaDescriptors(caDescriptorsLength, caDescriptors);
+ }
+ 
++cCiCaPmt::~cCiCaPmt(void)
++{
++  delete [] caDescriptors;
++}
++
+ void cCiCaPmt::SetListManagement(uint8_t ListManagement)
+ {
+   capmt[0] = ListManagement;
+@@ -805,21 +822,34 @@ void cCiCaPmt::SetListManagement(uint8_t ListManagement)
+ void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
+ {
+   if (Pid) {
+-     uint8_t caDescriptors[512];
+-     int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, Pid);
+-     //XXX buffer overflow check???
+-     capmt[length++] = StreamType;
+-     capmt[length++] = (Pid >> 8) & 0xFF;
+-     capmt[length++] =  Pid       & 0xFF;
+-     esInfoLengthPos = length;
+-     capmt[length++] = 0x00; // ES_info_length H (at ES level)
+-     capmt[length++] = 0x00; // ES_info_length L
+-     AddCaDescriptors(caDescriptorsLength, caDescriptors);
++     int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, Pid);
++     if (caDescriptorsLength < 0) {
++       delete [] caDescriptors;
++       caBufSize = -caDescriptorsLength + 8;
++       caDescriptors = new uint8_t[caBufSize];
++       caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, caBufSize, caDescriptors, Pid);
++       }
++     if (length + 5 < int(sizeof(capmt))) {
++        capmt[length++] = StreamType;
++        capmt[length++] = (Pid >> 8) & 0xFF;
++        capmt[length++] =  Pid       & 0xFF;
++        esInfoLengthPos = length;
++        capmt[length++] = 0x00; // ES_info_length H (at ES level)
++        capmt[length++] = 0x00; // ES_info_length L
++        AddCaDescriptors(caDescriptorsLength, caDescriptors);
++        }
++     else
++        esyslog("ERROR: buffer overflow in CA descriptor");
+      }
+ }
+ 
+ void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
+ {
++  if (Length < 0) {
++     dsyslog("DEBUG: calling AddCaDescriptors with Length %d", Length);
++     return;
++     }
++
+   if (esInfoLengthPos) {
+      if (length + Length < int(sizeof(capmt))) {
+         if (Length || cmdId == CPCI_QUERY) {
+diff --git a/pat.c b/pat.c
+index 98d306e..9dfbc62 100644
+--- a/pat.c
++++ b/pat.c
+@@ -165,21 +165,25 @@ int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar
+      return 0;
+   if (BufSize > 0 && Data) {
+      int length = 0;
++     bool tooSmall = false;
+      for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+          if (EsPid < 0 || d->EsPid() == EsPid) {
+             const int *caids = CaSystemIds;
+             do {
+                if (*caids == 0xFFFF || d->CaSystem() == *caids) {
+-                  if (length + d->Length() <= BufSize) {
++                  if (length + d->Length() <= BufSize)
+                      memcpy(Data + length, d->Data(), d->Length());
+-                     length += d->Length();
+-                     }
+                   else
+-                     return -1;
++                     tooSmall = true;
++                  length += d->Length();
+                   }
+                } while (*++caids);
+             }
+          }
++     if (tooSmall) {
++        dsyslog("DEBUG: buffer for ca-descriptors too small (%d, needed %d)", BufSize, length);
++        return -length;
++        }
+      return length;
+      }
+   return -1;
+diff --git a/pat.h b/pat.h
+index 19e60dc..8bf0738 100644
+--- a/pat.h
++++ b/pat.h
+@@ -45,7 +45,7 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
+          ///< are copied that match one of the given CA system IDs (or all of them, if CaSystemIds
+          ///< is 0xFFFF).
+          ///< Returns the number of bytes copied into Data (0 if no CA descriptors are
+-         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
++         ///< available), or -(NeededBufSize) if BufSize was too small to hold all CA descriptors.
+ 
+ int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
+          ///< Gets all CA pids for a given channel.
+

packages/addons/service/emby/changelog.txt

@@ -1,3 +1,7 @@
+113
+- Updated to version 3.2.8
+- Rebuilt x264 and ffmpegx
+
 112
 - Refer to libMagickWand-7
 

packages/addons/service/emby/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.2.5"
-PKG_REV="112"
+PKG_VERSION="3.2.8"
+PKG_REV="113"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"

packages/addons/service/lcdd/changelog.txt

@@ -1,3 +1,6 @@
+104:
+- Update to 466edd3
+
 103:
 - Update to 0.5.8
 

packages/addons/service/lcdd/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="lcdd"
-PKG_VERSION="0.5.8"
-PKG_REV="103"
+PKG_VERSION="466edd3"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lcdproc.org/"
-PKG_URL="https://github.com/lcdproc/lcdproc/archive/lcdproc-$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="lcdproc-lcdproc-$PKG_VERSION*"
+PKG_URL="https://github.com/lcdproc/lcdproc/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="lcdproc-$PKG_VERSION*"
 PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb netbsd-curses serdisplib"
 PKG_SECTION="service"
 PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"

packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch

@@ -59,13 +59,13 @@ index f82df85..0d98570 100644
  
  futaba_CFLAGS =      @LIBUSB_CFLAGS@ @LIBUSB_1_0_CFLAGS@ $(AM_CFLAGS)
 @@ -89,6 +89,7 @@ CFontzPacket_SOURCES = lcd.h lcd_lib.h CFontzPacket.c CFontzPacket.h CFontz-char
- curses_SOURCES =     lcd.h curses_drv.h curses_drv.c report.h
- CwLnx_SOURCES =      lcd.h lcd_lib.h CwLnx.c CwLnx.h report.h
- debug_SOURCES =      lcd.h report.h debug.c debug.h
+ curses_SOURCES =     lcd.h curses_drv.h curses_drv.c
+ CwLnx_SOURCES =      lcd.h lcd_lib.h CwLnx.c CwLnx.h
+ debug_SOURCES =      lcd.h debug.c debug.h
 +dm140_SOURCES =      lcd.h led.c libvfd.h led.h dm140.c dm140.h report.h
- ea65_SOURCES =       lcd.h ea65.h ea65.c report.h
- EyeboxOne_SOURCES =  lcd.h lcd_lib.h EyeboxOne.c EyeboxOne.h report.h
- futaba_SOURCES =     lcd.h futaba.c futaba.h report.h
+ ea65_SOURCES =       lcd.h ea65.h ea65.c
+ EyeboxOne_SOURCES =  lcd.h lcd_lib.h EyeboxOne.c EyeboxOne.h
+ futaba_SOURCES =     lcd.h futaba.c futaba.h
 diff --git a/server/drivers/dm140.c b/server/drivers/dm140.c
 new file mode 100644
 index 0000000..56f9219
@@ -92,7 +92,7 @@ index 0000000..56f9219
 +#include "lcd.h"
 +#include "dm140.h"
 +
-+#include "report.h"
++#include "shared/report.h"
 +#include "lcd_lib.h"
 +#include "libvfd.h"
 +#include "led.h"
@@ -392,7 +392,7 @@ index 0000000..0bb565c
 +#include <string.h>
 +#include "lcd.h"
 +#include "libvfd.h"
-+#include "report.h"
++#include "shared/report.h"
 +#include "dm140.h"
 +
 +

packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch

@@ -1,16 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 7c053d2..dcb0c4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -314,7 +314,7 @@ AC_MSG_RESULT($enable_libftdi)
- 
- if test "$enable_libftdi" = "yes"; then
- 	ifdef([PKG_CHECK_MODULES],
--	 	[PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.8,
-+	 	[PKG_CHECK_MODULES(LIBFTDI, libftdi1 >= 0.8,
- 			[AC_DEFINE(HAVE_LIBFTDI, [1], [Define to 1 if you have libftdi])],
- 			[ enable_libftdi=no ])],
- 		[AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libftdi may not be built])])
 diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h
 index 47acf45..6faa830 100644
 --- a/server/drivers/hd44780-low.h
@@ -42,9 +29,9 @@ index 5d3e97a..6c26a19 100644
 --- a/server/drivers/lis.c
 +++ b/server/drivers/lis.c
 @@ -42,7 +42,7 @@
+ #include <errno.h>
  #include <pthread.h>
  
- #include <usb.h>
 -#include <ftdi.h>
 +#include <libftdi1/ftdi.h>
  
@@ -55,9 +42,9 @@ index cbdde40..a84eb49 100644
 --- a/server/drivers/ula200.c
 +++ b/server/drivers/ula200.c
 @@ -31,7 +31,7 @@
+ #include <string.h>
  #include <errno.h>
  
- #include <usb.h>
 -#include <ftdi.h>
 +#include <libftdi1/ftdi.h>
  

packages/addons/service/net-snmp/changelog.txt

@@ -1,3 +1,6 @@
+101
+- make addon configurable
+
 100
 - Initial addon
 - net-snmp 5.7.3

packages/addons/service/net-snmp/package.mk

@@ -18,12 +18,12 @@
 
 PKG_NAME="net-snmp"
 PKG_VERSION="5.7.3"
-PKG_REV="100"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.net-snmp.org"
 PKG_URL="http://sourceforge.net/projects/net-snmp/files/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain libnl"
 PKG_SECTION="service"
 PKG_SHORTDESC="Simple Network Management Protocol utilities."
 PKG_LONGDESC="Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring the health and welfare of network equipment."
@@ -39,14 +39,22 @@ PKG_CONFIGURE_OPTS_TARGET="--with-defaults \
         --disable-debugging \
         --disable-deprecated \
         --disable-snmptrapd-subagent \
-        --disable-perl-cc-checks \
-        --with-perl-modules=no \
-        --enable-mini-agent \
+        --disable-scripts \
         --enable-static=no \
         --enable-shared=yes \
-        --with-logfile=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/ \
-        --with-persistent-directory=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/ \
-        --disable-embedded-perl"
+        --enable-mini-agent \
+        --with-nl \
+        --with-logfile=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID} \
+        --with-persistent-directory=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID} \
+        --sysconfdir=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID} \
+        --prefix=/storage/.kodi/addons/${PKG_ADDON_ID} \
+        --exec-prefix=/storage/.kodi/addons/${PKG_ADDON_ID} \
+        --datarootdir=/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share \
+        --bindir=/storage/.kodi/addons/${PKG_ADDON_ID}/bin \
+        --sbindir=/storage/.kodi/addons/${PKG_ADDON_ID}/bin \
+        --libdir=/storage/.kodi/addons/${PKG_ADDON_ID}/lib \
+        --disable-embedded-perl \
+        --with-sysroot=$SYSROOT_PREFIX"
 
 make_target() {
   make
@@ -57,12 +65,11 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  mv $PKG_BUILD/.$TARGET_NAME/usr/sbin/snmpd $PKG_BUILD/.$TARGET_NAME/usr/bin/snmpd
-  rm -rf $PKG_BUILD/.$TARGET_NAME/usr/sbin/
-  rm -rf $PKG_BUILD/.$TARGET_NAME/usr/include/
-  cp -r $PKG_BUILD/.$TARGET_NAME/usr/* $ADDON_BUILD/$PKG_ADDON_ID/
-  $STRIP $ADDON_BUILD/$PKG_ADDON_ID/lib/*.so
-  $STRIP $ADDON_BUILD/$PKG_ADDON_ID/bin/snmpd
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -r $PKG_BUILD/.$TARGET_NAME/storage/.kodi/addons/${PKG_ADDON_ID}/bin $PKG_BUILD/.$TARGET_NAME/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share $ADDON_BUILD/$PKG_ADDON_ID/
+  #Do not copy symlinks
+  find $PKG_BUILD/.$TARGET_NAME/storage/.kodi/addons/${PKG_ADDON_ID}/lib/ -type f -name '*.so.*' -exec cp '{}' $ADDON_BUILD/$PKG_ADDON_ID/lib/ \;
+  #remove all but major version from so file
+  for f in $ADDON_BUILD/$PKG_ADDON_ID/lib/*.so.* ; do mv "$f" "${f%.*.*}" ; done
 }
 

packages/addons/service/net-snmp/patches/net-snmp-0001-read_config.c.patch

@@ -0,0 +1,11 @@
+--- a/snmplib/read_config.c	2014-12-08 14:23:22.000000000 -0600
++++ b/snmplib/read_config.c	2017-03-30 12:21:16.351042803 -0500
+@@ -1618,7 +1618,7 @@
+      * save a warning header to the top of the new file 
+      */
+     snprintf(fileold, sizeof(fileold),
+-            "%s%s# Please save normal configuration tokens for %s in SNMPCONFPATH/%s.conf.\n# Only \"createUser\" tokens should be placed here by %s administrators.\n%s",
++            "%s%s# Please save normal configuration tokens for %s in /storage/.kodi/userdata/addon_data/service.net-snmp/share/snmp/%s.conf.\n# Only \"createUser\" tokens should be placed here by %s administrators.\n%s",
+             "#\n# net-snmp (or ucd-snmp) persistent data file.\n#\n############################################################################\n# STOP STOP STOP STOP STOP STOP STOP STOP STOP \n",
+             "#\n#          **** DO NOT EDIT THIS FILE ****\n#\n# STOP STOP STOP STOP STOP STOP STOP STOP STOP \n############################################################################\n#\n# DO NOT STORE CONFIGURATION ENTRIES HERE.\n",
+             type, type, type,

packages/addons/service/net-snmp/patches/net-snmp-0002-net-snmp-create-v3-user.in.patch

@@ -0,0 +1,15 @@
+--- a/net-snmp-create-v3-user.in	2014-12-08 14:23:22.000000000 -0600
++++ b/net-snmp-create-v3-user.in	2017-03-30 13:20:56.336794994 -0500
+@@ -28,10 +28,8 @@
+    NSC_SRCDIR="NET-SNMP-SOURCE-DIR"
+ fi
+ 
+-if @PSCMD@ | egrep ' snmpd *$' > /dev/null 2>&1 ; then
+-    echo "Apparently at least one snmpd demon is already running."
+-    echo "You must stop them in order to use this command."
+-    exit 1
++if @PSCMD@ | egrep 'snmpd'> /dev/null 2>&1 ; then
++    systemctl stop service.net-snmp.service
+ fi
+ 
+ Aalgorithm="MD5"

packages/addons/service/net-snmp/source/bin/snmpd.start

@@ -24,4 +24,4 @@ ADDON_ID=service.net-snmp
 ADDON_DIR="$HOME/.kodi/addons/$ADDON_ID"
 ADDON_HOME="$HOME/.kodi/userdata/addon_data/$ADDON_ID"
 
-$ADDON_DIR/bin/snmpd -LS0-6d -c $ADDON_DIR/snmpd.conf -M /storage/.kodi/addons/service.net-snmp/share/snmp/mibs -p /var/run/snmpd.pid
+$ADDON_DIR/bin/snmpd -f -LS0-6d -c $ADDON_HOME/share/snmp/snmpd.conf -M $ADDON_DIR/share/snmp/mibs -p /var/run/snmpd.pid

packages/addons/service/net-snmp/source/default.py

@@ -15,3 +15,63 @@
 #  You should have received a copy of the GNU General Public License
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
+import xbmc
+import xbmcvfs
+import xbmcaddon
+from os import system
+
+
+class MyMonitor(xbmc.Monitor):
+    def __init__(self, *args, **kwargs):
+        xbmc.Monitor.__init__(self)
+    
+    def onSettingsChanged(self):
+        writeconfig()
+
+            
+# addon
+__addon__ = xbmcaddon.Addon(id='service.net-snmp')
+__addonpath__ = xbmc.translatePath(__addon__.getAddonInfo('path'))
+__addonhome__ = xbmc.translatePath(__addon__.getAddonInfo('profile'))
+if not xbmcvfs.exists(xbmc.translatePath(__addonhome__ + 'share/snmp/')):
+    xbmcvfs.mkdirs(xbmc.translatePath(__addonhome__ + 'share/snmp/'))
+config = xbmc.translatePath(__addonhome__ + 'share/snmp/snmpd.conf')
+persistent = xbmc.translatePath(__addonhome__ + 'snmpd.conf')
+
+
+def writeconfig():
+    system("systemctl stop service.net-snmp.service")
+    community = __addon__.getSetting("COMMUNITY")
+    location = __addon__.getSetting("LOCATION")
+    contact = __addon__.getSetting("CONTACT")
+    snmpversion = __addon__.getSetting("SNMPVERSION")
+    
+    if xbmcvfs.exists(persistent):
+            xbmcvfs.delete(persistent)
+    
+    file = xbmcvfs.File(config, 'w')
+    file.write('com2sec local default {}\n'.format(community))
+    file.write('group localgroup {} local\n'.format(snmpversion))
+    file.write('access localgroup "" any noauth exact all all none\n')
+    file.write('view all included .1 80\n')
+    file.write('syslocation {}\n'.format(location))
+    file.write('syscontact {}\n'.format(contact))
+    file.write('dontLogTCPWrappersConnects yes\n')
+    file.close()
+    
+    if snmpversion == "v3":
+        snmppassword = __addon__.getSetting("SNMPPASSWORD")
+        snmpuser = __addon__.getSetting("SNMPUSER")
+        system("net-snmp-config --create-snmpv3-user -a {0} {1}".format(snmppassword,snmpuser))
+    
+    system("systemctl start service.net-snmp.service")
+
+
+if not xbmcvfs.exists(config):
+    writeconfig()
+
+monitor = MyMonitor()
+while not monitor.abortRequested():
+    if monitor.waitForAbort():
+        break
+

packages/addons/service/net-snmp/source/resources/language/English/strings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+    <!-- net-snmp -->
+    <string id="32000">General</string>
+    <string id="32001">Community</string>
+    <string id="32002">Location</string>
+    <string id="32003">Contact</string>
+    <string id="32004">SNMP Version</string>
+    <string id="32005">SNMP User</string>
+    <string id="32006">SNMP Password</string>
+</strings>

packages/addons/service/net-snmp/source/resources/settings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <!-- net-snmp -->
+    <category label="32000">
+		<setting label="32001" id="COMMUNITY" type="text" default="libreelec"/>
+		<setting label="32002" id="LOCATION" type="text" default="HOME"/>
+		<setting label="32003" id="CONTACT" type="text" default="root@localhost"/>
+		<setting label="32004" id="SNMPVERSION" type="labelenum" values="v1|v2c|v3" default="v2c"/>
+		<setting label="32005" id="SNMPUSER" type="text" default="user"/>
+		<setting label="32006" id="SNMPPASSWORD" type="text" default="password"/>
+    </category>
+</settings>

packages/addons/service/net-snmp/source/snmpd.conf

@@ -1,10 +0,0 @@
-com2sec local   default       libreelec
-group   localgroup      v2c     local
-access  localgroup      ""      any     noauth  exact   all     all     none
-
-view all    included  .1	80
-
-syslocation HOME
-syscontact root@libreelec
-
-dontLogTCPWrappersConnects yes

packages/addons/service/net-snmp/source/system.d/service.net-snmp.service

@@ -4,9 +4,11 @@ After=network-online.target
 Requires=network-online.target
 
 [Service]
-Type=forking
+Type=notification
 ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.net-snmp/bin/snmpd.start"
 ExecStop=/bin/sh -c "exec sh /storage/.kodi/addons/service.net-snmp/bin/snmpd.stop"
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/var/run/snmpd.pid
 
 [Install]
 WantedBy=kodi.target

packages/addons/service/vdr-addon/changelog.txt

@@ -1,3 +1,9 @@
+105
+- fix for some scrambled channels
+- update dvbapi to d7c7587
+- update Sat>IP plugin to ed99cfb
+- update VNSI to 615a077
+
 104
 - encode special characters in directory names to be accesible via smb
 - update VNSI to d6847c3

packages/addons/service/vdr-addon/package.mk

@@ -18,11 +18,11 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="8.0"
-PKG_REV="104"
+PKG_VERSION="2.2"
+PKG_REV="105"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
+PKG_SITE="https://libreelec.tv"
 PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-dummydevice vdr-plugin-dvbapi vdr-plugin-eepg vdr-plugin-epgfixer vdr-plugin-epgsearch vdr-plugin-iptv vdr-plugin-live vdr-plugin-restfulapi vdr-plugin-satip vdr-plugin-streamdev vdr-plugin-vnsiserver vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-xmltv2vdr"
 PKG_SECTION="service.multimedia"

packages/addons/tools/dvb-tools/changelog.txt

@@ -1,3 +1,9 @@
+102
+- added MuMuDVB
+- updated w_scan to 20170107
+- updated dvblast to 3.1
+- updated dvb-fe-tool to 1.12.3
+
 101
 - added w_scan
 

packages/addons/tools/dvb-tools/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 PKG_NAME="dvb-tools"
 PKG_VERSION=""
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE=""
@@ -26,7 +26,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="DVB-Tools: is a bundle of dvb tools and programs"
-PKG_LONGDESC="This bundle currently includes dvb-apps, dvb-fe-tool, dvblast and w_scan."
+PKG_LONGDESC="This bundle currently includes dvb-apps, dvb-fe-tool, dvblast, mumudvb and w_scan."
 PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
@@ -37,6 +37,7 @@ PKG_DEPENDS_TARGET="toolchain \
                     dvb-apps \
                     dvb-fe-tool \
                     dvblast \
+                    mumudvb \
                     w_scan"
 
 addon() {
@@ -60,6 +61,9 @@ addon() {
     # dvblast
     cp -P $(get_build_dir dvblast)/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin
 
+    # mumudvb
+    cp -P $(get_build_dir mumudvb)/.$TARGET_NAME/src/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin
+
     # w_scan
     cp -P $(get_build_dir w_scan)/.$TARGET_NAME/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/addons/tools/mono/changelog.txt

@@ -1,10 +1,13 @@
-8.0.102
+103:
+- Update to 4.8.1.0
+
+102:
 - Update to 4.8.0.495
 
-8.0.101
+101:
 - Update to 4.2.1.102
 - Build static for all projects and architectures
 - Remove uneeded binaries and libraries
 
-8.0.100
+100:
 - Initial release

packages/addons/tools/mono/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="mono"
-PKG_VERSION="4.8.0.495"
-PKG_REV="102"
+PKG_VERSION="4.8.1.0"
+PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.mono-project.com"

packages/addons/tools/mono/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

packages/devel/libcec/package.mk

@@ -22,13 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
 PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz"
-if [ "$PROJECT" = "imx6" ]; then
-  if [ "$LINUX_VERSION" = "sr-3.14" ]; then
-    PKG_PATCH_DIRS="3.14-sr"
-  else
-    PKG_PATCH_DIRS="4.4-xbian"
-  fi
-fi
+[ "$PROJECT" = "imx6" ] && PKG_PATCH_DIRS="${LINUX#imx6-}"
 PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform"
 PKG_SECTION="system"
 PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="2ef9cb6"
+PKG_VERSION="856c68d"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

packages/graphics/imx-gpu-viv/package.mk

@@ -17,7 +17,13 @@
 ################################################################################
 
 PKG_NAME="imx-gpu-viv"
-PKG_VERSION="5.0.11.p4.5-hfp"
+if [ "$LINUX" = "imx6-3.14-sr" ]; then
+  PKG_VERSION="5.0.11.p4.5-hfp"
+elif [ "$LINUX" = "imx6-4.4-xbian" ]; then
+  PKG_VERSION="5.0.11.p7.4-hfp"
+else
+  exit 0
+fi
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.freescale.com"
@@ -49,14 +55,19 @@ makeinstall_target() {
              gpu-core/usr/lib/libGLSLC.so* \
              gpu-core/usr/lib/libGAL-fb.so \
              gpu-core/usr/lib/libGAL.so* \
-             gpu-core/usr/lib/libGAL_egl.fb.so \
-             gpu-core/usr/lib/libGAL_egl.so* \
              gpu-core/usr/lib/libVIVANTE-fb.so \
              gpu-core/usr/lib/libVIVANTE.so* \
              gpu-core/usr/lib/libOpenCL.so \
              gpu-core/usr/lib/libVSC.so \
              g2d/usr/lib/libg2d*.so*"
 
+  # missing in 5.0.11.p7.4-hfp
+  if [ "$PKG_VERSION" = "5.0.11.p4.5-hfp" ]; then
+    LIBS_COPY="$LIBS_COPY \
+               gpu-core/usr/lib/libGAL_egl.fb.so \
+               gpu-core/usr/lib/libGAL_egl.so*"
+  fi
+
   mkdir -p $SYSROOT_PREFIX/usr/lib
   cp -PRv $LIBS_COPY $SYSROOT_PREFIX/usr/lib
 

packages/linux-drivers/RTL8812AU/patches/RTL8812AU-01-add_new_cards.patch

@@ -1,12 +1,11 @@
-diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c
-index 85312bc..7318b1e 100644
---- a/os_dep/linux/usb_intf.c
-+++ b/os_dep/linux/usb_intf.c
-@@ -167,6 +167,11 @@ static struct usb_device_id rtw_usb_id_tbl[] ={
+--- a/os_dep/linux/usb_intf.c	2017-04-01 13:42:06.213757346 +0100
++++ b/os_dep/linux/usb_intf.c	2017-04-01 13:43:43.195961025 +0100
+@@ -167,6 +167,12 @@ static struct usb_device_id rtw_usb_id_t
  	{USB_DEVICE(0x13b1, 0x003f),.driver_info = RTL8812}, /* Linksys - WUSB6300 */
  	{USB_DEVICE(0x2357, 0x0101),.driver_info = RTL8812}, /* TP-Link - T4U */
  	{USB_DEVICE(0x2357, 0x0103),.driver_info = RTL8812}, /* TP-Link - T4UH */
 +	/*=== Patched ID ===*/
++	{USB_DEVICE(0x050D, 0x010d),.driver_info = RTL8812}, /* TP-Link - T4U v2 */
 +	{USB_DEVICE(0x050D, 0x1109),.driver_info = RTL8812}, /* Belkin F9L1109 - SerComm */
 +	{USB_DEVICE(0x20F4, 0x805B),.driver_info = RTL8812}, /* TRENDnet - Cameo */
 +	{USB_DEVICE(0x148F, 0x9097),.driver_info = RTL8812}, /* Amped Wireless ACA1 */
@@ -14,7 +13,7 @@ index 85312bc..7318b1e 100644
  #endif
  
  #ifdef CONFIG_RTL8821A
-@@ -184,9 +189,18 @@ static struct usb_device_id rtw_usb_id_tbl[] ={
+@@ -184,9 +190,18 @@ static struct usb_device_id rtw_usb_id_t
  	{USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */
  	{USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link - Cameo */
  	{USB_DEVICE(0x0E66, 0x0023),.driver_info = RTL8821}, /* HAWKING - Edimax */

packages/linux-drivers/gpu-aml/patches/gpu-aml-0002-use-rfc-date-in-version-string.patch

@@ -0,0 +1,13 @@
+diff --git a/mali/Kbuild b/mali/Kbuild
+index 7cc2225..6ce6270 100755
+--- a/mali/Kbuild
++++ b/mali/Kbuild
+@@ -312,7 +312,7 @@ VERSION_STRINGS += REPO_URL=$(REPO_URL)
+ VERSION_STRINGS += REVISION=$(DRIVER_REV)
+ VERSION_STRINGS += CHANGED_REVISION=$(CHANGED_REVISION)
+ VERSION_STRINGS += CHANGE_DATE=$(CHANGE_DATE)
+-VERSION_STRINGS += BUILD_DATE=$(shell date)
++VERSION_STRINGS += BUILD_DATE=$(shell date -R)
+ ifdef CONFIG_MALI400_DEBUG
+ VERSION_STRINGS += BUILD=debug
+ else

packages/linux-drivers/media_build/config/usb.config

@@ -578,3 +578,7 @@ CONFIG_MISC_DEVICES=y
 #
 CONFIG_ALTERA_STAPL=m
 # CONFIG_STAGING is not set
+
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_CXD2880=m

packages/linux-drivers/media_build/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="media_build"
-PKG_VERSION="2017-01-22"
+PKG_VERSION="2017-01-22-rpi"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/crazycat69/linux_media"

packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch

@@ -1,6 +1,6 @@
 --- a/backports/backports.txt
 +++ b/backports/backports.txt
-@@ -25,6 +25,15 @@
+@@ -25,6 +25,17 @@
  add pr_fmt.patch
  add debug.patch
  add drx39xxj.patch
@@ -13,6 +13,8 @@
 +add linux-062-imon_pad_ignore_diagonal.patch
 +add linux-063-fix-rc-raw-decoder-loading.patch
 +add linux-240-pctv452e_kernel_oops_in_4.9.patch
++add linux-220-cx231xx-suspend-fix.patch
++add cxd2880-support.patch
 
  [4.8.255]
  add v4.8_user_pages_flag.patch

packages/linux-drivers/media_build/sources/backports/linux-220-cx231xx-suspend-fix.patch

@@ -0,0 +1,31 @@
+drop at next major media_build bump
+fixes https://github.com/tbsdtv/linux_media/issues/40
+
+From f10b80837b205be12e3b511a14c184f1873ce1d6 Mon Sep 17 00:00:00 2001
+From: CrazyCat <crazycat69@narod.ru>
+Date: Fri, 31 Mar 2017 01:04:42 +0300
+Subject: [PATCH] cx231xx-dvb: Fixed merge issue in unregister_dvb().
+
+---
+ drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
+index 593be48..fb477e9 100644
+--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
++++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
+@@ -755,14 +755,6 @@ static void unregister_dvb(struct cx231xx_dvb *dvb)
+ 	}
+ 	dvb_unregister_frontend(dvb->frontend);
+ 	dvb_frontend_detach(dvb->frontend);
+-
+-	client = dvb->i2c_client_demod;
+-	/* remove I2C demod */
+-	if (client) {
+-		module_put(client->dev.driver->owner);
+-		i2c_unregister_device(client);
+-	}
+-
+ 	dvb_unregister_adapter(&dvb->adapter);
+ }
+ 

packages/linux-drivers/wetekdvb/package.mk

@@ -17,7 +17,14 @@
 ################################################################################
 
 PKG_NAME="wetekdvb"
-PKG_VERSION="20170116"
+case "$PROJECT" in
+  WeTek_Play)
+    PKG_VERSION="20170116"
+    ;;
+  *)
+    PKG_VERSION="20170404"
+    ;;
+esac
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.wetek.com/"

packages/linux-firmware/misc-firmware/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="misc-firmware"
-PKG_VERSION="0.0.17"
+PKG_VERSION="0ed3d22"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
-PKG_SITE="https://github.com/OpenELEC/misc-firmware"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_SITE="https://github.com/LibreELEC/misc-firmware"
+PKG_URL="https://github.com/LibreELEC/misc-firmware/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="firmware"
 PKG_SHORTDESC="misc-firmware: firmwares for various drivers"

packages/linux-firmware/x86-firmware/package.mk

@@ -20,8 +20,8 @@ PKG_NAME="x86-firmware"
 PKG_VERSION="c4c07a8"
 PKG_ARCH="x86_64"
 PKG_LICENSE="other"
-PKG_SITE="http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/"
-PKG_URL="http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.xz"
+PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
+PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="linux-firmware"

packages/linux/package.mk

@@ -29,13 +29,13 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 case "$LINUX" in
   amlogic-3.10)
-    PKG_VERSION="de626d8"
+    PKG_VERSION="7c63993"
     PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
     PKG_PATCH_DIRS="amlogic-3.10"
     ;;
   amlogic-3.14)
-    PKG_VERSION="eb7e852"
+    PKG_VERSION="6c88aa0"
     PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
     PKG_PATCH_DIRS="amlogic-3.14"
@@ -59,7 +59,7 @@ case "$LINUX" in
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
     ;;
   *)
-    PKG_VERSION="4.9.13"
+    PKG_VERSION="4.9.29"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;
@@ -130,15 +130,6 @@ post_patch() {
     sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config
     sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config
   fi
-
-  # enable different libcec version for imx6 project with kernel 4.4
-  # using customized kernel driver
-  if [ "$PROJECT" = "imx6" ]; then
-    if [ "$LIBCEC_TYPE" = "xbian" -a "$LINUX" = "imx6-4.4-xbian" ]; then
-      sed -i -e "s|# CONFIG_MXC_HDMI_CEC is not set|CONFIG_MXC_HDMI_CEC=y|" $PKG_BUILD/.config
-      sed -i -e "s|CONFIG_MXC_HDMI_CEC_SR=y||" $PKG_BUILD/.config
-    fi
-  fi
 }
 
 makeinstall_host() {

packages/linux/patches/default/linux-063-fix-rc-raw-decoder-loading.patch

@@ -1,46 +0,0 @@
-From d13ee07f431c94ea72320ea4136e75ebeaee98c1 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Fri, 3 Mar 2017 10:27:44 +0100
-Subject: [PATCH] backport: rc: raw decoder for keymap protocol is not loaded
- on register
-
-see http://www.spinics.net/lists/linux-media/msg111651.html
----
- drivers/media/rc/rc-main.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index dedaf38..9a397da 100644
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -1441,6 +1441,7 @@ int rc_register_device(struct rc_dev *dev)
- 	int attr = 0;
- 	int minor;
- 	int rc;
-+	u64 rc_type;
- 
- 	if (!dev || !dev->map_name)
- 		return -EINVAL;
-@@ -1526,14 +1527,18 @@ int rc_register_device(struct rc_dev *dev)
- 			goto out_input;
- 	}
- 
-+	rc_type = BIT_ULL(rc_map->rc_type);
-+
- 	if (dev->change_protocol) {
--		u64 rc_type = (1ll << rc_map->rc_type);
- 		rc = dev->change_protocol(dev, &rc_type);
- 		if (rc < 0)
- 			goto out_raw;
- 		dev->enabled_protocols = rc_type;
- 	}
- 
-+	if (dev->driver_type == RC_DRIVER_IR_RAW)
-+		ir_raw_load_modules(&rc_type);
-+
- 	/* Allow the RC sysfs nodes to be accessible */
- 	atomic_set(&dev->initialized, 1);
- 
--- 
-2.1.4
-

packages/linux/patches/default/linux-999-i915-use-legacy-turbo.patch

@@ -1,27 +0,0 @@
-From aefcd1a6b1ec22e4e0d26eb932b618c5d12f7e9c Mon Sep 17 00:00:00 2001
-From: fritsch <peter.fruehberger@gmail.com>
-Date: Sun, 21 Feb 2016 12:39:16 +0100
-Subject: [PATCH] i915_irq: enable legacy turbo (4.6)
-
----
- drivers/gpu/drm/i915/i915_irq.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 1c21220..6507643 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -4557,12 +4557,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
- 	INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work);
- 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
- 
--	/* Let's track the enabled rps events */
--	if (IS_VALLEYVIEW(dev_priv))
--		/* WaGsvRC0ResidencyMethod:vlv */
--		dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
--	else
--		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
-+	dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
- 
- 	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
- 			  i915_hangcheck_elapsed);

packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="adsp.biquad.filters"
-PKG_VERSION="e08990f"
+PKG_VERSION="29bfe9d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="adsp.freesurround"
-PKG_VERSION="61568b9"
+PKG_VERSION="34f5040"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="aa0d511"
+PKG_VERSION="c69f134"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/liberty-developer/inputstream.adaptive/archive/$PKG_VERSION.tar.gz"

packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="peripheral.joystick"
-PKG_VERSION="0c47f0e"
+PKG_VERSION="b464260"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="00f03b2"
+PKG_VERSION="9040b14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.demo"
-PKG_VERSION="147fd97"
+PKG_VERSION="57a1c56"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvblink"
-PKG_VERSION="63cf195"
+PKG_VERSION="17d1263"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvbviewer"
-PKG_VERSION="ba78fd2"
+PKG_VERSION="602042c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.filmon"
-PKG_VERSION="d043da6"
+PKG_VERSION="ab9b519"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hdhomerun"
-PKG_VERSION="cb3f151"
+PKG_VERSION="60d89d1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="5bf84c3"
+PKG_VERSION="4e2a833"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.iptvsimple"
-PKG_VERSION="c06f367"
+PKG_VERSION="d782816"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="379658a"
+PKG_VERSION="d261c83"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="a3e4a50"
+PKG_VERSION="c4259bf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.kodi.tv"
-PKG_URL="https://github.com/kodi-pvr/pvr.mythtv/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/janbar/pvr.mythtv"
+PKG_URL="https://github.com/janbar/pvr.mythtv/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_SECTION=""
 PKG_SHORTDESC="pvr.mythtv"

packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="e7430e9"
+PKG_VERSION="dd03d62"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.njoy"
-PKG_VERSION="57393bd"
+PKG_VERSION="ce66c1d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.pctv"
-PKG_VERSION="b7b5fe0"
+PKG_VERSION="85d6eae"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.stalker"
-PKG_VERSION="c396e47"
+PKG_VERSION="df111a0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vbox"
-PKG_VERSION="46a612d"
+PKG_VERSION="adc6c34"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vdr.vnsi"
-PKG_VERSION="960f2d3"
+PKG_VERSION="4ed7d60"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vuplus"
-PKG_VERSION="763a644"
+PKG_VERSION="25c4883"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.wmc"
-PKG_VERSION="55218f5"
+PKG_VERSION="ed67cfe"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="fc1619b"
+PKG_VERSION="147cec4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"

packages/mediacenter/kodi/patches/aarch64/kodi-0006-aml-Scale-video-axis-correctly-when-1080p-to-2160p-switching.patch

@@ -1,20 +1,19 @@
-From 211edfa19b20820772b33f6042992811037a21b3 Mon Sep 17 00:00:00 2001
+From c5ace4b3e353142177352a910a56ec1c9508aa40 Mon Sep 17 00:00:00 2001
 From: Jamie Coldhill <wrxtasy@amnet.net.au>
 Date: Thu, 6 Oct 2016 17:54:40 +0800
-Subject: [PATCH] [aml] Scale video axis correctly when 1080p to 2160p switching
- Fixup 720p60hz fallback resolution 
+Subject: [PATCH] Scale video axis correctly when 1080p to 2160p switching
 
+Amended to fix 720p -> 1080p switching
 ---
- xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 10 +++++++++-
+ xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 14 +++++++++++---
  xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h   |  1 +
- xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp         |  2 +-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ 2 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
-index f9b4138..2a3b413 100644
+index c38c223..bb8161e 100644
 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
 +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
-@@ -2163,6 +2163,13 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
+@@ -2164,6 +2164,13 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
      update = true;
    }
  
@@ -28,13 +27,20 @@ index f9b4138..2a3b413 100644
    if (!update)
    {
      // mainvideo 'should' be showing already if we get here, make sure.
-@@ -2176,7 +2183,8 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
+@@ -2172,12 +2179,13 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
+   }
+ 
+   CRect gui, display;
+-  gui = CRect(0, 0, CDisplaySettings::GetInstance().GetCurrentResolutionInfo().iWidth, CDisplaySettings::GetInstance().GetCurrentResolutionInfo().iHeight);
+-
  #ifdef TARGET_ANDROID
    display = m_display_rect;
++  gui = CRect(0, 0, CDisplaySettings::GetInstance().GetCurrentResolutionInfo().iWidth, CDisplaySettings::GetInstance().GetCurrentResolutionInfo().iHeight);
  #else
 -  display = gui;
 +  const RESOLUTION_INFO& video_res_info = CDisplaySettings::GetInstance().GetResolutionInfo(video_res);
 +  display = m_display_rect = CRect(0, 0, video_res_info.iScreenWidth, video_res_info.iScreenHeight);
++  gui = CRect(0, 0, video_res_info.iWidth, video_res_info.iHeight);
  #endif
    if (gui != display)
    {
@@ -50,16 +56,6 @@ index 0eb5c3e..ede815d 100644
  
    PosixFilePtr     m_amlVideoFile;
    std::string      m_defaultVfmMap;
-diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp
-index 88cd385..6d63571 100644
---- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp
-+++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp
-@@ -173,7 +173,7 @@ bool CEGLNativeTypeAmlogic::GetPreferredResolution(RESOLUTION_INFO *res) const
-   if (!GetNativeResolution(res))
-   {
-     // punt to 720p if we get nothing
--    aml_mode_to_resolution("720p", res);
-+    aml_mode_to_resolution("720p60hz", res);
-   }
- 
-   return true;
+-- 
+1.8.3.1
+

packages/mediacenter/kodi/patches/kodi-999.99-ae-settings-samplerate.patch

@@ -0,0 +1,74 @@
+From aabc63419df8aa69f156afdafb28820c3c9ccdc7 Mon Sep 17 00:00:00 2001
+From: fritsch <Peter.Fruehberger@gmail.com>
+Date: Sat, 1 Nov 2014 12:44:54 +0100
+Subject: [PATCH] AdvancedSettings: Add minimalSampleRate to ActiveAE cause of
+ broken AVRs out there
+
+---
+ xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 8 ++++++++
+ xbmc/settings/AdvancedSettings.cpp                   | 3 +++
+ xbmc/settings/AdvancedSettings.h                     | 2 ++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+index bf7e439..1687bad 100644
+--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+@@ -28,6 +28,7 @@ using namespace ActiveAE;
+ #include "cores/AudioEngine/Encoders/AEEncoderFFmpeg.h"
+ 
+ #include "settings/Settings.h"
++#include "settings/AdvancedSettings.h"
+ #include "windowing/WindowingFactory.h"
+ 
+ #define MAX_CACHE_LEVEL 0.5   // total cache time of stream in seconds
+@@ -1504,6 +1505,13 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett
+       format.m_channelLayout = AE_CH_LAYOUT_2_0;
+     }
+ 
++    // OpenELEC workaround to define a minimum sample Rate for broken AVRs
++    if (format.m_sampleRate < g_advancedSettings.m_minimumSampleRate)
++    {
++      format.m_sampleRate = g_advancedSettings.m_minimumSampleRate;
++      CLog::Log(LOGDEBUG, "CActiveAE::MinimumSampleRate - Forced by use to samplerate %d", format.m_sampleRate);
++    }
++
+     if (m_settings.config == AE_CONFIG_FIXED)
+     {
+       format.m_sampleRate = m_settings.samplerate;
+diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
+index c4fa298..35728e4 100644
+--- a/xbmc/settings/AdvancedSettings.cpp
++++ b/xbmc/settings/AdvancedSettings.cpp
+@@ -108,6 +108,8 @@ void CAdvancedSettings::Initialize()
+     return;
+ 
+   m_audioHeadRoom = 0;
++  // OpenELEC workaround for broken AVRs
++  m_minimumSampleRate = 8000;
+   m_ac3Gain = 12.0f;
+   m_audioApplyDrc = -1.0f;
+   m_dvdplayerIgnoreDTSinWAV = false;
+@@ -464,6 +466,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
+   {
+     XMLUtils::GetFloat(pElement, "ac3downmixgain", m_ac3Gain, -96.0f, 96.0f);
+     XMLUtils::GetInt(pElement, "headroom", m_audioHeadRoom, 0, 12);
++    XMLUtils::GetInt(pElement, "minimumsamplerate", m_minimumSampleRate, 8000, 192000);
+     XMLUtils::GetString(pElement, "defaultplayer", m_audioDefaultPlayer);
+     // 101 on purpose - can be used to never automark as watched
+     XMLUtils::GetFloat(pElement, "playcountminimumpercent", m_audioPlayCountMinimumPercent, 0.0f, 101.0f);
+diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
+index b0b4df1..7137614 100644
+--- a/xbmc/settings/AdvancedSettings.h
++++ b/xbmc/settings/AdvancedSettings.h
+@@ -140,6 +140,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
+     static void SettingOptionsLoggingComponentsFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int &current, void *data);
+ 
+     int m_audioHeadRoom;
++    // OpenELEC workaround for minimum sample Rate
++    int m_minimumSampleRate;
+     float m_ac3Gain;
+     std::string m_audioDefaultPlayer;
+     float m_audioPlayCountMinimumPercent;
+-- 
+2.1.4

packages/mediacenter/kodi/scripts/kodi.sh

@@ -93,6 +93,11 @@ fi
 # clean up any stale cores. just in case
 rm -f /storage/.cache/cores/*
 
+# clean zero-byte database files that prevent migration/startup
+for file in /storage/.kodi/userdata/Database/*.db; do
+  [ -s $file ] || rm -f $file
+done
+
 /usr/lib/kodi/kodi.bin $SAVED_ARGS
 RET=$?
 

packages/multimedia/ffmpeg/patches/ffmpeg-99.1008-73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch

@@ -22,4 +22,3 @@ index 2fd3f2b..7165652 100644
          if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
              *poutbuf      = NULL;
              *poutbuf_size = 0;
-

packages/network/connman/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.33"
+PKG_VERSION="1.34"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"

packages/network/connman/patches/connman-06-fix-dns-ordering.patch

@@ -1,42 +0,0 @@
-From ff413a83164b2398549ed9e94277addb9bbc36f8 Mon Sep 17 00:00:00 2001
-From: Sam Nazarko <email@samnazarko.co.uk>
-Date: Thu, 21 Jul 2016 15:59:48 +0100
-Subject: [PATCH] [package] [connman-osmc] Fix an issue where DNS servers and
- search domains are added in the reverse order
-
-Signed-off-by: Sam Nazarko <email@samnazarko.co.uk>
----
- src/resolver.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/resolver.c b/src/resolver.c
-index fbe4be7..c4adbc6 100644
---- a/src/resolver.c
-+++ b/src/resolver.c
-@@ -100,9 +100,9 @@ static int resolvfile_export(void)
- 	 * MAXDNSRCH/MAXNS entries are used.
- 	 */
- 
--	for (count = 0, list = g_list_last(resolvfile_list);
-+	for (count = 0, list = g_list_first(resolvfile_list);
- 						list && (count < MAXDNSRCH);
--						list = g_list_previous(list)) {
-+						list = g_list_next(list)) {
- 		struct resolvfile_entry *entry = list->data;
- 
- 		if (!entry->domain)
-@@ -118,9 +118,9 @@ static int resolvfile_export(void)
- 	if (count)
- 		g_string_append_printf(content, "\n");
- 
--	for (count = 0, list = g_list_last(resolvfile_list);
-+	for (count = 0, list = g_list_first(resolvfile_list);
- 						list && (count < MAXNS);
--						list = g_list_previous(list)) {
-+						list = g_list_next(list)) {
- 		struct resolvfile_entry *entry = list->data;
- 
- 		if (!entry->server)
--- 
-2.7.4
-

packages/sysutils/busybox/config/busybox-target.conf

@@ -114,7 +114,7 @@ CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
 CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 CONFIG_FEATURE_NON_POSIX_CP=y

packages/sysutils/busybox/scripts/createlog

@@ -24,7 +24,7 @@ DATE=`date -u +%Y-%m-%d-%H.%M.%S`
 BASEDIR="/tmp"
 LOGDIR="log-$DATE"
 RELEASE="`cat /etc/release`"
-GIT="`cat /etc/issue |grep git`"
+GIT="`cat /etc/issue | grep git`"
 
 getlog_cmd() {
   if command -v $1 >/dev/null; then
@@ -74,8 +74,24 @@ rm -rf $BASEDIR/$LOGDIR
 mkdir -p $BASEDIR/$LOGDIR
 
 # kodi.log
+  KODI_LOG_DIR=/storage/.kodi/temp
+
   LOGFILE="01_KODI.log"
-  for i in `find /storage/.kodi/temp/ -type f -name "*.log"`; do
+  for i in kodi.log kodi.old.log; do
+    [ -f ${KODI_LOG_DIR}/${i} ] && getlog_cmd cat ${KODI_LOG_DIR}/$i
+  done
+
+  LOGFILE="01_KODI_CRASH.log"
+  for i in `find ${KODI_LOG_DIR} -type f -name "kodi_crashlog_*.log" | sort -r`; do
+    getlog_cmd cat $i
+  done
+
+  LOGFILE="01_KODI_OTHER.log"
+  for i in `find ${KODI_LOG_DIR} -type f -name "*.log" | sort`; do
+    iname="${i#${KODI_LOG_DIR}/}"
+    [ ${iname} == kodi.log ] && continue
+    [ ${iname} == kodi.old.log ] && continue
+    [ "${iname#kodi_crashlog_}" != "${iname}" ] && continue
     getlog_cmd cat $i
   done
 

packages/sysutils/e2fsprogs/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.42.13"
+PKG_VERSION="1.43.3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"

packages/sysutils/imx6-status-led/scripts/imx6-system-type

@@ -32,7 +32,7 @@ case "$SYSTEM_TYPE" in
   "TBS Matrix")
     export SYSTEM_TYPE="matrix"
     ;;
-  "SolidRun Cubox-i Dual/Quad")
+  "SolidRun Cubox-i Dual/Quad"|"SolidRun Cubox-i Solo/DualLite")
     export SYSTEM_TYPE="cuboxi"
     ;;
   "Udoo i.MX6 Dual-lite Board"|"Udoo i.MX6 Quad Board")

packages/sysutils/lirc/udev.d/98-lircd.rules

@@ -11,6 +11,7 @@ KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="i2c", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="usb", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="platform", GOTO="begin"
 KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="pnp", GOTO="begin"
+KERNEL=="lirc[0-9]*",   SUBSYSTEM=="lirc", SUBSYSTEMS=="rc", GOTO="begin"
 GOTO="end"
 LABEL="begin"
 

packages/sysutils/tz/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tz"
-PKG_VERSION="2016i"
+PKG_VERSION="2017b"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"
 PKG_SITE="http://www.iana.org/time-zones"

packages/tools/bcm2835-bootloader/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="2ef9cb6"
+PKG_VERSION="856c68d"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

packages/tools/dtc/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="dtc"
-PKG_VERSION="1.4.2"
+PKG_VERSION="1.4.4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://git.kernel.org/cgit/utils/dtc/dtc.git"
-PKG_URL="https://git.kernel.org/cgit/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.xz"
+PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
+PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"

packages/tools/u-boot/package.mk

@@ -19,7 +19,7 @@
 PKG_NAME="u-boot"
 PKG_DEPENDS_TARGET="toolchain"
 if [ "$UBOOT_VERSION" = "imx6-cuboxi" ]; then
-  PKG_COMMIT="c8d1200"
+  PKG_COMMIT="ad02f49"
   PKG_VERSION="imx6-$PKG_COMMIT"
   PKG_SITE="http://solid-run.com/wiki/doku.php?id=products:imx6:software:development:u-boot"
   PKG_URL="https://github.com/SolidRun/u-boot-imx6/archive/$PKG_COMMIT.tar.gz"

projects/Generic/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.9.0 Kernel Configuration
+# Linux/x86_64 4.9.24 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1919,8 +1919,7 @@ CONFIG_RTLWIFI_PCI=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTL8XXXU is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set
 CONFIG_WLAN_VENDOR_ST=y
@@ -2361,7 +2360,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 
 #
 # Memory mapped GPIO drivers
@@ -3561,6 +3560,7 @@ CONFIG_SND_SOC_INTEL_SST_MATCH=m
 # CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 # CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set

projects/Odroid_C2/patches/u-boot/u-boot-0003-update_cec_simplink_wakeup.patch

@@ -0,0 +1,54 @@
+From 4afa1ca1f37bc084c2805f76372dc6a47e2d971a Mon Sep 17 00:00:00 2001
+From: Radostan Riedel <raybuntu@googlemail.com>
+Date: Sun, 30 Apr 2017 15:48:53 +0200
+Subject: [PATCH 1/1] CEC: make wakeup work with LG simplink
+
+---
+ .../cpu/armv8/gxb/firmware/scp_task/hdmi_cec_arc.c | 24 ++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/arch/arm/cpu/armv8/gxb/firmware/scp_task/hdmi_cec_arc.c b/arch/arm/cpu/armv8/gxb/firmware/scp_task/hdmi_cec_arc.c
+index 7d397cac8b..8a3423b7cc 100644
+--- a/arch/arm/cpu/armv8/gxb/firmware/scp_task/hdmi_cec_arc.c
++++ b/arch/arm/cpu/armv8/gxb/firmware/scp_task/hdmi_cec_arc.c
+@@ -359,6 +359,18 @@ static void cec_get_version(unsigned char initiator)
+ 	cec_triggle_tx(msg, 3);
+ }
+ 
++void cec_send_simplink_init_ack(void)
++{
++	unsigned char msg[4];
++
++	msg[0] = ((cec_msg.log_addr & 0xf) << 4) | CEC_TV_ADDR;
++	msg[1] = CEC_OC_VENDOR_COMMAND;
++	msg[2] = 0x2;
++	msg[3] = 0x5;
++
++	cec_triggle_tx(msg, 4);
++}
++
+ static unsigned int cec_handle_message(void)
+ {
+ 	unsigned char initiator = (cec_msg.msg[0] >> 4) & 0xf;
+@@ -388,6 +400,18 @@ static unsigned int cec_handle_message(void)
+ 		cec_device_vendor_id();
+ 		break;
+ 	case CEC_OC_VENDOR_COMMAND:
++		if (cec_msg.msg_len < 3)
++			break;
++		if (directly_addressed) {
++			if (cec_msg.msg[2] == 0x1) { // SL INIT
++				cec_send_simplink_init_ack(); // SL INIT ACK
++			}
++			if ((cec_msg.msg[2] == 0x3) || // SL POWER ON
++				(cec_msg.msg[2] == 0x4) || // SL CONNECT REQUEST
++				(cec_msg.msg[2] == 0xb)) { // SL RECONNECT REQUEST
++				cec_msg.cec_power = 0x1;
++			}
++		}
+ 	case CEC_OC_VENDOR_COMMAND_WITH_ID:
+ 		break;
+ 	case CEC_OC_GIVE_OSD_NAME:
+-- 
+2.11.0
+

projects/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.13 Kernel Configuration
+# Linux/arm 4.9.24 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1393,8 +1393,7 @@ CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTL8XXXU is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set
 CONFIG_WLAN_VENDOR_ST=y
@@ -2474,6 +2473,11 @@ CONFIG_VIDEO_CX25840=m
 #
 # Sensors used on soc_camera driver
 #
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -2775,6 +2779,7 @@ CONFIG_SND_SOC_COMPRESS=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
@@ -2789,11 +2794,14 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
 CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
 CONFIG_SND_DIGIDAC1_SOUNDCARD=m
 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
 CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
 CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
 CONFIG_SND_PISOUND=m
 # CONFIG_SND_DESIGNWARE_I2S is not set
 
@@ -2841,11 +2849,13 @@ CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set

projects/RPi/patches/kodi/kodi-000-revert-pr11222.patch

@@ -0,0 +1,102 @@
+From 073c2c6a118a03b70a29fd302e48f1f75bc7e5bc Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Wed, 24 May 2017 19:17:24 +0100
+Subject: [PATCH] Revert "PR11222"
+
+This reverts commit 6cc9ab253753aeb62b01d3e654bbfa77a7f22a42.
+---
+ .../resource.language.en_gb/resources/strings.po   | 15 --------------
+ system/peripherals.xml                             |  4 +---
+ xbmc/peripherals/devices/PeripheralCecAdapter.cpp  | 23 +++++++---------------
+ 3 files changed, 8 insertions(+), 34 deletions(-)
+
+diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
+index 6443f3d..e0060d1 100644
+--- a/addons/resource.language.en_gb/resources/strings.po
++++ b/addons/resource.language.en_gb/resources/strings.po
+@@ -19745,18 +19745,3 @@ msgstr ""
+ msgctxt "#39010"
+ msgid "Select sort method"
+ msgstr ""
+-
+-#: system/peripherals.xml
+-msgctxt "#38050"
+-msgid "Remote button press delay before repeating (ms)"
+-msgstr ""
+-
+-#: system/peripherals.xml
+-msgctxt "#38051"
+-msgid "Remote button press repeat rate (ms)"
+-msgstr ""
+-
+-#: system/peripherals.xml
+-msgctxt "#38052"
+-msgid "Remote button press release time (ms)"
+-msgstr ""
+diff --git a/system/peripherals.xml b/system/peripherals.xml
+index 02b1a9e..d5704b2 100644
+--- a/system/peripherals.xml
++++ b/system/peripherals.xml
+@@ -31,9 +31,7 @@
+     <setting key="device_type" type="int" value="1" configurable="0" />
+     <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
+     <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
+-    <setting key="double_tap_timeout_ms" type="int" min="50" max="1000" step="50" value="300" label="38050" order="16" />
+-    <setting key="button_repeat_rate_ms" type="int" min="0" max="250" step="10" value="0" label="38051" order="17" />
+-    <setting key="button_release_delay_ms" type="int" min="0" max="500" step="50" value="0" label="38052" order="18" />
++    <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
+   </peripheral>
+ 
+   <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
+diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+index d04a632..d032ffd 100644
+--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+@@ -803,10 +803,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key)
+   CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration);
+ 
+   CSingleLock lock(m_critSection);
+-  // avoid the queue getting too long
+-  if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5)
+-    return;
+-  if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0)
++  if (key.iDuration > 0)
+   {
+     if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0)
+     {
+@@ -1299,15 +1296,6 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
+   m_configuration.bActivateSource = config.bActivateSource;
+   bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1);
+ 
+-  m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs;
+-  bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs);
+-
+-  m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs;
+-  bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs);
+-
+-  m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs;
+-  bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs);
+-
+   m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby;
+ 
+   m_configuration.iFirmwareVersion = config.iFirmwareVersion;
+@@ -1403,10 +1391,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
+   m_configuration.bPowerOffOnStandby = iStandbyAction == LOCALISED_ID_SUSPEND ? 1 : 0;
+   m_bShutdownOnStandby = iStandbyAction == LOCALISED_ID_POWEROFF;
+ 
+-  // double tap prevention timeout in ms
++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
++  // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
++  m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
++#else
++  // backwards compatibility. will be removed once the next major release of libCEC is out
+   m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
+-  m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms");
+-  m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms");
++#endif
+ 
+   if (GetSettingBool("pause_playback_on_deactivate"))
+   {
+-- 
+2.7.4
+

projects/RPi2/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.13 Kernel Configuration
+# Linux/arm 4.9.24 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2566,6 +2566,11 @@ CONFIG_VIDEO_CX25840=m
 #
 # Sensors used on soc_camera driver
 #
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -2867,6 +2872,7 @@ CONFIG_SND_SOC_COMPRESS=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
@@ -2881,11 +2887,14 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
 CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
 CONFIG_SND_DIGIDAC1_SOUNDCARD=m
 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
 CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
 CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
 CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
 CONFIG_SND_PISOUND=m
 # CONFIG_SND_DESIGNWARE_I2S is not set
 
@@ -2933,11 +2942,13 @@ CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set