updated to v2.58.1

3 files changed, 11 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acf37ca4c8da..8152943a1232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plex-media-player
 	pkgdesc = Next generation Plex Desktop Client
-	pkgver = 2.58.0
-	pkgrel = 4
+	pkgver = 2.58.1
+	pkgrel = 1
 	url = https://github.com/plexinc/plex-media-player
 	arch = i686
 	arch = x86_64
@@ -19,24 +19,19 @@ pkgbase = plex-media-player
 	depends = protobuf
 	noextract = web-client-desktop-183-045db5be50e175-4.29.2-e50e175.tar.xz
 	noextract = web-client-tv-183-045db5be50e175-4.29.6-045db5b.tar.xz
-	source = plex-media-player-2.58.0.1076-38e019da.tar.gz::https://github.com/plexinc/plex-media-player/archive/v2.58.0.1076-38e019da.tar.gz
+	source = plex-media-player-2.58.1-ae73e074.tar.gz::https://github.com/plexinc/plex-media-player/archive/v2.58.1-ae73e074.tar.gz
 	source = buildid-183-045db5be50e175.cmake::https://artifacts.plex.tv/web-client-pmp/183-045db5be50e175/buildid.cmake
 	source = web-client-desktop-183-045db5be50e175-4.29.2-e50e175.tar.xz::https://artifacts.plex.tv/web-client-pmp/183-045db5be50e175/web-client-desktop-4.29.2-e50e175.tar.xz
 	source = web-client-desktop-183-045db5be50e175-4.29.2-e50e175.tar.xz.sha1::https://artifacts.plex.tv/web-client-pmp/183-045db5be50e175/web-client-desktop-4.29.2-e50e175.tar.xz.sha1
 	source = web-client-tv-183-045db5be50e175-4.29.6-045db5b.tar.xz::https://artifacts.plex.tv/web-client-pmp/183-045db5be50e175/web-client-tv-4.29.6-045db5b.tar.xz
 	source = web-client-tv-183-045db5be50e175-4.29.6-045db5b.tar.xz.sha1::https://artifacts.plex.tv/web-client-pmp/183-045db5be50e175/web-client-tv-4.29.6-045db5b.tar.xz.sha1
-	source = qt.patch
 	source = plex.patch
-	source = mpv.patch
-	sha512sums = 702826ed5dc5ad4f1a9a877834dce0734eeb5b0f3eb007a6e6dff2fc1b7fc1ebbd1ad7a42be6ebec392e5313abb2867121b3dfcf00acc008dbae628564594866
+	sha512sums = 86fc3cd4c37700a1881ccd2aa43c0aa5e7ff20eacc643e3babef6acfab4b355903b69988b9d8821c87269fc5d6bdc8803e115ef867f5f388a1e9b6cad8fd321e
 	sha512sums = 6c3fa0d2fa26da3c8ed47de5385f0f2fb1af0409f4a58aef5bc2c2cf75741dcbddd4b496ca5b9a55c4ce35e09ed076d411c3e9c330de1d99761aa0ebc3fae6bc
 	sha512sums = 0c09ebf57cd39e8e4dae449e3882725686214e0bed07e3dac25eae579ebdc3a136e51bb2272aaca6a5b8e317b1ccbe94231eb214ddf11cbfb14307a0e7f3e3e0
 	sha512sums = 3f2de45e29303445bca976d61e343acabc29edbca0c9dcddeff9134d75c317a8f678a122e6c429fea0801b49fe40d2b30a4f44cd8fdcc040b3c9ab5b15f04d0e
 	sha512sums = d60cc01f6b9abf579b3fa2e5b5c9b19e71a986578b0ca46173572324fb54573c97f09ac0ef1654a0b04d68eee20ab3d81ab19a85a761ba638b2b543548ff94ac
 	sha512sums = 442c2e5a31eed30167009bdaf263c66bea482d4ad03e168c9d9eb5e9f4e40f771dee9bc6913d6be46f7d86feb961603f172bb6497fac28c4f5d36a1f05d0ec66
 	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
 
 pkgname = plex-media-player
-
diff --git a/PKGBUILD b/PKGBUILD
index 69de92550b05..ecdcbf7782a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,16 @@
 # Contributor: Daniel Egeberg <daniel.egeberg@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: TingPing <tingping@tingping.se>
-
 pkgname=plex-media-player
-pkgver=2.58.0
-_gitrev=1076
-_gitver=38e019da
-_fullver="$pkgver.$_gitrev-$_gitver"
+pkgver=2.58.1
+_gitrev=
+_gitver=ae73e074
+_fullver="$pkgver-$_gitver"
 _fullname="$pkgname-$_fullver"
 _web_buildid=183-045db5be50e175
 _web_desktop_ver=4.29.2-e50e175
 _web_tv_ver=4.29.6-045db5b
-pkgrel=4
+pkgrel=1
 pkgdesc='Next generation Plex Desktop Client'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 license=('GPL')
