Merge pull request #248 from chewitt/settings073

settings: bump to v0.7.3

config/version

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

packages/addons/addon-depends/RPi.GPIO/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 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="RPi.GPIO"
+PKG_VERSION="0.6.2"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="MIT"
+PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/"
+PKG_URL="https://pypi.python.org/packages/source/R/RPi.GPIO/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A module to control Raspberry Pi GPIO channels"
+PKG_LONGDESC="A module to control Raspberry Pi GPIO channels"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+  export LDSHARED="$CC -shared"
+  export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7"
+}
+
+make_target() {
+  python setup.py build
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/containerd/package.mk

@@ -0,0 +1,77 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  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="containerd"
+PKG_VERSION="d2f0386"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://containerd.tools/"
+PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain go"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="containerd is a daemon to control runC"
+PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $TARGET_CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/ctr             -a -tags "static_build" -ldflags "$LDFLAGS" ./ctr
+  $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
+  $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
+}
+
+makeinstall_target() {
+  :
+}
+

packages/addons/addon-depends/go/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.6"
+PKG_VERSION="1.6.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch

@@ -0,0 +1,11 @@
+diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+--- a/src/crypto/x509/root_unix.go	2016-04-19 16:27:35.000000000 -0700
++++ b/src/crypto/x509/root_unix.go	2016-04-22 01:21:02.884977461 -0700
+@@ -13,6 +13,7 @@
+ var certDirectories = []string{
+ 	"/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
+ 	"/system/etc/security/cacerts", // Android
++	"/etc/ssl",                     // LibreELEC
+ }
+ 
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

packages/addons/addon-depends/gpiozero/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 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="gpiozero"
+PKG_VERSION="1.2.0"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/RPi-Distro/python-gpiozero"
+PKG_URL="https://pypi.python.org/packages/source/g/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/picamera/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 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="picamera"
+PKG_VERSION="1.10"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/waveform80/picamera"
+PKG_URL="https://pypi.python.org/packages/source/p/picamera/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host bcm2835-driver"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/runc/package.mk

@@ -0,0 +1,74 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  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="runc"
+PKG_VERSION="e874369"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://github.com/opencontainers/runc"
+PKG_URL="https://github.com/opencontainers/runc/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain go"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
+PKG_LONGDESC="runc is a CLI tool for spawning and running containers according to the OCI specification"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -extld $TARGET_CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/runc -a -tags "cgo static_build" -ldflags "$LDFLAGS" ./
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/browser/chromium/changelog.txt

@@ -1,2 +1,5 @@
+7.0.101
+- update to version 50.0.2661.75
+
 7.0.100
 - initial LibreELEC release

packages/addons/browser/chromium/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="chromium"
-PKG_VERSION="49.0.2623.87"
-PKG_REV="100"
+PKG_VERSION="50.0.2661.75"
+PKG_REV="101"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Mixed"
 PKG_SITE="http://www.chromium.org/Home"
@@ -75,7 +75,7 @@ make_target() {
     -Dlinux_use_bundled_binutils=0
     -Dlinux_use_bundled_gold=0
     -Dlinux_use_gold_flags=0
-    -Dicu_use_data_file_flag=0
+    -Dicu_use_data_file_flag=1
     -Dlogging_like_official_build=1
     -Dtracing_like_official_build=1
     -Dfieldtrial_testing_like_official_build=1
@@ -126,7 +126,7 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P  $PKG_BUILD/out/Release/chrome $ADDON_BUILD/$PKG_ADDON_ID/bin/chromium.bin
   cp -P  $PKG_BUILD/out/Release/chrome_sandbox $ADDON_BUILD/$PKG_ADDON_ID/bin/chrome-sandbox
-  cp -P  $PKG_BUILD/out/Release/{*.pak,*.bin,libwidevinecdmadapter.so} $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P  $PKG_BUILD/out/Release/{*.pak,*.dat,*.bin,libwidevinecdmadapter.so} $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -PR $PKG_BUILD/out/Release/locales $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
   $STRIP $ADDON_BUILD/$PKG_ADDON_ID/bin/chromium.bin
@@ -150,9 +150,6 @@ addon() {
   cp -PL $(get_build_dir gtk+)/.install_pkg/usr/lib/libgdk-x11-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -PL $(get_build_dir gtk+)/.install_pkg/usr/lib/libgtk-x11-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
 
-  # atk
-  # cp -PL $(get_build_dir atk)/.install_pkg/usr/lib/libatk-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
-
   # harfbuzz
   cp -PL $(get_build_dir harfbuzz)/.install_pkg/usr/lib/libharfbuzz.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
 

packages/addons/browser/chromium/patches/chromium-0002_allow-runing-as-root.patch

@@ -1,10 +0,0 @@
---- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	2015-12-15 12:05:07.000000000 -0800
-+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	2016-01-12 16:08:45.701976368 -0800
-@@ -140,7 +140,6 @@
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-   // Now that we have some minimal ui initialized, check to see if we're
-   // running as root and bail if we are.
--  DetectRunningAsRoot();
- #endif
- }
- 

packages/addons/browser/chromium/patches/chromium-0004_enable-vaapi-on-linux.patch

@@ -295,13 +295,13 @@ Index: dev.wily/chrome/browser/about_flags.cc
 ===================================================================
 --- dev.wily.orig/chrome/browser/about_flags.cc
 +++ dev.wily/chrome/browser/about_flags.cc
-@@ -937,7 +937,7 @@
-      "disable-accelerated-video-decode",
-      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
-      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
--     kOsMac | kOsWin | kOsCrOS,
-+     kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+@@ -854,7 +854,7 @@
+         "disable-accelerated-video-decode",
+         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+-        kOsMac | kOsWin | kOsCrOS,
++        kOsAll,
+         SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
 Index: dev.wily/content/common/gpu/media/vaapi_wrapper.cc

packages/addons/script/script.config.vdr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="script.config.vdr"
-PKG_VERSION="1.1.0"
+PKG_VERSION="1.1.2"
 PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/service/docker/changelog.txt

@@ -1,2 +1,6 @@
+7.0.101
+- Update to golan 1.6.2
+- Update to docker 1.11.0
+
 7.0.100
 - Initial release

packages/addons/service/docker/package.mk

@@ -17,14 +17,14 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.10.3"
-PKG_REV="100"
+PKG_VERSION="1.11.0"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi RPi2"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
 PKG_URL="https://github.com/docker/docker/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain sqlite go:host"
+PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
@@ -70,8 +70,6 @@ configure_target() {
   export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ./hack/vendor.sh
-
   ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/docker
 
   # used for docker version
@@ -91,6 +89,14 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-    cp -a $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+    # containerd
+    cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd
+    cp -P $(get_build_dir containerd)/bin/containerd-shim $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-shim
+    cp -P $(get_build_dir containerd)/bin/ctr $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-ctr
+
+    # runc
+    cp -P $(get_build_dir runc)/bin/runc $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-runc
 }

packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch

@@ -2,18 +2,18 @@
 # find . -name "*.go" -print | xargs sed -i 's/\/etc\/docker/\/storage\/.kodi\/userdata\/addon_data\/service.system.docker\/config/g'
 
 diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
---- a/docker/daemon_unix.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/docker/daemon_unix.go	2016-02-19 00:28:50.662085695 +0100
+--- a/docker/daemon_unix.go	2016-04-13 11:03:42.000000000 -0700
++++ b/docker/daemon_unix.go	2016-04-21 02:39:35.588218701 -0700
 @@ -16,7 +16,7 @@
- 	_ "github.com/docker/docker/daemon/execdriver/native"
+ 	"github.com/docker/docker/pkg/system"
  )
  
 -const defaultDaemonConfigFile = "/etc/docker/daemon.json"
 +const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json"
  
  func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
- 	serverConfig.SocketGroup = daemonCfg.SocketGroup
-@@ -50,7 +50,7 @@
+ 	serverConfig.EnableCors = daemonCfg.EnableCors
+@@ -49,7 +49,7 @@
  }
  
  func getDaemonConfDir() string {
@@ -23,10 +23,10 @@ diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
  
  // setupConfigReloadTrap configures the USR2 signal to reload the configuration.
 diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go
---- a/integration-cli/docker_cli_authz_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_authz_unix_test.go	2016-02-19 00:28:50.642085661 +0100
-@@ -121,10 +121,10 @@
- 		}
+--- a/integration-cli/docker_cli_authz_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_authz_unix_test.go	2016-04-21 02:39:35.417217012 -0700
+@@ -134,10 +134,10 @@
+ 		w.Write(b)
  	})
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
@@ -38,7 +38,7 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  	err = ioutil.WriteFile(fileName, []byte(s.server.URL), 0644)
  	c.Assert(err, checker.IsNil)
  }
-@@ -163,7 +163,7 @@
+@@ -186,7 +186,7 @@
  
  	s.server.Close()
  
@@ -48,9 +48,9 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  }
  
 diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
---- a/integration-cli/docker_cli_daemon_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_daemon_test.go	2016-02-19 00:28:50.636085651 +0100
-@@ -537,13 +537,13 @@
+--- a/integration-cli/docker_cli_daemon_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_daemon_test.go	2016-04-21 02:39:35.482217654 -0700
+@@ -511,13 +511,13 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -66,7 +66,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -556,7 +556,7 @@
+@@ -530,7 +530,7 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyMigration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -75,7 +75,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	k1, err := libtrust.GenerateECP256PrivateKey()
  	if err != nil {
  		c.Fatalf("Error generating private key: %s", err)
-@@ -573,7 +573,7 @@
+@@ -547,7 +547,7 @@
  	}
  	s.d.Stop()
  
@@ -84,7 +84,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -1337,7 +1337,7 @@
+@@ -1295,7 +1295,7 @@
  		Y   string `json:"y"`
  	}
  
@@ -93,7 +93,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err != nil {
  		c.Fatalf("Failed to start daemon: %v", err)
  	}
-@@ -1347,7 +1347,7 @@
+@@ -1305,7 +1305,7 @@
  	}
  
  	config := &Config{}
@@ -102,7 +102,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error reading key.json file: %s", err)
  	}
-@@ -1367,11 +1367,11 @@
+@@ -1325,11 +1325,11 @@
  	}
  
  	// write back
@@ -117,8 +117,8 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err == nil {
  		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
 diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go
---- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-02-19 00:28:50.632085644 +0100
+--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-21 02:39:35.509217920 -0700
 @@ -283,18 +283,18 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
@@ -145,9 +145,9 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
  
  func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
 diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_network_unix_test.go	2016-02-19 00:28:50.629085639 +0100
-@@ -201,14 +201,14 @@
+--- a/integration-cli/docker_cli_network_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2016-04-21 02:39:35.506217891 -0700
+@@ -200,14 +200,14 @@
  		}
  	})
  
@@ -165,7 +165,7 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
  	c.Assert(err, checker.IsNil)
  }
-@@ -220,7 +220,7 @@
+@@ -219,7 +219,7 @@
  
  	s.server.Close()
  
@@ -175,9 +175,9 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  }
  
 diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go
---- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-02-19 00:28:50.651085676 +0100
-@@ -206,17 +206,17 @@
+--- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
++++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-21 02:39:35.514217970 -0700
+@@ -216,17 +216,17 @@
  		send(w, nil)
  	})
  
@@ -198,7 +198,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	c.Assert(err, checker.IsNil)
  }
  
-@@ -301,7 +301,7 @@
+@@ -311,7 +311,7 @@
  
  // Make sure a request to use a down driver doesn't block other requests
  func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
@@ -207,7 +207,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	err := ioutil.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
  	c.Assert(err, check.IsNil)
  	defer os.RemoveAll(specPath)
-@@ -340,7 +340,7 @@
+@@ -350,7 +350,7 @@
  	err := s.d.StartWithBusybox()
  	c.Assert(err, checker.IsNil)
  
@@ -216,33 +216,9 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	os.RemoveAll(specPath)
  	defer os.RemoveAll(specPath)
  
