upstream release 1.1.7

2 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a1c7b684e30..6998b0a65cc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Nov 28 18:56:46 UTC 2016
 pkgbase = plex-media-player
 	pkgdesc = Next generation Plex Desktop Client
-	pkgver = 1.1.5
+	pkgver = 1.1.7
 	pkgrel = 1
 	url = https://github.com/plexinc/plex-media-player
 	arch = i686
@@ -9,15 +11,15 @@ pkgbase = plex-media-player
 	makedepends = cmake
 	depends = mpv
 	depends = qt5-webengine>=5.6
-	depends = libcec
+	depends = libcec3
 	depends = sdl2
 	depends = qt5-x11extras
-	noextract = plex-web-client-konvergo-f5036c1.cpp.tbz2
-	source = plex-media-player-1.1.5.405-43e1569b.tar.gz::https://github.com/plexinc/plex-media-player/archive/v1.1.5.405-43e1569b.tar.gz
-	source = https://nightlies.plex.tv/directdl/plex-dependencies/plex-web-client-plexmediaplayer/153/plex-web-client-pmp-2.10.0-f5036c1.tbz2
+	noextract = plex-web-client-konvergo-e96a2ba.cpp.tbz2
+	source = plex-media-player-1.1.7.442-5d0c3c70.tar.gz::https://github.com/plexinc/plex-media-player/archive/v1.1.7.442-5d0c3c70.tar.gz
+	source = https://nightlies.plex.tv/directdl/plex-dependencies/plex-web-client-plexmediaplayer/160/plex-web-client-pmp-2.10.8-e96a2ba.tbz2
 	source = plex-media-player.desktop
-	sha256sums = f056d92eb9bf93c3febb1fee85b427cae4b579a44bb5ea7ccd8b8a1d773f0ba8
-	sha256sums = ab953a86385a4f5dae10afb051ea07036fe6b4cc8b26bebbdb71e399ce74e620
+	sha256sums = 7b268d3ccb4d1fab44e57cb30f40d75f57f583bfa3cacb9abb14b5f6a127b437
+	sha256sums = cc5328fb49f67fd736c7ffa95139b19fada67ab007941dced2b847eded9816a8
 	sha256sums = b03845b761cc18a88252b72d0c83e439006224660444d9174f53cc577f9498b6
 
 pkgname = plex-media-player
diff --git a/PKGBUILD b/PKGBUILD
index 817f94d5371e..d1059cd6a538 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,26 @@
 # Contributor: TingPing <tingping@tingping.se>
 
 pkgname=plex-media-player
-pkgver=1.1.5
-_gitrev=405
-_gitver=43e1569b
+pkgver=1.1.7
+_gitrev=442
+_gitver=5d0c3c70
 _fullname="$pkgname-$pkgver.$_gitrev-$_gitver"
-_webclientver=f5036c1 # Set in CMakeModules/WebClientVariables.cmake
-_webclientbuild=153
-_webclientversionnr=2.10.0
+_webclientver=e96a2ba # Set in CMakeModules/WebClientVariables.cmake
+_webclientbuild=160
+_webclientversionnr=2.10.8
 pkgrel=1
 pkgdesc='Next generation Plex Desktop Client'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='https://github.com/plexinc/plex-media-player'
-depends=('mpv' 'qt5-webengine>=5.6' 'libcec' 'sdl2' 'qt5-x11extras')
+depends=('mpv' 'qt5-webengine>=5.6' 'libcec3' 'sdl2' 'qt5-x11extras')
 makedepends=('cmake')
 source=("$_fullname.tar.gz::https://github.com/plexinc/plex-media-player/archive/v${pkgver}.${_gitrev}-${_gitver}.tar.gz"
         "https://nightlies.plex.tv/directdl/plex-dependencies/plex-web-client-plexmediaplayer/${_webclientbuild}/plex-web-client-pmp-${_webclientversionnr}-${_webclientver}.tbz2"
         'plex-media-player.desktop')
 noextract=("plex-web-client-konvergo-$_webclientver.cpp.tbz2")
-sha256sums=('f056d92eb9bf93c3febb1fee85b427cae4b579a44bb5ea7ccd8b8a1d773f0ba8'
-            'ab953a86385a4f5dae10afb051ea07036fe6b4cc8b26bebbdb71e399ce74e620'
+sha256sums=('7b268d3ccb4d1fab44e57cb30f40d75f57f583bfa3cacb9abb14b5f6a127b437'
+            'cc5328fb49f67fd736c7ffa95139b19fada67ab007941dced2b847eded9816a8'
             'b03845b761cc18a88252b72d0c83e439006224660444d9174f53cc577f9498b6')
 
 # NOTE:
@@ -36,16 +36,20 @@ prepare() {
 	        s|get_git_head_revision(REFSPEC FULL_GIT_REVISION)||' \
 	       CMakeModules/VersionConfiguration.cmake
 
+    sed -i 's|#include <libcec/|#include <libcec3/|' \
+           src/input/InputCEC.h
+
 	# Use our downloaded copy of web-client
 	mkdir -p build/src
-	ln -sf {$srcdir,build/src}/plex-web-client-konvergo-${_webclientver}.cpp.tbz2
+	ln -sf {$srcdir,build}/plex-web-client-pmp-${_webclientversionnr}-${_webclientver}.tbz2
 }
 
 build() {
 	cd "$_fullname/build"
 
 	cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_SKIP_RPATH=1 \
-	      -DFULL_GIT_REVISION="$_gitver" -DQTROOT='/usr' ..
+	      -DFULL_GIT_REVISION="$_gitver" -DQTROOT='/usr' -DCEC_INCLUDE_DIR=/usr/include/libcec3 \
+          -DCEC_LIBRARY=/usr/lib/libcec.so.3 ..
 	make
 }