Update shotcut to 22.06.23.
- Tested with mlt 7.8.0
- Cleanup GH_* and remove DISTNAME
- Cleanup WANTLIB
- Switch to CMake, qmake is gone upstream
- Add BUILD_DEPENDS, jack and sdl2 are grepped at build-time.
Feedback, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/shotcut/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 11 Mar 2022 19:39:27 -0000 1.9
+++ Makefile 18 Aug 2022 07:26:22 -0000
@@ -1,8 +1,10 @@
USE_WXNEEDED = Yes
+
COMMENT = video editor
-V = 21.10.31
-DISTNAME = shotcut-$V
+GH_ACCOUNT = mltframework
+GH_PROJECT = shotcut
+GH_TAGNAME = v22.06.23
CATEGORIES = multimedia
@@ -12,22 +14,20 @@ HOMEPAGE = https://www.shotcut.org/
PERMIT_PACKAGE = Yes
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-GH_ACCOUNT = mltframework
-GH_PROJECT = shotcut
-GH_TAGNAME = v$V
-
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5OpenGL
-WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Sql
-WANTLIB += Qt5WebSockets Qt5Widgets
-WANTLIB += Qt5Xml c m mlt-7 mlt++-7
-WANTLIB += Qt5QuickControls2
-WANTLIB += Qt5QmlModels
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Multimedia Qt5Network
+WANTLIB += Qt5OpenGL Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
+WANTLIB += Qt5QuickWidgets Qt5Sql Qt5WebSockets Qt5Widgets Qt5Xml
+WANTLIB += c fftw3 m mlt++-7 mlt-7
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/qmake \
+
+MODULES = devel/cmake \
x11/qt5
+
+BUILD_DEPENDS = audio/jack \
+ devel/sdl2
+
RUN_DEPENDS = audio/jack \
devel/desktop-file-utils \
devel/sdl2 \
@@ -36,13 +36,14 @@ RUN_DEPENDS = audio/jack \
x11/gtk+3,-guic \
x11/qt5/qtgraphicaleffects \
x11/qt5/qtquickcontrols
+
LIB_DEPENDS = multimedia/mlt7 \
x11/qt5/qtmultimedia \
x11/qt5/qtwebsockets \
x11/qt5/qtquickcontrols2
-CONFIGURE_STYLE = qmake
-
NO_TEST = Yes
+
+CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR=${PREFIX}/man/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/shotcut/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Dec 2021 06:53:38 -0000 1.6
+++ distinfo 18 Aug 2022 07:26:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (shotcut-21.10.31.tar.gz) = BI+vIRbC1uAcZFxkjY5V/00iw7FEchxM5GKjIjG7lMo=
-SIZE (shotcut-21.10.31.tar.gz) = 4408987
+SHA256 (shotcut-22.06.23.tar.gz) = eEhmUeyG7P34E9Q9jifE7PaGnQlAyH6aVpFg1gRZXSc=
+SIZE (shotcut-22.06.23.tar.gz) = 4587440
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CMakeLists_txt 18 Aug 2022 07:26:22 -0000
@@ -0,0 +1,10 @@
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -300,5 +300,5 @@ if(UNIX AND NOT APPLE)
+ install(FILES ${CMAKE_SOURCE_DIR}/packaging/linux/icons/128x128/org.shotcut.Shotcut.png
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
+ install(FILES ${CMAKE_SOURCE_DIR}/packaging/linux/shotcut.1
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1/)
++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+ endif()
Index: patches/patch-src_mainwindow_cpp
===================================================================
RCS file: /cvs/ports/multimedia/shotcut/patches/patch-src_mainwindow_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_mainwindow_cpp
--- patches/patch-src_mainwindow_cpp 11 Mar 2022 19:39:27 -0000 1.5
+++ patches/patch-src_mainwindow_cpp 18 Aug 2022 07:26:22 -0000
@@ -1,7 +1,7 @@
Index: src/mainwindow.cpp
--- src/mainwindow.cpp.orig
+++ src/mainwindow.cpp
-@@ -131,7 +131,7 @@ MainWindow::MainWindow()
+@@ -135,7 +135,7 @@ MainWindow::MainWindow()
, m_keyframesDock(0)
{
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -9,8 +9,8 @@ Index: src/mainwindow.cpp
+ 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."));
-@@ -139,7 +139,7 @@ MainWindow::MainWindow()
+ 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."));
+@@ -143,7 +143,7 @@ MainWindow::MainWindow()
} else {
libJack.unload();
}
@@ -18,4 +18,4 @@ Index: src/mainwindow.cpp
+ QLibrary libSDL("libSDL2.so");
if (!libSDL.load()) {
QMessageBox::critical(this, qApp->applicationName(),
- tr("Error: This program requires the SDL 2 library.\n\nPlease install it using your package manager. It may be named libsdl2-2.0-0, SDL2, or similar."));
+ tr("Error: This program requires the SDL 2 library.\n\nPlease install it using your package manager. It may be named libsdl2-2.0-0, SDL2, or similar."));
Index: patches/patch-src_src_pro
===================================================================
RCS file: patches/patch-src_src_pro
diff -N patches/patch-src_src_pro
--- patches/patch-src_src_pro 11 Mar 2022 19:39:27 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/src.pro
---- src/src.pro.orig
-+++ src/src.pro
-@@ -459,7 +459,7 @@ unix:!mac {
- icon128.files = $$PWD/../packaging/linux/icons/128x128/org.shotcut.Shotcut.png
- icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
- man.files = $$PWD/../packaging/linux/shotcut.1
-- man.path = $$PREFIX/share/man/man1
-+ man.path = $$PREFIX/man/man1
- INSTALLS += metainfo desktop mime icon64 icon128 man
- }
-
Index: patches/patch-src_util_cpp
===================================================================
RCS file: /cvs/ports/multimedia/shotcut/patches/patch-src_util_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_util_cpp
--- patches/patch-src_util_cpp 11 Mar 2022 19:39:27 -0000 1.3
+++ patches/patch-src_util_cpp 18 Aug 2022 07:26:22 -0000
@@ -1,7 +1,7 @@
Index: src/util.cpp
--- src/util.cpp.orig
+++ src/util.cpp
-@@ -518,6 +518,8 @@ bool Util::isMemoryLow()
+@@ -529,6 +529,8 @@ bool Util::isMemoryLow()
meminfo.close();
LOG_INFO() << "available RAM = " << availableKB << "KB";
return availableKB < kLowMemoryThresholdKB;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/shotcut/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 11 Mar 2022 19:39:27 -0000 1.6
+++ pkg/PLIST 18 Aug 2022 07:26:22 -0000
@@ -1,4 +1,5 @@
@bin bin/shotcut
+@so lib/libCuteLogger.so
@man man/man1/shotcut.1
share/applications/org.shotcut.Shotcut.desktop
share/icons/hicolor/128x128/apps/org.shotcut.Shotcut.png
@@ -8,6 +9,13 @@ share/metainfo/org.shotcut.Shotcut.metai
share/mime/packages/org.shotcut.Shotcut.xml
share/shotcut/
share/shotcut/qml/
+share/shotcut/qml/export-chapters/
+share/shotcut/qml/export-chapters/export-chapters.js
+share/shotcut/qml/export-chapters/main.js
+share/shotcut/qml/export-chapters/mlt2chapters.js
+share/shotcut/qml/export-chapters/package.json
+share/shotcut/qml/export-chapters/rebuild.sh
+share/shotcut/qml/export-chapters/test-node.js
share/shotcut/qml/export-edl/
share/shotcut/qml/export-edl/export-edl.js
share/shotcut/qml/export-edl/main.js
@@ -40,6 +48,15 @@ share/shotcut/qml/filters/audio_compress
share/shotcut/qml/filters/audio_delay/
share/shotcut/qml/filters/audio_delay/meta.qml
share/shotcut/qml/filters/audio_delay/ui.qml
+share/shotcut/qml/filters/audio_eq15band/
+share/shotcut/qml/filters/audio_eq15band/meta.qml
+share/shotcut/qml/filters/audio_eq15band/ui.qml
+share/shotcut/qml/filters/audio_eq3band/
+share/shotcut/qml/filters/audio_eq3band/meta.qml
+share/shotcut/qml/filters/audio_eq3band/ui.qml
+share/shotcut/qml/filters/audio_eqparametric/
+share/shotcut/qml/filters/audio_eqparametric/meta.qml
+share/shotcut/qml/filters/audio_eqparametric/ui.qml
share/shotcut/qml/filters/audio_expander/
share/shotcut/qml/filters/audio_expander/meta.qml
share/shotcut/qml/filters/audio_expander/ui.qml
@@ -89,9 +106,16 @@ share/shotcut/qml/filters/audio_pitch/ui
share/shotcut/qml/filters/audio_reverb/
share/shotcut/qml/filters/audio_reverb/meta.qml
share/shotcut/qml/filters/audio_reverb/ui.qml
+share/shotcut/qml/filters/audio_stereoenhance/
+share/shotcut/qml/filters/audio_stereoenhance/meta.qml
+share/shotcut/qml/filters/audio_stereoenhance/ui.qml
share/shotcut/qml/filters/audio_swapchannels/
share/shotcut/qml/filters/audio_swapchannels/meta.qml
share/shotcut/qml/filters/audio_swapchannels/ui.qml
+share/shotcut/qml/filters/audiolevelgraph/
+share/shotcut/qml/filters/audiolevelgraph/meta.qml
+share/shotcut/qml/filters/audiolevelgraph/ui.qml
+share/shotcut/qml/filters/audiolevelgraph/vui.qml
share/shotcut/qml/filters/bigsh0t_eq_mask/
share/shotcut/qml/filters/bigsh0t_eq_mask/meta.qml
share/shotcut/qml/filters/bigsh0t_eq_mask/ui.qml
@@ -123,8 +147,10 @@ share/shotcut/qml/filters/bluescreen0r/
share/shotcut/qml/filters/bluescreen0r/meta.qml
share/shotcut/qml/filters/bluescreen0r/ui.qml
share/shotcut/qml/filters/blur/
+share/shotcut/qml/filters/blur/meta_box_blur.qml
share/shotcut/qml/filters/blur/meta_boxblur.qml
share/shotcut/qml/filters/blur/meta_movit.qml
+share/shotcut/qml/filters/blur/ui_box_blur.qml
share/shotcut/qml/filters/blur/ui_boxblur.qml
share/shotcut/qml/filters/blur/ui_movit.qml
share/shotcut/qml/filters/blur_exponential/
@@ -132,7 +158,9 @@ share/shotcut/qml/filters/blur_exponenti
share/shotcut/qml/filters/blur_exponential/ui.qml
share/shotcut/qml/filters/blur_gaussian/
share/shotcut/qml/filters/blur_gaussian/meta.qml
-share/shotcut/qml/filters/blur_gaussian/ui.qml
+share/shotcut/qml/filters/blur_gaussian/meta_av.qml
+share/shotcut/qml/filters/blur_gaussian/ui_av.qml
+share/shotcut/qml/filters/blur_gaussian/ui_frei0r.qml
share/shotcut/qml/filters/blur_lowpass/
share/shotcut/qml/filters/blur_lowpass/meta.qml
share/shotcut/qml/filters/blur_lowpass/ui.qml
@@ -277,6 +305,9 @@ share/shotcut/qml/filters/mask_apply/ui.
share/shotcut/qml/filters/mask_chromakey/
share/shotcut/qml/filters/mask_chromakey/meta.qml
share/shotcut/qml/filters/mask_chromakey/ui.qml
+share/shotcut/qml/filters/mask_glaxnimate/
+share/shotcut/qml/filters/mask_glaxnimate/meta.qml
+share/shotcut/qml/filters/mask_glaxnimate/ui.qml
share/shotcut/qml/filters/mask_shape/
share/shotcut/qml/filters/mask_shape/meta.qml
share/shotcut/qml/filters/mask_shape/ui.qml
@@ -421,6 +452,7 @@ share/shotcut/qml/filters/white/ui.qml
share/shotcut/qml/modules/
share/shotcut/qml/modules/Shotcut/
share/shotcut/qml/modules/Shotcut/Controls/
+share/shotcut/qml/modules/Shotcut/Controls/AutoSizeMenu.qml
share/shotcut/qml/modules/Shotcut/Controls/Button.qml
share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml
share/shotcut/qml/modules/Shotcut/Controls/ComboBox.qml
No comments:
Post a Comment