pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/multimedia/olive-editor

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Oct 15 19:57:54 UTC 2023

Modified Files:
        pkgsrc/multimedia/olive-editor: Makefile PLIST distinfo
        pkgsrc/multimedia/olive-editor/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/multimedia/olive-editor/patches: patch-app_CMakeLists.txt
            patch-ext_core_src_util_timecodefunctions.cpp
Removed Files:
        pkgsrc/multimedia/olive-editor/patches:
            patch-effects_internal_texteffect.cpp
            patch-effects_internal_timecodeeffect.cpp patch-ui_graphview.cpp
            patch-ui_timelineheader.cpp patch-ui_timelinewidget.cpp

Log Message:
olive-editor: Update to 0.2.0pre20230924

Changelog:
GUI layout changes.
Improvements and bugfixes.
Update translations.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/olive-editor/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/olive-editor/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/olive-editor/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/olive-editor/patches/patch-app_CMakeLists.txt \
    pkgsrc/multimedia/olive-editor/patches/patch-ext_core_src_util_timecodefunctions.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_graphview.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/multimedia/olive-editor/Makefile
diff -u pkgsrc/multimedia/olive-editor/Makefile:1.30 pkgsrc/multimedia/olive-editor/Makefile:1.31
--- pkgsrc/multimedia/olive-editor/Makefile:1.30        Tue Jul 18 18:34:31 2023
+++ pkgsrc/multimedia/olive-editor/Makefile     Sun Oct 15 19:57:54 2023
@@ -1,34 +1,43 @@
-# $NetBSD: Makefile,v 1.30 2023/07/18 18:34:31 nia Exp $
+# $NetBSD: Makefile,v 1.31 2023/10/15 19:57:54 ryoon Exp $
 
-DISTNAME=      olive-editor-0.1.2
-PKGREVISION=   9
+DISTNAME=      olive-editor-0.2.0pre20230924
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=olive-editor/}
 GITHUB_PROJECT=        olive
+GITHUB_TAG=    55eedbfce909dfd7df97611a2eea1d1958385f9c
 
 MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://olivevideoeditor.org/
 COMMENT=       Non-linear video editor
 LICENSE=       gnu-gpl-v3
 
+GITHUB_SUBMODULES+=    olive-editor core 277792824801495e868580ca86f6e7a1b53e4779 ext/core
+GITHUB_SUBMODULES+=    olive-editor KDDockWidgets 8d2d0a5764f8393cc148a2296d511276a8ffe559 ext/KDDockWidgets
+
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
-WRKSRC=                ${WRKDIR}/olive-${PKGVERSION_NOREV}
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
 USE_CXX_FEATURES+=     c++11
 
-CMAKE_ARGS+=   -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg4
-CMAKE_ARGS+=   -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg4
+CMAKE_ARGS+=   -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg6
+CMAKE_ARGS+=   -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg6
+CMAKE_ARGS+=   -DPORTAUDIO_INCLUDE_DIR=${BUILDLINK_DIR}/include/portaudio2
+CMAKE_ARGS+=   -DPORTAUDIO_LIBRARY=${BUILDLINK_DIR}/lib/portaudio2/libportaudiocpp.so
 
+.include "../../audio/portaudio/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/opencolorio/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../graphics/openimageio/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../multimedia/frei0r/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/olive-editor/PLIST
diff -u pkgsrc/multimedia/olive-editor/PLIST:1.2 pkgsrc/multimedia/olive-editor/PLIST:1.3
--- pkgsrc/multimedia/olive-editor/PLIST:1.2    Mon Apr 18 13:21:26 2022
+++ pkgsrc/multimedia/olive-editor/PLIST        Sun Oct 15 19:57:54 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/04/18 13:21:26 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/10/15 19:57:54 ryoon Exp $
 bin/olive-editor
 share/applications/org.olivevideoeditor.Olive.desktop
 share/icons/hicolor/128x128/apps/org.olivevideoeditor.Olive.png
