From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D1A0158020 for ; Thu, 27 Oct 2022 12:56:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66C9EE096F; Thu, 27 Oct 2022 12:56:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5068EE096F for ; Thu, 27 Oct 2022 12:56:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B82B340B37 for ; Thu, 27 Oct 2022 12:56:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79DE666B for ; Thu, 27 Oct 2022 12:55:59 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1666875356.2dd2248c4cd1b5fdbda7bcf8b76eeef4c359e5e8.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/shotcut/shotcut-9999.ebuild X-VCS-Directories: media-video/shotcut/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 2dd2248c4cd1b5fdbda7bcf8b76eeef4c359e5e8 X-VCS-Branch: master Date: Thu, 27 Oct 2022 12:55:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66861f42-679b-4daf-bd9e-5efb1590162b X-Archives-Hash: 1491392e614de8334fc2252daad11176 commit: 2dd2248c4cd1b5fdbda7bcf8b76eeef4c359e5e8 Author: Felix Neumärker posteo de> AuthorDate: Wed Oct 5 20:42:29 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Oct 27 12:55:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd2248c media-video/shotcut: update live ebuild Signed-off-by: Felix Neumärker posteo.de> Closes: https://github.com/gentoo/gentoo/pull/27648 Signed-off-by: Joonas Niilola gentoo.org> media-video/shotcut/shotcut-9999.ebuild | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild index beb71ab8d58c..937c3ecd7cc2 100644 --- a/media-video/shotcut/shotcut-9999.ebuild +++ b/media-video/shotcut/shotcut-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qmake-utils xdg +inherit cmake flag-o-matic xdg DESCRIPTION="A free, open source, cross-platform video editor" HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/" @@ -24,19 +24,16 @@ BDEPEND=" dev-qt/linguist-tools:5 " COMMON_DEPEND=" - dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - >=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] + >=media-libs/mlt-7.8.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg " DEPEND="${COMMON_DEPEND} @@ -45,22 +42,15 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} dev-qt/qtgraphicaleffects:5 - dev-qt/qtquickcontrols:5 virtual/jack " src_configure() { - local myqmakeargs=( - PREFIX="${EPREFIX}/usr" - SHOTCUT_VERSION="${PV}" - DEFINES+=SHOTCUT_NOUPGRADE + CMAKE_BUILD_TYPE=$(usex debug Debug Release) + local mycmakeargs=( + -DSHOTCUT_VERSION="${PV}" ) - use debug || myqmakeargs+=(DEFINES+=NDEBUG) - - eqmake5 "${myqmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs + use debug || append-cxxflags "-DNDEBUG" + append-cxxflags "-DSHOTCUT_NOUPGRADE" + cmake_src_configure }