From 489e3307a84c75fd98ebe8ed6dd34d19f4b149b6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 17 Mar 2024 18:39:14 +1000 Subject: [PATCH] subtitlecomposer: bump version --- .../patches/subtitlecomposer-0.7.0.patchset | 48 ------------------- ...0.recipe => subtitlecomposer-0.8.0.recipe} | 38 +++++++-------- 2 files changed, 18 insertions(+), 68 deletions(-) delete mode 100644 media-video/subtitlecomposer/patches/subtitlecomposer-0.7.0.patchset rename media-video/subtitlecomposer/{subtitlecomposer-0.7.0.recipe => subtitlecomposer-0.8.0.recipe} (85%) diff --git a/media-video/subtitlecomposer/patches/subtitlecomposer-0.7.0.patchset b/media-video/subtitlecomposer/patches/subtitlecomposer-0.7.0.patchset deleted file mode 100644 index 86b2117ac..000000000 --- a/media-video/subtitlecomposer/patches/subtitlecomposer-0.7.0.patchset +++ /dev/null @@ -1,48 +0,0 @@ -From 76a8bccb9cdf3049931e8dc637f4e9231ffa0698 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 15 Oct 2019 20:49:48 +1000 -Subject: Use system iconset - - -diff --git a/src/main.cpp b/src/main.cpp -index dd29dfa..d1a4ffd 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -54,9 +54,11 @@ main(int argc, char **argv) - QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QDir(qApp->applicationDirPath()) - .absoluteFilePath(QDir(QStringLiteral(SC_INSTALL_BIN)).relativeFilePath(QStringLiteral(CUSTOM_ICON_INSTALL_PATH)))); - -+#ifndef __HAIKU__ - // force breeze theme outside kde environment - if(QProcessEnvironment::systemEnvironment().value(QStringLiteral("XDG_CURRENT_DESKTOP")).toLower() != QLatin1String("kde")) - QIcon::setThemeName("breeze"); -+#endif - - KLocalizedString::setApplicationDomain("subtitlecomposer"); - --- -2.23.0 - - -From 4d2dc6643098bf34d96ec5570626122bef3dcde4 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 15 Oct 2019 20:50:28 +1000 -Subject: Fix phonon widget - - -diff --git a/src/videoplayerplugins/phonon/phononplayerbackend.cpp b/src/videoplayerplugins/phonon/phononplayerbackend.cpp -index 813fd10..c4b4e2f 100644 ---- a/src/videoplayerplugins/phonon/phononplayerbackend.cpp -+++ b/src/videoplayerplugins/phonon/phononplayerbackend.cpp -@@ -81,7 +81,7 @@ PhononPlayerBackend::initMediaObject() - bool - PhononPlayerBackend::initialize(VideoWidget *videoWidget) - { -- m_videoOutput = new Phonon::VideoWidget(0); -+ m_videoOutput = new Phonon::VideoWidget(videoWidget); - m_audioOutput = new Phonon::AudioOutput(Phonon::VideoCategory); - - videoWidget->setVideoLayer(m_videoOutput); --- -2.23.0 - diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.recipe b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.recipe similarity index 85% rename from media-video/subtitlecomposer/subtitlecomposer-0.7.0.recipe rename to media-video/subtitlecomposer/subtitlecomposer-0.8.0.recipe index 595774c45..ab632ad7b 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.recipe +++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.recipe @@ -23,14 +23,12 @@ FEATURES: * Spell checking * Detection of timing errors in subtitles * Scripting (JavaScript, Python, Ruby and other languages supported by Kross)." -HOMEPAGE="https://github.com/maxrd2/SubtitleComposer" -COPYRIGHT="2007-2019 Subtitle Composer project" +HOMEPAGE="https://subtitlecomposer.kde.org/" +COPYRIGHT="2007-2023 Subtitle Composer project" LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="https://github.com/maxrd2/SubtitleComposer/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="90dee806df0ee57f4098d417f62014b4533dbf5598d5535c9da1066536c1ed41" -SOURCE_DIR="SubtitleComposer-$portVersion" -PATCHES="subtitlecomposer-$portVersion.patchset" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/subtitlecomposer/subtitlecomposer-$portVersion.tar.xz" +CHECKSUM_SHA256="b1416bdf7223b1979a36620b913c117c1b6c933bf165e28491af476310d7c9f8" ADDITIONAL_FILES="subtitlecomposer.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -45,6 +43,7 @@ REQUIRES=" lib:libavcodec$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix lib:libexiv2$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -80,7 +79,7 @@ REQUIRES=" lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix - lib:libphonon4qt5$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix @@ -88,13 +87,14 @@ REQUIRES=" lib:libQt5Network$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libswresample$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.55 + extra_cmake_modules$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix devel:libavdevice$secondaryArchSuffix devel:libavfilter$secondaryArchSuffix @@ -135,9 +135,10 @@ BUILD_REQUIRES=" devel:libKF5WidgetsAddons$secondaryArchSuffix devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix - devel:libphonon4qt5$secondaryArchSuffix + devel:libopenal$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix >= 5.13 + devel:libQt5Core$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libswresample$secondaryArchSuffix devel:libswscale$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -157,11 +158,10 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir/SubtitleComposer \ - -DCMAKE_INSTALL_BINDIR=$appsDir/SubtitleComposer \ + -DCMAKE_INSTALL_PREFIX=$appsDir \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ -DCMAKE_INSTALL_DATADIR=$dataDir \ -DSHARE_INSTALL_PREFIX=$dataDir \ - -DKDE_INSTALL_LIBDIR="plugins" \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make $jobArgs } @@ -171,11 +171,9 @@ INSTALL() cd build make install - mkdir -p $appsDir/SubtitleComposer/videoplayerplugins/phonon - mv $appsDir/SubtitleComposer/plugins/subtitlecomposer/phononplayer.so $appsDir/SubtitleComposer/videoplayerplugins/phonon - mv $appsDir/SubtitleComposer/subtitlecomposer $appsDir/SubtitleComposer/SubtitleComposer + mv $appsDir/subtitlecomposer $appsDir/SubtitleComposer - rm -rf $appsDir/SubtitleComposer/{bin,etc,plugins} + rm -rf $appsDir/{bin,etc} rm -rf $dataDir/{icons,applications} local APP_SIGNATURE="application/x-vnd.qt5-subtitlecomposer" @@ -191,6 +189,6 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/subtitlecomposer.rdef.in > subtitlecomposer.rdef - addResourcesToBinaries subtitlecomposer.rdef $appsDir/SubtitleComposer/SubtitleComposer - addAppDeskbarSymlink $appsDir/SubtitleComposer/SubtitleComposer + addResourcesToBinaries subtitlecomposer.rdef $appsDir/SubtitleComposer + addAppDeskbarSymlink $appsDir/SubtitleComposer }