diff options
Diffstat (limited to 'media-video/orion/files')
3 files changed, 218 insertions, 0 deletions
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 new file mode 100644 index 000000000000..c6aced452ca7 --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-fix_login.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 000000000000..4cd302cb3d1f --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-mpv_backwards.patch @@ -0,0 +1,147 @@ +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 new file mode 100644 index 000000000000..c9163d3376c5 --- /dev/null +++ b/media-video/orion/files/orion-1.6.6-mpv_compilation.patch @@ -0,0 +1,39 @@ +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"); + |