olive-editor: Update to 0.2.0pre20230924 Changelog: GUI layout changes. Improvements and bugfixes. Update translations.diff -r1.30 -r1.31 pkgsrc/multimedia/olive-editor/Makefile
(ryoon)
@@ -1,34 +1,43 @@ | @@ -1,34 +1,43 @@ | |||
1 | # $NetBSD: Makefile,v 1.30 2023/07/18 18:34:31 nia Exp $ | 1 | # $NetBSD: Makefile,v 1.31 2023/10/15 19:57:54 ryoon Exp $ | |
2 | 2 | |||
3 | DISTNAME= olive-editor-0.1.2 | 3 | DISTNAME= olive-editor-0.2.0pre20230924 | |
4 | PKGREVISION= 9 | |||
5 | CATEGORIES= multimedia | 4 | CATEGORIES= multimedia | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=olive-editor/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=olive-editor/} | |
7 | GITHUB_PROJECT= olive | 6 | GITHUB_PROJECT= olive | |
7 | GITHUB_TAG= 55eedbfce909dfd7df97611a2eea1d1958385f9c | |||
8 | 8 | |||
9 | MAINTAINER= nia@NetBSD.org | 9 | MAINTAINER= nia@NetBSD.org | |
10 | HOMEPAGE= https://olivevideoeditor.org/ | 10 | HOMEPAGE= https://olivevideoeditor.org/ | |
11 | COMMENT= Non-linear video editor | 11 | COMMENT= Non-linear video editor | |
12 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
13 | 13 | |||
14 | GITHUB_SUBMODULES+= olive-editor core 277792824801495e868580ca86f6e7a1b53e4779 ext/core | |||
15 | GITHUB_SUBMODULES+= olive-editor KDDockWidgets 8d2d0a5764f8393cc148a2296d511276a8ffe559 ext/KDDockWidgets | |||
16 | ||||
14 | TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools | 17 | TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools | |
15 | 18 | |||
16 | WRKSRC= ${WRKDIR}/olive-${PKGVERSION_NOREV} | |||
17 | USE_CMAKE= yes | |||
18 | USE_TOOLS+= pkg-config | 19 | USE_TOOLS+= pkg-config | |
19 | USE_LANGUAGES= c c++ | 20 | USE_LANGUAGES= c c++ | |
20 | 21 | |||
21 | USE_CXX_FEATURES+= c++11 | 22 | USE_CXX_FEATURES+= c++11 | |
22 | 23 | |||
23 | CMAKE_ARGS+= -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg4 | 24 | CMAKE_ARGS+= -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg6 | |
24 | CMAKE_ARGS+= -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg4 | 25 | CMAKE_ARGS+= -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg6 | |
26 | CMAKE_ARGS+= -DPORTAUDIO_INCLUDE_DIR=${BUILDLINK_DIR}/include/portaudio2 | |||
27 | CMAKE_ARGS+= -DPORTAUDIO_LIBRARY=${BUILDLINK_DIR}/lib/portaudio2/libportaudiocpp.so | |||
25 | 28 | |||
29 | .include "../../audio/portaudio/buildlink3.mk" | |||
30 | .include "../../devel/zlib/buildlink3.mk" | |||
26 | .include "../../graphics/MesaLib/buildlink3.mk" | 31 | .include "../../graphics/MesaLib/buildlink3.mk" | |
27 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 32 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
28 | .include "../../graphics/opencolorio/buildlink3.mk" | 33 | .include "../../graphics/opencolorio/buildlink3.mk" | |
29 | .include "../../multimedia/ffmpeg4/buildlink3.mk" | 34 | .include "../../graphics/openimageio/buildlink3.mk" | |
35 | .include "../../graphics/openexr/buildlink3.mk" | |||
36 | .include "../../multimedia/ffmpeg6/buildlink3.mk" | |||
30 | .include "../../multimedia/frei0r/buildlink3.mk" | 37 | .include "../../multimedia/frei0r/buildlink3.mk" | |
31 | .include "../../x11/qt5-qtbase/buildlink3.mk" | 38 | .include "../../x11/qt5-qtbase/buildlink3.mk" | |
32 | .include "../../x11/qt5-qtmultimedia/buildlink3.mk" | 39 | .include "../../x11/qt5-qtmultimedia/buildlink3.mk" | |
33 | .include "../../x11/qt5-qtsvg/buildlink3.mk" | 40 | .include "../../x11/qt5-qtsvg/buildlink3.mk" | |
41 | .include "../../x11/qt5-qtx11extras/buildlink3.mk" | |||
42 | .include "../../devel/cmake/build.mk" | |||
34 | .include "../../mk/bsd.pkg.mk" | 43 | .include "../../mk/bsd.pkg.mk" |
@@ -1,95 +1,36 @@ | @@ -1,95 +1,36 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2022/04/18 13:21:26 nia Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2023/10/15 19:57:54 ryoon Exp $ | |
2 | bin/olive-editor | 2 | bin/olive-editor | |
3 | share/applications/org.olivevideoeditor.Olive.desktop | 3 | share/applications/org.olivevideoeditor.Olive.desktop | |
4 | share/icons/hicolor/128x128/apps/org.olivevideoeditor.Olive.png | 4 | share/icons/hicolor/128x128/apps/org.olivevideoeditor.Olive.png | |
5 | share/icons/hicolor/128x128/mimetypes/application-vnd.olive-project.png | 5 | share/icons/hicolor/128x128/mimetypes/application-vnd.olive-project.png | |
6 | share/icons/hicolor/16x16/apps/org.olivevideoeditor.Olive.png | 6 | share/icons/hicolor/16x16/apps/org.olivevideoeditor.Olive.png | |
7 | share/icons/hicolor/16x16/mimetypes/application-vnd.olive-project.png | 7 | share/icons/hicolor/16x16/mimetypes/application-vnd.olive-project.png | |
8 | share/icons/hicolor/256x256/apps/org.olivevideoeditor.Olive.png | 8 | share/icons/hicolor/256x256/apps/org.olivevideoeditor.Olive.png | |
9 | share/icons/hicolor/256x256/mimetypes/application-vnd.olive-project.png | 9 | share/icons/hicolor/256x256/mimetypes/application-vnd.olive-project.png | |
10 | share/icons/hicolor/32x32/apps/org.olivevideoeditor.Olive.png | 10 | share/icons/hicolor/32x32/apps/org.olivevideoeditor.Olive.png | |
11 | share/icons/hicolor/32x32/mimetypes/application-vnd.olive-project.png | 11 | share/icons/hicolor/32x32/mimetypes/application-vnd.olive-project.png | |
12 | share/icons/hicolor/48x48/apps/org.olivevideoeditor.Olive.png | 12 | share/icons/hicolor/48x48/apps/org.olivevideoeditor.Olive.png | |
13 | share/icons/hicolor/48x48/mimetypes/application-vnd.olive-project.png | 13 | share/icons/hicolor/48x48/mimetypes/application-vnd.olive-project.png | |
14 | share/icons/hicolor/512x512/apps/org.olivevideoeditor.Olive.png | 14 | share/icons/hicolor/512x512/apps/org.olivevideoeditor.Olive.png | |
15 | share/icons/hicolor/512x512/mimetypes/application-vnd.olive-project.png | 15 | share/icons/hicolor/512x512/mimetypes/application-vnd.olive-project.png | |
16 | share/icons/hicolor/64x64/apps/org.olivevideoeditor.Olive.png | 16 | share/icons/hicolor/64x64/apps/org.olivevideoeditor.Olive.png | |
17 | share/icons/hicolor/64x64/mimetypes/application-vnd.olive-project.png | 17 | share/icons/hicolor/64x64/mimetypes/application-vnd.olive-project.png | |
18 | share/metainfo/org.olivevideoeditor.Olive.appdata.xml | 18 | share/metainfo/org.olivevideoeditor.Olive.appdata.xml | |
19 | share/mime/packages/org.olivevideoeditor.Olive.xml | 19 | share/mime/packages/org.olivevideoeditor.Olive.xml | |
20 | share/olive-editor/effects/boxblur.frag | 20 | share/olive-editor/ts/ar_AR.qm | |
21 | share/olive-editor/effects/boxblur.xml | 21 | share/olive-editor/ts/bs_BA.qm | |
22 | share/olive-editor/effects/bulge.frag | 22 | share/olive-editor/ts/cs_CZ.qm | |
23 | share/olive-editor/effects/bulge.xml | 23 | share/olive-editor/ts/de_DE.qm | |
24 | share/olive-editor/effects/chromakey.frag | 24 | share/olive-editor/ts/en_US.qm | |
25 | share/olive-editor/effects/chromakey.xml | 25 | share/olive-editor/ts/es_ES.qm | |
26 | share/olive-editor/effects/chromaticaberration.frag | 26 | share/olive-editor/ts/fr_FR.qm | |
27 | share/olive-editor/effects/chromaticaberration.xml | 27 | share/olive-editor/ts/id_ID.qm | |
28 | share/olive-editor/effects/colorcorrection.frag | 28 | share/olive-editor/ts/it_IT.qm | |
29 | share/olive-editor/effects/colorcorrection.xml | 29 | share/olive-editor/ts/ja_JP.qm | |
30 | share/olive-editor/effects/colorsel.frag | 30 | share/olive-editor/ts/pt_BR.qm | |
31 | share/olive-editor/effects/colorsel.xml | 31 | share/olive-editor/ts/ru_RU.qm | |
32 | share/olive-editor/effects/common.frag | 32 | share/olive-editor/ts/sr_RS.qm | |
33 | share/olive-editor/effects/common.vert | 33 | share/olive-editor/ts/tr_TR.qm | |
34 | share/olive-editor/effects/crop.frag | 34 | share/olive-editor/ts/uk_UK.qm | |
35 | share/olive-editor/effects/crop.xml | 35 | share/olive-editor/ts/zh_CN.qm | |
36 | share/olive-editor/effects/crossstitch.frag | 36 | share/olive-editor/ts/zh_TW.qm | |
37 | share/olive-editor/effects/crossstitch.xml | |||
38 | share/olive-editor/effects/directionalblur.frag | |||
39 | share/olive-editor/effects/directionalblur.xml | |||
40 | share/olive-editor/effects/dropshadow.xml.disabled | |||
41 | share/olive-editor/effects/emboss.frag | |||
42 | share/olive-editor/effects/emboss.xml | |||
43 | share/olive-editor/effects/findedges.frag | |||
44 | share/olive-editor/effects/findedges.xml.disabled | |||
45 | share/olive-editor/effects/fisheye.frag | |||
46 | share/olive-editor/effects/fisheye.xml | |||
47 | share/olive-editor/effects/flip.frag | |||
48 | share/olive-editor/effects/flip.xml | |||
49 | share/olive-editor/effects/gaussianblur.frag | |||
50 | share/olive-editor/effects/gaussianblur.xml | |||
51 | share/olive-editor/effects/huesatbri.frag | |||
52 | share/olive-editor/effects/huesatbri.xml | |||
53 | share/olive-editor/effects/invert.frag | |||
54 | share/olive-editor/effects/invert.xml | |||
55 | share/olive-editor/effects/lumakey.frag | |||
56 | share/olive-editor/effects/lumakey.xml | |||
57 | share/olive-editor/effects/noise.frag | |||
58 | share/olive-editor/effects/noise.xml | |||
59 | share/olive-editor/effects/pixelate.frag | |||
60 | share/olive-editor/effects/pixelate.xml | |||
61 | share/olive-editor/effects/posterize.frag | |||
62 | share/olive-editor/effects/posterize.xml | |||
63 | share/olive-editor/effects/radialblur.frag | |||
64 | share/olive-editor/effects/radialblur.xml | |||
65 | share/olive-editor/effects/ripple.frag | |||
66 | share/olive-editor/effects/ripple.xml | |||
67 | share/olive-editor/effects/sphere.frag | |||
68 | share/olive-editor/effects/sphere.xml | |||
69 | share/olive-editor/effects/swirl.frag | |||
70 | share/olive-editor/effects/swirl.xml | |||
71 | share/olive-editor/effects/tile.frag | |||
72 | share/olive-editor/effects/tile.xml | |||
73 | share/olive-editor/effects/toonify.frag | |||
74 | share/olive-editor/effects/toonify.xml | |||
75 | share/olive-editor/effects/vignette.frag | |||
76 | share/olive-editor/effects/vignette.xml | |||
77 | share/olive-editor/effects/volumetriclight.frag | |||
78 | share/olive-editor/effects/volumetriclight.xml | |||
79 | share/olive-editor/effects/wave.frag | |||
80 | share/olive-editor/effects/wave.xml | |||
81 | share/olive-editor/ts/olive_ar.qm | |||
82 | share/olive-editor/ts/olive_bs.qm | |||
83 | share/olive-editor/ts/olive_cs.qm | |||
84 | share/olive-editor/ts/olive_de.qm | |||
85 | share/olive-editor/ts/olive_es.qm | |||
86 | share/olive-editor/ts/olive_fr.qm | |||
87 | share/olive-editor/ts/olive_id.qm | |||
88 | share/olive-editor/ts/olive_it.qm | |||
89 | share/olive-editor/ts/olive_pt-BR.qm | |||
90 | share/olive-editor/ts/olive_ru.qm | |||
91 | share/olive-editor/ts/olive_sr.qm | |||
92 | share/olive-editor/ts/olive_tr.qm | |||
93 | share/olive-editor/ts/olive_uk.qm | |||
94 | share/olive-editor/ts/olive_zh-CN.qm | |||
95 | share/olive-editor/ts/olive_zh-TW.qm |
@@ -1,12 +1,15 @@ | @@ -1,12 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2022/04/18 13:21:26 nia Exp $ | 1 | $NetBSD: distinfo,v 1.6 2023/10/15 19:57:54 ryoon Exp $ | |
2 | 2 | |||
3 | BLAKE2s (olive-editor-0.1.2.tar.gz) = f699bc4fbed8b6e12f2f91ff1b1142ffe9d1571e0dd2217c0e0fc95f999c1ac5 | 3 | BLAKE2s (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 28d9d3c9998990f318b55ab15310c6a395841fd32e073db336dc6f4f97df9f44 | |
4 | SHA512 (olive-editor-0.1.2.tar.gz) = 48cf44b5ba1bd95e20efb5312d61d6c37e6dedc1f02156ef436ab51705be4bdaf5bb68875b55b06337c25a34aee23eac645fe295d08ab0038872adccf12fc95e | 4 | SHA512 (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 36e3284f7b4a0f563c6e62078f5ec901e5edcdd97230097537003b0b7b3cdcaad773e8b081e7b1af2fc5d0f3b0f5fc1740eb957ef95760cc7338c9ef20f528dc | |
5 | Size (olive-editor-0.1.2.tar.gz) = 2174284 bytes | 5 | Size (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 8159223 bytes | |
6 | SHA1 (patch-CMakeLists.txt) = 4379576d9087ed5494fa374791aaadf03f2416b0 | 6 | BLAKE2s (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = 3951caf39d6084c888243160269010338e64e8408972cd2a44524631c0a78cb3 | |
7 | SHA512 (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = f4f5af353a022814a2dc6e2d0f2e5990a9138b9d404e50c4fa7ade3ccdebc57872b1e29152dfdc08d64cf303ac4d0e86a8d83962afbe5590bc3e3fa8aa558cc6 | |||
8 | Size (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = 3932727 bytes | |||
9 | BLAKE2s (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 1dbe8adfcb84e8b96d59794ccf48360f3aa0f10f76a5392e83eafc8cad755a60 | |||
10 | SHA512 (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 13163da75959e0a3ee817307391207e0a8f534f9f48b0225e199c217ed7f4020a0f5f2b1759c63f4b33f3076285110fefad01636736bcb7e22817088c5a88c14 | |||
11 | Size (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 76408 bytes | |||
12 | SHA1 (patch-CMakeLists.txt) = 6995fddfb1dfb3c7e663f8a1c61db701c9601f85 | |||
13 | SHA1 (patch-app_CMakeLists.txt) = d01fc5269c79fef9f8b4aa65dd128c58f2e0dc61 | |||
7 | SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3 | 14 | SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3 | |
8 | SHA1 (patch-effects_internal_texteffect.cpp) = 0bc1d2b67980ca3168c6e355cdd9740f44c9bc74 | 15 | SHA1 (patch-ext_core_src_util_timecodefunctions.cpp) = 81e20605774b8463f7d53fe1dc448dee2cb3e5e9 | |
9 | SHA1 (patch-effects_internal_timecodeeffect.cpp) = fbd5ff65f8019f7b863d3ea4dc9f3fc2c184d317 | |||
10 | SHA1 (patch-ui_graphview.cpp) = aeaaeda9cf43117dcb18a00e130fe007cd060771 | |||
11 | SHA1 (patch-ui_timelineheader.cpp) = b0e188363d0d08e2edb9973320378c1efd0a2edf | |||
12 | SHA1 (patch-ui_timelinewidget.cpp) = 9c86fa424437a06f0db2e1a719f9bf074630250e |
@@ -1,38 +1,28 @@ | @@ -1,38 +1,28 @@ | |||
1 | $NetBSD: patch-CMakeLists.txt,v 1.2 2022/04/18 13:21:26 nia Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.3 2023/10/15 19:57:54 ryoon Exp $ | |
2 | 2 | |||
3 | Don't try to find the git hash. | 3 | Don't try to find the git hash. | |
4 | 4 | |||
5 | --- CMakeLists.txt.orig 2019-11-11 06:05:02.000000000 +0000 | 5 | --- CMakeLists.txt.orig 2023-09-24 11:40:23.000000000 +0000 | |
6 | +++ CMakeLists.txt | 6 | +++ CMakeLists.txt | |
7 | @@ -54,31 +54,6 @@ if(WIN32) | 7 | @@ -233,21 +233,6 @@ elseif(UNIX) | |
8 | endif() | 8 | list(APPEND OLIVE_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus) | |
9 | endif() | 9 | endif() | |
10 | 10 | |||
11 | -# Generate Git hash | |||
12 | -set(PROJECT_LONG_VERSION ${PROJECT_VERSION}) | |||
11 | -if(EXISTS "${CMAKE_SOURCE_DIR}/.git") | 13 | -if(EXISTS "${CMAKE_SOURCE_DIR}/.git") | |
12 | - find_package(Git) | 14 | - find_package(Git) | |
13 | - if(GIT_FOUND) | 15 | - if(GIT_FOUND) | |
14 | - execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h | 16 | - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD | |
15 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} | 17 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} | |
16 | - OUTPUT_VARIABLE GIT_HASH | 18 | - OUTPUT_VARIABLE GIT_HASH | |
17 | - OUTPUT_STRIP_TRAILING_WHITESPACE | 19 | - OUTPUT_STRIP_TRAILING_WHITESPACE | |
18 | - ) | 20 | - ) | |
21 | - | |||
22 | - set(PROJECT_LONG_VERSION ${PROJECT_VERSION}-${GIT_HASH}) | |||
19 | - endif() | 23 | - endif() | |
20 | -elseif(UNIX AND NOT APPLE) | |||
21 | - # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) | |||
22 | - # (see https://answers.launchpad.net/launchpad/+question/678556) | |||
23 | - execute_process(COMMAND sh -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog" | |||
24 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debian | |||
25 | - OUTPUT_VARIABLE GIT_HASH | |||
26 | - OUTPUT_STRIP_TRAILING_WHITESPACE | |||
27 | - ) | |||
28 | -endif() | |||
29 | -if(DEFINED GIT_HASH) | |||
30 | - message("Olive: git hash = " "${GIT_HASH}") | |||
31 | - list(APPEND OLIVE_DEFINITIONS -DGITHASH="${GIT_HASH}") | |||
32 | -else() | |||
33 | - message("Olive: No git hash defined!") | |||
34 | -endif() | 24 | -endif() | |
35 | - | 25 | - | |
36 | find_package(Doxygen) | 26 | # Optional: Find Doxygen if requested | |
37 | 27 | if(BUILD_DOXYGEN) | ||
38 | set(OLIVE_SOURCES | 28 | find_package(Doxygen) |
$NetBSD: patch-app_CMakeLists.txt,v 1.1 2023/10/15 19:57:54 ryoon Exp $
* Install translated strings.
--- app/CMakeLists.txt.orig 2023-09-24 11:40:23.000000000 +0000
+++ app/CMakeLists.txt
@@ -123,6 +123,7 @@ elseif(APPLE)
elseif(UNIX)
# Set Linux-specific properties for application
install(TARGETS olive-editor RUNTIME DESTINATION bin)
+ install(FILES ${OLIVE_QM_FILES} DESTINATION share/olive-editor/ts)
endif()
# Set link libraries
$NetBSD: patch-ext_core_src_util_timecodefunctions.cpp,v 1.1 2023/10/15 19:57:54 ryoon Exp $
* for std:ceil etc.
--- ext/core/src/util/timecodefunctions.cpp.orig 2023-02-17 02:04:25.000000000 +0000
+++ ext/core/src/util/timecodefunctions.cpp
@@ -18,6 +18,7 @@
***/
+#include <cmath>
#include "util/timecodefunctions.h"
extern "C" {