From nobody Tue Jan 28 14:59:41 2025 X-Original-To: dev-commits-ports-all@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 4Yj7jn32FHz5lZMT; Tue, 28 Jan 2025 14:59:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj7jn18Chz3fCx; Tue, 28 Jan 2025 14:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738076381; 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=rTlOG6fxtEeXW6bZPojHLWstb9UFo5pWMYnIOcxmGns=; b=V9HiMlfgdY1QGs5mKkPQ+ppgneQL3nQLk2kDzP3SdsqhEBibDR+7owLGBZI2U9edkbIAGi 43SYP66B7Zt7G3usLCulPTPjEkCwvVT41DAk1Z/nmsUsfuNLaVVKdsBfME3bjU5wZK9dvS r+VrFOyyjA3wgaYLSJfccD7woDiq3SGa8jxNEzrf9kfSHZjkbuPqlmirGqSKA/ZOcbHdL/ lAB2aNreRqWMXp3vfeiaKE58C2y4oQaCA9vRZkQpMKdPPhMSfYUaRKA5bPCgGKIcUG84BO q5gdGHolFV3xv+mHUUTYg4oVJgKnQBZQksZpo4B8LCGbrjnHuwuP6C7+TXPtWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738076381; 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=rTlOG6fxtEeXW6bZPojHLWstb9UFo5pWMYnIOcxmGns=; b=yB1W07Na4xscMvh7VOBcEp49jJZGLF4zBlYO5Tqpmpc933rJZkVKAIyOYnfHY2FL+Lr7+X 3c1R+XCQXrjawarKBcTzKX6ZMphMLj39SaQ//8Ay8OcWywlQ1mgTNKori0mZFF+NGC0UtJ LXsK4OL9Y+iYitzGww+T/WdwsHDlt84aHmWuVfuY8SYWpNElfsrn1Y4yXP9ciFTyfWvmt9 Svl9Ptu8xZpQeHxiQrpKNFdu7/b4/Qk2nNEjDRgg0O/vfYBP0m7zYgFAh8WQD7lmZAOGpL 7WlxZ2Yf6exywq0WEb/P77HqBcAlmLrvKvfIKkTTF7AKUBaxH7a0zk/eUduZDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738076381; a=rsa-sha256; cv=none; b=piuiaA64W49VO5o0zzKHPFoG1245dw3uTT4/3Crw1i4/eiKQPUtEul4+zmkg5c2nzLfuZ/ v/kgCn19pmLCZ6jORybcLh8URCCe2aGGEUTrPRqRLEbqJ3GstLCGppVesveTNnpDIgxCpd KuEen6xBSiukhTECNpaFyyB6qUYHgIjl//KnGdaV7eHbbcI44C+pYObKINo8/Gdgq/Vl5G X0xmXUh1BSsTvE1ojL7C0+mmaGY2cnqbdpweeRZvCGP0FRaKztwu6xXnHnQSFw/I4Ib+ZJ auq0jOVDNKB9Tw5/3IBiBoZguu16on/KifCxkrweMv0AbwTIHmjvdeOTQc0svg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yj7jn0bMLz4XY; Tue, 28 Jan 2025 14:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SExf9S016188; Tue, 28 Jan 2025 14:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SExfB7016185; Tue, 28 Jan 2025 14:59:41 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:59:41 GMT Message-Id: <202501281459.50SExfB7016185@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 367d575e1160 - main - multimedia/shotcut-qt6: Update to 25.01.25 "Finally, Playlist Bins" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 367d575e1160bcea5623b037a737841436e88b97 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=367d575e1160bcea5623b037a737841436e88b97 commit 367d575e1160bcea5623b037a737841436e88b97 Author: Jason E. Hale AuthorDate: 2025-01-28 14:38:49 +0000 Commit: Jason E. Hale CommitDate: 2025-01-28 14:59:35 +0000 multimedia/shotcut-qt6: Update to 25.01.25 "Finally, Playlist Bins" Remove hard deps on multimedia/mlt7-glaxnimate@qt6 and multimedia/mlt7-qt@qt6. These can be easily installed as separate packages for additional filters, but are not required for runtime. https://github.com/mltframework/shotcut/releases/tag/v25.01.25 --- multimedia/shotcut-qt6/Makefile | 6 ++---- multimedia/shotcut-qt6/distinfo | 6 +++--- multimedia/shotcut-qt6/files/patch-src_database.cpp | 18 ------------------ multimedia/shotcut-qt6/pkg-plist | 11 +++++++++++ 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/multimedia/shotcut-qt6/Makefile b/multimedia/shotcut-qt6/Makefile index 89c9c25c0433..d375c84db5b0 100644 --- a/multimedia/shotcut-qt6/Makefile +++ b/multimedia/shotcut-qt6/Makefile @@ -1,5 +1,5 @@ PORTNAME= shotcut -DISTVERSION= 24.11.17 +DISTVERSION= 25.01.25 CATEGORIES= multimedia MASTER_SITES= https://github.com/mltframework/${PORTNAME}/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= -qt6 @@ -15,9 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libfftw3.so:math/fftw3 RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ - ${LOCALBASE}/lib/libjack.so:audio/jack \ - ${LOCALBASE}/lib/mlt-7/libmltglaxnimate-qt6.so:multimedia/mlt7-glaxnimate@qt6 \ - ${LOCALBASE}/lib/mlt-7/libmltqt6.so:multimedia/mlt7-qt@qt6 + ${LOCALBASE}/lib/libjack.so:audio/jack USES= cmake compiler:c++17-lang cpe desktop-file-utils gl mlt:7 \ pkgconfig qt:6 sdl shared-mime-info tar:txz xorg diff --git a/multimedia/shotcut-qt6/distinfo b/multimedia/shotcut-qt6/distinfo index de40d696cadb..595542d61f7f 100644 --- a/multimedia/shotcut-qt6/distinfo +++ b/multimedia/shotcut-qt6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732942012 -SHA256 (shotcut-src-241117.txz) = a69dd704089f1999e55c4506c26442b1276ec529c9e721983bc9ee6708a72013 -SIZE (shotcut-src-241117.txz) = 324261632 +TIMESTAMP = 1738074017 +SHA256 (shotcut-src-250125.txz) = 02ae3d40acd4641f450cedc68e59afe512a52aadc3cc1c633edb5f5886daf804 +SIZE (shotcut-src-250125.txz) = 345393540 diff --git a/multimedia/shotcut-qt6/files/patch-src_database.cpp b/multimedia/shotcut-qt6/files/patch-src_database.cpp deleted file mode 100644 index 654c03d80dd4..000000000000 --- a/multimedia/shotcut-qt6/files/patch-src_database.cpp +++ /dev/null @@ -1,18 +0,0 @@ -Fix build on i386. - -/wrkdirs/usr/ports/multimedia/shotcut-qt6/work/src/shotcut/src/database.cpp:89:29: -error: non-constant-expression cannot be narrowed from type 'qint64' (aka 'long long') -to 'time_t' (aka 'int') in initializer list [-Wc++11-narrowing] - 89 | accessed.toSecsSinceEpoch() + offset, accessed.toSecsSinceEpoch() + offset - ---- src/database.cpp.orig 2024-11-17 08:04:05 UTC -+++ src/database.cpp -@@ -86,7 +86,7 @@ QDir Database::thumbnailsDir() - auto accessed = query.value(1).toDateTime(); - auto offset = accessed.timeZone().offsetFromUtc(accessed); - struct utimbuf utimes { -- accessed.toSecsSinceEpoch() + offset, accessed.toSecsSinceEpoch() + offset -+ static_cast(accessed.toSecsSinceEpoch() + offset), static_cast(accessed.toSecsSinceEpoch() + offset) - }; - ::utime(dir.filePath(fileName).toUtf8().constData(), &utimes); - } diff --git a/multimedia/shotcut-qt6/pkg-plist b/multimedia/shotcut-qt6/pkg-plist index f952d1c8777d..2461a7b89e15 100644 --- a/multimedia/shotcut-qt6/pkg-plist +++ b/multimedia/shotcut-qt6/pkg-plist @@ -251,6 +251,9 @@ share/mime/packages/org.shotcut.Shotcut.xml %%DATADIR%%/qml/filters/gradient/meta.qml %%DATADIR%%/qml/filters/gradient/ui.qml %%DATADIR%%/qml/filters/gradient/vui.qml +%%DATADIR%%/qml/filters/gradientmap/icon.webp +%%DATADIR%%/qml/filters/gradientmap/meta.qml +%%DATADIR%%/qml/filters/gradientmap/ui.qml %%DATADIR%%/qml/filters/grain/meta.qml %%DATADIR%%/qml/filters/grain/ui.qml %%DATADIR%%/qml/filters/grid/icon.webp @@ -262,6 +265,12 @@ share/mime/packages/org.shotcut.Shotcut.xml %%DATADIR%%/qml/filters/hqdn3d/icon.webp %%DATADIR%%/qml/filters/hqdn3d/meta.qml %%DATADIR%%/qml/filters/hqdn3d/ui.qml +%%DATADIR%%/qml/filters/hslprimaries/icon.webp +%%DATADIR%%/qml/filters/hslprimaries/meta.qml +%%DATADIR%%/qml/filters/hslprimaries/ui.qml +%%DATADIR%%/qml/filters/hslrange/icon.webp +%%DATADIR%%/qml/filters/hslrange/meta.qml +%%DATADIR%%/qml/filters/hslrange/ui.qml %%DATADIR%%/qml/filters/hue_lightness_saturation/icon.webp %%DATADIR%%/qml/filters/hue_lightness_saturation/meta.qml %%DATADIR%%/qml/filters/hue_lightness_saturation/ui.qml @@ -463,6 +472,7 @@ share/mime/packages/org.shotcut.Shotcut.xml %%DATADIR%%/qml/modules/Shotcut/Controls/Button.qml %%DATADIR%%/qml/modules/Shotcut/Controls/ColorPicker.qml %%DATADIR%%/qml/modules/Shotcut/Controls/ComboBox.qml +%%DATADIR%%/qml/modules/Shotcut/Controls/CurveComboBox.qml %%DATADIR%%/qml/modules/Shotcut/Controls/DoubleSpinBox.qml %%DATADIR%%/qml/modules/Shotcut/Controls/EditMenu.qml %%DATADIR%%/qml/modules/Shotcut/Controls/Gauge.qml @@ -527,6 +537,7 @@ share/mime/packages/org.shotcut.Shotcut.xml %%DATADIR%%/translations/shotcut_eu.qm %%DATADIR%%/translations/shotcut_fi.qm %%DATADIR%%/translations/shotcut_fr.qm +%%DATADIR%%/translations/shotcut_ga.qm %%DATADIR%%/translations/shotcut_gd.qm %%DATADIR%%/translations/shotcut_gl.qm %%DATADIR%%/translations/shotcut_he_IL.qm