[gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     bb3292aef1e447fac1e58c9300cc7fa932d2ff15
Author:     Felix Neumärker <xdch47 <AT> posteo <DOT> de>
AuthorDate: Thu Aug  5 05:34:30 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 06:45:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3292ae

media-video/shotcut: bump to shotcut-21.06.29

Closes: https://bugs.gentoo.org/798897
Closes: https://bugs.gentoo.org/796560

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Felix Neumärker <xdch47 <AT> posteo.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-video/shotcut/Manifest                               |  1 +
 .../{shotcut-9999.ebuild => shotcut-21.06.29.ebuild}       | 14 ++++++++++----
 media-video/shotcut/shotcut-9999.ebuild                    | 14 ++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 9c920661ee2..f7a73b932b5 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,2 +1,3 @@
 DIST shotcut-21.02.27.tar.gz 4101402 BLAKE2B ef5320fd9b353fed0b429763cf1fa57bfef0417dabe2bbedd744bc95afe957c6312b7c344dbf53d0986aec05165aae394304454398767ce8d9a76ed0201fead8 SHA512 6c282702fa0322448a9679128e920d099d5d11b122dbcb7c0a54be3da25fd54afc39c910fe99b498dc67be8f31c251be31472c93233d1b609f9eea5dd96e3ed0
 DIST shotcut-21.03.21.tar.gz 4101401 BLAKE2B fb716215ba31b4b057080f05a59462a674aebfa364924240f96ebf87bb94e4ccb649c2452e952b507037a8e62840cb7c805ee258761bb21d515173bba26dfdd1 SHA512 402d714df7285d49269891e5def0b8a1a46f54b6ec88b0201981bdf8d866c49e83bbbf513805795630e39335e0fddc2457e1a7db582affe4a4d057ac5ab4e2bb
+DIST shotcut-21.06.29.tar.gz 4234142 BLAKE2B 32fa68d07e442fc60301733862d09b8723ff00d49af84a604e5a58c5c4a672c63407387f134b7ffd06a236b55a95c870fcd300d76d0de4a2e864dffef3e54b47 SHA512 b6256b2d6b6f5040321a227e60c447455b9026fc5315ddc0d16fcf76930162552fd883029536de201cb2b58e2544dd58203a4dbc9e27144c4ef399fb53fdb996

diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-21.06.29.ebuild
similarity index 82%
copy from media-video/shotcut/shotcut-9999.ebuild
copy to media-video/shotcut/shotcut-21.06.29.ebuild
index 598b4f6b656..94b278e8181 100644
--- a/media-video/shotcut/shotcut-9999.ebuild
+++ b/media-video/shotcut/shotcut-21.06.29.ebuild
@@ -15,6 +15,8 @@ else
 	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
 fi
 
+IUSE="debug"
+
 LICENSE="GPL-3+"
 SLOT="0"
 
@@ -34,7 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml]
+	>=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
 	media-video/ffmpeg
 "
 DEPEND="${COMMON_DEPEND}
@@ -48,10 +50,14 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		SHOTCUT_VERSION="${PV}" \
+	local myqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		SHOTCUT_VERSION="${PV}"
 		DEFINES+=SHOTCUT_NOUPGRADE
+	)
+	use debug || myqmakeargs+=(DEFINES+=NDEBUG)
+
+	eqmake5 "${myqmakeargs[@]}"
 }
 
 src_install() {

diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild
index 598b4f6b656..94b278e8181 100644
--- a/media-video/shotcut/shotcut-9999.ebuild
+++ b/media-video/shotcut/shotcut-9999.ebuild
@@ -15,6 +15,8 @@ else
 	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
 fi
 
+IUSE="debug"
+
 LICENSE="GPL-3+"
 SLOT="0"
 
@@ -34,7 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml]
+	>=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
 	media-video/ffmpeg
 "
 DEPEND="${COMMON_DEPEND}
@@ -48,10 +50,14 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		SHOTCUT_VERSION="${PV}" \
+	local myqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		SHOTCUT_VERSION="${PV}"
 		DEFINES+=SHOTCUT_NOUPGRADE
+	)
+	use debug || myqmakeargs+=(DEFINES+=NDEBUG)
+
+	eqmake5 "${myqmakeargs[@]}"
 }
 
 src_install() {