@@ -17,79 +17,20 @@ share/icons/hicolor/64x64/apps/org.olive
 share/icons/hicolor/64x64/mimetypes/application-vnd.olive-project.png
 share/metainfo/org.olivevideoeditor.Olive.appdata.xml
 share/mime/packages/org.olivevideoeditor.Olive.xml
-share/olive-editor/effects/boxblur.frag
-share/olive-editor/effects/boxblur.xml
-share/olive-editor/effects/bulge.frag
-share/olive-editor/effects/bulge.xml
-share/olive-editor/effects/chromakey.frag
-share/olive-editor/effects/chromakey.xml
-share/olive-editor/effects/chromaticaberration.frag
-share/olive-editor/effects/chromaticaberration.xml
-share/olive-editor/effects/colorcorrection.frag
-share/olive-editor/effects/colorcorrection.xml
-share/olive-editor/effects/colorsel.frag
-share/olive-editor/effects/colorsel.xml
-share/olive-editor/effects/common.frag
-share/olive-editor/effects/common.vert
-share/olive-editor/effects/crop.frag
-share/olive-editor/effects/crop.xml
-share/olive-editor/effects/crossstitch.frag
-share/olive-editor/effects/crossstitch.xml
-share/olive-editor/effects/directionalblur.frag
-share/olive-editor/effects/directionalblur.xml
-share/olive-editor/effects/dropshadow.xml.disabled
-share/olive-editor/effects/emboss.frag
-share/olive-editor/effects/emboss.xml
-share/olive-editor/effects/findedges.frag
-share/olive-editor/effects/findedges.xml.disabled
-share/olive-editor/effects/fisheye.frag
-share/olive-editor/effects/fisheye.xml
-share/olive-editor/effects/flip.frag
-share/olive-editor/effects/flip.xml
-share/olive-editor/effects/gaussianblur.frag
-share/olive-editor/effects/gaussianblur.xml
-share/olive-editor/effects/huesatbri.frag
-share/olive-editor/effects/huesatbri.xml
-share/olive-editor/effects/invert.frag
-share/olive-editor/effects/invert.xml
-share/olive-editor/effects/lumakey.frag
-share/olive-editor/effects/lumakey.xml
-share/olive-editor/effects/noise.frag
-share/olive-editor/effects/noise.xml
-share/olive-editor/effects/pixelate.frag
-share/olive-editor/effects/pixelate.xml
-share/olive-editor/effects/posterize.frag
-share/olive-editor/effects/posterize.xml
-share/olive-editor/effects/radialblur.frag
-share/olive-editor/effects/radialblur.xml
-share/olive-editor/effects/ripple.frag
-share/olive-editor/effects/ripple.xml
-share/olive-editor/effects/sphere.frag
-share/olive-editor/effects/sphere.xml
-share/olive-editor/effects/swirl.frag
-share/olive-editor/effects/swirl.xml
-share/olive-editor/effects/tile.frag
-share/olive-editor/effects/tile.xml
-share/olive-editor/effects/toonify.frag
-share/olive-editor/effects/toonify.xml
-share/olive-editor/effects/vignette.frag
-share/olive-editor/effects/vignette.xml
-share/olive-editor/effects/volumetriclight.frag
-share/olive-editor/effects/volumetriclight.xml
-share/olive-editor/effects/wave.frag
-share/olive-editor/effects/wave.xml
-share/olive-editor/ts/olive_ar.qm
-share/olive-editor/ts/olive_bs.qm
-share/olive-editor/ts/olive_cs.qm
-share/olive-editor/ts/olive_de.qm
-share/olive-editor/ts/olive_es.qm
-share/olive-editor/ts/olive_fr.qm
-share/olive-editor/ts/olive_id.qm
-share/olive-editor/ts/olive_it.qm
-share/olive-editor/ts/olive_pt-BR.qm
-share/olive-editor/ts/olive_ru.qm
-share/olive-editor/ts/olive_sr.qm
-share/olive-editor/ts/olive_tr.qm
-share/olive-editor/ts/olive_uk.qm
-share/olive-editor/ts/olive_zh-CN.qm
-share/olive-editor/ts/olive_zh-TW.qm
+share/olive-editor/ts/ar_AR.qm
+share/olive-editor/ts/bs_BA.qm
+share/olive-editor/ts/cs_CZ.qm
+share/olive-editor/ts/de_DE.qm
+share/olive-editor/ts/en_US.qm
+share/olive-editor/ts/es_ES.qm
+share/olive-editor/ts/fr_FR.qm
+share/olive-editor/ts/id_ID.qm
+share/olive-editor/ts/it_IT.qm
+share/olive-editor/ts/ja_JP.qm
+share/olive-editor/ts/pt_BR.qm
+share/olive-editor/ts/ru_RU.qm
+share/olive-editor/ts/sr_RS.qm
+share/olive-editor/ts/tr_TR.qm
+share/olive-editor/ts/uk_UK.qm
+share/olive-editor/ts/zh_CN.qm
+share/olive-editor/ts/zh_TW.qm

