Date: Sun, 01 Mar 2026 08:48:20 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 19f65b70578b - main - multimedia/olive: Change to Qt6 Message-ID: <69a3fd54.1f1d6.57be01d3@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=19f65b70578b6247e748b9445d34608cd759c96a commit 19f65b70578b6247e748b9445d34608cd759c96a Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-03-01 05:46:44 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-03-01 08:48:16 +0000 multimedia/olive: Change to Qt6 --- multimedia/olive/Makefile | 10 ++++++---- .../patch-app_node_project_serializer_serializer230220.cpp | 14 ++++++++++++++ multimedia/olive/files/patch-app_render_videoparams.cpp | 11 +++++++++++ multimedia/olive/files/patch-app_ui_humanstrings.cpp | 11 +++++++++++ .../olive/files/patch-ext_KDDockWidgets_CMakeLists.txt | 11 +++++++++++ .../olive/files/patch-ext_KDDockWidgets_src_CMakeLists.txt | 13 +++++++++++++ 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/multimedia/olive/Makefile b/multimedia/olive/Makefile index 632918e153fa..444740ddfdfc 100644 --- a/multimedia/olive/Makefile +++ b/multimedia/olive/Makefile @@ -1,7 +1,7 @@ PORTNAME= olive DISTVERSION= 0.2.0 DISTVERSIONSUFFIX= -nightly -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia PKGNAMESUFFIX= -video-editor @@ -30,11 +30,13 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ RUN_DEPENDS= frei0r>0:graphics/frei0r # libopentimelineio.so:multimedia/opentimelineio -USES= cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:5 shared-mime-info -USE_QT= concurrent core dbus gui multimedia network opengl svg widgets x11extras \ - buildtools:build linguisttools:build qmake:build testlib:build +USES= cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:6 shared-mime-info +USE_QT= base multimedia svg \ + tools:build USE_GL= gl +CMAKE_ON= BUILD_QT6 + USE_GITHUB= yes GH_ACCOUNT= olive-editor GH_TUPLE= olive-editor:core:2777928:core/ext/core \ diff --git a/multimedia/olive/files/patch-app_node_project_serializer_serializer230220.cpp b/multimedia/olive/files/patch-app_node_project_serializer_serializer230220.cpp new file mode 100644 index 000000000000..99867c2a5f8d --- /dev/null +++ b/multimedia/olive/files/patch-app_node_project_serializer_serializer230220.cpp @@ -0,0 +1,14 @@ +--- app/node/project/serializer/serializer230220.cpp.orig 2026-03-01 03:09:36 UTC ++++ app/node/project/serializer/serializer230220.cpp +@@ -190,9 +190,9 @@ ProjectSerializer230220::LoadData ProjectSerializer230 + } else if (attr.name() == QStringLiteral("ptr")) { + ptr = attr.value().toULongLong(); + } else if (attr.name() == QStringLiteral("items")) { +- QVector<QStringRef> l = attr.value().split(','); ++ QList<QStringView> l = attr.value().split(','); + items.reserve(l.size()); +- for (const QStringRef &s : l) { ++ for (QStringView s : l) { + items.append(s.toULongLong()); + } + } diff --git a/multimedia/olive/files/patch-app_render_videoparams.cpp b/multimedia/olive/files/patch-app_render_videoparams.cpp new file mode 100644 index 000000000000..48ccbd628179 --- /dev/null +++ b/multimedia/olive/files/patch-app_render_videoparams.cpp @@ -0,0 +1,11 @@ +--- app/render/videoparams.cpp.orig 2026-03-01 03:24:41 UTC ++++ app/render/videoparams.cpp +@@ -226,7 +226,7 @@ QString VideoParams::GetFormatName(PixelFormat format) + break; + } + +- return QCoreApplication::translate("VideoParams", "Unknown (0x%1)").arg(format, 0, 16); ++ return QCoreApplication::translate("VideoParams", "Unknown (0x%1)").arg(static_cast<int>(format), 0, 16); + } + + int VideoParams::GetDividerForTargetResolution(int src_width, int src_height, int dst_width, int dst_height) diff --git a/multimedia/olive/files/patch-app_ui_humanstrings.cpp b/multimedia/olive/files/patch-app_ui_humanstrings.cpp new file mode 100644 index 000000000000..d29f125ae782 --- /dev/null +++ b/multimedia/olive/files/patch-app_ui_humanstrings.cpp @@ -0,0 +1,11 @@ +--- app/ui/humanstrings.cpp.orig 2026-03-01 03:26:05 UTC ++++ app/ui/humanstrings.cpp +@@ -60,7 +60,7 @@ QString HumanStrings::FormatToString(const SampleForma + break; + } + +- return QCoreApplication::translate("AudioParams", "Unknown (0x%1)").arg(f, 1, 16); ++ return QCoreApplication::translate("AudioParams", "Unknown (0x%1)").arg(static_cast<int>(f), 1, 16); + } + + } diff --git a/multimedia/olive/files/patch-ext_KDDockWidgets_CMakeLists.txt b/multimedia/olive/files/patch-ext_KDDockWidgets_CMakeLists.txt new file mode 100644 index 000000000000..8a1ff36f4c8c --- /dev/null +++ b/multimedia/olive/files/patch-ext_KDDockWidgets_CMakeLists.txt @@ -0,0 +1,11 @@ +--- ext/KDDockWidgets/CMakeLists.txt.orig 2026-03-01 03:04:31 UTC ++++ ext/KDDockWidgets/CMakeLists.txt +@@ -156,7 +156,7 @@ endif() + set(QT_MIN_VERSION "5.15") + set(${PROJECT_NAME}_LIBRARY_QTID "") + endif() +-find_package(Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Test) ++find_package(Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Core Widgets Test) + include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables + + set(${PROJECT_NAME}_DEPS "widgets") diff --git a/multimedia/olive/files/patch-ext_KDDockWidgets_src_CMakeLists.txt b/multimedia/olive/files/patch-ext_KDDockWidgets_src_CMakeLists.txt new file mode 100644 index 000000000000..85188d615e9a --- /dev/null +++ b/multimedia/olive/files/patch-ext_KDDockWidgets_src_CMakeLists.txt @@ -0,0 +1,13 @@ +--- ext/KDDockWidgets/src/CMakeLists.txt.orig 2026-03-01 03:06:51 UTC ++++ ext/KDDockWidgets/src/CMakeLists.txt +@@ -296,6 +296,10 @@ endif() + endif() + endif() + ++if(Qt_VERSION_MAJOR GREATER_EQUAL 6) ++ find_package(Qt6 REQUIRED COMPONENTS CorePrivate GuiPrivate WidgetsPrivate) ++endif() ++ + if(${PROJECT_NAME}_QTQUICK) + target_link_libraries( + kddockwidgetshome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a3fd54.1f1d6.57be01d3>