From 0c2774eaed8075096b48df8660131e36baf6d53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 Jul 2020 08:05:30 +0200 Subject: [PATCH] plex-media-player: update to 2.58.0 + fix build The template for Downloader::HeaderList append() expects a QString instead of a const char*. --- .../patches/qt5-append-header.patch | 16 +++++++++++ srcpkgs/plex-media-player/template | 27 ++++++++++--------- 2 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/plex-media-player/patches/qt5-append-header.patch diff --git a/srcpkgs/plex-media-player/patches/qt5-append-header.patch b/srcpkgs/plex-media-player/patches/qt5-append-header.patch new file mode 100644 index 00000000000..02ef423ec6c --- /dev/null +++ b/srcpkgs/plex-media-player/patches/qt5-append-header.patch @@ -0,0 +1,16 @@ +--- src/player/CodecsComponent.cpp 2020-05-19 19:32:23.000000000 +0200 ++++ src/player/CodecsComponent.cpp 2020-07-28 08:00:34.966060781 +0200 +@@ -684,9 +684,11 @@ + { + Downloader::HeaderList headers; + QString auth = SystemComponent::Get().authenticationToken(); ++ QString prod = WITH_CODECS ? "Plex Media Player" : "openpmp"; ++ QString plat = "Konvergo"; + 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({"X-Plex-Product", prod}); ++ headers.append({"X-Plex-Platform", plat}); + return headers; + } diff --git a/srcpkgs/plex-media-player/template b/srcpkgs/plex-media-player/template index bd44fd76b56..8432c27fdb0 100644 --- a/srcpkgs/plex-media-player/template +++ b/srcpkgs/plex-media-player/template @@ -1,14 +1,15 @@ # Template file for 'plex-media-player' pkgname=plex-media-player -version=2.37.2.996 +version=2.58.0 revision=1 -_commit_rev=bea4f9ca +_verbuild=1076 +_commit_rev=38e019da # See CMakeModules/WebClient.cmake -_buildid_version=132-156395a99cd699 +_buildid_version=183-045db5be50e175 # See https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake -_clientdesktop_version=3.104.1-99cd699 -_clienttv_version=3.107.0-156395a -wrksrc="plex-media-player-${version}-${_commit_rev}" +_clientdesktop_version=4.29.2-e50e175 +_clienttv_version=4.29.6-045db5b +wrksrc="plex-media-player-${version}.${_verbuild}-${_commit_rev}" build_style=cmake configure_args="-DQTROOT="${XBPS_CROSS_BASE}/usr" -DFULL_GIT_REVISION=${_commit_rev}" hostmakedepends="pkg-config python3" @@ -20,18 +21,18 @@ short_desc="Next generation Plex Desktop/Embedded Client" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://github.com/plexinc/plex-media-player" -distfiles="https://github.com/plexinc/plex-media-player/archive/v${version}-${_commit_rev}.tar.gz +distfiles="https://github.com/plexinc/plex-media-player/archive/v${version}.${_verbuild}-${_commit_rev}.tar.gz https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake>buildid-${_buildid_version}.cmake https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz.sha1 https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz.sha1" -checksum="1c31b0057337a14bc1eea99f61a44b288b5b7e707f81a629cee941789e6b901a - 6b516d498097f1e84d04eefbeaf519492081ed2df9673119b66089ff9822c6f6 - 5815709d80a66484043b68ec2b86473b165a3a64f855fd59b3d176440f8b210b - 5da2c32325943426fad7a00d19ec109452beda7f2a2d112d0238c8c8b07aba98 - b0a153088d7e85b665b9acbe6ba08eeb230d36eb7ce95fd703f02dc3c57730e7 - a973210e2e428774d926f2bd044d709963800824c9e421981dd968cacd0020ce" +checksum="f73ddae52d40eb5019283a16c83f4d5909dc1059ced85d6298e5525347705341 + 0331e53bb67c4b14284fafbe3a98700c3438ece99b9e969bcb49a1d583674af7 + c56c1784dd8de0fbda971b66e4fc19a6b91c154e9122213a7c0ef577613a94fe + eef51c4ee379ca914522b072832bad119bb831897958f985bab79097a1ef571f + e04b7d77804efb850f6abbec48982526f6fe727a74a143f73b83033672de3fb8 + 53cbb948ec4fa73f073892ab6179481f1d17d3c165b2997aee1973739ee0eeff" skip_extraction="buildid-${_buildid_version}.cmake web-client-desktop-${_clientdesktop_version}.tar.xz web-client-desktop-${_clientdesktop_version}.tar.xz.sha1