Update to 2.4.0

2 files changed, 10 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ed467267445..b2e6cb59f478 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jan 24 07:14:18 UTC 2018
+# Wed Feb  7 20:33:28 UTC 2018
 pkgbase = plex-media-player
 	pkgdesc = Next generation Plex Desktop Client
-	pkgver = 2.3.0
-	pkgrel = 2
+	pkgver = 2.4.0
+	pkgrel = 1
 	url = https://github.com/plexinc/plex-media-player
 	arch = i686
 	arch = x86_64
@@ -19,11 +19,9 @@ pkgbase = plex-media-player
 	depends = p8-platform
 	depends = protobuf
 	noextract = plex-web-client-konvergo-.cpp.tbz2
-	source = plex-media-player-2.3.0.774-ef2108c2.tar.gz::https://github.com/plexinc/plex-media-player/archive/v2.3.0.774-ef2108c2.tar.gz
-	source = plex-media-player-2.3.0.774-ef2108c2_osx.tar.gz::https://downloads.plex.tv/plexmediaplayer/2.3.0.774-ef2108c2/PlexMediaPlayer-2.3.0.774-ef2108c2-macosx-x86_64.zip
+	source = plex-media-player-2.4.0.786-970a87bf.tar.gz::https://github.com/plexinc/plex-media-player/archive/v2.4.0.786-970a87bf.tar.gz
 	source = plex-media-player.desktop
-	sha512sums = 345c15a65a4f1b2590c7f99794b5986c3764c03b519cf11343a7d111e50959638396d51ed7ce666b91912f57d842ce221b24055d26fc6b332ca87eda5467d30c
-	sha512sums = 0c75dd187454ffa940863164cea5a10fc92b28ecc81a2acb8fa7e5204f16509425f728b8a069036042f4601b1635a1ab944b24a14ca4771e850c12209766ef1a
+	sha512sums = 886e33d95303854cd0f5dd2fd8898f39b6ecf6a76647d453e95d107e14cc153696fa45c28458fa8c27bbaf90c58eaa8f4674b887c920dff6bbb2da48c3492f85
 	sha512sums = f24d70646babc2d248d6159442e3b9d5518276e7d8e33004f13d260953ebcd741067c507a47de25c24842e4391f4c403cdb46dc989b52fa1dde38a7312382db1
 
 pkgname = plex-media-player
diff --git a/PKGBUILD b/PKGBUILD
index aa6cee69f1f6..5a8a90beaa64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,22 @@
 # Contributor: TingPing <tingping@tingping.se>
 
 pkgname=plex-media-player
-pkgver=2.3.0
-_gitrev=774
-_gitver=ef2108c2
+pkgver=2.4.0
+_gitrev=786
+_gitver=970a87bf
 _fullver="$pkgver.$_gitrev-$_gitver"
 _fullname="$pkgname-$_fullver"
-pkgrel=2
+pkgrel=1
 pkgdesc='Next generation Plex Desktop Client'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 url='https://github.com/plexinc/plex-media-player'
 depends=('mpv' 'qt5-webengine>=5.6' 'libcec' 'sdl2' 'qt5-x11extras' 'qt5-quickcontrols' 'p8-platform' 'protobuf')
-#makedepends=('cmake' 'conan')
 makedepends=('cmake')
 source=("$_fullname.tar.gz::https://github.com/plexinc/plex-media-player/archive/v${_fullver}.tar.gz"
-        "${_fullname}_osx.tar.gz::https://downloads.plex.tv/plexmediaplayer/${_fullver}/PlexMediaPlayer-${_fullver}-macosx-x86_64.zip"
         'plex-media-player.desktop')
 noextract=("plex-web-client-konvergo-$_webclientver.cpp.tbz2")
-sha512sums=('345c15a65a4f1b2590c7f99794b5986c3764c03b519cf11343a7d111e50959638396d51ed7ce666b91912f57d842ce221b24055d26fc6b332ca87eda5467d30c'
-            '0c75dd187454ffa940863164cea5a10fc92b28ecc81a2acb8fa7e5204f16509425f728b8a069036042f4601b1635a1ab944b24a14ca4771e850c12209766ef1a'
+sha512sums=('886e33d95303854cd0f5dd2fd8898f39b6ecf6a76647d453e95d107e14cc153696fa45c28458fa8c27bbaf90c58eaa8f4674b887c920dff6bbb2da48c3492f85'
             'f24d70646babc2d248d6159442e3b9d5518276e7d8e33004f13d260953ebcd741067c507a47de25c24842e4391f4c403cdb46dc989b52fa1dde38a7312382db1')
 
 prepare() {
@@ -32,29 +29,14 @@ prepare() {
             s|get_git_head_revision(REFSPEC FULL_GIT_REVISION)||' \
            CMakeModules/VersionConfiguration.cmake
 
-    #conan_remote="https://conan.plex.tv"
-    #msg2 "Checking for plex conan remote"
-    #if conan remote list | grep -q plex; then
-    #    msg2 "plex remote exists for conan"
-    #else
-    #    msg2 "Adding ${conan_remote} as a conan remote"
-    #    conan remote add plex "$conan_remote"
-    #fi
-
     mkdir -p build
-    #cd build
-    #conan install ..
 }
 
 build() {
     cd "${srcdir}/$_fullname/build"
 
-    # https://github.com/plexinc/plex-media-player/issues/641#issuecomment-354332463
-    RES="${srcdir}/Plex Media Player.app/Contents/Resources/web-client"
-
     cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_SKIP_RPATH=1 \
           -DFULL_GIT_REVISION="$_gitver" -DQTROOT='/usr/share/qt' \
-          -DCONAN_WEB-CLIENT-TV2_ROOT="$RES" -DCONAN_WEB-CLIENT-DESKTOP_ROOT="$RES" \
           ..
     make
 }