CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 19 Sep 2019 14:28:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep 19 14:28:15 UTC 2019

Modified Files:
        pkgsrc/multimedia: Makefile
Added Files:
        pkgsrc/multimedia/olive-editor: DESCR Makefile PLIST distinfo
        pkgsrc/multimedia/olive-editor/patches: patch-CMakeLists.txt
            patch-cmake_FindFFMPEG.cmake

Log Message:
Add multimedia/olive-editor.

Olive is a free non-linear video editor aiming to provide a fully-featured
alternative to high-end professional video editing software.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 pkgsrc/multimedia/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/olive-editor/DESCR \
    pkgsrc/multimedia/olive-editor/Makefile \
    pkgsrc/multimedia/olive-editor/PLIST \
    pkgsrc/multimedia/olive-editor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt \
    pkgsrc/multimedia/olive-editor/patches/patch-cmake_FindFFMPEG.cmake

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

Modified files:

Index: pkgsrc/multimedia/Makefile
diff -u pkgsrc/multimedia/Makefile:1.277 pkgsrc/multimedia/Makefile:1.278
--- pkgsrc/multimedia/Makefile:1.277    Sat Sep 14 18:11:40 2019
+++ pkgsrc/multimedia/Makefile  Thu Sep 19 14:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.277 2019/09/14 18:11:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.278 2019/09/19 14:28:14 nia Exp $
 #
 
 COMMENT=       Multimedia utilities
@@ -168,6 +168,7 @@ SUBDIR+=    obs-studio
 SUBDIR+=       ogle
 SUBDIR+=       ogle_gui
 SUBDIR+=       ogmtools
+SUBDIR+=       olive-editor
 SUBDIR+=       omxplayer
 SUBDIR+=       openquicktime
 SUBDIR+=       p5-GStreamer

Added files:

Index: pkgsrc/multimedia/olive-editor/DESCR
diff -u /dev/null pkgsrc/multimedia/olive-editor/DESCR:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/DESCR        Thu Sep 19 14:28:15 2019
@@ -0,0 +1,2 @@
+Olive is a free non-linear video editor aiming to provide a fully-featured
+alternative to high-end professional video editing software.
Index: pkgsrc/multimedia/olive-editor/Makefile
diff -u /dev/null pkgsrc/multimedia/olive-editor/Makefile:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/Makefile     Thu Sep 19 14:28:15 2019
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2019/09/19 14:28:15 nia Exp $
+
+DISTNAME=      olive-editor-0.1.1
+CATEGORIES=    multimedia
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=olive-editor/}
+GITHUB_PROJECT=        olive
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://olivevideoeditor.org/
+COMMENT=       Non-linear video editor
+LICENSE=       gnu-gpl-v3
+
+WRKSRC=                ${WRKDIR}/olive-${PKGVERSION_NOREV}
+USE_CMAKE=     yes
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++11
+
+# C++11
+GCC_REQD+=     4.7
+
+CMAKE_ARGS+=   -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg4
+CMAKE_ARGS+=   -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg4
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/opencolorio/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/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-qttools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/olive-editor/PLIST
diff -u /dev/null pkgsrc/multimedia/olive-editor/PLIST:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/PLIST        Thu Sep 19 14:28:15 2019
@@ -0,0 +1,93 @@
+@comment $NetBSD: PLIST,v 1.1 2019/09/19 14:28:15 nia Exp $
+bin/olive-editor
+share/applications/org.olivevideoeditor.Olive.desktop
+share/icons/hicolor/128x128/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/128x128/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/16x16/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/16x16/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/256x256/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/256x256/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/32x32/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/32x32/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/48x48/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/48x48/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/512x512/apps/org.olivevideoeditor.Olive.png
+share/icons/hicolor/512x512/mimetypes/application-vnd.olive-project.png
+share/icons/hicolor/64x64/apps/org.olivevideoeditor.Olive.png
+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_zh-CN.qm
+share/olive-editor/ts/olive_zh-TW.qm
Index: pkgsrc/multimedia/olive-editor/distinfo
diff -u /dev/null pkgsrc/multimedia/olive-editor/distinfo:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/distinfo     Thu Sep 19 14:28:15 2019
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2019/09/19 14:28:15 nia Exp $
+
+SHA1 (olive-editor-0.1.1.tar.gz) = 0a20262158ce5c94a6301537e486e1bcda2385d8
+RMD160 (olive-editor-0.1.1.tar.gz) = 7e68543a4642bad659960dc6a6d73f9e54f8bb58
+SHA512 (olive-editor-0.1.1.tar.gz) = 72aefc03956b3a64d4fb69d15f9a5c88429e8988dac7a6f10287265c065e7b85cb7c6c63ea35e07aef34cdc71e6a3611a8622a1916163c08182bab227d8555e1
+Size (olive-editor-0.1.1.tar.gz) = 2237511 bytes
+SHA1 (patch-CMakeLists.txt) = c38f07520052a40dd235768f4ccb7d34885a121a
+SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3

Index: pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt Thu Sep 19 14:28:15 2019
@@ -0,0 +1,48 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/09/19 14:28:15 nia Exp $
+
+Don't try to find the git hash.
+
+ts/olive_tr.ts's format is invalid.
+
+--- CMakeLists.txt.orig        2019-07-09 15:16:17.000000000 +0000
++++ CMakeLists.txt
+@@ -54,31 +54,6 @@ if(WIN32)
+   endif()
+ endif()
+ 
+-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+-  find_package(Git)
+-  if(GIT_FOUND)
+-    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-      OUTPUT_VARIABLE GIT_HASH
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-  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
+@@ -428,7 +403,6 @@ qt5_add_translation(OLIVE_QM_FILES
+   ts/olive_ru.ts
+   ts/olive_sr.ts
+   ts/olive_id.ts
+-  ts/olive_tr.ts
+   ts/olive_pt-BR.ts
+   ts/olive_zh-CN.ts
+   ts/olive_zh-TW.ts
Index: pkgsrc/multimedia/olive-editor/patches/patch-cmake_FindFFMPEG.cmake
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-cmake_FindFFMPEG.cmake:1.1
--- /dev/null   Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/patches/patch-cmake_FindFFMPEG.cmake Thu Sep 19 14:28:15 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_FindFFMPEG.cmake,v 1.1 2019/09/19 14:28:15 nia Exp $
+
+Support pkgsrc's install locations for ffmpeg.
+
+--- cmake/FindFFMPEG.cmake.orig        2019-07-09 15:16:17.000000000 +0000
++++ cmake/FindFFMPEG.cmake
+@@ -34,6 +34,7 @@ function (_ffmpeg_find component headern
+     NAMES
+       "lib${component}/${headername}"
+     PATHS
++      "${FFMPEG_INCLUDE_ROOT}"
+       "${FFMPEG_ROOT}/include"
+       ~/Library/Frameworks
+       /Library/Frameworks
+@@ -59,6 +60,7 @@ function (_ffmpeg_find component headern
+     NAMES
+       "${component}"
+     PATHS
++      "${FFMPEG_LIB_ROOT}"
+       "${FFMPEG_ROOT}/lib"
+       ~/Library/Frameworks
+       /Library/Frameworks

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index