Index: pkgsrc/multimedia/olive-editor/distinfo
diff -u pkgsrc/multimedia/olive-editor/distinfo:1.5 pkgsrc/multimedia/olive-editor/distinfo:1.6
--- pkgsrc/multimedia/olive-editor/distinfo:1.5 Mon Apr 18 13:21:26 2022
+++ pkgsrc/multimedia/olive-editor/distinfo     Sun Oct 15 19:57:54 2023
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.5 2022/04/18 13:21:26 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/10/15 19:57:54 ryoon Exp $
 
-BLAKE2s (olive-editor-0.1.2.tar.gz) = f699bc4fbed8b6e12f2f91ff1b1142ffe9d1571e0dd2217c0e0fc95f999c1ac5
-SHA512 (olive-editor-0.1.2.tar.gz) = 48cf44b5ba1bd95e20efb5312d61d6c37e6dedc1f02156ef436ab51705be4bdaf5bb68875b55b06337c25a34aee23eac645fe295d08ab0038872adccf12fc95e
-Size (olive-editor-0.1.2.tar.gz) = 2174284 bytes
-SHA1 (patch-CMakeLists.txt) = 4379576d9087ed5494fa374791aaadf03f2416b0
+BLAKE2s (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 28d9d3c9998990f318b55ab15310c6a395841fd32e073db336dc6f4f97df9f44
+SHA512 (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 
36e3284f7b4a0f563c6e62078f5ec901e5edcdd97230097537003b0b7b3cdcaad773e8b081e7b1af2fc5d0f3b0f5fc1740eb957ef95760cc7338c9ef20f528dc
+Size (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 8159223 bytes
+BLAKE2s (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = 3951caf39d6084c888243160269010338e64e8408972cd2a44524631c0a78cb3
+SHA512 (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = 
f4f5af353a022814a2dc6e2d0f2e5990a9138b9d404e50c4fa7ade3ccdebc57872b1e29152dfdc08d64cf303ac4d0e86a8d83962afbe5590bc3e3fa8aa558cc6
+Size (olive-editor-KDDockWidgets-8d2d0a5764f8393cc148a2296d511276a8ffe559.tar.gz) = 3932727 bytes
+BLAKE2s (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 1dbe8adfcb84e8b96d59794ccf48360f3aa0f10f76a5392e83eafc8cad755a60
+SHA512 (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 
13163da75959e0a3ee817307391207e0a8f534f9f48b0225e199c217ed7f4020a0f5f2b1759c63f4b33f3076285110fefad01636736bcb7e22817088c5a88c14
+Size (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 76408 bytes
+SHA1 (patch-CMakeLists.txt) = 6995fddfb1dfb3c7e663f8a1c61db701c9601f85
+SHA1 (patch-app_CMakeLists.txt) = d01fc5269c79fef9f8b4aa65dd128c58f2e0dc61
 SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3
-SHA1 (patch-effects_internal_texteffect.cpp) = 0bc1d2b67980ca3168c6e355cdd9740f44c9bc74
-SHA1 (patch-effects_internal_timecodeeffect.cpp) = fbd5ff65f8019f7b863d3ea4dc9f3fc2c184d317
-SHA1 (patch-ui_graphview.cpp) = aeaaeda9cf43117dcb18a00e130fe007cd060771
-SHA1 (patch-ui_timelineheader.cpp) = b0e188363d0d08e2edb9973320378c1efd0a2edf
-SHA1 (patch-ui_timelinewidget.cpp) = 9c86fa424437a06f0db2e1a719f9bf074630250e
+SHA1 (patch-ext_core_src_util_timecodefunctions.cpp) = 81e20605774b8463f7d53fe1dc448dee2cb3e5e9

Index: pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.2 pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.2     Mon Apr 18 13:21:26 2022
+++ pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt Sun Oct 15 19:57:54 2023
@@ -1,38 +1,28 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2022/04/18 13:21:26 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/10/15 19:57:54 ryoon Exp $
 
 Don't try to find the git hash.
 
---- CMakeLists.txt.orig        2019-11-11 06:05:02.000000000 +0000
+--- CMakeLists.txt.orig        2023-09-24 11:40:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -54,31 +54,6 @@ if(WIN32)
-   endif()
+@@ -233,21 +233,6 @@ elseif(UNIX)
+   list(APPEND OLIVE_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
  endif()
  
+-# Generate Git hash
+-set(PROJECT_LONG_VERSION ${PROJECT_VERSION})
 -if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
 -  find_package(Git)
 -  if(GIT_FOUND)
--    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
 -      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 -      OUTPUT_VARIABLE GIT_HASH
 -      OUTPUT_STRIP_TRAILING_WHITESPACE
 -    )
+-
+-    set(PROJECT_LONG_VERSION ${PROJECT_VERSION}-${GIT_HASH})
 -  endif()
--elseif(UNIX AND NOT APPLE)
--  # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo)
--  # (see https://answers.launchpad.net/launchpad/+question/678556)
--  execute_process(COMMAND sh -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog"
--    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debian
--    OUTPUT_VARIABLE GIT_HASH
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--endif()
--if(DEFINED GIT_HASH)
--  message("Olive: git hash = " "${GIT_HASH}")
--  list(APPEND OLIVE_DEFINITIONS -DGITHASH="${GIT_HASH}")
--else()
--  message("Olive: No git hash defined!")
 -endif()
 -
- find_package(Doxygen)
- 
- set(OLIVE_SOURCES
+ # Optional: Find Doxygen if requested
+ if(BUILD_DOXYGEN)
+   find_package(Doxygen)

Added files:

Index: pkgsrc/multimedia/olive-editor/patches/patch-app_CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-app_CMakeLists.txt:1.1
--- /dev/null   Sun Oct 15 19:57:54 2023
+++ pkgsrc/multimedia/olive-editor/patches/patch-app_CMakeLists.txt     Sun Oct 15 19:57:54 2023
@@ -0,0 +1,14 @@
+$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
Index: pkgsrc/multimedia/olive-editor/patches/patch-ext_core_src_util_timecodefunctions.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-ext_core_src_util_timecodefunctions.cpp:1.1
--- /dev/null   Sun Oct 15 19:57:54 2023
+++ pkgsrc/multimedia/olive-editor/patches/patch-ext_core_src_util_timecodefunctions.cpp        Sun Oct 15 19:57:54 2023
@@ -0,0 +1,14 @@
+$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" {
Home | Main Index | Thread Index | Old Index