gentoo resync : 23.09.2020

6 files changed, 3 insertions, 277 deletions

diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index bae7a56b808b..10b9ae23fcb3 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,8 +1,3 @@
-AUX orion-1.6.6-fix_login.patch 999 BLAKE2B 43f37299be369aa56d612ec6393c4a240c06a65b37a9e22dd499b774497c22eb5fe342ecd6b030912cab2354ef4774d067b10c1fa0288f5a6c8554dea9aef1e3 SHA512 a5b45ca8dae9008bb21ca73a8fa57ccff56da46cdb0aa3f9cc03299ca9d864bfa311a622e7735505a52b4a6c7cc66399756f159fa3757ef17a0f00d7b4304792
-AUX orion-1.6.6-mpv_backwards.patch 4470 BLAKE2B 19ca0d4e5226038d5e8bc528856d2f145a6750a87d9f20591810165d513a1fd3067bda2e483088d3e2cf1a44a963ff7498e530d03099ddc6b6ef2a4661d4ac84 SHA512 79f421e95a97f22e91dda2e350c94e8612230123ee64a18f15926bc111c67a6965dc740def5d9624575024f6b0e11871dfa3c26ce0e4e7abb4e3d3c1811ddd9b
-AUX orion-1.6.6-mpv_compilation.patch 1108 BLAKE2B 021660340ba3f6cf7f70fda13af65544ea26edafb50331b4f5bba0af0b1662840ec25a5993b1f19335c7c2ebb5129c04d487640fad975cb797a1a07bd400ca29 SHA512 ffff325f22eace89c0b2f59701e0f119c759ea3d2f2c5d2422b6e3f0eac74e08fa56e442502895ab78cc41be9fe2182f2a62d036ba872c3dfc9457ad61e324af
-DIST orion-1.6.6.tar.gz 629917 BLAKE2B 303af947533aeb26561fb3fc57d4ffbbd6d168e1e51ffe196a0de82fca3406599cfb84c1ae361c9b7b84c9c01b47bb6147b98f62cc5b1dec3d08d0588cbc7327 SHA512 88c7efe1796d1135f18bd53c83a25747df1bbf35163b27c625711ab5027e988425e3ba13ff6e3349d30cdc99d24cae0642d1d058e401a24b240d73c6b47a2aaf
 DIST orion-1.6.7.tar.gz 644899 BLAKE2B 7aa188bc5eaf1f1781735416152a9324a2945f10b2c1ccd55fa5a2b557c31e4bdad55d282c4efc0552dbf998db7193bc19ec0679034ec53cbd97f688b572f74c SHA512 dc4c4d364423cae52f95c4ad2d241e311d6947066c2a7b02b5754df2b69a7bb7aeed54d4515afe31b4437b8e47057e939e9444e7812ca0125ba3a8c65678d3d0
-EBUILD orion-1.6.6.ebuild 1156 BLAKE2B d1277c411bdcc32e73169f249c0c2e9abad004cb87bb8dcaa12a40596d7d999a3f0f90ee7d57817a4d120aed74c3053b15be5867d3c292ca47c9038e08029fed SHA512 16d0c26553e3afc5ae71f694cc528db25d74b3662079285aba7b7bd1fc3a0b1872a310f558066adf1170df6610c9bb31b425a1a312e80cf136ea30ed33169cc8
-EBUILD orion-1.6.7.ebuild 1025 BLAKE2B a87a4eacdeeacd6ebf1e62389064b3308a46ed9aff13121e034226553bddc295b33df98be4bb1b7dc177c53557c19437d5accb5df9efccfd58e001b50a67289d SHA512 ceea89157cdac2e2dbbd5027791754de2a8431ea4ae4204b4e88276124eba4c8ea7902b6c925a90abffe65bd56ecc662539c14de5088e7a4e7f64b8d20232c0f
+EBUILD orion-1.6.7.ebuild 1048 BLAKE2B 3e3078f2d55514ac96928d982697e9b7e342709e242f6cd1d0ed3e4659878fa31d7169141468189c039e030dc26d3880986d6b43917bb5578151a2f01a8a69fd SHA512 11c13933d6598b859c6945285eba8e8adf4f1248bd6ca1d7e5e3b2fcbc6517e949b17e747f554993e2450b0b23232633c85be9a408d09f2cb0f6c4dba2590803
 MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