-diff -Naur a/integration-cli/docker_cli_volume_driver_compat_unix_test.go b/integration-cli/docker_cli_volume_driver_compat_unix_test.go
---- a/integration-cli/docker_cli_volume_driver_compat_unix_test.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/integration-cli/docker_cli_volume_driver_compat_unix_test.go	2016-02-19 00:28:50.646085667 +0100
-@@ -173,17 +173,17 @@
- 		send(w, nil)
- 	})
- 
--	err := os.MkdirAll("/etc/docker/plugins", 0755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
- 
--	err = ioutil.WriteFile("/etc/docker/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
-+	err = ioutil.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
- 	c.Assert(err, checker.IsNil)
- }
- 
- func (s *DockerExternalVolumeSuiteCompatV1_1) TearDownSuite(c *check.C) {
- 	s.server.Close()
- 
--	err := os.RemoveAll("/etc/docker/plugins")
-+	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 	c.Assert(err, checker.IsNil)
- }
- 
 diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/pkg/plugins/discovery.go	2016-02-19 00:28:50.247084996 +0100
+--- a/pkg/plugins/discovery.go	2016-04-13 11:03:42.000000000 -0700
++++ b/pkg/plugins/discovery.go	2016-04-21 02:39:35.668219491 -0700
 @@ -15,7 +15,7 @@
  	// ErrNotFound plugin not found
  	ErrNotFound = errors.New("plugin not found")
@@ -253,8 +229,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
  
  // localRegistry defines a registry that is local (using unix socket).
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/pkg/plugins/plugins.go	2016-02-19 00:28:50.263085023 +0100
+--- a/pkg/plugins/plugins.go	2016-04-13 11:03:42.000000000 -0700
++++ b/pkg/plugins/plugins.go	2016-04-21 02:39:35.667219481 -0700
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -265,9 +241,9 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/registry/config_unix.go	2016-02-19 00:28:50.742085829 +0100
-@@ -12,7 +12,7 @@
+--- a/registry/config_unix.go	2016-04-13 11:03:42.000000000 -0700
++++ b/registry/config_unix.go	2016-04-21 02:39:35.629219106 -0700
+@@ -4,7 +4,7 @@
  
  var (
  	// CertsDir is the directory where certificates are stored
@@ -276,10 +252,10 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  )
  
  // cleanPath is used to ensure that a directory name is valid on the target
-diff -Naur a/registry/endpoint.go b/registry/endpoint.go
---- a/registry/endpoint.go	2016-02-11 19:45:56.000000000 +0100
-+++ b/registry/endpoint.go	2016-02-19 00:28:50.740085826 +0100
-@@ -73,7 +73,7 @@
+diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
+--- a/registry/endpoint_v1.go	2016-04-13 11:03:42.000000000 -0700
++++ b/registry/endpoint_v1.go	2016-04-21 02:39:35.629219106 -0700
+@@ -49,7 +49,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
  			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.

packages/addons/service/docker/source/systemd/service.system.docker.service

@@ -6,6 +6,7 @@ Requires=docker.socket
 
 [Service]
 Type=notify
+Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin:/storage/.kodi/addons/service.system.docker/bin
 ExecStartPre=/storage/.kodi/addons/service.system.docker/bin/docker-config
 EnvironmentFile=-/storage/.kodi/userdata/addon_data/service.system.docker/config/docker.conf
 ExecStart=/storage/.kodi/addons/service.system.docker/bin/docker daemon -H fd:// $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS

packages/addons/service/tvheadend42/changelog.txt

@@ -1,2 +1,5 @@
+7.0.101
+- Update to Tvheadend 4.1.1928
+
 7.0.100
 - initial LibreELEC version

packages/addons/service/tvheadend42/package.mk

@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="616413f"
-PKG_VERSION_NUMBER="4.1.1892"
-PKG_REV="100"
+PKG_VERSION="ac2d90e"
+PKG_VERSION_NUMBER="4.1.1928"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"

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

@@ -0,0 +1,2 @@
+7.0.100
+- Initial Release

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

@@ -0,0 +1,54 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 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="rpi-tools"
+PKG_VERSION=""
+PKG_REV="100"
+PKG_ARCH="arm"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain RPi.GPIO picamera gpiozero"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="A bundle of tools and programs for use on the Raspberry Pi"
+PKG_LONGDESC="This bundle currently includes RPi.GPIO, picamera, and gpiozero python modules"
+PKG_DISCAIMER="Raspberry Pi is a trademark of the Raspberry Pi Foundation http://www.raspberrypi.org"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Raspberry Pi Tools"
+PKG_ADDON_TYPE="xbmc.python.module"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_PROJECTS="RPi RPi2"
+PKG_ADDON_REPOVERSION="7.0"
+
+PKG_AUTORECONF="no"
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/
+    cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi
+    cp -PR $(get_build_dir picamera)/picamera $ADDON_BUILD/$PKG_ADDON_ID/lib/
+    cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/
+
+  BCM2835_DIR="$(get_build_dir bcm2835-driver)"
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspistill $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspiyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspivid $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspividyuv $ADDON_BUILD/$PKG_ADDON_ID/bin
+}

packages/addons/tools/rpi-tools/source/default.py

@@ -0,0 +1,22 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 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/>.
+################################################################################
+
+import xbmcgui
+
+dialog = xbmcgui.Dialog()
+dialog.ok('', 'This is a console-only addon')

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="efdcf16"
+PKG_VERSION="c5e1319"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux/firmware/i915/skl_dmc_ver1.bin

@@ -1 +1 @@
-skl_dmc_ver1_22.bin
+skl_dmc_ver1_26.bin

packages/linux/firmware/i915/skl_guc_ver6.bin

@@ -0,0 +1 @@
+skl_guc_ver6_1.bin

packages/mediacenter/LibreELEC-settings/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="LibreELEC-settings"
-PKG_VERSION="69d7952"
+PKG_VERSION="bbe9cdf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="654715b"
+PKG_VERSION="cdc86cc"
 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="88849a2"
+PKG_VERSION="026155e"
 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="3c673b5"
+PKG_VERSION="ada1e05"
 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="330d90b"
+PKG_VERSION="7437171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="f6b0483"
+PKG_VERSION="18ee0b5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="9214bc0"
+PKG_VERSION="51169be"
 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="92893c7"
+PKG_VERSION="72a064a"
 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="6c8d668"
+PKG_VERSION="df5141d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="16.1-rc2-a7caa16"
+PKG_VERSION="16.1-c327c53"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="16.1-rc2-a7caa16"
+PKG_VERSION="16.1-c327c53"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/bluez/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.38"
+PKG_VERSION="5.39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/bluez/system.d/bluetooth.service

@@ -12,6 +12,9 @@ ExecStart=/usr/lib/bluetooth/bluetoothd $BLUEZ_ARGS $BLUEZ_DEBUG
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
 LimitNPROC=1
 TimeoutStopSec=1s
+Restart=on-failure
+RestartSec=2
+StartLimitInterval=0
 
 [Install]
 WantedBy=bluetooth.target

packages/security/libressl/patches/libressl-trusted-first.patch