@@ -25,33 +24,23 @@ source=("$_fullname.tar.gz::https://github.com/plexinc/plex-media-player/archive
         "web-client-desktop-${_web_buildid}-${_web_desktop_ver}.tar.xz.sha1::https://artifacts.plex.tv/web-client-pmp/${_web_buildid}/web-client-desktop-${_web_desktop_ver}.tar.xz.sha1"
         "web-client-tv-${_web_buildid}-${_web_tv_ver}.tar.xz::https://artifacts.plex.tv/web-client-pmp/${_web_buildid}/web-client-tv-${_web_tv_ver}.tar.xz"
         "web-client-tv-${_web_buildid}-${_web_tv_ver}.tar.xz.sha1::https://artifacts.plex.tv/web-client-pmp/${_web_buildid}/web-client-tv-${_web_tv_ver}.tar.xz.sha1"
-        'qt.patch'
-        'plex.patch'
-        'mpv.patch')
+        'plex.patch')
 noextract=("web-client-desktop-${_web_buildid}-${_web_desktop_ver}.tar.xz"
            "web-client-tv-${_web_buildid}-${_web_tv_ver}.tar.xz")
-sha512sums=('702826ed5dc5ad4f1a9a877834dce0734eeb5b0f3eb007a6e6dff2fc1b7fc1ebbd1ad7a42be6ebec392e5313abb2867121b3dfcf00acc008dbae628564594866'
+sha512sums=('86fc3cd4c37700a1881ccd2aa43c0aa5e7ff20eacc643e3babef6acfab4b355903b69988b9d8821c87269fc5d6bdc8803e115ef867f5f388a1e9b6cad8fd321e'
             '6c3fa0d2fa26da3c8ed47de5385f0f2fb1af0409f4a58aef5bc2c2cf75741dcbddd4b496ca5b9a55c4ce35e09ed076d411c3e9c330de1d99761aa0ebc3fae6bc'
             '0c09ebf57cd39e8e4dae449e3882725686214e0bed07e3dac25eae579ebdc3a136e51bb2272aaca6a5b8e317b1ccbe94231eb214ddf11cbfb14307a0e7f3e3e0'
             '3f2de45e29303445bca976d61e343acabc29edbca0c9dcddeff9134d75c317a8f678a122e6c429fea0801b49fe40d2b30a4f44cd8fdcc040b3c9ab5b15f04d0e'
             'd60cc01f6b9abf579b3fa2e5b5c9b19e71a986578b0ca46173572324fb54573c97f09ac0ef1654a0b04d68eee20ab3d81ab19a85a761ba638b2b543548ff94ac'
             '442c2e5a31eed30167009bdaf263c66bea482d4ad03e168c9d9eb5e9f4e40f771dee9bc6913d6be46f7d86feb961603f172bb6497fac28c4f5d36a1f05d0ec66'
-            'SKIP'
-            'SKIP'
             'SKIP')
-
 prepare() {
     cd "${srcdir}/$_fullname"
-
-    patch --forward --strip=1 --input="${srcdir}/qt.patch"
     patch --forward --strip=1 --input="${srcdir}/plex.patch"
-    patch --forward --strip=1 --input="${srcdir}/mpv.patch"
-
     # All this git version junk fails, just remove it we already have the version
     sed -i 's|include(GetGitRevisionDescription)||
             s|get_git_head_revision(REFSPEC FULL_GIT_REVISION)||' \
            CMakeModules/VersionConfiguration.cmake
-
     mkdir -p build/dependencies
     for f in "buildid-${_web_buildid}.cmake"; do
          ln -sf "${srcdir}/${f}" "build/dependencies/${f}"
@@ -61,18 +50,14 @@ prepare() {
         ln -sf "${srcdir}/${f}" "build/dependencies/${target}"
     done
 }
-
 build() {
     cd "${srcdir}/$_fullname/build"
-
     cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_SKIP_RPATH=1 \
           -DFULL_GIT_REVISION="$_gitver" -DQTROOT='/usr' \
           ..
     make
 }
-
 package() {
     cd "${srcdir}/$_fullname/build"
-
     DESTDIR="$pkgdir" make install
 }
diff --git a/qt.patch b/qt.patch
deleted file mode 100644
index 5b415cab7c05..000000000000
--- a/qt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/player/CodecsComponent.cpp    2019-12-10 20:22:36.000000000 +0300
-+++ b/src/player/CodecsComponent.cpp    2019-12-25 18:13:48.973701844 +0300
-@@ -683,9 +683,9 @@
-   Downloader::HeaderList headers;
-   QString auth = SystemComponent::Get().authenticationToken();
-   if (auth.size())
--    headers.append({"X-Plex-Token", auth});
--  headers.append({"X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"});
--  headers.append({"X-Plex-Platform", "Konvergo"});
-+    headers.append(qMakePair<QString, QString>("X-Plex-Token", auth));
-+  headers.append(qMakePair<QString, QString>("X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"));
-+  headers.append(qMakePair<QString, QString>("X-Plex-Platform", "Konvergo"));
-   return headers;
- }