From 822a054dd1bab7f8080ccd486398034b4ff0b97d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Mar 2023 15:53:38 +0100 Subject: gentoo auto-resync : 29:03:2023 - 15:53:38 --- media-video/subtitlecomposer/Manifest | 7 +- .../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 ----- .../subtitlecomposer-0.7.1-r1.ebuild | 62 +++++++++++ .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 12 +- 6 files changed, 72 insertions(+), 223 deletions(-) delete mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch delete mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch delete mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch create mode 100644 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild (limited to 'media-video/subtitlecomposer') diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index 5429eb3717ea..fca2d544413d 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,6 +1,5 @@ -AUX subtitlecomposer-0.7.1-ffmpeg-5.patch 2218 BLAKE2B 5ceb17db99f0fa8579ef072365c801f7dfb5b6980386237473ebe44f9b43e7a58f0d1940bdf0bb29652624ea501f40e8b37fec27b6fa68afd161e60a800f9819 SHA512 fa310d2219cf114626c90ad1ce909f1865004321bb4b31692f7dc2c3f4707e0c3ace3df9f4b31263454c5b3c72682667588829f9ec0f7b58565fd3cfc120495c -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-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92 -EBUILD subtitlecomposer-0.7.1.ebuild 1551 BLAKE2B f7e1457573720a3d6a0636be0529707ef5a2525dfbe30551988774cb2d3df2dc97c4721df3d50abc645a3f5c1fbb0a801a588f7bc66550301f717607a0f8db0e SHA512 d6f972f6286bab6d1e30b3371d71fd389573ad2ea2e78346bbae0d7c76418cb83d4df09f9fc5680526f50ce1178766d40932e9c01bda8d696cf20266a9a7a0be +EBUILD subtitlecomposer-0.7.1-r1.ebuild 1598 BLAKE2B 507daedb9b1a7d63e7809c9152ea4bfdcdd5d1d5dacf3d4fccebb17cb4058a8c9447ea921e929ca5f6e34951616d87118b5b31db1fe6cf50924d1ab51dbc16ef SHA512 92b54c268d97a3199b0c1aa62f2c42d99bf1943f809c2e97fab0ea46d8b4f191c231f4327448fc3972a378de4094243055dbfb73fa6caf997d1e27161ad0b73c +EBUILD subtitlecomposer-0.7.1.ebuild 1672 BLAKE2B 79c0ecfd549fe9e606c482fa4c1b1fe378e8ab486be2fb91bc978211845c61691d3b8c843b2d853fe7c086fc27b0bb5767fcdc68a396d98bd56d512b85251214 SHA512 5f8258e44bc0a5ee16d359a2e3f7052f9cc93f5922e9441b3d26406f3fd2b392f0676a365faa0de6d5f70662ed8a878c38cffbfc92bb18f61cb64d71c72e525e MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 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 -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 - - 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 -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/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 -Date: Wed, 6 Oct 2021 20:30:03 +0200 -Subject: [PATCH] Make tests optional - -Signed-off-by: Andreas Sturmlechner ---- - 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-r1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild new file mode 100644 index 000000000000..aa729948e01b --- /dev/null +++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild @@ -0,0 +1,62 @@ +# 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.5 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Text-based subtitles editor" +HOMEPAGE="https://subtitlecomposer.kde.org/" +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" +IUSE="unicode" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + media-libs/openal + media-video/ffmpeg:0= + unicode? ( dev-libs/icu:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${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() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706 + $(cmake_use_find_package unicode ICU) + ) + + ecm_src_configure +} 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() { -- cgit v1.2.3