commit: c0b635cc77e5b73691d5397c22cb638ed5f4eb85 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 29 13:45:38 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 29 13:53:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b635cc
media-video/subtitlecomposer: Replace Kross with QJSEngine Upstream commit 4a8df2a16c929f179fe69f1c3e867c03780874c5 Switch to patchset. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/subtitlecomposer/Manifest | 1 + .../files/subtitlecomposer-0.7.1-ffmpeg-5.patch | 65 ----------- .../subtitlecomposer-0.7.1-gles-support.patch | 122 --------------------- .../subtitlecomposer-0.7.1-tests-optional.patch | 27 ----- ...7.1.ebuild => subtitlecomposer-0.7.1-r1.ebuild} | 26 ++--- .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 12 +- 6 files changed, 19 insertions(+), 234 deletions(-) diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index f88fc4132ffd..f8cfd0d22adc 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1 +1,2 @@ +DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92 diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch deleted file mode 100644 index a0314fb06820..000000000000 --- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001 -From: Mladen Milinkovic <[email protected]> -Date: Tue, 25 Jan 2022 14:01:56 +0100 -Subject: [PATCH] Fix compilation with ffmpeg5 #63 - ---- - src/streamprocessor/streamprocessor.cpp | 2 +- - src/videoplayer/backend/decoder.h | 1 + - src/videoplayer/backend/framequeue.h | 1 + - src/videoplayer/backend/streamdemuxer.cpp | 2 +- - 4 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/streamprocessor/streamprocessor.cpp b/src/streamprocessor/streamprocessor.cpp -index b86795e..8faf8a2 100644 ---- a/src/streamprocessor/streamprocessor.cpp -+++ b/src/streamprocessor/streamprocessor.cpp -@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int streamIndex, bool imageSub) - int ret; - char errorText[1024]; - -- AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); -+ const AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); - if(!dec) { - qWarning() << "Failed to find decoder for stream" << i; - return false; -diff --git a/src/videoplayer/backend/decoder.h b/src/videoplayer/backend/decoder.h -index 4ab95b2..fb6840d 100644 ---- a/src/videoplayer/backend/decoder.h -+++ b/src/videoplayer/backend/decoder.h -@@ -11,6 +11,7 @@ - #include <QThread> - - extern "C" { -+#include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - } - -diff --git a/src/videoplayer/backend/framequeue.h b/src/videoplayer/backend/framequeue.h -index dc9b2fa..ece1166 100644 ---- a/src/videoplayer/backend/framequeue.h -+++ b/src/videoplayer/backend/framequeue.h -@@ -9,6 +9,7 @@ - #define FRAMEQUEUE_H - - extern "C" { -+#include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - } - -diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp -index 1e339b3..e8320ea 100644 ---- a/src/videoplayer/backend/streamdemuxer.cpp -+++ b/src/videoplayer/backend/streamdemuxer.cpp -@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex) - { - AVFormatContext *ic = m_vs->fmtContext; - AVCodecContext *avCtx; -- AVCodec *codec; -+ const AVCodec *codec; - AVDictionary *opts = nullptr; - AVDictionaryEntry *t = nullptr; - int sampleRate, nbChannels; --- -GitLab - 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 deleted file mode 100644 index 98de494cf306..000000000000 --- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001 -From: Mladen Milinkovic <[email protected]> -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<const char *>(glGetString(GL_VERSION)); -- qDebug() << "GLSL version: " << reinterpret_cast<const char *>(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<const char *>(glGetString(GL_VERSION)); -+ qDebug() << "GLSL version:" << reinterpret_cast<const char *>(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/files/subtitlecomposer-0.7.1-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch deleted file mode 100644 index 75d4f71a2ff7..000000000000 --- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6e25dd4670f0d14bdc8aff050bdacb050e0327ff Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 6 Oct 2021 20:30:03 +0200 -Subject: [PATCH] Make tests optional - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - src/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1cb7098..97d60a3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -124,7 +124,9 @@ else() - message(STATUS "ICU Library not found. KEncodingProber fallback will be used for charset detection.") - endif() - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - add_subdirectory(scripting) - - add_executable(subtitlecomposer WIN32 main.cpp ${subtitlecomposer_RES_SRC}) --- -2.33.0 - diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild similarity index 69% copy from media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild copy to media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild index 54143eba37a9..aa729948e01b 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" KFMIN=5.82.0 -QTMIN=5.15.2 +QTMIN=5.15.5 VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Text-based subtitles editor" HOMEPAGE="https://subtitlecomposer.kde.org/"; -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" +PATCHSET="${P}-patchset-1" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; LICENSE="GPL-2" SLOT="5" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="unicode" DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kcodecs-${KFMIN}:5 @@ -28,7 +31,6 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kross-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 @@ -44,9 +46,10 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-tests-optional.patch" - "${FILESDIR}/${P}-gles-support.patch" # bug 820035 - "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416 + "${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch" + "${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035 + "${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416 + "${WORKDIR}/${PATCHSET}/${P}-replace-kross-w-qjsengine.patch" # bug 755956 ) src_configure() { @@ -57,10 +60,3 @@ src_configure() { ecm_src_configure } - -pkg_postinst() { - ecm_pkg_postinst - - elog "Some example scripts provided by ${PN} require dev-lang/ruby" - elog "or dev-lang/python to be installed." -} diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild index 54143eba37a9..ad0554f6b897 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,9 @@ inherit ecm kde.org DESCRIPTION="Text-based subtitles editor" HOMEPAGE="https://subtitlecomposer.kde.org/"; -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" +PATCHSET="${P}-patchset-1" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; LICENSE="GPL-2" SLOT="5" @@ -44,9 +46,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-tests-optional.patch" - "${FILESDIR}/${P}-gles-support.patch" # bug 820035 - "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416 + "${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch" + "${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035 + "${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416 ) src_configure() {