diff --git a/media-video/orion/files/orion-1.6.6-fix_login.patch b/media-video/orion/files/orion-1.6.6-fix_login.patch
deleted file mode 100644
index c6aced452ca7..000000000000
--- a/media-video/orion/files/orion-1.6.6-fix_login.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 69c58ba5af5f83903be70629b02f348fc3ad8757 Mon Sep 17 00:00:00 2001
-From: Andrew Tonner <rakslice@gmail.com>
-Date: Tue, 26 Mar 2019 14:58:40 -0700
-Subject: [PATCH] Fix HTTP request socket output
-
----
- src/network/httpserver.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/network/httpserver.cpp b/src/network/httpserver.cpp
-index 235e073..b0368eb 100644
---- a/src/network/httpserver.cpp
-+++ b/src/network/httpserver.cpp
-@@ -89,7 +89,6 @@ void HttpServer::onRead() {
- 
-     // Respond with 200
-     QByteArray block;
--    QDataStream out(&block, QIODevice::WriteOnly);
- 
-     // http payload message body
-     QByteArray content;
-@@ -111,9 +110,7 @@ void HttpServer::onRead() {
-     response += "Content-Length: " + QString::number(content.length()) + "\n";
-     response += "\n" + content;
- 
--    out << response.toUtf8();
--
--    socket->write(block);
-+    socket->write(response.toUtf8());
-     socket->waitForBytesWritten();
-     socket->disconnectFromHost();
- 
diff --git a/media-video/orion/files/orion-1.6.6-mpv_backwards.patch b/media-video/orion/files/orion-1.6.6-mpv_backwards.patch
deleted file mode 100644
index 4cd302cb3d1f..000000000000
--- a/media-video/orion/files/orion-1.6.6-mpv_backwards.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 755fae82a31105808ec978855803f52affa01f87 Mon Sep 17 00:00:00 2001
-From: mrgreywater <mr.greywater@googlemail.com>
-Date: Fri, 19 Oct 2018 22:21:07 +0200
-Subject: [PATCH] opengl-cb backward compatibility
-
----
- src/player/mpvobject.cpp | 43 ++++++++++++++++++++++++++++++++++------
- src/player/mpvobject.h   | 15 +++++++++++++-
- 2 files changed, 51 insertions(+), 7 deletions(-)
-
-diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
-index 2955063..31cdf73 100644
---- a/src/player/mpvobject.cpp
-+++ b/src/player/mpvobject.cpp
-@@ -48,16 +48,25 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-     MpvRenderer(MpvObject *new_obj)
-         : obj{new_obj}
-     {
--
-+#ifdef USE_OPENGL_CB
-+    int r = mpv_opengl_cb_init_gl(obj->mpv_gl, nullptr, &get_proc_address_mpv, nullptr);
-+    if (r < 0)
-+        throw std::runtime_error("could not initialize OpenGL");
-+#endif
-     }
- 
-     virtual ~MpvRenderer()
--    {}
-+    {
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_uninit_gl(obj->mpv_gl);
-+#endif
-+    }
- 
-     // This function is called when a new FBO is needed.
-     // This happens on the initial frame.
-     QOpenGLFramebufferObject * createFramebufferObject(const QSize &size)
-     {
-+#ifndef USE_OPENGL_CB
-         // init mpv_gl:
-         if (!obj->mpv_gl)
-         {
-@@ -72,15 +81,17 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-                 throw std::runtime_error("failed to initialize mpv GL context");
-             mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj);
-         }
--
-+#endif
-         return QQuickFramebufferObject::Renderer::createFramebufferObject(size);
-     }
- 
-     void render()
-     {
-         obj->window()->resetOpenGLState();
--
-         QOpenGLFramebufferObject *fbo = framebufferObject();
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_draw(obj->mpv_gl, fbo->handle(), fbo->width(), fbo->height());
-+#else
-         mpv_opengl_fbo mpfbo{static_cast<int>(fbo->handle()), fbo->width(), fbo->height(), 0};
-         int flip_y{0};
- 
-@@ -97,7 +108,7 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-         // See render_gl.h on what OpenGL environment mpv expects, and
-         // other API details.
-         mpv_render_context_render(obj->mpv_gl, params);
--
-+#endif
-         obj->window()->resetOpenGLState();
-     }
- };
-@@ -115,11 +126,27 @@ MpvObject::MpvObject(QQuickItem * parent)
-     mpv_set_option_string(mpv, "msg-level", "all=v");
- #endif
- 
-+#ifdef USE_OPENGL_CB
-+    mpv_set_option_string(mpv, "vo", "opengl-cb");
-+#endif
-+
-     if (mpv_initialize(mpv) < 0)
-         throw std::runtime_error("could not initialize mpv context");
- 
-     // Request hw decoding, just for testing.
--    mpv::qt::set_option_variant(mpv, "hwdec", "auto");
-+    mpv_set_option_string(mpv, "hwdec", "auto");
-+
-+#ifdef USE_OPENGL_CB
-+    // Setup the callback that will make QtQuick update and redraw if there
-+    // is a new video frame. Use a queued connection: this makes sure the
-+    // doUpdate() function is run on the GUI thread.
-+    mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB);
-+
-+    if (!mpv_gl)
-+        throw std::runtime_error("OpenGL not compiled in");
-+
-+    mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this);
-+#endif
- 
-     mpv_set_wakeup_callback(mpv, wakeup, this);
- 
-@@ -130,7 +157,11 @@ MpvObject::~MpvObject()
- {
-     if (mpv_gl) // only initialized if something got drawn
-     {
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_set_update_callback(mpv_gl, nullptr, nullptr);
-+#else
-         mpv_render_context_free(mpv_gl);
-+#endif
-     }
- 
-     mpv_terminate_destroy(mpv);
-diff --git a/src/player/mpvobject.h b/src/player/mpvobject.h
-index 0ec0b7a..eeaa250 100644
---- a/src/player/mpvobject.h
-+++ b/src/player/mpvobject.h
-@@ -6,8 +6,21 @@
- 
- #include <QtQuick/QQuickFramebufferObject>
- 
-+
- #include <mpv/client.h>
-+
-+#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(1, 28)
-+#define USE_OPENGL_CB
-+#endif
-+
-+#ifdef USE_OPENGL_CB
-+#include <mpv/opengl_cb.h>
-+typedef mpv_opengl_cb_context mpv_context;
-+#else
- #include <mpv/render_gl.h>
-+typedef mpv_render_context mpv_context;
-+#endif
-+
- #include <mpv/qthelper.hpp>
- 
- class MpvRenderer;
-@@ -17,7 +30,7 @@ class MpvObject : public QQuickFramebufferObject
-     Q_OBJECT
- 
-     mpv_handle *mpv;
--    mpv_render_context *mpv_gl;
-+    mpv_context *mpv_gl;
-     std::vector<std::unique_ptr<QJSValue>> callbacks;
- 
-     friend class MpvRenderer;
diff --git a/media-video/orion/files/orion-1.6.6-mpv_compilation.patch b/media-video/orion/files/orion-1.6.6-mpv_compilation.patch
deleted file mode 100644
index c9163d3376c5..000000000000
--- a/media-video/orion/files/orion-1.6.6-mpv_compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-index def79f5..7fd9d93 100644
---- a/orion.pro
-+++ b/orion.pro
-@@ -8,7 +8,7 @@ QT     += gui qml network widgets quickcontrols2
- 
- QMAKE_CXXFLAGS += -Wall -O2
- 
--CONFIG += c++11
-+CONFIG += c++14
- #CONFIG += console
- 
- TARGET = orion
-@@ -86,8 +86,8 @@ android: {
-     android/src/com/orion/MainActivity.java
- 
-     ANDROID_EXTRA_LIBS = \
--        $$PWD/../openssl-1.0.2l/libcrypto.so \
--        $$PWD/../openssl-1.0.2l/libssl.so
-+        $$PWD/libs/libcrypto.so \
-+        $$PWD/libs/libssl.so
- }
- 
- #Backend for player, uses mpv as default
-diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
-index 2c30462..2955063 100644
---- a/src/player/mpvobject.cpp
-+++ b/src/player/mpvobject.cpp
-@@ -103,8 +103,10 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
- };
- 
- MpvObject::MpvObject(QQuickItem * parent)
--    : QQuickFramebufferObject(parent), mpv{mpv_create()}, mpv_gl(nullptr)
-+    : QQuickFramebufferObject(parent), mpv_gl(nullptr)
- {
-+    std::setlocale(LC_NUMERIC, "C");
-+    mpv = mpv_create();
-     if (!mpv)
-         throw std::runtime_error("could not create mpv context");
- 
diff --git a/media-video/orion/orion-1.6.6.ebuild b/media-video/orion/orion-1.6.6.ebuild
deleted file mode 100644
index 740953442c02..000000000000
--- a/media-video/orion/orion-1.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Cross-platform Twitch client"
-HOMEPAGE="https://alamminsalo.github.io/orion/"
-SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mpv qtav qtmedia"
-
-DEPEND=">=dev-qt/qtquickcontrols-5.8:5
-	>=dev-qt/qtquickcontrols2-5.8:5
-	>=dev-qt/qtsvg-5.8:5
-	>=dev-qt/qtwebengine-5.8:5
-	mpv? ( media-video/mpv[libmpv] )
-	qtav? ( media-libs/qtav )
-	qtmedia? ( >=dev-qt/qtmultimedia-5.8:5 )"
-RDEPEND="${DEPEND}
-	!mpv? ( media-plugins/gst-plugins-hls )"
-
-REQUIRED_USE="^^ ( mpv qtav qtmedia )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_login.patch
-	"${FILESDIR}"/${P}-mpv_compilation.patch
-	"${FILESDIR}"/${P}-mpv_backwards.patch
-)
-
-src_configure() {
-	local PLAYER
-	if use mpv; then
-		PLAYER=mpv
-	elif use qtav; then
-		PLAYER=qtav
-	else
-		PLAYER=multimedia
-	fi
-	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
-}
-
-src_install() {
-	dobin ${PN}
-	domenu distfiles/*.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins distfiles/${PN}.svg
-}
diff --git a/media-video/orion/orion-1.6.7.ebuild b/media-video/orion/orion-1.6.7.ebuild
index 406bf1c592ec..095b3c005cf1 100644
--- a/media-video/orion/orion-1.6.7.ebuild
+++ b/media-video/orion/orion-1.6.7.ebuild
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mpv qtav qtmedia"
 
-DEPEND=">=dev-qt/qtquickcontrols-5.8:5
+DEPEND=">=dev-qt/qtdbus-5.8:5
+	>=dev-qt/qtquickcontrols-5.8:5
 	>=dev-qt/qtquickcontrols2-5.8:5
 	>=dev-qt/qtsvg-5.8:5
 	>=dev-qt/qtwebengine-5.8:5