From nobody Sat Mar 25 20:39:40 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkWCc3rZZz41gvr; Sat, 25 Mar 2023 20:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkWCc3CfBz3q8v; Sat, 25 Mar 2023 20:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679776780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oy+MTlRdHsf15QS3YBgEShczAAonGn4BvOWiTjxyPpg=; b=k2UmrUESAMheS6KRHEfGeWJ72YFzxR31901yr0LBuiQYWHCotpo9iFgRU3EPFzeY+nsKiJ rJx01nIwHhHlhdotcblNntPGwPYqQrghFJgQ2nC18VC5w+4M9IL1iRw5RbEfUTobpRim9q 3SFwJk+tHTlGRbJ4p0I5wZ9MmjbpcSSuOdUU+eLMZO6/nLKwRefOBSQC09y5hwuyxAMu3s aewIqf6kgjfuhI/MP4ssjiLP8rWcH7tYUKU0XQqG6tx6WNyBXWXQ4wlqLo7xCGS5AIacTU DrAsHKH6uxC5sZKArWhRBvluyJtVEkoVf8HSX8jIOQ2Gvq16thJB6OYEHC+uLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679776780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oy+MTlRdHsf15QS3YBgEShczAAonGn4BvOWiTjxyPpg=; b=iLz1bSfN8FwBUGRwbs/DtdHRyjvMT0XpXxYLJCxeDVj+/1qJq8ZDlW1XLxYZ/LyVFCSGbS y26xLHS85Xj2jE8ZCoghUUgmeXSHykZa19xmxHa8oZNQpXDmvGtXXuyEWwkHziw6v+Q41L L/K+1oJPcOsi1kpffWL53hFAHCI9Q9Av42yZYEqHyBP7SlLT0SMQD5triQcaTk6RTErNrC 4Sp0lbsk0bU0GozRo4LveoPaeBZGCpZkeasntI3r+l8IK0JBtqmFtdqcuFbx8aBaunvuMb GbO/P39lJOP6ORhfRtHQej6563bXHHPN0JDqcA2w0B0LrLmf+6q+A/QtkNkKRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679776780; a=rsa-sha256; cv=none; b=RnfI3DLgxrPalmzIHoi2nfjsTeRaLc+IKoHoe3c3S19p351n0iZ+7thoyLhuFI8z8r1aE1 0d0HrCINu8TH5uyJhvNjXKe8VcFjDGtGdS9bimdRL3CbsRpFZTKqx44c/Ybs6xTbmwJHVg 2EmJJOb+p9tuADXVr9Ho1w6IpcC3//LaxiW6O7/jgF7BYYATdR4KDomHX2DV8ny+tSueJ6 mEzjHfPnIPy7CxD8KseydpVhJQ4puSZwkNMLs/5K77YLVm+USuTk+88OKaCIYxVbcXq1q9 GLLDOU37MFapXT6PSlzrjm8nPuPuJaGIPn+5aDFrbisIcNhBzDI12utP48B3qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkWCc2GBgz1Cw2; Sat, 25 Mar 2023 20:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PKdeoQ024044; Sat, 25 Mar 2023 20:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PKdejb024043; Sat, 25 Mar 2023 20:39:40 GMT (envelope-from git) Date: Sat, 25 Mar 2023 20:39:40 GMT Message-Id: <202303252039.32PKdejb024043@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: bb71df077726 - main - =?utf-8?Q?multimedia/olive:=20Update=200.1.2=20=E2=86=92=200.1.2-20230320?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb71df0777265765e100177da814bf9bbcf28021 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb71df0777265765e100177da814bf9bbcf28021 commit bb71df0777265765e100177da814bf9bbcf28021 Author: Yuri Victorovich AuthorDate: 2023-03-25 20:39:08 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-25 20:39:37 +0000 multimedia/olive: Update 0.1.2 → 0.1.2-20230320 PR: 270324 --- multimedia/olive/Makefile | 32 ++++++----- multimedia/olive/distinfo | 10 ++-- .../files/patch-effects_internal_texteffect.cpp | 10 ---- .../patch-effects_internal_timecodeeffect.cpp | 10 ---- .../patch-ext_core_src_util_timecodefunctions.cpp | 11 ++++ multimedia/olive/files/patch-olive.pro | 43 --------------- multimedia/olive/files/patch-ui_graphview.cpp | 10 ---- multimedia/olive/files/patch-ui_timelineheader.cpp | 10 ---- multimedia/olive/pkg-plist | 63 ---------------------- 9 files changed, 37 insertions(+), 162 deletions(-) diff --git a/multimedia/olive/Makefile b/multimedia/olive/Makefile index f75f6bec5bc5..06ac9f15ec62 100644 --- a/multimedia/olive/Makefile +++ b/multimedia/olive/Makefile @@ -1,32 +1,38 @@ PORTNAME= olive -DISTVERSION= 0.1.2 -PORTREVISION= 1 +DISTVERSION= 0.1.2-20230320 CATEGORIES= multimedia PKGNAMESUFFIX= -video-editor MAINTAINER= yuri@FreeBSD.org -COMMENT= NLE (nonlinear) video editor -WWW= https://www.olivevideoeditor.org/ +COMMENT= Non-linear video editor +WWW= https://olivevideoeditor.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= frei0r>0:graphics/frei0r LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ - libOpenColorIO.so:graphics/opencolorio + libImath-3_1.so:math/Imath \ + libOpenColorIO.so:graphics/opencolorio \ + libOpenEXR-3_1.so:graphics/openexr \ + libOpenImageIO.so:graphics/openimageio \ + libportaudio.so:audio/portaudio RUN_DEPENDS= frei0r>0:graphics/frei0r +# libopentimelineio.so:multimedia/opentimelineio -USES= dos2unix qmake compiler:c++11-lang desktop-file-utils gl pkgconfig qt:5 shared-mime-info -USE_GITHUB= yes -GH_ACCOUNT= olive-editor -DOS2UNIX_FILES= olive.pro \ - ui/graphview.cpp \ - ui/timelineheader.cpp -USE_QT= core gui multimedia network opengl svg widgets buildtools:build linguisttools:build +USES= cmake compiler:c++11-lang desktop-file-utils gl pkgconfig qt:5 shared-mime-info +USE_QT= concurrent core dbus gui multimedia network opengl svg widgets x11extras \ + buildtools:build linguisttools:build qmake:build testlib:build USE_GL= gl -DATADIR= ${PREFIX}/share/olive-editor +USE_GITHUB= yes +GH_ACCOUNT= olive-editor +GH_TAGNAME= 8ca1672 +GH_TUPLE= olive-editor:core:2777928:core/ext/core \ + KDAB:KDDockWidgets:8d2d0a5:KDDockWidgets/ext/KDDockWidgets PORTSCOUT= limit:^.*[1-9]\..* # prevent tags like 20181223 +CONFLICTS_BUILD= opentimelineio # fails to build with the opentimelineio optional dependency, see https://github.com/olive-editor/olive/issues/2201 + .include diff --git a/multimedia/olive/distinfo b/multimedia/olive/distinfo index 30d19a8b691b..f95606f19fe5 100644 --- a/multimedia/olive/distinfo +++ b/multimedia/olive/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1579423140 -SHA256 (olive-editor-olive-0.1.2_GH0.tar.gz) = cb9a5b109e67a47f03448633cbc7a257aa8e6c3c76a59c1fada77fd3d97875c1 -SIZE (olive-editor-olive-0.1.2_GH0.tar.gz) = 2174284 +TIMESTAMP = 1679768370 +SHA256 (olive-editor-olive-0.1.2-20230320-8ca1672_GH0.tar.gz) = 72321e63b48da8a40defc935d938f432f5692e65220406788b48ee6a1b1aa5ed +SIZE (olive-editor-olive-0.1.2-20230320-8ca1672_GH0.tar.gz) = 8156522 +SHA256 (olive-editor-core-2777928_GH0.tar.gz) = 2a7f57fcf782d62d9a40a3c51a1cb7d5f87aaf20952402d9d52bdbafddbaec6c +SIZE (olive-editor-core-2777928_GH0.tar.gz) = 76380 +SHA256 (KDAB-KDDockWidgets-8d2d0a5_GH0.tar.gz) = 5d6d40c8a3f128ce61769c2bcb01b89dfd92460779e63cde40d8068647157705 +SIZE (KDAB-KDDockWidgets-8d2d0a5_GH0.tar.gz) = 3930847 diff --git a/multimedia/olive/files/patch-effects_internal_texteffect.cpp b/multimedia/olive/files/patch-effects_internal_texteffect.cpp deleted file mode 100644 index d736c6c638f5..000000000000 --- a/multimedia/olive/files/patch-effects_internal_texteffect.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- effects/internal/texteffect.cpp.orig 2020-05-21 12:06:43 UTC -+++ effects/internal/texteffect.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/multimedia/olive/files/patch-effects_internal_timecodeeffect.cpp b/multimedia/olive/files/patch-effects_internal_timecodeeffect.cpp deleted file mode 100644 index 7327a4cfada2..000000000000 --- a/multimedia/olive/files/patch-effects_internal_timecodeeffect.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- effects/internal/timecodeeffect.cpp.orig 2020-05-21 12:06:43 UTC -+++ effects/internal/timecodeeffect.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/multimedia/olive/files/patch-ext_core_src_util_timecodefunctions.cpp b/multimedia/olive/files/patch-ext_core_src_util_timecodefunctions.cpp new file mode 100644 index 000000000000..f45e245afdbb --- /dev/null +++ b/multimedia/olive/files/patch-ext_core_src_util_timecodefunctions.cpp @@ -0,0 +1,11 @@ +--- ext/core/src/util/timecodefunctions.cpp.orig 2023-03-25 20:23:08 UTC ++++ ext/core/src/util/timecodefunctions.cpp +@@ -20,6 +20,8 @@ + + #include "util/timecodefunctions.h" + ++#include ++ + extern "C" { + #include + } diff --git a/multimedia/olive/files/patch-olive.pro b/multimedia/olive/files/patch-olive.pro deleted file mode 100644 index 2695965cda20..000000000000 --- a/multimedia/olive/files/patch-olive.pro +++ /dev/null @@ -1,43 +0,0 @@ ---- olive.pro.orig 2019-11-11 06:05:02 UTC -+++ olive.pro -@@ -28,23 +28,23 @@ DEFINES += QT_DEPRECATED_WARNINGS - #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - - # Tries to get the current Git short hash --system("which git") { -- GITPATH = $$PWD -- -- win32 { -- GITPATH = $$system(cygpath $$PWD) -- } -- -- GITHASHVAR = $$system(git --git-dir=\"$$GITPATH/.git\" --work-tree=\"$$GITPATH\" log -1 --format=%h) -- -- # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) -- # (see https://answers.launchpad.net/launchpad/+question/678556) -- isEmpty(GITHASHVAR) { -- GITHASHVAR = $$system(sh $$PWD/debian/gitfromlog.sh $$PWD/debian/changelog) -- } -- -- DEFINES += GITHASH=\\"\"$$GITHASHVAR\\"\" --} -+#system("which git") { -+# GITPATH = $$PWD -+# -+# win32 { -+# GITPATH = $$system(cygpath $$PWD) -+# } -+# -+# GITHASHVAR = $$system(git --git-dir=\"$$GITPATH/.git\" --work-tree=\"$$GITPATH\" log -1 --format=%h) -+# -+# # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) -+# # (see https://answers.launchpad.net/launchpad/+question/678556) -+# isEmpty(GITHASHVAR) { -+# GITHASHVAR = $$system(sh $$PWD/debian/gitfromlog.sh $$PWD/debian/changelog) -+# } -+# -+# DEFINES += GITHASH=\\"\"$$GITHASHVAR\\"\" -+#} - - CONFIG += c++11 - diff --git a/multimedia/olive/files/patch-ui_graphview.cpp b/multimedia/olive/files/patch-ui_graphview.cpp deleted file mode 100644 index ea1e420df65a..000000000000 --- a/multimedia/olive/files/patch-ui_graphview.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/graphview.cpp.orig 2020-05-21 12:06:43 UTC -+++ ui/graphview.cpp -@@ -21,6 +21,7 @@ - #include "graphview.h" - - #include -+#include - #include - #include - #include diff --git a/multimedia/olive/files/patch-ui_timelineheader.cpp b/multimedia/olive/files/patch-ui_timelineheader.cpp deleted file mode 100644 index e01b1dae1621..000000000000 --- a/multimedia/olive/files/patch-ui_timelineheader.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/timelineheader.cpp.orig 2020-05-21 12:06:43 UTC -+++ ui/timelineheader.cpp -@@ -21,6 +21,7 @@ - #include "timelineheader.h" - - #include -+#include - #include - #include - #include diff --git a/multimedia/olive/pkg-plist b/multimedia/olive/pkg-plist index e258c95f334e..ed3e1deea303 100644 --- a/multimedia/olive/pkg-plist +++ b/multimedia/olive/pkg-plist @@ -16,66 +16,3 @@ 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 -%%DATADIR%%/effects/boxblur.frag -%%DATADIR%%/effects/boxblur.xml -%%DATADIR%%/effects/bulge.frag -%%DATADIR%%/effects/bulge.xml -%%DATADIR%%/effects/chromakey.frag -%%DATADIR%%/effects/chromakey.xml -%%DATADIR%%/effects/chromaticaberration.frag -%%DATADIR%%/effects/chromaticaberration.xml -%%DATADIR%%/effects/colorcorrection.frag -%%DATADIR%%/effects/colorcorrection.xml -%%DATADIR%%/effects/colorsel.frag -%%DATADIR%%/effects/colorsel.xml -%%DATADIR%%/effects/common.frag -%%DATADIR%%/effects/common.vert -%%DATADIR%%/effects/crop.frag -%%DATADIR%%/effects/crop.xml -%%DATADIR%%/effects/crossstitch.frag -%%DATADIR%%/effects/crossstitch.xml -%%DATADIR%%/effects/despill.frag -%%DATADIR%%/effects/despill.xml -%%DATADIR%%/effects/directionalblur.frag -%%DATADIR%%/effects/directionalblur.xml -%%DATADIR%%/effects/dropshadow.xml.disabled -%%DATADIR%%/effects/emboss.frag -%%DATADIR%%/effects/emboss.xml -%%DATADIR%%/effects/findedges.frag -%%DATADIR%%/effects/findedges.xml.disabled -%%DATADIR%%/effects/fisheye.frag -%%DATADIR%%/effects/fisheye.xml -%%DATADIR%%/effects/flip.frag -%%DATADIR%%/effects/flip.xml -%%DATADIR%%/effects/gaussianblur.frag -%%DATADIR%%/effects/gaussianblur.xml -%%DATADIR%%/effects/huesatbri.frag -%%DATADIR%%/effects/huesatbri.xml -%%DATADIR%%/effects/invert.frag -%%DATADIR%%/effects/invert.xml -%%DATADIR%%/effects/lumakey.frag -%%DATADIR%%/effects/lumakey.xml -%%DATADIR%%/effects/noise.frag -%%DATADIR%%/effects/noise.xml -%%DATADIR%%/effects/pixelate.frag -%%DATADIR%%/effects/pixelate.xml -%%DATADIR%%/effects/posterize.frag -%%DATADIR%%/effects/posterize.xml -%%DATADIR%%/effects/radialblur.frag -%%DATADIR%%/effects/radialblur.xml -%%DATADIR%%/effects/ripple.frag -%%DATADIR%%/effects/ripple.xml -%%DATADIR%%/effects/sphere.frag -%%DATADIR%%/effects/sphere.xml -%%DATADIR%%/effects/swirl.frag -%%DATADIR%%/effects/swirl.xml -%%DATADIR%%/effects/tile.frag -%%DATADIR%%/effects/tile.xml -%%DATADIR%%/effects/toonify.frag -%%DATADIR%%/effects/toonify.xml -%%DATADIR%%/effects/vignette.frag -%%DATADIR%%/effects/vignette.xml -%%DATADIR%%/effects/volumetriclight.frag -%%DATADIR%%/effects/volumetriclight.xml -%%DATADIR%%/effects/wave.frag -%%DATADIR%%/effects/wave.xml