From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- media-video/subtitlecomposer/Manifest | 3 +- .../subtitlecomposer-0.7.1-gles-support.patch | 122 +++++++++++++++++++++ .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 7 +- 3 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch (limited to 'media-video/subtitlecomposer') diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index 253ed0a7c71a..215234fce96c 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,4 +1,5 @@ +AUX subtitlecomposer-0.7.1-gles-support.patch 4291 BLAKE2B fe5e39720c89f6bed7cf66f23b793b53823f588e188f9e0487e8fd7ab034915da712944cfae79a5be090d810c77ade183291e09cb98777d2ebcae6bd28f28943 SHA512 f02a103eb61b8e2b02375d4b15939d836b53181365c79a3100f6c14d62c8b17598d169191ab400a57031fcbc922d62695692908564e4cc85c2a42f3a09cc69a4 AUX subtitlecomposer-0.7.1-tests-optional.patch 762 BLAKE2B cc8f7408e165422788ed9f6c3641e816237ef1230e64853ceb0fe83acbbe9a10b3cd2b5670270904984ab3e23ebfe6ea1d07278826a6ab89346ec7502076f477 SHA512 a02f847164f2f117f024c09311b00a55b268f80089c6304b29ffd5bb7166ea3b81c14e65befc36379124f18600cb6d57ae8f320261ecd25bb0e05c754d55cbcb DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92 -EBUILD subtitlecomposer-0.7.1.ebuild 1450 BLAKE2B 139a8fb6c99b28a5d0ad928a3470460f196d967c273875ed1f3b672c6c3a056f5d0391f125852f65efc7d0b2d0366c1e58c858160dc477a7eb4d9303f5a44c75 SHA512 b922e2b045bd91949050bd9c6e4525d2d7a3d70bcafb1d3dda75b29d6632a4f17d9eaaf758b7cd0c646db515f24e4217a26ea5df3dddf419bf695295e6bcafea +EBUILD subtitlecomposer-0.7.1.ebuild 1503 BLAKE2B 137faa2e750391323816982db54cd03bf88562e3ae09a28ad71a0756fa532be15a8583684e1eb5ee8603b7acb2a6a0cf14d7d01c1db6a15dcb6e52482e24f74b SHA512 466f47a9c43405b54350ff6b2665fb787666f1b421430a3f9c5fcd569ef8598e611c2b2a9f4b30741fe1b79254eb0adbd34d1d6e4f21db4d3f60571d28f4bf73 MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch new file mode 100644 index 000000000000..98de494cf306 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch @@ -0,0 +1,122 @@ +From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001 +From: Mladen Milinkovic +Date: Thu, 7 Oct 2021 19:37:23 +0200 +Subject: [PATCH] GLRenderer: added GLES support + +--- + src/videoplayer/backend/glrenderer.cpp | 44 ++++++++++++++++++++++---- + 1 file changed, 38 insertions(+), 6 deletions(-) + +diff --git a/src/videoplayer/backend/glrenderer.cpp b/src/videoplayer/backend/glrenderer.cpp +index 7c9c38b..5cb985d 100644 +--- a/src/videoplayer/backend/glrenderer.cpp ++++ b/src/videoplayer/backend/glrenderer.cpp +@@ -20,6 +20,7 @@ extern "C" { + } + + #define DEBUG_GL 0 ++#define FORCE_GLES 0 + #define OPENGL_CORE 0 + #define OPENGL_VER 2,0 + +@@ -33,6 +34,17 @@ extern "C" { + #define asGL(glCall) glCall + #endif + ++#if defined(GL_ES_VERSION_2_0) || FORCE_GLES ++#define USE_GLES ++#define TEXTURE_RGB_FORMAT GL_RGBA ++// NOTE: we don't currently support more than 8bpp on GLES ++#define TEXTURE_U16_FORMAT GL_R8 ++#else ++#undef USE_GLES ++#define TEXTURE_RGB_FORMAT GL_BGRA ++#define TEXTURE_U16_FORMAT GL_R16 ++#endif ++ + using namespace SubtitleComposer; + + enum { ID_Y, ID_U, ID_V, ID_OVR, ID_SIZE }; +@@ -82,6 +94,9 @@ void + GLRenderer::setupProfile() + { + QSurfaceFormat format(QSurfaceFormat::defaultFormat()); ++#if FORCE_GLES ++ format.setRenderableType(QSurfaceFormat::OpenGLES); ++#endif + format.setVersion(OPENGL_VER); + #if DEBUG_GL + format.setOption(QSurfaceFormat::DebugContext); +@@ -126,7 +141,7 @@ GLRenderer::setFrameFormat(int width, int height, int compBits, int crWidthShift + m_crHeight = crHeight; + + m_glType = compBytes == 1 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT; +- m_glFormat = compBytes == 1 ? GL_R8 : GL_R16; ++ m_glFormat = compBytes == 1 ? GL_R8 : TEXTURE_U16_FORMAT; + + delete[] m_bufYUV; + m_bufSize = bufSize; +@@ -261,7 +276,11 @@ GLRenderer::initShader() + delete m_vertShader; + m_vertShader = new QOpenGLShader(QOpenGLShader::Vertex, this); + bool success = m_vertShader->compileSourceCode( ++#ifdef USE_GLES ++ "#version 100\n" ++#else + "#version 120\n" ++#endif + "attribute vec4 vPos;" + "attribute vec2 vVidTex;" + "attribute vec2 vOvrTex;" +@@ -288,7 +307,13 @@ GLRenderer::initShader() + csms.append(QString::number(csm[i], 'g', 10)); + } + +- success = m_fragShader->compileSourceCode(QStringLiteral("#version 120\n" ++ success = m_fragShader->compileSourceCode(QStringLiteral( ++#ifdef USE_GLES ++ "#version 100\n" ++ "precision mediump float;\n" ++#else ++ "#version 120\n" ++#endif + "varying vec2 vfVidTex;" + "varying vec2 vfOvrTex;" + "uniform sampler2D texY;" +@@ -348,8 +373,15 @@ GLRenderer::initializeGL() + QMutexLocker l(&m_texMutex); + + initializeOpenGLFunctions(); +- qDebug() << "OpenGL version: " << reinterpret_cast(glGetString(GL_VERSION)); +- qDebug() << "GLSL version: " << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); ++ qDebug().nospace() << "GL API: OpenGL " << (format().renderableType() == QSurfaceFormat::OpenGLES ? "ES" : "Desktop") ++ << ' ' << format().majorVersion() << "." << format().minorVersion() ++#ifdef USE_GLES ++ << " (compiled for OpenGL ES)"; ++#else ++ << " (compiled for OpenGL Desktop)"; ++#endif ++ qDebug() << "OpenGL version:" << reinterpret_cast(glGetString(GL_VERSION)); ++ qDebug() << "GLSL version:" << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); + + if(m_vao.create()) + m_vao.bind(); +@@ -453,13 +485,13 @@ GLRenderer::uploadMM(int texWidth, int texHeight, T *texBuf, const T *texSrc) + if(D == 1) { + asGL(glTexImage2D(GL_TEXTURE_2D, level, m_glFormat, texWidth, texHeight, 0, GL_RED, m_glType, texSrc)); + } else { // D == 4 +- asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, texSrc)); ++ asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc)); + } + } else { + if(D == 1) { + asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_RED, m_glType, texSrc)); + } else { // D == 4 +- asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_BGRA, GL_UNSIGNED_BYTE, texSrc)); ++ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc)); + } + } + +-- +GitLab + diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild index aef529fbf604..3ff7e5e962a5 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,10 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" ) +PATCHES=( + "${FILESDIR}/${P}-tests-optional.patch" + "${FILESDIR}/${P}-gles-support.patch" # bug 820035 +) src_configure() { local mycmakeargs=( -- cgit v1.2.3