* [PR PATCH] shotcut 23.09.29
@ 2023-11-02 10:43 Johnnynator
2023-11-02 11:33 ` [PR PATCH] [Updated] " Johnnynator
2023-11-02 12:54 ` [PR PATCH] [Merged]: " Johnnynator
0 siblings, 2 replies; 3+ messages in thread
From: Johnnynator @ 2023-11-02 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages shotcut-23.09.29
https://github.com/void-linux/void-packages/pull/47020
shotcut 23.09.29
- shotcut: update to 23.09.29.
- mlt7: update to 7.20.0.
A patch file from https://github.com/void-linux/void-packages/pull/47020.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shotcut-23.09.29-47020.patch --]
[-- Type: text/x-diff, Size: 7715 bytes --]
From 665ee59ac5003b08147ec15b82832bf3ab54a85e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Nov 2023 11:25:38 +0100
Subject: [PATCH 1/2] shotcut: update to 23.09.29.
fixes #46991
---
srcpkgs/shotcut/patches/qt6.6-timeline.patch | 73 ++++++++++++++++++++
srcpkgs/shotcut/template | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/shotcut/patches/qt6.6-timeline.patch
diff --git a/srcpkgs/shotcut/patches/qt6.6-timeline.patch b/srcpkgs/shotcut/patches/qt6.6-timeline.patch
new file mode 100644
index 0000000000000..96a8541c9958a
--- /dev/null
+++ b/srcpkgs/shotcut/patches/qt6.6-timeline.patch
@@ -0,0 +1,73 @@
+From 4f92e2c3f4dc562fd92d631239a3203555c8ae52 Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <jhale@FreeBSD.org>
+Date: Thu, 19 Oct 2023 21:09:40 -0400
+Subject: [PATCH] Don't shadow FINAL properties. Fixes #1479 (#1481)
+
+---
+ .../views/timeline/CornerSelectionShadow.qml | 4 ++--
+ src/qml/views/timeline/timeline.qml | 18 +++++++++---------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/qml/views/timeline/CornerSelectionShadow.qml b/src/qml/views/timeline/CornerSelectionShadow.qml
+index 348fa780f6..2b3c8102f4 100644
+--- a/src/qml/views/timeline/CornerSelectionShadow.qml
++++ b/src/qml/views/timeline/CornerSelectionShadow.qml
+@@ -19,11 +19,11 @@ import QtQuick
+ Item {
+ id: root
+
+- property Item clip
++ property Item clipN
+ property bool mirrorGradient: false
+
+ width: 100
+- height: clip ? clip.height : 0
++ height: clipN ? clipN.height : 0
+
+ Rectangle {
+ id: shadowGradient
+diff --git a/src/qml/views/timeline/timeline.qml b/src/qml/views/timeline/timeline.qml
+index 98dbff27e1..bd2c60a049 100644
+--- a/src/qml/views/timeline/timeline.qml
++++ b/src/qml/views/timeline/timeline.qml
+@@ -534,16 +534,16 @@ Rectangle {
+ model: timeline.selection
+
+ Rectangle {
+- property var clip: trackAt(modelData.y).clipAt(modelData.x)
+- property var track: typeof clip !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clip.trackIndex + dragDelta.y) : 0
++ property var clipN: trackAt(modelData.y).clipAt(modelData.x)
++ property var track: typeof clipN !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clipN.trackIndex + dragDelta.y) : 0
+
+- x: clip && typeof dragDelta !== 'undefined' ? clip.x + dragDelta.x : 0
++ x: clipN && typeof dragDelta !== 'undefined' ? clipN.x + dragDelta.x : 0
+ y: track ? track.y : 0
+- width: clip ? clip.width : 0
++ width: clipN ? clipN.width : 0
+ height: track ? track.height : 0
+ color: 'transparent'
+ border.color: 'red'
+- visible: clip && !clip.Drag.active && clip.trackIndex === clip.originalTrackIndex
++ visible: clipN && !clipN.Drag.active && clipN.trackIndex === clipN.originalTrackIndex
+ }
+ }
+ }
+@@ -574,14 +574,14 @@ Rectangle {
+
+ CornerSelectionShadow {
+ y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0
+- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null
+- opacity: clip && clip.x + clip.width < tracksFlickable.contentX ? 1 : 0
++ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null
++ opacity: clipN && clipN.x + clipN.width < tracksFlickable.contentX ? 1 : 0
+ }
+
+ CornerSelectionShadow {
+ y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0
+- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null
+- opacity: clip && clip.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0
++ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null
++ opacity: clipN && clipN.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0
+ anchors.right: parent.right
+ mirrorGradient: true
+ }
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 7d2af7b0470b5..33141fbd862d7 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,6 +1,6 @@
# Template file for 'shotcut'
pkgname=shotcut
-version=23.05.14
+version=23.09.29
revision=1
build_style=cmake
configure_args="-DSHOTCUT_VERSION=${version}"
@@ -15,6 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://www.shotcut.org"
changelog="https://github.com/mltframework/shotcut/releases"
distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=94632bd69cc8f3b2cba0668b9e8d051493efa5a9c9554c02822c346fe64c1ce0
+checksum=c76ee1b85bac4bf5e601601e85b4e3d3e2c8579c40ad923d39f2e34f6034a975
CXXFLAGS="-DHAVE_LOCALE_H=1 -DSHOTCUT_NOUPGRADE"
From 2ffada58e8ba6b0b8db2cc9e2f90110b27bddd57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Nov 2023 11:35:42 +0100
Subject: [PATCH 2/2] mlt7: update to 7.20.0.
---
srcpkgs/mlt7/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 77579fbf6b634..f8aff03e7f3be 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,22 +1,22 @@
# Template file for 'mlt7'
pkgname=mlt7
-version=7.14.0
-revision=2
+version=7.20.0
+revision=1
build_style=cmake
-configure_args="-DSWIG_PYTHON=ON"
+configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON"
hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which
qt5-host-tools qt5-qmake"
makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel
fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel
- libvidstab-devel qt5-svg-devel"
+ libvidstab-devel qt5-svg-devel qt6-svg-devel qt6-qt5compat-devel"
depends="mlt7-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://mltframework.org/"
distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz"
-checksum=824e96e7029ff034c61dd9edece45705ebc1a78b79ac32b7533085209bd59032
+checksum=01a54dda64d493cc74cf70a5e446dbb36d82298405abb66ef5da51a5af12a5c0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat"
@@ -40,7 +40,6 @@ fi
post_install() {
doxygen -u && doxygen
vmkdir usr/share/doc/mlt-7/html
- vcopy "docs/*.txt" usr/share/doc/mlt-7
vcopy "docs/html/*" usr/share/doc/mlt-7/html
rm ${DESTDIR}/usr/bin/melt
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] shotcut 23.09.29
2023-11-02 10:43 [PR PATCH] shotcut 23.09.29 Johnnynator
@ 2023-11-02 11:33 ` Johnnynator
2023-11-02 12:54 ` [PR PATCH] [Merged]: " Johnnynator
1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2023-11-02 11:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages shotcut-23.09.29
https://github.com/void-linux/void-packages/pull/47020
shotcut 23.09.29
- shotcut: update to 23.09.29.
- mlt7: update to 7.20.0.
A patch file from https://github.com/void-linux/void-packages/pull/47020.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shotcut-23.09.29-47020.patch --]
[-- Type: text/x-diff, Size: 7761 bytes --]
From 665ee59ac5003b08147ec15b82832bf3ab54a85e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Nov 2023 11:25:38 +0100
Subject: [PATCH 1/2] shotcut: update to 23.09.29.
fixes #46991
---
srcpkgs/shotcut/patches/qt6.6-timeline.patch | 73 ++++++++++++++++++++
srcpkgs/shotcut/template | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/shotcut/patches/qt6.6-timeline.patch
diff --git a/srcpkgs/shotcut/patches/qt6.6-timeline.patch b/srcpkgs/shotcut/patches/qt6.6-timeline.patch
new file mode 100644
index 0000000000000..96a8541c9958a
--- /dev/null
+++ b/srcpkgs/shotcut/patches/qt6.6-timeline.patch
@@ -0,0 +1,73 @@
+From 4f92e2c3f4dc562fd92d631239a3203555c8ae52 Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <jhale@FreeBSD.org>
+Date: Thu, 19 Oct 2023 21:09:40 -0400
+Subject: [PATCH] Don't shadow FINAL properties. Fixes #1479 (#1481)
+
+---
+ .../views/timeline/CornerSelectionShadow.qml | 4 ++--
+ src/qml/views/timeline/timeline.qml | 18 +++++++++---------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/qml/views/timeline/CornerSelectionShadow.qml b/src/qml/views/timeline/CornerSelectionShadow.qml
+index 348fa780f6..2b3c8102f4 100644
+--- a/src/qml/views/timeline/CornerSelectionShadow.qml
++++ b/src/qml/views/timeline/CornerSelectionShadow.qml
+@@ -19,11 +19,11 @@ import QtQuick
+ Item {
+ id: root
+
+- property Item clip
++ property Item clipN
+ property bool mirrorGradient: false
+
+ width: 100
+- height: clip ? clip.height : 0
++ height: clipN ? clipN.height : 0
+
+ Rectangle {
+ id: shadowGradient
+diff --git a/src/qml/views/timeline/timeline.qml b/src/qml/views/timeline/timeline.qml
+index 98dbff27e1..bd2c60a049 100644
+--- a/src/qml/views/timeline/timeline.qml
++++ b/src/qml/views/timeline/timeline.qml
+@@ -534,16 +534,16 @@ Rectangle {
+ model: timeline.selection
+
+ Rectangle {
+- property var clip: trackAt(modelData.y).clipAt(modelData.x)
+- property var track: typeof clip !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clip.trackIndex + dragDelta.y) : 0
++ property var clipN: trackAt(modelData.y).clipAt(modelData.x)
++ property var track: typeof clipN !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clipN.trackIndex + dragDelta.y) : 0
+
+- x: clip && typeof dragDelta !== 'undefined' ? clip.x + dragDelta.x : 0
++ x: clipN && typeof dragDelta !== 'undefined' ? clipN.x + dragDelta.x : 0
+ y: track ? track.y : 0
+- width: clip ? clip.width : 0
++ width: clipN ? clipN.width : 0
+ height: track ? track.height : 0
+ color: 'transparent'
+ border.color: 'red'
+- visible: clip && !clip.Drag.active && clip.trackIndex === clip.originalTrackIndex
++ visible: clipN && !clipN.Drag.active && clipN.trackIndex === clipN.originalTrackIndex
+ }
+ }
+ }
+@@ -574,14 +574,14 @@ Rectangle {
+
+ CornerSelectionShadow {
+ y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0
+- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null
+- opacity: clip && clip.x + clip.width < tracksFlickable.contentX ? 1 : 0
++ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null
++ opacity: clipN && clipN.x + clipN.width < tracksFlickable.contentX ? 1 : 0
+ }
+
+ CornerSelectionShadow {
+ y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0
+- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null
+- opacity: clip && clip.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0
++ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null
++ opacity: clipN && clipN.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0
+ anchors.right: parent.right
+ mirrorGradient: true
+ }
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 7d2af7b0470b5..33141fbd862d7 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,6 +1,6 @@
# Template file for 'shotcut'
pkgname=shotcut
-version=23.05.14
+version=23.09.29
revision=1
build_style=cmake
configure_args="-DSHOTCUT_VERSION=${version}"
@@ -15,6 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://www.shotcut.org"
changelog="https://github.com/mltframework/shotcut/releases"
distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=94632bd69cc8f3b2cba0668b9e8d051493efa5a9c9554c02822c346fe64c1ce0
+checksum=c76ee1b85bac4bf5e601601e85b4e3d3e2c8579c40ad923d39f2e34f6034a975
CXXFLAGS="-DHAVE_LOCALE_H=1 -DSHOTCUT_NOUPGRADE"
From 68483a4623559b72cab0b3cc3b8466f74841eef2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Nov 2023 11:35:42 +0100
Subject: [PATCH 2/2] mlt7: update to 7.20.0.
---
srcpkgs/mlt7/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index 77579fbf6b634..6aa3918b0c366 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,22 +1,22 @@
# Template file for 'mlt7'
pkgname=mlt7
-version=7.14.0
-revision=2
+version=7.20.0
+revision=1
build_style=cmake
-configure_args="-DSWIG_PYTHON=ON"
+configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON"
hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which
- qt5-host-tools qt5-qmake"
+ qt5-host-tools qt5-qmake qt6-tools-devel"
makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk
libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel
fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel
- libvidstab-devel qt5-svg-devel"
+ libvidstab-devel qt5-svg-devel qt6-svg-devel qt6-qt5compat-devel"
depends="mlt7-data>=${version}_${revision} ladspa-sdk-example-plugins"
short_desc="Multimedia framework, designed for television broadcasting"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://mltframework.org/"
distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz"
-checksum=824e96e7029ff034c61dd9edece45705ebc1a78b79ac32b7533085209bd59032
+checksum=01a54dda64d493cc74cf70a5e446dbb36d82298405abb66ef5da51a5af12a5c0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat"
@@ -40,7 +40,6 @@ fi
post_install() {
doxygen -u && doxygen
vmkdir usr/share/doc/mlt-7/html
- vcopy "docs/*.txt" usr/share/doc/mlt-7
vcopy "docs/html/*" usr/share/doc/mlt-7/html
rm ${DESTDIR}/usr/bin/melt
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: shotcut 23.09.29
2023-11-02 10:43 [PR PATCH] shotcut 23.09.29 Johnnynator
2023-11-02 11:33 ` [PR PATCH] [Updated] " Johnnynator
@ 2023-11-02 12:54 ` Johnnynator
1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2023-11-02 12:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
There's a merged pull request on the void-packages repository
shotcut 23.09.29
https://github.com/void-linux/void-packages/pull/47020
Description:
- shotcut: update to 23.09.29.
- mlt7: update to 7.20.0.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-02 12:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-02 10:43 [PR PATCH] shotcut 23.09.29 Johnnynator
2023-11-02 11:33 ` [PR PATCH] [Updated] " Johnnynator
2023-11-02 12:54 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).