@@ -0,0 +1,62 @@
+From 779c075d93f339ee4043ea026586a463376b301c Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Wed, 20 Apr 2016 22:26:49 +0200
+Subject: [PATCH] trusted first
+
+---
+ apps/apps.c                |  2 ++
+ crypto/x509/x509_vfy.c     | 14 ++++++++++++++
+ include/openssl/x509_vfy.h |  2 ++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/apps/apps.c b/apps/apps.c
+index 6e40965..cbdd080 100644
+--- a/apps/apps.c
++++ b/apps/apps.c
+@@ -2051,6 +2051,8 @@ args_verify(char ***pargs, int *pargc, int *badarg, BIO *err,
+ 		flags |= X509_V_FLAG_NOTIFY_POLICY;
+ 	else if (!strcmp(arg, "-check_ss_sig"))
+ 		flags |= X509_V_FLAG_CHECK_SS_SIGNATURE;
++	else if (!strcmp(arg, "-trusted_first"))
++		flags |= X509_V_FLAG_TRUSTED_FIRST;
+ 	else
+ 		return 0;
+ 
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index f9fd3a0..6e51edb 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -209,6 +209,20 @@ X509_verify_cert(X509_STORE_CTX *ctx)
+ 		if (ctx->check_issued(ctx, x, x))
+ 			break;
+ 
++		/* If asked see if we can find issuer in trusted store first */
++		if (ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST) {
++			ok = ctx->get_issuer(&xtmp, ctx, x);
++			if (ok < 0)
++				goto end;
++			/* If successful for now free up cert so it
++			 * will be picked up again later.
++			 */
++			if (ok > 0) {
++				X509_free(xtmp);
++				break;
++			}
++		}
++
+ 		/* If we were passed a cert chain, use it first */
+ 		if (ctx->untrusted != NULL) {
+ 			xtmp = find_issuer(ctx, sktmp, x);
+diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
+index e4050b2..ddf77e7 100644
+--- a/include/openssl/x509_vfy.h
++++ b/include/openssl/x509_vfy.h
+@@ -383,6 +383,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
+ #define X509_V_FLAG_USE_DELTAS			0x2000
+ /* Check selfsigned CA signature */
+ #define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
++/* Use trusted store first */
++#define X509_V_FLAG_TRUSTED_FIRST		0x8000
+ 
+ 
+ #define X509_VP_FLAG_DEFAULT			0x1

packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch

@@ -0,0 +1,31 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2013-10-26 21:52:35.000000000 -0700
++++ b/CMakeLists.txt	2016-04-17 13:49:47.504923855 -0700
+@@ -51,26 +51,12 @@
+  	add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
+  	set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
+ endif(BUILD_STATIC_LIBS)
+-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
+-set_target_properties(tinyxml2 PROPERTIES
+-	VERSION "${GENERIC_LIB_VERSION}"
+-	SOVERSION "${GENERIC_LIB_SOVERSION}")
+-
+-add_executable(test xmltest.cpp)
+-add_dependencies(test tinyxml2)
+-add_dependencies(test ${TARGET_DATA_COPY})
+-target_link_libraries(test tinyxml2)
+-
+  
+ if(BUILD_STATIC_LIBS)
+-	install(TARGETS tinyxml2 tinyxml2static
++	install(TARGETS tinyxml2static
+  		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-else(BUILD_STATIC_LIBS)
+-	install(TARGETS tinyxml2
+-		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif(BUILD_STATIC_LIBS)
+ install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+  

packages/tools/bcm2835-bootloader/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="efdcf16"
+PKG_VERSION="c5e1319"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/virtual/mediacenter/package.mk

@@ -21,7 +21,7 @@ PKG_VERSION=""
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
+PKG_SITE="http://www.libreelec.tv"
 PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain $MEDIACENTER"
 PKG_PRIORITY="optional"

projects/Generic/patches/linux/linux-021-prevent-bcma-wl-driver-overlap.patch

@@ -0,0 +1,10 @@
+--- a/drivers/bcma/host_pci.c	2016-04-12 20:09:26.000000000 +0400
++++ b/drivers/bcma/host_pci.c	2016-04-18 11:13:09.866487748 +0400
+@@ -289,7 +289,6 @@
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },	/* 0xa8d8 */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },

projects/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2595,6 +2595,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 # CONFIG_SND_DESIGNWARE_I2S is not set

projects/RPi/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch

@@ -1,4 +1,4 @@
-From 01759c5adfb050b1ba0c8a8fc4e20a875a98c0e5 Mon Sep 17 00:00:00 2001
+From 1ac1ea72fb2d7a5b0707b12a11652609e8188033 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 10 Aug 2014 18:58:37 +0100
 Subject: [PATCH 1/2] confluence: Remove media-overlay.jpg for when video is
@@ -21,11 +21,8 @@ index cc996da..d6aa595 100644
  			<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
  			<include>VisibleFadeEffect</include>
  		</control>
--- 
-2.5.0
 
-
-From d99f70c094006144f07bdf739f5847b733030245 Mon Sep 17 00:00:00 2001
+From 173a2f038511095ad8390bc39cb40280b73d7cd4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jul 2013 23:19:15 +0100
 Subject: [PATCH 2/2] [confluence] Use animated gif as a cheaper working
@@ -112,6 +109,3 @@ xGUUb21Yb|%0k3;EZL|UA71ss70{N2%rZhjU!V8TtZxzYw_F;tVxR3z1e*p+ht@8i?
 literal 0
 HcmV?d00001
 
--- 
-2.5.0
-

projects/RPi/patches/kodi/kodi-001-jarvis-rbp-backports.patch

@@ -1,7 +1,7 @@
 From d11fabefb909e75e7186bd9ecd0cbff9e8b24577 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Sep 2015 19:11:14 +0100
-Subject: [PATCH 01/93] Enable concealed error frames, but discard them when
+Subject: [PATCH 01/96] Enable concealed error frames, but discard them when
  returned
 
 ---
@@ -55,7 +55,7 @@ index bebe136..727a9ea 100644
 From 5fb2a476f902f028de46e46863fdc74b4c021371 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 26 Aug 2015 21:47:41 +0100
-Subject: [PATCH 02/93] Reduce framerate of high framerate videos when not
+Subject: [PATCH 02/96] Reduce framerate of high framerate videos when not
  running fullscreen
 
 ---
@@ -121,7 +121,7 @@ index d081b9c..0ea6ecd 100644
 From 8f815de22d00759496cd60139fb497d4064002cf Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 20:08:05 +0000
-Subject: [PATCH 03/93] Remove preroll
+Subject: [PATCH 03/96] Remove preroll
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 12 ++----------
@@ -196,7 +196,7 @@ index 0ea6ecd..50ac0e3 100644
 From 18c08e9c0410f43d2deec9d69e64eca7fdfd9a17 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 22:35:11 +0000
-Subject: [PATCH 04/93] Remove demux queue
+Subject: [PATCH 04/96] Remove demux queue
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 81 ++++------------------
@@ -391,7 +391,7 @@ index 50ac0e3..f4df09c 100644
 From 432994f3a9e9867d04d4c3d360476d72acea0a6c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 20:10:33 +0000
-Subject: [PATCH 05/93] Remove time based limit on submitted packets
+Subject: [PATCH 05/96] Remove time based limit on submitted packets
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 24 +++-------------------
@@ -476,7 +476,7 @@ index f4df09c..8f84557 100644
 From 14ec8859335b4dc5add80bed34ce21ab3a4c8df4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Dec 2015 22:18:47 +0000
-Subject: [PATCH 06/93] Add back logging of data queued in decoder
+Subject: [PATCH 06/96] Add back logging of data queued in decoder
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 22 +++++++++++++++++++++-
@@ -561,7 +561,7 @@ index 8f84557..f4df09c 100644
 From 61928feb51d23e4550abfbf8ab26e933ff1fec4e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 8 Dec 2015 11:40:17 +0000
-Subject: [PATCH 07/93] Try to minimise latency through hardware decoder. This
+Subject: [PATCH 07/96] Try to minimise latency through hardware decoder. This
  could reduce performance but keeps videoplayer happier
 
 ---
@@ -650,7 +650,7 @@ index 35a9847..f96cc14 100644
 From 0d9c905db96e1b465a26c834430a1783c000a5a9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 13 Jul 2015 19:27:25 +0100
-Subject: [PATCH 08/93] Enable QPU based deinterlace and remove resolution
+Subject: [PATCH 08/96] Enable QPU based deinterlace and remove resolution
  limit
 
 ---
@@ -722,7 +722,7 @@ index e50c13a..20ad4fa 100644
 From 6cfe8e3a2fa86dbb63830eea0b1f9617ea6c9ba0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 16 Aug 2015 15:46:33 +0100
-Subject: [PATCH 09/93] Allow deinterlace with software decode
+Subject: [PATCH 09/96] Allow deinterlace with software decode
 
 ---
  xbmc/cores/VideoRenderers/MMALRenderer.cpp | 9 +++++++++
@@ -759,7 +759,7 @@ index bee3af1..9b5c666 100644
 From d5c49bf267a9dd4baf7e6be9127548adf64d899b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 15 Sep 2015 22:26:26 +0100
-Subject: [PATCH 10/93] omxplayer: Don't use AutoInterlaceMethod it changes at
+Subject: [PATCH 10/96] omxplayer: Don't use AutoInterlaceMethod it changes at
  start of file
 
 ---
@@ -798,7 +798,7 @@ index de493a2..7251fc1 100644
 From cb890fdeed45ff016c15f321d00f6cfe9cc3685d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Sep 2015 15:05:37 +0100
-Subject: [PATCH 11/93] Avoid calling render callback with the lock held to
+Subject: [PATCH 11/96] Avoid calling render callback with the lock held to
  avoid a deadlock
 
 ---
@@ -905,7 +905,7 @@ index d0634bb..7baefa5 100644
 From 364da740e395d2091293f521a4bde7806b3218a0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Dec 2015 22:03:56 +0000
-Subject: [PATCH 12/93] Add settings option to enable MVC and frame packing
+Subject: [PATCH 12/96] Add settings option to enable MVC and frame packing
  support
 
 ---
@@ -1055,7 +1055,7 @@ index 55e150d..f3ba426 100644
 From 71d3daeb3f44c6a7876415141e740464ce8b6c87 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 17 Dec 2015 15:38:34 +0000
-Subject: [PATCH 13/93] Don't adjust 3d rectangles in bypass mode
+Subject: [PATCH 13/96] Don't adjust 3d rectangles in bypass mode
 
 ---
  xbmc/cores/VideoRenderers/BaseRenderer.cpp | 55 ++++++++++++++++--------------
@@ -1134,7 +1134,7 @@ index 7889cf8..d4bb306 100644
 From 5ebb280be9de4ce882de665215c8bbda0c072864 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 14 Mar 2015 12:38:08 +0000
-Subject: [PATCH 14/93] Switch to using transform flags for 3d modes
+Subject: [PATCH 14/96] Switch to using transform flags for 3d modes
 
 ---
  xbmc/cores/VideoRenderers/MMALRenderer.cpp      | 100 +++++++++---------------
@@ -1550,7 +1550,7 @@ index 5d5b74b..443d037 100644
 From 2be3612226ee01a6d294c6ca6a7d8d0849bd4221 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 21 Jun 2015 17:42:03 +0100
-Subject: [PATCH 15/93] Remove unused Support3D function
+Subject: [PATCH 15/96] Remove unused Support3D function
 
 ---
  xbmc/windowing/egl/WinSystemEGL.cpp | 29 -----------------------------
@@ -1613,7 +1613,7 @@ index 9d4baf6..1ec4225 100644
 From ad81921b2e03b01bed2d40f0f1aff697cb48fa56 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Dec 2015 21:08:34 +0000
-Subject: [PATCH 16/93] Avoid switching stereo mode based on current display
+Subject: [PATCH 16/96] Avoid switching stereo mode based on current display
  mode
 
 ---
@@ -1659,7 +1659,7 @@ index a1b8812..60979bb 100644
 From be69b44990015a874305ef96e7fbdef7f815599e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 21 Jun 2015 18:53:29 +0100
-Subject: [PATCH 17/93] Drop reporting 3D modes and just use current rendering
+Subject: [PATCH 17/96] Drop reporting 3D modes and just use current rendering
  mode to request 3D signalling
 
 [rbp] Add ntsc version of 48Hz mode
@@ -1934,7 +1934,7 @@ index a0acb1a..e5bcae7 100644
 From 5d3349935e282c6d4faef746a5b8a9934676d4c6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jun 2015 16:27:15 +0100
-Subject: [PATCH 18/93] Consider stereomode when creating a new window
+Subject: [PATCH 18/96] Consider stereomode when creating a new window
 
 We might be changing from a non-3D to a 3D mode
 ---
@@ -1994,7 +1994,7 @@ index 1ec4225..a33dedc 100644
 From 5d836aad86bfed970e902005bae5761415cec58d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Apr 2014 18:19:32 +0100
-Subject: [PATCH 19/93] [rbp/omxplayer] When opening a stream don't try to
+Subject: [PATCH 19/96] [rbp/omxplayer] When opening a stream don't try to
  update gui so often
 
 ---
@@ -2021,7 +2021,7 @@ index 6816b45..6cc5a8f 100644
 From e01575ea1b07d19332017fca0e1a51389b78d93d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 29 Apr 2014 15:23:22 +0100
-Subject: [PATCH 20/93] [ffmpeg] Speed up wtv index creation
+Subject: [PATCH 20/96] [ffmpeg] Speed up wtv index creation
 
 The index creation is O(N^2) with number of entries (typically thousands).
 On a Pi this can take more than 60 seconds to execute for a recording of a few hours.
@@ -2110,7 +2110,7 @@ index 0000000..d829898
 From a29142db6e36056fd988b3199747c0da0dab78a0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 8 Mar 2014 15:36:06 +0000
-Subject: [PATCH 21/93] [hifiberry] Hack: force it to be recognised as IEC958
+Subject: [PATCH 21/96] [hifiberry] Hack: force it to be recognised as IEC958
  capable to enable passthrough options
 
 ---
@@ -2136,7 +2136,7 @@ index e22db7a..0120bd5 100644
 From cad0f33be5e0b5989ece0863ba96158dbf5174d9 Mon Sep 17 00:00:00 2001
 From: Ben Avison <bavison@riscosopen.org>
 Date: Thu, 1 May 2014 16:28:39 +0100
-Subject: [PATCH 22/93] Improved file buffering in CArchive
+Subject: [PATCH 22/96] Improved file buffering in CArchive
 
 Even though memcpy is typically inlined by the compiler into byte/word loads
 and stores (at least for release builds), the frequency with which 1, 2 and 4
@@ -2199,7 +2199,7 @@ index 6ed0f8f..8506d95 100644
 From 17eebeec762e4f1c921d886b6863ac4a21cdb2f0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 12 Aug 2014 00:31:36 +0100
-Subject: [PATCH 23/93] [omxcodec] Don't force software codec with dvds
+Subject: [PATCH 23/96] [omxcodec] Don't force software codec with dvds
 
 ---
  xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 ++
@@ -2223,7 +2223,7 @@ index 4ffe33a..4b09e8f 100644
 From 9da36b4157459cc72529ef6be5721f1ff6920ef6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 10 Aug 2014 16:45:16 +0100
-Subject: [PATCH 24/93] filesystem: Make support of browsing into archives
+Subject: [PATCH 24/96] filesystem: Make support of browsing into archives
  optional
 
 The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices.
@@ -2309,7 +2309,7 @@ index a1d4ee4..4929283 100644
 From b0231de02ec1821e136d75ff0f3986aaed8f0d92 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 27 Oct 2014 13:06:57 +0000
-Subject: [PATCH 25/93] [rbp] Make cachemembuffersize default depend on memory
+Subject: [PATCH 25/96] [rbp] Make cachemembuffersize default depend on memory
  size
 
 ---
@@ -2414,7 +2414,7 @@ index bc3aa8c..562757e 100644
 From 6d080c7c800d2e1120b46c5490d64d80b4e63ad4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 30 May 2014 14:58:43 +0100
-Subject: [PATCH 26/93] [settings] Experiment: Report DESKTOP resolution in
+Subject: [PATCH 26/96] [settings] Experiment: Report DESKTOP resolution in
  video settings
 
 ---
@@ -2439,7 +2439,7 @@ index 7993a73..761385b 100644
 From 80f582c6ced4a245d0cabb97a3e9fefc009e096d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 19 Sep 2014 11:54:49 +0100
-Subject: [PATCH 27/93] [dvdplayer/rbp] Add pi specific option to maintain
+Subject: [PATCH 27/96] [dvdplayer/rbp] Add pi specific option to maintain
  vsync with pll adjustment
 
 New A/V sync option in settings/video/playback to do "Adjust PLL".
@@ -2748,7 +2748,7 @@ index 6475350..93de9bd 100644
 From cecfb10575958e190cf3c6394ff2158bff6fe52a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 24 Sep 2014 23:13:52 +0100
-Subject: [PATCH 28/93] [audio] Add settings option to boost centre channel
+Subject: [PATCH 28/96] [audio] Add settings option to boost centre channel
  when downmixing
 
 This allows a dB volume increase to be added to centre channel.
@@ -2874,7 +2874,7 @@ index 08b1b84..70d0866 100644
 From cd089d7903e1fd4e0812ad817126a19d07fa896d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 27 Oct 2014 15:23:51 +0000
-Subject: [PATCH 29/93] [rbp] Default extract thumbnails to false
+Subject: [PATCH 29/96] [rbp] Default extract thumbnails to false
 
 It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors.
 It genereates a lot of support issues. Best to default to disabled and let users enable it if they must
@@ -2907,7 +2907,7 @@ index 7a170c2..1506035 100644
 From c0b8590f78235540d82d478334c7f30fae417754 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 10 Feb 2015 15:29:16 +0000
-Subject: [PATCH 30/93] [libcec] Add repeating keypress patch from popcornmix'
+Subject: [PATCH 30/96] [libcec] Add repeating keypress patch from popcornmix'
  repo
 
 ---
@@ -3797,7 +3797,7 @@ index 0000000..8366a69
 From bfc97f9146e8ac70fb03c439a4cf1a9a3135ea9b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 28 Oct 2014 00:19:40 +0000
-Subject: [PATCH 31/93] [cec] Add settings for configuring button repeats
+Subject: [PATCH 31/96] [cec] Add settings for configuring button repeats
 
 ---
  addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++
@@ -3881,7 +3881,7 @@ index e0d8dae..f738c84 100644
 From af63fad05fc2f6c24354c7acd08cd685ff376e28 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 3 Nov 2014 23:17:46 +0000
-Subject: [PATCH 32/93] [cec] Don't discard buttons when repeat mode is enabled
+Subject: [PATCH 32/96] [cec] Don't discard buttons when repeat mode is enabled
 
 ---
  xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++-
@@ -3907,7 +3907,7 @@ index f738c84..58d7d0d 100644
 From 42155d82d06a1deea72d4c3092315ea1110c6cb7 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 4 Nov 2014 18:50:00 +0000
-Subject: [PATCH 33/93] [cec] Temp - more logging
+Subject: [PATCH 33/96] [cec] Temp - more logging
 
 ---
  xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++-
@@ -3962,7 +3962,7 @@ index 58d7d0d..dfba61a 100644
 From f8d6e97fedcb9184af7dfc8a976815892faa7784 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 15 Nov 2014 12:03:34 +0000
-Subject: [PATCH 34/93] [dvdplayer] Add lock for player creation
+Subject: [PATCH 34/96] [dvdplayer] Add lock for player creation
 
 ---
  xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 +++
@@ -4011,7 +4011,7 @@ index 2f00647..b1418e3 100644
 From 2e80c975eb2d085f157ea328488aa7889c092f47 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 24 Nov 2014 22:07:25 +0000
-Subject: [PATCH 35/93] [dvdplayervideo] Prod decoder when in stills mode
+Subject: [PATCH 35/96] [dvdplayervideo] Prod decoder when in stills mode
 
 An asynchronous hardware decoder doesn't only produce output pictures when new packets arrive.
 In dvd stills mode give it a chance to return pictures that weren't ready when frame was decoded.
@@ -4091,7 +4091,7 @@ index 379c541..b5777a1 100644
 From 1a4b613e9981829137c817baad127fda8e1e2823 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 27 Nov 2014 16:31:56 +0000
-Subject: [PATCH 36/93] [languageinvoker] Reduce priority of python threads
+Subject: [PATCH 36/96] [languageinvoker] Reduce priority of python threads
 
 ---
  xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@@ -4117,7 +4117,7 @@ index fcdd063..16f0c89 100644
 From 73c6f413799cbb821f597253eb80457ee29a45f8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 14 Dec 2013 16:55:05 +0000
-Subject: [PATCH 37/93] logging: Add microsecond timer to log messages
+Subject: [PATCH 37/96] logging: Add microsecond timer to log messages
 
 ---
  xbmc/utils/log.cpp | 17 +++++++++++++++--
@@ -4173,7 +4173,7 @@ index 3443f12..31c4a99 100644
 From dd959edaaae1f167e0979ac55d64e5d769127687 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 29 Nov 2014 15:25:16 +0000
-Subject: [PATCH 38/93] [rbp] hack: wait for splash to complete before changing
+Subject: [PATCH 38/96] [rbp] hack: wait for splash to complete before changing
  hdmi mode
 
 ---
@@ -4250,7 +4250,7 @@ index ee29770..ff0d3e3 100644
 From 3afc5e302cd1fdad4afa43ec705707f36de2ddaf Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 11 Dec 2014 17:00:57 +0000
-Subject: [PATCH 39/93] Fix for UI not showing both extractflags and
+Subject: [PATCH 39/96] Fix for UI not showing both extractflags and
  extractthumb
 
 ---
@@ -4317,7 +4317,7 @@ index 918e8bf..61e1a22 100644
 From c423d114818b5cd611bd83c31cda74139b5dfd91 Mon Sep 17 00:00:00 2001
 From: anaconda <anaconda@menakite.eu>
 Date: Thu, 11 Sep 2014 21:30:43 +0200
-Subject: [PATCH 40/93] Disable autoscrolling while on screensaver and while
+Subject: [PATCH 40/96] Disable autoscrolling while on screensaver and while
  opening streams.
 
 ---
@@ -4451,7 +4451,7 @@ index d7bc1c5..ac76629 100644
 From 6b4fbcdd92b654b53fe8aeb5f00a5037117a505f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 13 Dec 2014 18:35:20 +0000
-Subject: [PATCH 41/93] [demuxer] Avoid memcpy on every demuxer packet
+Subject: [PATCH 41/96] [demuxer] Avoid memcpy on every demuxer packet
 
 Avoids an unnecessary memcpy on every demuxer packet which for
 high bitrate videos can be significant.
@@ -4552,7 +4552,7 @@ index ab298b2..10c5ee0 100644
 From 4e92f88d301118106a6aa08375bdd524fbbb0da8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 15 Feb 2015 14:06:12 +0000
-Subject: [PATCH 42/93] [mmal] Allow mmal codec for dvd stills
+Subject: [PATCH 42/96] [mmal] Allow mmal codec for dvd stills
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 7 +++++++
@@ -4587,7 +4587,7 @@ index 84e9ef1..f920f49 100644
 From 6f7b1c2fa7e8b46895b2287b3a9361b85af7b210 Mon Sep 17 00:00:00 2001
 From: anaconda <anaconda@menakite.eu>
 Date: Wed, 25 Feb 2015 18:22:21 +0100
-Subject: [PATCH 43/93] Load OSD dialogs on startup.
+Subject: [PATCH 43/96] Load OSD dialogs on startup.
 
 Fixes skipped frames the first time they're loaded in memory on less powered
 devices, like a Raspberry Pi, when using DVDPlayer.
@@ -4685,7 +4685,7 @@ index b248566..96c63cd 100644
 From 881432f2448626f24ea06cf02a29c811b075cdc8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 7 Mar 2015 22:46:21 +0000
-Subject: [PATCH 44/93] configure: Add raspberry-pi2 platform
+Subject: [PATCH 44/96] configure: Add raspberry-pi2 platform
 
 ---
  configure.ac                                      | 14 +++++++--
@@ -4862,7 +4862,7 @@ index dc6d565..98494b4 100644
 From 555c3d2ed48c00e6ef8632d47db58cab4d53b78b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 14 Apr 2015 20:51:14 +0100
-Subject: [PATCH 45/93] [gui] Also limit GUI updates when in non full-screen
+Subject: [PATCH 45/96] [gui] Also limit GUI updates when in non full-screen
  video mode
 
 ---
@@ -4895,7 +4895,7 @@ index c274e2f..212a5c7 100644
 From 67b90947ab8fb7fe16d39597f285a7e08fabc5b8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 21 Apr 2015 14:32:07 +0100
-Subject: [PATCH 46/93] [mmalrenderer] Add sharpness control
+Subject: [PATCH 46/96] [mmalrenderer] Add sharpness control
 
 ---
  addons/resource.language.en_gb/resources/strings.po |  2 +-
@@ -4970,7 +4970,7 @@ index d3e5129..a71e645 100644
 From 2ce900e2ef03fae1215700b5a839276585a00c92 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 24 Apr 2015 13:49:51 +0100
-Subject: [PATCH 47/93] [dvdplayer] Add back required include
+Subject: [PATCH 47/96] [dvdplayer] Add back required include
 
 ---
  xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 +
@@ -4992,7 +4992,7 @@ index b5777a1..64b4d60 100644
 From dc5e83b0cfbec04a34b3b8ea7fca8bbbcaae1f2c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 5 May 2015 23:58:06 +0100
-Subject: [PATCH 48/93] [screensaver] Leave GUI contents available for
+Subject: [PATCH 48/96] [screensaver] Leave GUI contents available for
  screensaver
 
 ---
@@ -5025,7 +5025,7 @@ index 89cfb8b..767c7b6 100644
 From 249d8d5147b3124129255deaa216da316cb8732e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 6 Jun 2015 18:43:57 +0100
-Subject: [PATCH 49/93] ffmpeg: Automatic switch to software decode for GMC
+Subject: [PATCH 49/96] ffmpeg: Automatic switch to software decode for GMC
  with more than one warp point
 
 ---
@@ -5242,7 +5242,7 @@ index 7251fc1..3429cea 100644
 From eb80abbf4ad8994a28d58ea8494e8a7bcd48b2f3 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jun 2015 21:46:57 +0100
-Subject: [PATCH 50/93] [rbp] Use default resampling setting on Pi2
+Subject: [PATCH 50/96] [rbp] Use default resampling setting on Pi2
 
 ---
  system/settings/rbp2.xml | 5 +++++
@@ -5268,7 +5268,7 @@ index 8cc8f19..52778ec 100644
 From 822ce9d64325082d7b071b68331c8fbd406d2ee1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 10 Mar 2016 17:54:59 +0000
-Subject: [PATCH 51/93] rbp: Expose gpu memory allocation functions
+Subject: [PATCH 51/96] rbp: Expose gpu memory allocation functions
 
 ---
  xbmc/linux/RBP.cpp         | 116 ++++++++++++
@@ -5934,7 +5934,7 @@ index 0000000..94e6e79
 From 97b436ca545f9a2faad6fdf02a9668843bd3f324 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 10 Mar 2016 17:56:11 +0000
-Subject: [PATCH 52/93] [rbp] HW mouse pointer
+Subject: [PATCH 52/96] [rbp] HW mouse pointer
 
 Updating the mouse point provokes a complete screen update which can make it feel laggy
 and results in high cpu.
@@ -6372,7 +6372,7 @@ index a17e987..23244a2 100644
 From fbd04377a1dac080166e1e4baa2250f402e3b66f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 2 Aug 2014 17:48:04 +0100
-Subject: [PATCH 53/93] [omx] Report decoded image name
+Subject: [PATCH 53/96] [omx] Report decoded image name
 
 ---
  xbmc/cores/omxplayer/OMXImage.cpp | 1 +
@@ -6394,7 +6394,7 @@ index 1524214..a01c435 100644
 From 99d06dd14a4501fe81b36e8ce3966dc99cd04b94 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 11 Apr 2014 16:12:27 +0100
-Subject: [PATCH 54/93] [omxplayer] Add ability to log more timestamp info in
+Subject: [PATCH 54/96] [omxplayer] Add ability to log more timestamp info in
  extra debug settings
 
 ---
@@ -6548,7 +6548,7 @@ index 22b8459..8045a03 100644
 From 85731b224b68bac5a47774d5447bbd3e1d14236d Mon Sep 17 00:00:00 2001
 From: Memphiz <memphis@machzwo.de>
 Date: Tue, 18 Nov 2014 13:28:36 +0100
-Subject: [PATCH 55/93] - evaluate the setting for hiding watched
+Subject: [PATCH 55/96] - evaluate the setting for hiding watched
  movies/episodes/musicvideos in recently added job (should influence
  homescreen of skins only)
 
@@ -6677,7 +6677,7 @@ index 2021dd9..5f67d10 100644
 From 11a94854f5d433c121314cdf989fd0e7bcc0102b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 14:28:37 +0100
-Subject: [PATCH 56/93] build: Add vcsm lib
+Subject: [PATCH 56/96] build: Add vcsm lib
 
 ---
  configure.ac | 2 +-
@@ -6700,7 +6700,7 @@ index 7a06a31..239a2a1 100644
 From 0077cb637667dc35084234c792dedfc8c5e80485 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 8 May 2015 14:09:31 +0100
-Subject: [PATCH 57/93] [cec] re-implement 'RFC' style POLLing for LA
+Subject: [PATCH 57/96] [cec] re-implement 'RFC' style POLLing for LA
  registering process
 
 ---
@@ -6925,7 +6925,7 @@ index ddf9963..5d1f933 100644
 From 3916ef0e55ad307d7a3e0f88ba5df0cdc73d5477 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 15:35:43 +0100
-Subject: [PATCH 58/93] ffmpeg: test: increase number of threads
+Subject: [PATCH 58/96] ffmpeg: test: increase number of threads
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 3 +++
@@ -6949,7 +6949,7 @@ index 3498503..c2f3287 100644
 From 36fd4c27fe9af15d65461e32b8d105e00fd8df52 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 22 May 2015 13:56:29 +0100
-Subject: [PATCH 59/93] ffmpeg: Allow neon to be enabled in unified builds
+Subject: [PATCH 59/96] ffmpeg: Allow neon to be enabled in unified builds
 
 ---
  tools/depends/target/ffmpeg/Makefile | 4 ++++
@@ -6975,7 +6975,7 @@ index 6a9f105..fef5ef2 100644
 From 5d5698967a69035d742d55f8986bce84831e73e9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 5 Mar 2015 20:00:59 +0000
-Subject: [PATCH 60/93] [ffmpmeg] Discard data before VO/VOL in mpeg-4 over
+Subject: [PATCH 60/96] [ffmpmeg] Discard data before VO/VOL in mpeg-4 over
  mpegts
 
 ---
@@ -7085,7 +7085,7 @@ index fef5ef2..e780521 100644
 From 4a4b1b0427cfb3116a112d682d10c802a71f913a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 27 Feb 2015 14:37:27 +0000
-Subject: [PATCH 61/93] ffmpeg: Add some upstream HEVC optimisations
+Subject: [PATCH 61/96] ffmpeg: Add some upstream HEVC optimisations
 
 ---
  tools/depends/target/ffmpeg/Makefile               |    6 +-
@@ -10872,7 +10872,7 @@ index 0000000..5e8e07d
 From 51c12471695d2d06c671707a7e2e6fec3b01f538 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 14:04:18 +0100
-Subject: [PATCH 62/93] [ffmpeg] Add GPU acceleration to hevc
+Subject: [PATCH 62/96] [ffmpeg] Add GPU acceleration to hevc
 
 ---
  tools/depends/target/ffmpeg/Makefile               |     4 +-
@@ -47584,7 +47584,7 @@ index 0000000..f2b8ffc
 From aa8268363b74f1b9ed6d6801d379bc08a85eead2 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 14 Dec 2015 12:35:14 +0000
-Subject: [PATCH 63/93] [build] Add patches to ffmpeg for native build
+Subject: [PATCH 63/96] [build] Add patches to ffmpeg for native build
 
 ---
  tools/depends/target/ffmpeg/autobuild.sh | 8 ++++++++
@@ -47613,7 +47613,7 @@ index b9bfd57..f6d4c3b 100755
 From 31e2cf35741edf914f5413668c158186f9310197 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 12 Jan 2016 16:29:57 +0000
-Subject: [PATCH 64/93] ffmpeg: Add cabac opimisations for hevc
+Subject: [PATCH 64/96] ffmpeg: Add cabac opimisations for hevc
 
 ---
  .../0001-Squashed-commit-of-the-following.patch    | 2288 ++++++++++++++++++++
@@ -49949,7 +49949,7 @@ index e4acfa9..072e711 100644
 From 653e6185b0976bd50eea79f9834ede99db13e3aa Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 14 Jul 2015 08:30:44 +0200
-Subject: [PATCH 65/93] fix high cpu load caused by false positive frame
+Subject: [PATCH 65/96] fix high cpu load caused by false positive frame
  limiter
 
 ---
@@ -50024,7 +50024,7 @@ index 212a5c7..1adbb01 100644
 From 7eae470ce134f19cb5002969ac3f7e85fcf5220d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 5 Aug 2015 13:43:25 +0100
-Subject: [PATCH 66/93] [dvdplayeraudio] Avoid busy spinning when queue is
+Subject: [PATCH 66/96] [dvdplayeraudio] Avoid busy spinning when queue is
  empty
 
 ---
@@ -50048,7 +50048,7 @@ index 97a23a6..9f21a19 100644
 From 492a2e7ac5fb1895b71b62f68918e74db053f0b9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 6 Aug 2015 11:23:05 +0100
-Subject: [PATCH 67/93] [rbp] Make sync playback to display the default option
+Subject: [PATCH 67/96] [rbp] Make sync playback to display the default option
 
 ---
  system/settings/rbp.xml | 7 +++++++
@@ -50076,7 +50076,7 @@ index 1506035..f2a6892 100644
 From 3ff59db3bd9c43b037bbe89c72f5fd97f4563b71 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 8 Sep 2015 23:42:30 +0100
-Subject: [PATCH 68/93] [cec] Fixing initialisation issue found on Raspberry Pi
+Subject: [PATCH 68/96] [cec] Fixing initialisation issue found on Raspberry Pi
  with Buildroot
 
 ---
@@ -50131,7 +50131,7 @@ index 0000000..8f289f2
 From c456ad03e68428ef849490c385cc069cb8dde87d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 9 Dec 2015 13:31:14 +0000
-Subject: [PATCH 69/93] [mmalcodec] Fail to open when width is invalid. Can
+Subject: [PATCH 69/96] [mmalcodec] Fail to open when width is invalid. Can
  happen with mpegts files
 
 ---
@@ -50157,7 +50157,7 @@ index 3345685..5386b4a 100644
 From 9bcbb1f3c5e687ccf4aeecbe583eb7643f5d48c8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 21 Dec 2015 18:34:06 +0000
-Subject: [PATCH 70/93] [mmalrender] Force a SetVideoRect after a reconfigure
+Subject: [PATCH 70/96] [mmalrender] Force a SetVideoRect after a reconfigure
 
 There has been an issue with dvd stills and a hdmi refresh rate change.
 The hdmi mode change loses the currently displayed picture.
@@ -50188,7 +50188,7 @@ index adf6f73..ad3f66f 100644
 From 902a0514368d1ec48107d5951ee990b93cb4282f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 31 Mar 2015 17:31:47 +0100
-Subject: [PATCH 71/93] mmalcodec: Add SetCodecControl function
+Subject: [PATCH 71/96] mmalcodec: Add SetCodecControl function
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 10 +++++++++-
@@ -50258,7 +50258,7 @@ index f4df09c..37d0868 100644
 From cae99d2093015ba70d1a387e83ed6214393fc31a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 27 Dec 2015 18:44:22 +0000
-Subject: [PATCH 72/93] mmalcodec: Switch to a condition variable when blocking
+Subject: [PATCH 72/96] mmalcodec: Switch to a condition variable when blocking
  waiting for a picture
 
 ---
@@ -50370,7 +50370,7 @@ index 37d0868..ca28c6f 100644
 From ec6e9acc113651fc3408c9fc32d188f41d8de64a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 16 Jan 2016 16:46:03 +0000
-Subject: [PATCH 73/93] omxaudio: Avoid reporting a spurious cached value
+Subject: [PATCH 73/96] omxaudio: Avoid reporting a spurious cached value
 
 Avoids seek bar showing zero after a seek
 ---
@@ -50394,7 +50394,7 @@ index 70d0866..052b5ef 100644
 From 711b4b11b49c9ebc255e565462e3ac665a1cda8c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 21 Dec 2015 22:17:25 +0000
-Subject: [PATCH 74/93] [omximage] Fall back to arm jpeg encode/decode when gpu
+Subject: [PATCH 74/96] [omximage] Fall back to arm jpeg encode/decode when gpu
  is busy
 
 ---
@@ -50640,7 +50640,7 @@ index a93aa82..6f38dbc 100644
 From dfb7b32bb3d8220a30ad67a26dfc388b4c4d9f43 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 2 Jan 2016 18:08:16 +0000
-Subject: [PATCH 75/93] [mmalcodec] Don't send zero sized extradata
+Subject: [PATCH 75/96] [mmalcodec] Don't send zero sized extradata
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 2 +-
@@ -50663,7 +50663,7 @@ index 3579966..0f5c1b7 100644
 From 374227275b47f31ca0cca887a12e5cce187cdd55 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 3 Jan 2016 19:12:16 +0000
-Subject: [PATCH 76/93] stereoscopicmanager: Ensure we don't have a stale value
+Subject: [PATCH 76/96] stereoscopicmanager: Ensure we don't have a stale value
  of videoplayer stereoscopic mode
 
 ---
@@ -50758,7 +50758,7 @@ index ec2310f..f090bb9 100644
 From d33bcf6304a60bfbdbc993eadab11505ae675851 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Sep 2015 19:05:12 +0100
-Subject: [PATCH 77/93] [3d] Make MVC a valid 3D filename tag
+Subject: [PATCH 77/96] [3d] Make MVC a valid 3D filename tag
 
 ---
  xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++
@@ -50822,7 +50822,7 @@ index 93de9bd..4da88f4 100644
 From ff22ccfba36a15d2ed383bf5543f2dd3b9c6a618 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 24 Jan 2016 16:42:04 +0000
-Subject: [PATCH 78/93] fixup! [build] Add patches to ffmpeg for native build
+Subject: [PATCH 78/96] fixup! [build] Add patches to ffmpeg for native build
 
 ---
  tools/depends/target/ffmpeg/autobuild.sh | 2 +-
@@ -50845,7 +50845,7 @@ index f6d4c3b..cc59d17 100755
 From 8bcf9f72ff12412fdc4c8139be071c2448d51ae7 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 19:58:30 +0000
-Subject: [PATCH 79/93] OMXAudio: Make use of m_bGotFrame to skip decoding when
+Subject: [PATCH 79/96] OMXAudio: Make use of m_bGotFrame to skip decoding when
  full
 
 ---
@@ -50886,7 +50886,7 @@ index 33c4c6a..b9dab89 100644
 From 7044ba837edb2060a28bf534f5327d90e1c545e5 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 20:01:18 +0000
-Subject: [PATCH 80/93] OMXAudio: Handle GetData before adding the next buffer
+Subject: [PATCH 80/96] OMXAudio: Handle GetData before adding the next buffer
  so we can be sure it fits
 
 ---
@@ -50957,7 +50957,7 @@ index b9dab89..f150dc6 100644
 From c4abc577bf4c12d48cc800930c2d292c0a65031f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 20:03:49 +0000
-Subject: [PATCH 81/93] OMXAudio: Handle changes in decoded audio size
+Subject: [PATCH 81/96] OMXAudio: Handle changes in decoded audio size
  correctly
 
 ---
@@ -51013,7 +51013,7 @@ index f150dc6..4956b5b 100644
 From df922f986ab0b2dc1363224ef6c72a7a8ac616dc Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 4 Feb 2016 15:29:55 +0000
-Subject: [PATCH 82/93] MMALCodec: Set dropped flag on output pictures when
+Subject: [PATCH 82/96] MMALCodec: Set dropped flag on output pictures when
  input requested that
 
 ---
@@ -51075,7 +51075,7 @@ index ca28c6f..bf669e0 100644
 From a6102bec84b610166da7448d80b853e5efd649a1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 3 Feb 2016 21:35:01 +0000
-Subject: [PATCH 83/93] DVDVideoCodecFFmpeg: Enable refcounted frames
+Subject: [PATCH 83/96] DVDVideoCodecFFmpeg: Enable refcounted frames
 
 Without this frames will get (deep) copied when deinterlace is set to automatic,
 but file is not deinterlaced.
@@ -51104,7 +51104,7 @@ index c2f3287..64087f2 100644
 From a301f546dcfa4bf1ceaa9737a60a835826d54fec Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 19 Feb 2016 13:45:23 +0000
-Subject: [PATCH 84/93] mmal: increase decode buffering a little to help harder
+Subject: [PATCH 84/96] mmal: increase decode buffering a little to help harder
  MVC files
 
 PR8610 reduced buffering in codec which generally improved behaviour,
@@ -51133,7 +51133,7 @@ index 7b025fd..08f61fc 100644
 From c0b0aad15a9ffcd921bb70af5bf9200ee7a93fed Mon Sep 17 00:00:00 2001
 From: Mario Holzinger <sandman01xda@gmail.com>
 Date: Fri, 11 Dec 2015 16:48:57 +0100
-Subject: [PATCH 85/93] touch panel to display adjustment
+Subject: [PATCH 85/96] touch panel to display adjustment
 
 ---
  xbmc/input/linux/LinuxInputDevices.cpp |  7 ++++---
@@ -51225,7 +51225,7 @@ index 4da88f4..1bdc77e 100644
 From d3c755950fe7e7b255a2a28cafd105affb3aab13 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 15 Feb 2016 15:51:11 +0000
-Subject: [PATCH 86/93] touch panel to display adjustment - support multitouch
+Subject: [PATCH 86/96] touch panel to display adjustment - support multitouch
 
 PR7978 allowed a simple calibration to be applied to touch input
 It didn't cover multitouch which this adds support for
@@ -51259,7 +51259,7 @@ index a506956..3579cd0 100644
 From f517a6ff4ab7f04b9a6ba371d3429e5ae95eb3d1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 22 Mar 2016 22:28:13 +0000
-Subject: [PATCH 87/93] [linux] Move hotplug checking into its own thread
+Subject: [PATCH 87/96] [linux] Move hotplug checking into its own thread
 
 Currently checking for new linux input devices is called from the rendering thread.
 We've been getting reports of skipped frames on raspberry pi.
@@ -51436,7 +51436,7 @@ index 23244a2..c82ba84 100644
 From ffb8b5378dbb2c53f1411e051f0c7eec9555ca83 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 28 Jul 2015 17:47:33 +0100
-Subject: [PATCH 88/93] [rbp] Refactor the vsync handle to support multiple
+Subject: [PATCH 88/96] [rbp] Refactor the vsync handle to support multiple
  callers
 
 ---
@@ -51653,7 +51653,7 @@ index 2eee35d..3b59cd9 100644
 From 2e13233a89859c10902059dd34160582af62ee1e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 24 Mar 2016 23:24:18 +0000
-Subject: [PATCH 89/93] [mmalrenderer] Wait for vsync before submitting to mmal
+Subject: [PATCH 89/96] [mmalrenderer] Wait for vsync before submitting to mmal
  when display sync is disabled
 
 This avoids an issue where video occasionally goes stuttery after a seek, until the next pause/play or seek.
@@ -51816,7 +51816,7 @@ index a71e645..34cb294 100644
 From 1f63176ba9c91a1f1e58dec440a56e90ee944583 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 16:57:19 +0000
-Subject: [PATCH 90/93] mmal: Include mmal renderer logging in video category
+Subject: [PATCH 90/96] mmal: Include mmal renderer logging in video category
 
 On Pi the decoder and renderer are closely coupled so combining the
 logging category makes sense to me.
@@ -52083,7 +52083,7 @@ index 76c4682..e1099da 100644
 From 6a008777d9f6c0b2b8724fc66cecf74ac7c32383 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 17:34:48 +0000
-Subject: [PATCH 91/93] rendermanager: Increase configure timeout to see if it
+Subject: [PATCH 91/96] rendermanager: Increase configure timeout to see if it
  fixes video playing in background issues
 
 ---
@@ -52107,7 +52107,7 @@ index 7a99ac4..4b03c86 100644
 From 67223b6440475c4797aa2aa1949f73c078114474 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 17:39:47 +0000
-Subject: [PATCH 92/93] Revert "[rbp] Use default resampling setting on Pi2"
+Subject: [PATCH 92/96] Revert "[rbp] Use default resampling setting on Pi2"
 
 This reverts commit e6b2f1693480ad5d8062acaed512393e72fb9b1d.
 ---
@@ -52134,7 +52134,7 @@ index 52778ec..8cc8f19 100644
 From bb33be4220a3fd1ad131ec1f2218f7b4750fda98 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 31 Mar 2016 20:00:15 +0100
-Subject: [PATCH 93/93] Revert "[rbp] Make sync playback to display the default
+Subject: [PATCH 93/96] Revert "[rbp] Make sync playback to display the default
  option"
 
 This reverts commit 492a2e7ac5fb1895b71b62f68918e74db053f0b9.
@@ -52160,3 +52160,86 @@ index f2a6892..1506035 100644
      <category id="videoacceleration">
        <group id="1">
          <visible>false</visible>
+
+From 4cf382f46873b4a3da10d825a103c2ef897b87fb Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Fri, 1 Apr 2016 17:26:27 +0100
+Subject: [PATCH 94/96] fixup: Handle case where fps=0.0 with sync playback to
+ display disabled
+
+---
+ xbmc/cores/VideoRenderers/MMALRenderer.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+index e1099da..e545e87 100644
+--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
++++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+@@ -529,7 +529,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+         return;
+       omvb->Acquire();
+       omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
+-      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock"))
++      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock") && m_fps > 0.0f)
+         mmal_queue_put(m_queue, omvb->mmal_buffer);
+       else
+         mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
+@@ -551,7 +551,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+       omvb->Acquire();
+       omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
+       omvb->mmal_buffer->user_data = omvb;
+-      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock"))
++      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock") && m_fps > 0.0f)
+         mmal_queue_put(m_queue, omvb->mmal_buffer);
+       else
+         mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
+
+From 7367c175628cac663dd5cbea18bef17e9c74f992 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 3 Apr 2016 11:26:19 +0100
+Subject: [PATCH 95/96] squash: initialise error term to zero
+
+---
+ xbmc/cores/VideoRenderers/MMALRenderer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+index e545e87..16f6142 100644
+--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
++++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+@@ -245,6 +245,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer")
+   m_inflight = 0;
+   m_sharpness = -2.0f;
+   m_queue = mmal_queue_create();
++  m_error = 0.0;
+   Create();
+ }
+ 
+
+From f923a12de46ebe78820335ef1e42ce81982e7091 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 11 Apr 2016 11:53:13 +0100
+Subject: [PATCH 96/96] Revert "Revert "[rbp] Use default resampling setting on
+ Pi2""
+
+This reverts commit 67223b6440475c4797aa2aa1949f73c078114474.
+---
+ system/settings/rbp2.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/system/settings/rbp2.xml b/system/settings/rbp2.xml
+index 8cc8f19..52778ec 100644
+--- a/system/settings/rbp2.xml
++++ b/system/settings/rbp2.xml
+@@ -23,6 +23,11 @@
+         <setting id="audiooutput.ac3transcode" help="36429">
+         </setting>
+       </group>
++      <group id="1">
++        <setting id="audiooutput.processquality">
++          <default>30</default> <!-- AE_QUALITY_MID -->
++        </setting>
++      </group>
+     </category>
+   </section>
+ </settings>

projects/RPi2/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2643,6 +2643,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
+CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 # CONFIG_SND_DESIGNWARE_I2S is not set

projects/RPi2/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch

@@ -1,4 +1,4 @@
-From 01759c5adfb050b1ba0c8a8fc4e20a875a98c0e5 Mon Sep 17 00:00:00 2001
+From 1ac1ea72fb2d7a5b0707b12a11652609e8188033 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 10 Aug 2014 18:58:37 +0100
 Subject: [PATCH 1/2] confluence: Remove media-overlay.jpg for when video is
@@ -21,11 +21,8 @@ index cc996da..d6aa595 100644
  			<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
  			<include>VisibleFadeEffect</include>
  		</control>
--- 
-2.5.0
 
-
-From d99f70c094006144f07bdf739f5847b733030245 Mon Sep 17 00:00:00 2001
+From 173a2f038511095ad8390bc39cb40280b73d7cd4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jul 2013 23:19:15 +0100
 Subject: [PATCH 2/2] [confluence] Use animated gif as a cheaper working
@@ -112,6 +109,3 @@ xGUUb21Yb|%0k3;EZL|UA71ss70{N2%rZhjU!V8TtZxzYw_F;tVxR3z1e*p+ht@8i?
 literal 0
 HcmV?d00001
 
--- 
-2.5.0
-

projects/RPi2/patches/kodi/kodi-001-jarvis-rbp-backports.patch

@@ -1,7 +1,7 @@
 From d11fabefb909e75e7186bd9ecd0cbff9e8b24577 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Sep 2015 19:11:14 +0100
-Subject: [PATCH 01/93] Enable concealed error frames, but discard them when
+Subject: [PATCH 01/96] Enable concealed error frames, but discard them when
  returned
 
 ---
@@ -55,7 +55,7 @@ index bebe136..727a9ea 100644
 From 5fb2a476f902f028de46e46863fdc74b4c021371 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 26 Aug 2015 21:47:41 +0100
-Subject: [PATCH 02/93] Reduce framerate of high framerate videos when not
+Subject: [PATCH 02/96] Reduce framerate of high framerate videos when not
  running fullscreen
 
 ---
@@ -121,7 +121,7 @@ index d081b9c..0ea6ecd 100644
 From 8f815de22d00759496cd60139fb497d4064002cf Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 20:08:05 +0000
-Subject: [PATCH 03/93] Remove preroll
+Subject: [PATCH 03/96] Remove preroll
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 12 ++----------
@@ -196,7 +196,7 @@ index 0ea6ecd..50ac0e3 100644
 From 18c08e9c0410f43d2deec9d69e64eca7fdfd9a17 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 22:35:11 +0000
-Subject: [PATCH 04/93] Remove demux queue
+Subject: [PATCH 04/96] Remove demux queue
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 81 ++++------------------
@@ -391,7 +391,7 @@ index 50ac0e3..f4df09c 100644
 From 432994f3a9e9867d04d4c3d360476d72acea0a6c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 2 Dec 2015 20:10:33 +0000
-Subject: [PATCH 05/93] Remove time based limit on submitted packets
+Subject: [PATCH 05/96] Remove time based limit on submitted packets
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 24 +++-------------------
@@ -476,7 +476,7 @@ index f4df09c..8f84557 100644
 From 14ec8859335b4dc5add80bed34ce21ab3a4c8df4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Dec 2015 22:18:47 +0000
-Subject: [PATCH 06/93] Add back logging of data queued in decoder
+Subject: [PATCH 06/96] Add back logging of data queued in decoder
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 22 +++++++++++++++++++++-
@@ -561,7 +561,7 @@ index 8f84557..f4df09c 100644
 From 61928feb51d23e4550abfbf8ab26e933ff1fec4e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 8 Dec 2015 11:40:17 +0000
-Subject: [PATCH 07/93] Try to minimise latency through hardware decoder. This
+Subject: [PATCH 07/96] Try to minimise latency through hardware decoder. This
  could reduce performance but keeps videoplayer happier
 
 ---
@@ -650,7 +650,7 @@ index 35a9847..f96cc14 100644
 From 0d9c905db96e1b465a26c834430a1783c000a5a9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 13 Jul 2015 19:27:25 +0100
-Subject: [PATCH 08/93] Enable QPU based deinterlace and remove resolution
+Subject: [PATCH 08/96] Enable QPU based deinterlace and remove resolution
  limit
 
 ---
@@ -722,7 +722,7 @@ index e50c13a..20ad4fa 100644
 From 6cfe8e3a2fa86dbb63830eea0b1f9617ea6c9ba0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 16 Aug 2015 15:46:33 +0100
-Subject: [PATCH 09/93] Allow deinterlace with software decode
+Subject: [PATCH 09/96] Allow deinterlace with software decode
 
 ---
  xbmc/cores/VideoRenderers/MMALRenderer.cpp | 9 +++++++++
@@ -759,7 +759,7 @@ index bee3af1..9b5c666 100644
 From d5c49bf267a9dd4baf7e6be9127548adf64d899b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 15 Sep 2015 22:26:26 +0100
-Subject: [PATCH 10/93] omxplayer: Don't use AutoInterlaceMethod it changes at
+Subject: [PATCH 10/96] omxplayer: Don't use AutoInterlaceMethod it changes at
  start of file
 
 ---
@@ -798,7 +798,7 @@ index de493a2..7251fc1 100644
 From cb890fdeed45ff016c15f321d00f6cfe9cc3685d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Sep 2015 15:05:37 +0100
-Subject: [PATCH 11/93] Avoid calling render callback with the lock held to
+Subject: [PATCH 11/96] Avoid calling render callback with the lock held to
  avoid a deadlock
 
 ---
@@ -905,7 +905,7 @@ index d0634bb..7baefa5 100644
 From 364da740e395d2091293f521a4bde7806b3218a0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Dec 2015 22:03:56 +0000
-Subject: [PATCH 12/93] Add settings option to enable MVC and frame packing
+Subject: [PATCH 12/96] Add settings option to enable MVC and frame packing
  support
 
 ---
@@ -1055,7 +1055,7 @@ index 55e150d..f3ba426 100644
 From 71d3daeb3f44c6a7876415141e740464ce8b6c87 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 17 Dec 2015 15:38:34 +0000
-Subject: [PATCH 13/93] Don't adjust 3d rectangles in bypass mode
+Subject: [PATCH 13/96] Don't adjust 3d rectangles in bypass mode
 
 ---
  xbmc/cores/VideoRenderers/BaseRenderer.cpp | 55 ++++++++++++++++--------------
@@ -1134,7 +1134,7 @@ index 7889cf8..d4bb306 100644
 From 5ebb280be9de4ce882de665215c8bbda0c072864 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 14 Mar 2015 12:38:08 +0000
-Subject: [PATCH 14/93] Switch to using transform flags for 3d modes
+Subject: [PATCH 14/96] Switch to using transform flags for 3d modes
 
 ---
  xbmc/cores/VideoRenderers/MMALRenderer.cpp      | 100 +++++++++---------------
@@ -1550,7 +1550,7 @@ index 5d5b74b..443d037 100644
 From 2be3612226ee01a6d294c6ca6a7d8d0849bd4221 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 21 Jun 2015 17:42:03 +0100
-Subject: [PATCH 15/93] Remove unused Support3D function
+Subject: [PATCH 15/96] Remove unused Support3D function
 
 ---
  xbmc/windowing/egl/WinSystemEGL.cpp | 29 -----------------------------
@@ -1613,7 +1613,7 @@ index 9d4baf6..1ec4225 100644
 From ad81921b2e03b01bed2d40f0f1aff697cb48fa56 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Dec 2015 21:08:34 +0000
-Subject: [PATCH 16/93] Avoid switching stereo mode based on current display
+Subject: [PATCH 16/96] Avoid switching stereo mode based on current display
  mode
 
 ---
@@ -1659,7 +1659,7 @@ index a1b8812..60979bb 100644
 From be69b44990015a874305ef96e7fbdef7f815599e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 21 Jun 2015 18:53:29 +0100
-Subject: [PATCH 17/93] Drop reporting 3D modes and just use current rendering
+Subject: [PATCH 17/96] Drop reporting 3D modes and just use current rendering
  mode to request 3D signalling
 
 [rbp] Add ntsc version of 48Hz mode
@@ -1934,7 +1934,7 @@ index a0acb1a..e5bcae7 100644
 From 5d3349935e282c6d4faef746a5b8a9934676d4c6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jun 2015 16:27:15 +0100
-Subject: [PATCH 18/93] Consider stereomode when creating a new window
+Subject: [PATCH 18/96] Consider stereomode when creating a new window
 
 We might be changing from a non-3D to a 3D mode
 ---
@@ -1994,7 +1994,7 @@ index 1ec4225..a33dedc 100644
 From 5d836aad86bfed970e902005bae5761415cec58d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 7 Apr 2014 18:19:32 +0100
-Subject: [PATCH 19/93] [rbp/omxplayer] When opening a stream don't try to
+Subject: [PATCH 19/96] [rbp/omxplayer] When opening a stream don't try to
  update gui so often
 
 ---
@@ -2021,7 +2021,7 @@ index 6816b45..6cc5a8f 100644
 From e01575ea1b07d19332017fca0e1a51389b78d93d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 29 Apr 2014 15:23:22 +0100
-Subject: [PATCH 20/93] [ffmpeg] Speed up wtv index creation
+Subject: [PATCH 20/96] [ffmpeg] Speed up wtv index creation
 
 The index creation is O(N^2) with number of entries (typically thousands).
 On a Pi this can take more than 60 seconds to execute for a recording of a few hours.
@@ -2110,7 +2110,7 @@ index 0000000..d829898
 From a29142db6e36056fd988b3199747c0da0dab78a0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 8 Mar 2014 15:36:06 +0000
-Subject: [PATCH 21/93] [hifiberry] Hack: force it to be recognised as IEC958
+Subject: [PATCH 21/96] [hifiberry] Hack: force it to be recognised as IEC958
  capable to enable passthrough options
 
 ---
@@ -2136,7 +2136,7 @@ index e22db7a..0120bd5 100644
 From cad0f33be5e0b5989ece0863ba96158dbf5174d9 Mon Sep 17 00:00:00 2001
 From: Ben Avison <bavison@riscosopen.org>
 Date: Thu, 1 May 2014 16:28:39 +0100
-Subject: [PATCH 22/93] Improved file buffering in CArchive
+Subject: [PATCH 22/96] Improved file buffering in CArchive
 
 Even though memcpy is typically inlined by the compiler into byte/word loads
 and stores (at least for release builds), the frequency with which 1, 2 and 4
@@ -2199,7 +2199,7 @@ index 6ed0f8f..8506d95 100644
 From 17eebeec762e4f1c921d886b6863ac4a21cdb2f0 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 12 Aug 2014 00:31:36 +0100
-Subject: [PATCH 23/93] [omxcodec] Don't force software codec with dvds
+Subject: [PATCH 23/96] [omxcodec] Don't force software codec with dvds
 
 ---
  xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 ++
@@ -2223,7 +2223,7 @@ index 4ffe33a..4b09e8f 100644
 From 9da36b4157459cc72529ef6be5721f1ff6920ef6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 10 Aug 2014 16:45:16 +0100
-Subject: [PATCH 24/93] filesystem: Make support of browsing into archives
+Subject: [PATCH 24/96] filesystem: Make support of browsing into archives
  optional
 
 The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices.
@@ -2309,7 +2309,7 @@ index a1d4ee4..4929283 100644
 From b0231de02ec1821e136d75ff0f3986aaed8f0d92 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 27 Oct 2014 13:06:57 +0000
-Subject: [PATCH 25/93] [rbp] Make cachemembuffersize default depend on memory
+Subject: [PATCH 25/96] [rbp] Make cachemembuffersize default depend on memory
  size
 
 ---
@@ -2414,7 +2414,7 @@ index bc3aa8c..562757e 100644
 From 6d080c7c800d2e1120b46c5490d64d80b4e63ad4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 30 May 2014 14:58:43 +0100
-Subject: [PATCH 26/93] [settings] Experiment: Report DESKTOP resolution in
+Subject: [PATCH 26/96] [settings] Experiment: Report DESKTOP resolution in
  video settings
 
 ---
@@ -2439,7 +2439,7 @@ index 7993a73..761385b 100644
 From 80f582c6ced4a245d0cabb97a3e9fefc009e096d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 19 Sep 2014 11:54:49 +0100
-Subject: [PATCH 27/93] [dvdplayer/rbp] Add pi specific option to maintain
+Subject: [PATCH 27/96] [dvdplayer/rbp] Add pi specific option to maintain
  vsync with pll adjustment
 
 New A/V sync option in settings/video/playback to do "Adjust PLL".
@@ -2748,7 +2748,7 @@ index 6475350..93de9bd 100644
 From cecfb10575958e190cf3c6394ff2158bff6fe52a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 24 Sep 2014 23:13:52 +0100
-Subject: [PATCH 28/93] [audio] Add settings option to boost centre channel
+Subject: [PATCH 28/96] [audio] Add settings option to boost centre channel
  when downmixing
 
 This allows a dB volume increase to be added to centre channel.
@@ -2874,7 +2874,7 @@ index 08b1b84..70d0866 100644
 From cd089d7903e1fd4e0812ad817126a19d07fa896d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 27 Oct 2014 15:23:51 +0000
-Subject: [PATCH 29/93] [rbp] Default extract thumbnails to false
+Subject: [PATCH 29/96] [rbp] Default extract thumbnails to false
 
 It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors.
 It genereates a lot of support issues. Best to default to disabled and let users enable it if they must
@@ -2907,7 +2907,7 @@ index 7a170c2..1506035 100644
 From c0b8590f78235540d82d478334c7f30fae417754 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 10 Feb 2015 15:29:16 +0000
-Subject: [PATCH 30/93] [libcec] Add repeating keypress patch from popcornmix'
+Subject: [PATCH 30/96] [libcec] Add repeating keypress patch from popcornmix'
  repo
 
 ---
@@ -3797,7 +3797,7 @@ index 0000000..8366a69
 From bfc97f9146e8ac70fb03c439a4cf1a9a3135ea9b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 28 Oct 2014 00:19:40 +0000
-Subject: [PATCH 31/93] [cec] Add settings for configuring button repeats
+Subject: [PATCH 31/96] [cec] Add settings for configuring button repeats
 
 ---
  addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++
@@ -3881,7 +3881,7 @@ index e0d8dae..f738c84 100644
 From af63fad05fc2f6c24354c7acd08cd685ff376e28 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 3 Nov 2014 23:17:46 +0000
-Subject: [PATCH 32/93] [cec] Don't discard buttons when repeat mode is enabled
+Subject: [PATCH 32/96] [cec] Don't discard buttons when repeat mode is enabled
 
 ---
  xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++-
@@ -3907,7 +3907,7 @@ index f738c84..58d7d0d 100644
 From 42155d82d06a1deea72d4c3092315ea1110c6cb7 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 4 Nov 2014 18:50:00 +0000
-Subject: [PATCH 33/93] [cec] Temp - more logging
+Subject: [PATCH 33/96] [cec] Temp - more logging
 
 ---
  xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++-
@@ -3962,7 +3962,7 @@ index 58d7d0d..dfba61a 100644
 From f8d6e97fedcb9184af7dfc8a976815892faa7784 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 15 Nov 2014 12:03:34 +0000
-Subject: [PATCH 34/93] [dvdplayer] Add lock for player creation
+Subject: [PATCH 34/96] [dvdplayer] Add lock for player creation
 
 ---
  xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 +++
@@ -4011,7 +4011,7 @@ index 2f00647..b1418e3 100644
 From 2e80c975eb2d085f157ea328488aa7889c092f47 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 24 Nov 2014 22:07:25 +0000
-Subject: [PATCH 35/93] [dvdplayervideo] Prod decoder when in stills mode
+Subject: [PATCH 35/96] [dvdplayervideo] Prod decoder when in stills mode
 
 An asynchronous hardware decoder doesn't only produce output pictures when new packets arrive.
 In dvd stills mode give it a chance to return pictures that weren't ready when frame was decoded.
@@ -4091,7 +4091,7 @@ index 379c541..b5777a1 100644
 From 1a4b613e9981829137c817baad127fda8e1e2823 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 27 Nov 2014 16:31:56 +0000
-Subject: [PATCH 36/93] [languageinvoker] Reduce priority of python threads
+Subject: [PATCH 36/96] [languageinvoker] Reduce priority of python threads
 
 ---
  xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@@ -4117,7 +4117,7 @@ index fcdd063..16f0c89 100644
 From 73c6f413799cbb821f597253eb80457ee29a45f8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 14 Dec 2013 16:55:05 +0000
-Subject: [PATCH 37/93] logging: Add microsecond timer to log messages
+Subject: [PATCH 37/96] logging: Add microsecond timer to log messages
 
 ---
  xbmc/utils/log.cpp | 17 +++++++++++++++--
@@ -4173,7 +4173,7 @@ index 3443f12..31c4a99 100644
 From dd959edaaae1f167e0979ac55d64e5d769127687 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 29 Nov 2014 15:25:16 +0000
-Subject: [PATCH 38/93] [rbp] hack: wait for splash to complete before changing
+Subject: [PATCH 38/96] [rbp] hack: wait for splash to complete before changing
  hdmi mode
 
 ---
@@ -4250,7 +4250,7 @@ index ee29770..ff0d3e3 100644
 From 3afc5e302cd1fdad4afa43ec705707f36de2ddaf Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 11 Dec 2014 17:00:57 +0000
-Subject: [PATCH 39/93] Fix for UI not showing both extractflags and
+Subject: [PATCH 39/96] Fix for UI not showing both extractflags and
  extractthumb
 
 ---
@@ -4317,7 +4317,7 @@ index 918e8bf..61e1a22 100644
 From c423d114818b5cd611bd83c31cda74139b5dfd91 Mon Sep 17 00:00:00 2001
 From: anaconda <anaconda@menakite.eu>
 Date: Thu, 11 Sep 2014 21:30:43 +0200
-Subject: [PATCH 40/93] Disable autoscrolling while on screensaver and while
+Subject: [PATCH 40/96] Disable autoscrolling while on screensaver and while
  opening streams.
 
 ---
@@ -4451,7 +4451,7 @@ index d7bc1c5..ac76629 100644
 From 6b4fbcdd92b654b53fe8aeb5f00a5037117a505f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 13 Dec 2014 18:35:20 +0000
-Subject: [PATCH 41/93] [demuxer] Avoid memcpy on every demuxer packet
+Subject: [PATCH 41/96] [demuxer] Avoid memcpy on every demuxer packet
 
 Avoids an unnecessary memcpy on every demuxer packet which for
 high bitrate videos can be significant.
@@ -4552,7 +4552,7 @@ index ab298b2..10c5ee0 100644
 From 4e92f88d301118106a6aa08375bdd524fbbb0da8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 15 Feb 2015 14:06:12 +0000
-Subject: [PATCH 42/93] [mmal] Allow mmal codec for dvd stills
+Subject: [PATCH 42/96] [mmal] Allow mmal codec for dvd stills
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 7 +++++++
@@ -4587,7 +4587,7 @@ index 84e9ef1..f920f49 100644
 From 6f7b1c2fa7e8b46895b2287b3a9361b85af7b210 Mon Sep 17 00:00:00 2001
 From: anaconda <anaconda@menakite.eu>
 Date: Wed, 25 Feb 2015 18:22:21 +0100
-Subject: [PATCH 43/93] Load OSD dialogs on startup.
+Subject: [PATCH 43/96] Load OSD dialogs on startup.
 
 Fixes skipped frames the first time they're loaded in memory on less powered
 devices, like a Raspberry Pi, when using DVDPlayer.
@@ -4685,7 +4685,7 @@ index b248566..96c63cd 100644
 From 881432f2448626f24ea06cf02a29c811b075cdc8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 7 Mar 2015 22:46:21 +0000
-Subject: [PATCH 44/93] configure: Add raspberry-pi2 platform
+Subject: [PATCH 44/96] configure: Add raspberry-pi2 platform
 
 ---
  configure.ac                                      | 14 +++++++--
@@ -4862,7 +4862,7 @@ index dc6d565..98494b4 100644
 From 555c3d2ed48c00e6ef8632d47db58cab4d53b78b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 14 Apr 2015 20:51:14 +0100
-Subject: [PATCH 45/93] [gui] Also limit GUI updates when in non full-screen
+Subject: [PATCH 45/96] [gui] Also limit GUI updates when in non full-screen
  video mode
 
 ---
@@ -4895,7 +4895,7 @@ index c274e2f..212a5c7 100644
 From 67b90947ab8fb7fe16d39597f285a7e08fabc5b8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 21 Apr 2015 14:32:07 +0100
-Subject: [PATCH 46/93] [mmalrenderer] Add sharpness control
+Subject: [PATCH 46/96] [mmalrenderer] Add sharpness control
 
 ---
  addons/resource.language.en_gb/resources/strings.po |  2 +-
@@ -4970,7 +4970,7 @@ index d3e5129..a71e645 100644
 From 2ce900e2ef03fae1215700b5a839276585a00c92 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 24 Apr 2015 13:49:51 +0100
-Subject: [PATCH 47/93] [dvdplayer] Add back required include
+Subject: [PATCH 47/96] [dvdplayer] Add back required include
 
 ---
  xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 +
@@ -4992,7 +4992,7 @@ index b5777a1..64b4d60 100644
 From dc5e83b0cfbec04a34b3b8ea7fca8bbbcaae1f2c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 5 May 2015 23:58:06 +0100
-Subject: [PATCH 48/93] [screensaver] Leave GUI contents available for
+Subject: [PATCH 48/96] [screensaver] Leave GUI contents available for
  screensaver
 
 ---
@@ -5025,7 +5025,7 @@ index 89cfb8b..767c7b6 100644
 From 249d8d5147b3124129255deaa216da316cb8732e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 6 Jun 2015 18:43:57 +0100
-Subject: [PATCH 49/93] ffmpeg: Automatic switch to software decode for GMC
+Subject: [PATCH 49/96] ffmpeg: Automatic switch to software decode for GMC
  with more than one warp point
 
 ---
@@ -5242,7 +5242,7 @@ index 7251fc1..3429cea 100644
 From eb80abbf4ad8994a28d58ea8494e8a7bcd48b2f3 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 22 Jun 2015 21:46:57 +0100
-Subject: [PATCH 50/93] [rbp] Use default resampling setting on Pi2
+Subject: [PATCH 50/96] [rbp] Use default resampling setting on Pi2
 
 ---
  system/settings/rbp2.xml | 5 +++++
@@ -5268,7 +5268,7 @@ index 8cc8f19..52778ec 100644
 From 822ce9d64325082d7b071b68331c8fbd406d2ee1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 10 Mar 2016 17:54:59 +0000
-Subject: [PATCH 51/93] rbp: Expose gpu memory allocation functions
+Subject: [PATCH 51/96] rbp: Expose gpu memory allocation functions
 
 ---
  xbmc/linux/RBP.cpp         | 116 ++++++++++++
@@ -5934,7 +5934,7 @@ index 0000000..94e6e79
 From 97b436ca545f9a2faad6fdf02a9668843bd3f324 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 10 Mar 2016 17:56:11 +0000
-Subject: [PATCH 52/93] [rbp] HW mouse pointer
+Subject: [PATCH 52/96] [rbp] HW mouse pointer
 
 Updating the mouse point provokes a complete screen update which can make it feel laggy
 and results in high cpu.
@@ -6372,7 +6372,7 @@ index a17e987..23244a2 100644
 From fbd04377a1dac080166e1e4baa2250f402e3b66f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 2 Aug 2014 17:48:04 +0100
-Subject: [PATCH 53/93] [omx] Report decoded image name
+Subject: [PATCH 53/96] [omx] Report decoded image name
 
 ---
  xbmc/cores/omxplayer/OMXImage.cpp | 1 +
@@ -6394,7 +6394,7 @@ index 1524214..a01c435 100644
 From 99d06dd14a4501fe81b36e8ce3966dc99cd04b94 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 11 Apr 2014 16:12:27 +0100
-Subject: [PATCH 54/93] [omxplayer] Add ability to log more timestamp info in
+Subject: [PATCH 54/96] [omxplayer] Add ability to log more timestamp info in
  extra debug settings
 
 ---
@@ -6548,7 +6548,7 @@ index 22b8459..8045a03 100644
 From 85731b224b68bac5a47774d5447bbd3e1d14236d Mon Sep 17 00:00:00 2001
 From: Memphiz <memphis@machzwo.de>
 Date: Tue, 18 Nov 2014 13:28:36 +0100
-Subject: [PATCH 55/93] - evaluate the setting for hiding watched
+Subject: [PATCH 55/96] - evaluate the setting for hiding watched
  movies/episodes/musicvideos in recently added job (should influence
  homescreen of skins only)
 
@@ -6677,7 +6677,7 @@ index 2021dd9..5f67d10 100644
 From 11a94854f5d433c121314cdf989fd0e7bcc0102b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 14:28:37 +0100
-Subject: [PATCH 56/93] build: Add vcsm lib
+Subject: [PATCH 56/96] build: Add vcsm lib
 
 ---
  configure.ac | 2 +-
@@ -6700,7 +6700,7 @@ index 7a06a31..239a2a1 100644
 From 0077cb637667dc35084234c792dedfc8c5e80485 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 8 May 2015 14:09:31 +0100
-Subject: [PATCH 57/93] [cec] re-implement 'RFC' style POLLing for LA
+Subject: [PATCH 57/96] [cec] re-implement 'RFC' style POLLing for LA
  registering process
 
 ---
@@ -6925,7 +6925,7 @@ index ddf9963..5d1f933 100644
 From 3916ef0e55ad307d7a3e0f88ba5df0cdc73d5477 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 15:35:43 +0100
-Subject: [PATCH 58/93] ffmpeg: test: increase number of threads
+Subject: [PATCH 58/96] ffmpeg: test: increase number of threads
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 3 +++
@@ -6949,7 +6949,7 @@ index 3498503..c2f3287 100644
 From 36fd4c27fe9af15d65461e32b8d105e00fd8df52 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 22 May 2015 13:56:29 +0100
-Subject: [PATCH 59/93] ffmpeg: Allow neon to be enabled in unified builds
+Subject: [PATCH 59/96] ffmpeg: Allow neon to be enabled in unified builds
 
 ---
  tools/depends/target/ffmpeg/Makefile | 4 ++++
@@ -6975,7 +6975,7 @@ index 6a9f105..fef5ef2 100644
 From 5d5698967a69035d742d55f8986bce84831e73e9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 5 Mar 2015 20:00:59 +0000
-Subject: [PATCH 60/93] [ffmpmeg] Discard data before VO/VOL in mpeg-4 over
+Subject: [PATCH 60/96] [ffmpmeg] Discard data before VO/VOL in mpeg-4 over
  mpegts
 
 ---
@@ -7085,7 +7085,7 @@ index fef5ef2..e780521 100644
 From 4a4b1b0427cfb3116a112d682d10c802a71f913a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 27 Feb 2015 14:37:27 +0000
-Subject: [PATCH 61/93] ffmpeg: Add some upstream HEVC optimisations
+Subject: [PATCH 61/96] ffmpeg: Add some upstream HEVC optimisations
 
 ---
  tools/depends/target/ffmpeg/Makefile               |    6 +-
@@ -10872,7 +10872,7 @@ index 0000000..5e8e07d
 From 51c12471695d2d06c671707a7e2e6fec3b01f538 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 7 May 2015 14:04:18 +0100
-Subject: [PATCH 62/93] [ffmpeg] Add GPU acceleration to hevc
+Subject: [PATCH 62/96] [ffmpeg] Add GPU acceleration to hevc
 
 ---
  tools/depends/target/ffmpeg/Makefile               |     4 +-
@@ -47584,7 +47584,7 @@ index 0000000..f2b8ffc
 From aa8268363b74f1b9ed6d6801d379bc08a85eead2 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 14 Dec 2015 12:35:14 +0000
-Subject: [PATCH 63/93] [build] Add patches to ffmpeg for native build
+Subject: [PATCH 63/96] [build] Add patches to ffmpeg for native build
 
 ---
  tools/depends/target/ffmpeg/autobuild.sh | 8 ++++++++
@@ -47613,7 +47613,7 @@ index b9bfd57..f6d4c3b 100755
 From 31e2cf35741edf914f5413668c158186f9310197 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 12 Jan 2016 16:29:57 +0000
-Subject: [PATCH 64/93] ffmpeg: Add cabac opimisations for hevc
+Subject: [PATCH 64/96] ffmpeg: Add cabac opimisations for hevc
 
 ---
  .../0001-Squashed-commit-of-the-following.patch    | 2288 ++++++++++++++++++++
@@ -49949,7 +49949,7 @@ index e4acfa9..072e711 100644
 From 653e6185b0976bd50eea79f9834ede99db13e3aa Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 14 Jul 2015 08:30:44 +0200
-Subject: [PATCH 65/93] fix high cpu load caused by false positive frame
+Subject: [PATCH 65/96] fix high cpu load caused by false positive frame
  limiter
 
 ---
@@ -50024,7 +50024,7 @@ index 212a5c7..1adbb01 100644
 From 7eae470ce134f19cb5002969ac3f7e85fcf5220d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 5 Aug 2015 13:43:25 +0100
-Subject: [PATCH 66/93] [dvdplayeraudio] Avoid busy spinning when queue is
+Subject: [PATCH 66/96] [dvdplayeraudio] Avoid busy spinning when queue is
  empty
 
 ---
@@ -50048,7 +50048,7 @@ index 97a23a6..9f21a19 100644
 From 492a2e7ac5fb1895b71b62f68918e74db053f0b9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 6 Aug 2015 11:23:05 +0100
-Subject: [PATCH 67/93] [rbp] Make sync playback to display the default option
+Subject: [PATCH 67/96] [rbp] Make sync playback to display the default option
 
 ---
  system/settings/rbp.xml | 7 +++++++
@@ -50076,7 +50076,7 @@ index 1506035..f2a6892 100644
 From 3ff59db3bd9c43b037bbe89c72f5fd97f4563b71 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 8 Sep 2015 23:42:30 +0100
-Subject: [PATCH 68/93] [cec] Fixing initialisation issue found on Raspberry Pi
+Subject: [PATCH 68/96] [cec] Fixing initialisation issue found on Raspberry Pi
  with Buildroot
 
 ---
@@ -50131,7 +50131,7 @@ index 0000000..8f289f2
 From c456ad03e68428ef849490c385cc069cb8dde87d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 9 Dec 2015 13:31:14 +0000
-Subject: [PATCH 69/93] [mmalcodec] Fail to open when width is invalid. Can
+Subject: [PATCH 69/96] [mmalcodec] Fail to open when width is invalid. Can
  happen with mpegts files
 
 ---
@@ -50157,7 +50157,7 @@ index 3345685..5386b4a 100644
 From 9bcbb1f3c5e687ccf4aeecbe583eb7643f5d48c8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 21 Dec 2015 18:34:06 +0000
-Subject: [PATCH 70/93] [mmalrender] Force a SetVideoRect after a reconfigure
+Subject: [PATCH 70/96] [mmalrender] Force a SetVideoRect after a reconfigure
 
 There has been an issue with dvd stills and a hdmi refresh rate change.
 The hdmi mode change loses the currently displayed picture.
@@ -50188,7 +50188,7 @@ index adf6f73..ad3f66f 100644
 From 902a0514368d1ec48107d5951ee990b93cb4282f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 31 Mar 2015 17:31:47 +0100
-Subject: [PATCH 71/93] mmalcodec: Add SetCodecControl function
+Subject: [PATCH 71/96] mmalcodec: Add SetCodecControl function
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 10 +++++++++-
@@ -50258,7 +50258,7 @@ index f4df09c..37d0868 100644
 From cae99d2093015ba70d1a387e83ed6214393fc31a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 27 Dec 2015 18:44:22 +0000
-Subject: [PATCH 72/93] mmalcodec: Switch to a condition variable when blocking
+Subject: [PATCH 72/96] mmalcodec: Switch to a condition variable when blocking
  waiting for a picture
 
 ---
@@ -50370,7 +50370,7 @@ index 37d0868..ca28c6f 100644
 From ec6e9acc113651fc3408c9fc32d188f41d8de64a Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 16 Jan 2016 16:46:03 +0000
-Subject: [PATCH 73/93] omxaudio: Avoid reporting a spurious cached value
+Subject: [PATCH 73/96] omxaudio: Avoid reporting a spurious cached value
 
 Avoids seek bar showing zero after a seek
 ---
@@ -50394,7 +50394,7 @@ index 70d0866..052b5ef 100644
 From 711b4b11b49c9ebc255e565462e3ac665a1cda8c Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 21 Dec 2015 22:17:25 +0000
-Subject: [PATCH 74/93] [omximage] Fall back to arm jpeg encode/decode when gpu
+Subject: [PATCH 74/96] [omximage] Fall back to arm jpeg encode/decode when gpu
  is busy
 
 ---
@@ -50640,7 +50640,7 @@ index a93aa82..6f38dbc 100644
 From dfb7b32bb3d8220a30ad67a26dfc388b4c4d9f43 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sat, 2 Jan 2016 18:08:16 +0000
-Subject: [PATCH 75/93] [mmalcodec] Don't send zero sized extradata
+Subject: [PATCH 75/96] [mmalcodec] Don't send zero sized extradata
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 2 +-
@@ -50663,7 +50663,7 @@ index 3579966..0f5c1b7 100644
 From 374227275b47f31ca0cca887a12e5cce187cdd55 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 3 Jan 2016 19:12:16 +0000
-Subject: [PATCH 76/93] stereoscopicmanager: Ensure we don't have a stale value
+Subject: [PATCH 76/96] stereoscopicmanager: Ensure we don't have a stale value
  of videoplayer stereoscopic mode
 
 ---
@@ -50758,7 +50758,7 @@ index ec2310f..f090bb9 100644
 From d33bcf6304a60bfbdbc993eadab11505ae675851 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 16 Sep 2015 19:05:12 +0100
-Subject: [PATCH 77/93] [3d] Make MVC a valid 3D filename tag
+Subject: [PATCH 77/96] [3d] Make MVC a valid 3D filename tag
 
 ---
  xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++
@@ -50822,7 +50822,7 @@ index 93de9bd..4da88f4 100644
 From ff22ccfba36a15d2ed383bf5543f2dd3b9c6a618 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 24 Jan 2016 16:42:04 +0000
-Subject: [PATCH 78/93] fixup! [build] Add patches to ffmpeg for native build
+Subject: [PATCH 78/96] fixup! [build] Add patches to ffmpeg for native build
 
 ---
  tools/depends/target/ffmpeg/autobuild.sh | 2 +-
@@ -50845,7 +50845,7 @@ index f6d4c3b..cc59d17 100755
 From 8bcf9f72ff12412fdc4c8139be071c2448d51ae7 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 19:58:30 +0000
-Subject: [PATCH 79/93] OMXAudio: Make use of m_bGotFrame to skip decoding when
+Subject: [PATCH 79/96] OMXAudio: Make use of m_bGotFrame to skip decoding when
  full
 
 ---
@@ -50886,7 +50886,7 @@ index 33c4c6a..b9dab89 100644
 From 7044ba837edb2060a28bf534f5327d90e1c545e5 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 20:01:18 +0000
-Subject: [PATCH 80/93] OMXAudio: Handle GetData before adding the next buffer
+Subject: [PATCH 80/96] OMXAudio: Handle GetData before adding the next buffer
  so we can be sure it fits
 
 ---
@@ -50957,7 +50957,7 @@ index b9dab89..f150dc6 100644
 From c4abc577bf4c12d48cc800930c2d292c0a65031f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Jan 2016 20:03:49 +0000
-Subject: [PATCH 81/93] OMXAudio: Handle changes in decoded audio size
+Subject: [PATCH 81/96] OMXAudio: Handle changes in decoded audio size
  correctly
 
 ---
@@ -51013,7 +51013,7 @@ index f150dc6..4956b5b 100644
 From df922f986ab0b2dc1363224ef6c72a7a8ac616dc Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 4 Feb 2016 15:29:55 +0000
-Subject: [PATCH 82/93] MMALCodec: Set dropped flag on output pictures when
+Subject: [PATCH 82/96] MMALCodec: Set dropped flag on output pictures when
  input requested that
 
 ---
@@ -51075,7 +51075,7 @@ index ca28c6f..bf669e0 100644
 From a6102bec84b610166da7448d80b853e5efd649a1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 3 Feb 2016 21:35:01 +0000
-Subject: [PATCH 83/93] DVDVideoCodecFFmpeg: Enable refcounted frames
+Subject: [PATCH 83/96] DVDVideoCodecFFmpeg: Enable refcounted frames
 
 Without this frames will get (deep) copied when deinterlace is set to automatic,
 but file is not deinterlaced.
@@ -51104,7 +51104,7 @@ index c2f3287..64087f2 100644
 From a301f546dcfa4bf1ceaa9737a60a835826d54fec Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 19 Feb 2016 13:45:23 +0000
-Subject: [PATCH 84/93] mmal: increase decode buffering a little to help harder
+Subject: [PATCH 84/96] mmal: increase decode buffering a little to help harder
  MVC files
 
 PR8610 reduced buffering in codec which generally improved behaviour,
@@ -51133,7 +51133,7 @@ index 7b025fd..08f61fc 100644
 From c0b0aad15a9ffcd921bb70af5bf9200ee7a93fed Mon Sep 17 00:00:00 2001
 From: Mario Holzinger <sandman01xda@gmail.com>
 Date: Fri, 11 Dec 2015 16:48:57 +0100
-Subject: [PATCH 85/93] touch panel to display adjustment
+Subject: [PATCH 85/96] touch panel to display adjustment
 
 ---
  xbmc/input/linux/LinuxInputDevices.cpp |  7 ++++---
@@ -51225,7 +51225,7 @@ index 4da88f4..1bdc77e 100644
 From d3c755950fe7e7b255a2a28cafd105affb3aab13 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 15 Feb 2016 15:51:11 +0000
-Subject: [PATCH 86/93] touch panel to display adjustment - support multitouch
+Subject: [PATCH 86/96] touch panel to display adjustment - support multitouch
 
 PR7978 allowed a simple calibration to be applied to touch input
 It didn't cover multitouch which this adds support for
@@ -51259,7 +51259,7 @@ index a506956..3579cd0 100644
 From f517a6ff4ab7f04b9a6ba371d3429e5ae95eb3d1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 22 Mar 2016 22:28:13 +0000
-Subject: [PATCH 87/93] [linux] Move hotplug checking into its own thread
+Subject: [PATCH 87/96] [linux] Move hotplug checking into its own thread
 
 Currently checking for new linux input devices is called from the rendering thread.
 We've been getting reports of skipped frames on raspberry pi.
@@ -51436,7 +51436,7 @@ index 23244a2..c82ba84 100644
 From ffb8b5378dbb2c53f1411e051f0c7eec9555ca83 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 28 Jul 2015 17:47:33 +0100
-Subject: [PATCH 88/93] [rbp] Refactor the vsync handle to support multiple
+Subject: [PATCH 88/96] [rbp] Refactor the vsync handle to support multiple
  callers
 
 ---
@@ -51653,7 +51653,7 @@ index 2eee35d..3b59cd9 100644
 From 2e13233a89859c10902059dd34160582af62ee1e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 24 Mar 2016 23:24:18 +0000
-Subject: [PATCH 89/93] [mmalrenderer] Wait for vsync before submitting to mmal
+Subject: [PATCH 89/96] [mmalrenderer] Wait for vsync before submitting to mmal
  when display sync is disabled
 
 This avoids an issue where video occasionally goes stuttery after a seek, until the next pause/play or seek.
@@ -51816,7 +51816,7 @@ index a71e645..34cb294 100644
 From 1f63176ba9c91a1f1e58dec440a56e90ee944583 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 16:57:19 +0000
-Subject: [PATCH 90/93] mmal: Include mmal renderer logging in video category
+Subject: [PATCH 90/96] mmal: Include mmal renderer logging in video category
 
 On Pi the decoder and renderer are closely coupled so combining the
 logging category makes sense to me.
@@ -52083,7 +52083,7 @@ index 76c4682..e1099da 100644
 From 6a008777d9f6c0b2b8724fc66cecf74ac7c32383 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 17:34:48 +0000
-Subject: [PATCH 91/93] rendermanager: Increase configure timeout to see if it
+Subject: [PATCH 91/96] rendermanager: Increase configure timeout to see if it
  fixes video playing in background issues
 
 ---
@@ -52107,7 +52107,7 @@ index 7a99ac4..4b03c86 100644
 From 67223b6440475c4797aa2aa1949f73c078114474 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 23 Mar 2016 17:39:47 +0000
-Subject: [PATCH 92/93] Revert "[rbp] Use default resampling setting on Pi2"
+Subject: [PATCH 92/96] Revert "[rbp] Use default resampling setting on Pi2"
 
 This reverts commit e6b2f1693480ad5d8062acaed512393e72fb9b1d.
 ---
@@ -52134,7 +52134,7 @@ index 52778ec..8cc8f19 100644
 From bb33be4220a3fd1ad131ec1f2218f7b4750fda98 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 31 Mar 2016 20:00:15 +0100
-Subject: [PATCH 93/93] Revert "[rbp] Make sync playback to display the default
+Subject: [PATCH 93/96] Revert "[rbp] Make sync playback to display the default
  option"
 
 This reverts commit 492a2e7ac5fb1895b71b62f68918e74db053f0b9.
@@ -52160,3 +52160,86 @@ index f2a6892..1506035 100644
      <category id="videoacceleration">
        <group id="1">
          <visible>false</visible>
+
+From 4cf382f46873b4a3da10d825a103c2ef897b87fb Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Fri, 1 Apr 2016 17:26:27 +0100
+Subject: [PATCH 94/96] fixup: Handle case where fps=0.0 with sync playback to
+ display disabled
+
+---
+ xbmc/cores/VideoRenderers/MMALRenderer.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+index e1099da..e545e87 100644
+--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
++++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+@@ -529,7 +529,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+         return;
+       omvb->Acquire();
+       omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
+-      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock"))
++      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock") && m_fps > 0.0f)
+         mmal_queue_put(m_queue, omvb->mmal_buffer);
+       else
+         mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
+@@ -551,7 +551,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+       omvb->Acquire();
+       omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
+       omvb->mmal_buffer->user_data = omvb;
+-      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock"))
++      if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock") && m_fps > 0.0f)
+         mmal_queue_put(m_queue, omvb->mmal_buffer);
+       else
+         mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
+
+From 7367c175628cac663dd5cbea18bef17e9c74f992 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 3 Apr 2016 11:26:19 +0100
+Subject: [PATCH 95/96] squash: initialise error term to zero
+
+---
+ xbmc/cores/VideoRenderers/MMALRenderer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+index e545e87..16f6142 100644
+--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
++++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+@@ -245,6 +245,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer")
+   m_inflight = 0;
+   m_sharpness = -2.0f;
+   m_queue = mmal_queue_create();
++  m_error = 0.0;
+   Create();
+ }
+ 
+
+From f923a12de46ebe78820335ef1e42ce81982e7091 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 11 Apr 2016 11:53:13 +0100
+Subject: [PATCH 96/96] Revert "Revert "[rbp] Use default resampling setting on
+ Pi2""
+
+This reverts commit 67223b6440475c4797aa2aa1949f73c078114474.
+---
+ system/settings/rbp2.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/system/settings/rbp2.xml b/system/settings/rbp2.xml
+index 8cc8f19..52778ec 100644
+--- a/system/settings/rbp2.xml
++++ b/system/settings/rbp2.xml
+@@ -23,6 +23,11 @@
+         <setting id="audiooutput.ac3transcode" help="36429">
+         </setting>
+       </group>
++      <group id="1">
++        <setting id="audiooutput.processquality">
++          <default>30</default> <!-- AE_QUALITY_MID -->
++        </setting>
++      </group>
+     </category>
+   </section>
+ </settings>

projects/WeTek_Core/patches/linux/080-amlogic-cec-driver.patch

@@ -55,10 +55,10 @@ index 7a944cd..f74ec1f 100755
  #EXTRA_CFLAGS += -O2
 diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 new file mode 100644
-index 0000000..a3556b3
+index 0000000..1bfc29b
 --- /dev/null
 +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,679 @@
 +/* linux/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 + *
 + * Copyright (c) 2016 Gerald Dachs
@@ -549,7 +549,6 @@ index 0000000..a3556b3
 +
 +    retval = entry->size;
 +
-+    amlogic_cec_set_rx_state(STATE_RX);
 +
 +error_exit:
 +    if (entry != NULL)
@@ -558,6 +557,11 @@ index 0000000..a3556b3
 +    	kfree(entry);
 +    }
 +
++    if (list_empty(&cec_rx_struct.list))
++    {
++        amlogic_cec_set_rx_state(STATE_RX);
++    }
++
 +    spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
 +
 +    return retval;
@@ -651,7 +655,11 @@ index 0000000..a3556b3
 +
 +static u32 amlogic_cec_poll(struct file *file, poll_table *wait)
 +{
-+    poll_wait(file, &cec_rx_struct.waitq, wait);
++
++    if (atomic_read(&cec_rx_struct.state) != STATE_DONE)
++    {
++        poll_wait(file, &cec_rx_struct.waitq, wait);
++    }
 +
 +    if (atomic_read(&cec_rx_struct.state) == STATE_DONE)
 +    {

projects/WeTek_Play/patches/linux/080-amlogic-cec-driver.patch

@@ -55,10 +55,10 @@ index 7a944cd..f74ec1f 100755
  #EXTRA_CFLAGS += -O2
 diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 new file mode 100644
-index 0000000..a3556b3
+index 0000000..1bfc29b
 --- /dev/null
 +++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
-@@ -0,0 +1,671 @@
+@@ -0,0 +1,679 @@
 +/* linux/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
 + *
 + * Copyright (c) 2016 Gerald Dachs
@@ -549,7 +549,6 @@ index 0000000..a3556b3
 +
 +    retval = entry->size;
 +
-+    amlogic_cec_set_rx_state(STATE_RX);
 +
 +error_exit:
 +    if (entry != NULL)
@@ -558,6 +557,11 @@ index 0000000..a3556b3
 +    	kfree(entry);
 +    }
 +
++    if (list_empty(&cec_rx_struct.list))
++    {
++        amlogic_cec_set_rx_state(STATE_RX);
++    }
++
 +    spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
 +
 +    return retval;
@@ -651,7 +655,11 @@ index 0000000..a3556b3
 +
 +static u32 amlogic_cec_poll(struct file *file, poll_table *wait)
 +{
-+    poll_wait(file, &cec_rx_struct.waitq, wait);
++
++    if (atomic_read(&cec_rx_struct.state) != STATE_DONE)
++    {
++        poll_wait(file, &cec_rx_struct.waitq, wait);
++    }
 +
 +    if (atomic_read(&cec_rx_struct.state) == STATE_DONE)
 +    {