Index | Thread | Search

From:
Josh Grosse <josh@jggimi.net>
Subject:
Re: update multimedia/shotcut
To:
ports@openbsd.org
Date:
Thu, 13 Feb 2025 09:59:41 -0500

Download raw body.

Thread 
Pinging again.  Diff attached for convenience.

On Fri, Feb 07, 2025 at 09:56:44AM -0500, Josh Grosse wrote:
> Ping.
> 
> On Fri, Jan 31, 2025 at 08:26:05PM -0500, Josh Grosse wrote:
> > This is an update to new version 25.01.25.  Lightly tested on amd64,
> > with and without h264_vaapi hardware encoding.
> > 
> > Full list of new features, fixes, changes: https://shotcut.org/blog/new-release-250125/
> 
> > diff --git multimedia/shotcut/Makefile multimedia/shotcut/Makefile
> > index b1d337d509c..86da49a84cb 100644
> > --- multimedia/shotcut/Makefile
> > +++ multimedia/shotcut/Makefile
> > @@ -4,7 +4,7 @@ COMMENT =	video editor
> >  
> >  GH_ACCOUNT =	mltframework
> >  GH_PROJECT =	shotcut
> > -GH_TAGNAME =	v24.10.29
> > +GH_TAGNAME =	v25.01.25
> >  
> >  CATEGORIES =	multimedia
> >  
> > diff --git multimedia/shotcut/distinfo multimedia/shotcut/distinfo
> > index 559afe63fa3..2a366185baf 100644
> > --- multimedia/shotcut/distinfo
> > +++ multimedia/shotcut/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (shotcut-24.10.29.tar.gz) = hjVIbPsOjg1Q4mTpejq0xXspAXQrGIrtPukawDcbMlA=
> > -SIZE (shotcut-24.10.29.tar.gz) = 12605367
> > +SHA256 (shotcut-25.01.25.tar.gz) = RqK++0WnGdgUFrAdyyKM4n6XqlQbMIVw5RUXOP4blnc=
> > +SIZE (shotcut-25.01.25.tar.gz) = 13103595
> > diff --git multimedia/shotcut/patches/patch-src_mainwindow_cpp multimedia/shotcut/patches/patch-src_mainwindow_cpp
> > index 3fe2cd626af..f465e62abab 100644
> > --- multimedia/shotcut/patches/patch-src_mainwindow_cpp
> > +++ multimedia/shotcut/patches/patch-src_mainwindow_cpp
> > @@ -1,19 +1,10 @@
> >  Index: src/mainwindow.cpp
> >  --- src/mainwindow.cpp.orig
> >  +++ src/mainwindow.cpp
> > -@@ -141,7 +141,7 @@ MainWindow::MainWindow()
> > +@@ -139,7 +139,7 @@ MainWindow::MainWindow()
> >       , m_keyframesDock(0)
> >   {
> >   #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
> > --    QLibrary libJack("libjack.so.0");
> > -+    QLibrary libJack("libjack.so");
> > -     if (!libJack.load()) {
> > -         QMessageBox::critical(this, qApp->applicationName(),
> > -                               tr("Error: This program requires the JACK 1 library.\n\nPlease install it using your package manager. It may be named libjack0, jack-audio-connection-kit, jack, or similar."));
> > -@@ -149,7 +149,7 @@ MainWindow::MainWindow()
> > -     } else {
> > -         libJack.unload();
> > -     }
> >  -    QLibrary libSDL("libSDL2-2.0.so.0");
> >  +    QLibrary libSDL("libSDL2.so");
> >       if (!libSDL.load()) {
> > diff --git multimedia/shotcut/pkg/PLIST multimedia/shotcut/pkg/PLIST
> > index 21bb867ac8c..d53c138eea5 100644
> > --- multimedia/shotcut/pkg/PLIST
> > +++ multimedia/shotcut/pkg/PLIST
> > @@ -336,6 +336,10 @@ share/shotcut/qml/filters/gradient/icon.webp
> >  share/shotcut/qml/filters/gradient/meta.qml
> >  share/shotcut/qml/filters/gradient/ui.qml
> >  share/shotcut/qml/filters/gradient/vui.qml
> > +share/shotcut/qml/filters/gradientmap/
> > +share/shotcut/qml/filters/gradientmap/icon.webp
> > +share/shotcut/qml/filters/gradientmap/meta.qml
> > +share/shotcut/qml/filters/gradientmap/ui.qml
> >  share/shotcut/qml/filters/grain/
> >  share/shotcut/qml/filters/grain/meta.qml
> >  share/shotcut/qml/filters/grain/ui.qml
> > @@ -351,6 +355,14 @@ share/shotcut/qml/filters/hqdn3d/
> >  share/shotcut/qml/filters/hqdn3d/icon.webp
> >  share/shotcut/qml/filters/hqdn3d/meta.qml
> >  share/shotcut/qml/filters/hqdn3d/ui.qml
> > +share/shotcut/qml/filters/hslprimaries/
> > +share/shotcut/qml/filters/hslprimaries/icon.webp
> > +share/shotcut/qml/filters/hslprimaries/meta.qml
> > +share/shotcut/qml/filters/hslprimaries/ui.qml
> > +share/shotcut/qml/filters/hslrange/
> > +share/shotcut/qml/filters/hslrange/icon.webp
> > +share/shotcut/qml/filters/hslrange/meta.qml
> > +share/shotcut/qml/filters/hslrange/ui.qml
> >  share/shotcut/qml/filters/hue_lightness_saturation/
> >  share/shotcut/qml/filters/hue_lightness_saturation/icon.webp
> >  share/shotcut/qml/filters/hue_lightness_saturation/meta.qml
> > @@ -614,6 +626,7 @@ share/shotcut/qml/modules/Shotcut/Controls/
> >  share/shotcut/qml/modules/Shotcut/Controls/Button.qml
> >  share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml
> >  share/shotcut/qml/modules/Shotcut/Controls/ComboBox.qml
> > +share/shotcut/qml/modules/Shotcut/Controls/CurveComboBox.qml
> >  share/shotcut/qml/modules/Shotcut/Controls/DoubleSpinBox.qml
> >  share/shotcut/qml/modules/Shotcut/Controls/EditMenu.qml
> >  share/shotcut/qml/modules/Shotcut/Controls/Gauge.qml
> > @@ -686,6 +699,7 @@ share/shotcut/translations/shotcut_et.qm
> >  share/shotcut/translations/shotcut_eu.qm
> >  share/shotcut/translations/shotcut_fi.qm
> >  share/shotcut/translations/shotcut_fr.qm
> > +share/shotcut/translations/shotcut_ga.qm
> >  share/shotcut/translations/shotcut_gd.qm
> >  share/shotcut/translations/shotcut_gl.qm
> >  share/shotcut/translations/shotcut_he_IL.qm
> 
diff --git multimedia/shotcut/Makefile multimedia/shotcut/Makefile
index b1d337d509c..86da49a84cb 100644
--- multimedia/shotcut/Makefile
+++ multimedia/shotcut/Makefile
@@ -4,7 +4,7 @@ COMMENT =	video editor
 
 GH_ACCOUNT =	mltframework
 GH_PROJECT =	shotcut
-GH_TAGNAME =	v24.10.29
+GH_TAGNAME =	v25.01.25
 
 CATEGORIES =	multimedia
 
diff --git multimedia/shotcut/distinfo multimedia/shotcut/distinfo
index 559afe63fa3..2a366185baf 100644
--- multimedia/shotcut/distinfo
+++ multimedia/shotcut/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shotcut-24.10.29.tar.gz) = hjVIbPsOjg1Q4mTpejq0xXspAXQrGIrtPukawDcbMlA=
-SIZE (shotcut-24.10.29.tar.gz) = 12605367
+SHA256 (shotcut-25.01.25.tar.gz) = RqK++0WnGdgUFrAdyyKM4n6XqlQbMIVw5RUXOP4blnc=
+SIZE (shotcut-25.01.25.tar.gz) = 13103595
diff --git multimedia/shotcut/patches/patch-src_mainwindow_cpp multimedia/shotcut/patches/patch-src_mainwindow_cpp
index 3fe2cd626af..f465e62abab 100644
--- multimedia/shotcut/patches/patch-src_mainwindow_cpp
+++ multimedia/shotcut/patches/patch-src_mainwindow_cpp
@@ -1,19 +1,10 @@
 Index: src/mainwindow.cpp
 --- src/mainwindow.cpp.orig
 +++ src/mainwindow.cpp
-@@ -141,7 +141,7 @@ MainWindow::MainWindow()
+@@ -139,7 +139,7 @@ MainWindow::MainWindow()
      , m_keyframesDock(0)
  {
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
--    QLibrary libJack("libjack.so.0");
-+    QLibrary libJack("libjack.so");
-     if (!libJack.load()) {
-         QMessageBox::critical(this, qApp->applicationName(),
-                               tr("Error: This program requires the JACK 1 library.\n\nPlease install it using your package manager. It may be named libjack0, jack-audio-connection-kit, jack, or similar."));
-@@ -149,7 +149,7 @@ MainWindow::MainWindow()
-     } else {
-         libJack.unload();
-     }
 -    QLibrary libSDL("libSDL2-2.0.so.0");
 +    QLibrary libSDL("libSDL2.so");
      if (!libSDL.load()) {
diff --git multimedia/shotcut/pkg/PLIST multimedia/shotcut/pkg/PLIST
index 21bb867ac8c..d53c138eea5 100644
--- multimedia/shotcut/pkg/PLIST
+++ multimedia/shotcut/pkg/PLIST
@@ -336,6 +336,10 @@ share/shotcut/qml/filters/gradient/icon.webp
 share/shotcut/qml/filters/gradient/meta.qml
 share/shotcut/qml/filters/gradient/ui.qml
 share/shotcut/qml/filters/gradient/vui.qml
+share/shotcut/qml/filters/gradientmap/
+share/shotcut/qml/filters/gradientmap/icon.webp
+share/shotcut/qml/filters/gradientmap/meta.qml
+share/shotcut/qml/filters/gradientmap/ui.qml
 share/shotcut/qml/filters/grain/
 share/shotcut/qml/filters/grain/meta.qml
 share/shotcut/qml/filters/grain/ui.qml
@@ -351,6 +355,14 @@ share/shotcut/qml/filters/hqdn3d/
 share/shotcut/qml/filters/hqdn3d/icon.webp
 share/shotcut/qml/filters/hqdn3d/meta.qml
 share/shotcut/qml/filters/hqdn3d/ui.qml
+share/shotcut/qml/filters/hslprimaries/
+share/shotcut/qml/filters/hslprimaries/icon.webp
+share/shotcut/qml/filters/hslprimaries/meta.qml
+share/shotcut/qml/filters/hslprimaries/ui.qml
+share/shotcut/qml/filters/hslrange/
+share/shotcut/qml/filters/hslrange/icon.webp
+share/shotcut/qml/filters/hslrange/meta.qml
+share/shotcut/qml/filters/hslrange/ui.qml
 share/shotcut/qml/filters/hue_lightness_saturation/
 share/shotcut/qml/filters/hue_lightness_saturation/icon.webp
 share/shotcut/qml/filters/hue_lightness_saturation/meta.qml
@@ -614,6 +626,7 @@ share/shotcut/qml/modules/Shotcut/Controls/
 share/shotcut/qml/modules/Shotcut/Controls/Button.qml
 share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml
 share/shotcut/qml/modules/Shotcut/Controls/ComboBox.qml
+share/shotcut/qml/modules/Shotcut/Controls/CurveComboBox.qml
 share/shotcut/qml/modules/Shotcut/Controls/DoubleSpinBox.qml
 share/shotcut/qml/modules/Shotcut/Controls/EditMenu.qml
 share/shotcut/qml/modules/Shotcut/Controls/Gauge.qml
@@ -686,6 +699,7 @@ share/shotcut/translations/shotcut_et.qm
 share/shotcut/translations/shotcut_eu.qm
 share/shotcut/translations/shotcut_fi.qm
 share/shotcut/translations/shotcut_fr.qm
+share/shotcut/translations/shotcut_ga.qm
 share/shotcut/translations/shotcut_gd.qm
 share/shotcut/translations/shotcut_gl.qm
 share/shotcut/translations/shotcut_he_IL.qm