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 ACBAC15802F for ; Wed, 29 Mar 2023 10:41:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D81E0948; Wed, 29 Mar 2023 10:41:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 7B73BE0948 for ; Wed, 29 Mar 2023 10:41:04 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74E503412DD for ; Wed, 29 Mar 2023 10:41:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0F048E6 for ; Wed, 29 Mar 2023 10:41:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1680085779.7ba52c3be557cfa3591287f7dcbad8df2ee38203.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/kphotoalbum/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/kphotoalbum/kphotoalbum-9999.ebuild media-gfx/kphotoalbum/metadata.xml X-VCS-Directories: media-gfx/kphotoalbum/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7ba52c3be557cfa3591287f7dcbad8df2ee38203 X-VCS-Branch: master Date: Wed, 29 Mar 2023 10:41:01 +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: 5336261c-2727-40d5-b24a-1c618fd421f0 X-Archives-Hash: 389a6b9e2f585e4b173955d71680a16c commit: 7ba52c3be557cfa3591287f7dcbad8df2ee38203 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 29 09:40:44 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 29 10:29:39 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ba52c3b media-gfx/kphotoalbum: Drop IUSE qtav, update DOCS and LICENSE Upstream commit 24cdf489f47e6c6f82aab72d309fc0aacc9cd9b8 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/kphotoalbum/kphotoalbum-9999.ebuild | 13 ++++++------- media-gfx/kphotoalbum/metadata.xml | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild index 241e7c996a..9443409019 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild @@ -18,11 +18,11 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then KEYWORDS="~amd64 ~x86" fi -LICENSE="GPL-2+ FDL-1.2" +LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" SLOT="5" -IUSE="map phonon qtav +raw share +vlc" +IUSE="map phonon +raw share +vlc" -REQUIRED_USE="|| ( phonon qtav vlc )" +REQUIRED_USE="|| ( phonon vlc )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -47,7 +47,6 @@ DEPEND=" media-libs/libjpeg-turbo:= map? ( kde-apps/marble:5 ) phonon? ( >=media-libs/phonon-4.11.0 ) - qtav? ( media-libs/qtav:= ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) vlc? ( media-video/vlc:= ) @@ -56,13 +55,13 @@ RDEPEND="${DEPEND} media-video/ffmpeg " -DOCS=( ChangeLog README.md ) +DOCS=( CHANGELOG.{md,old} README.md ) src_configure() { local mycmakeargs=( - $(cmake_use_find_package phonon Phonon4Qt5) - $(cmake_use_find_package qtav QtAV) + -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited $(cmake_use_find_package map Marble) + $(cmake_use_find_package phonon Phonon4Qt5) $(cmake_use_find_package raw KF5KDcraw) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package vlc LIBVLC) diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml index e4b11a20d6..0fd7db4de4 100644 --- a/media-gfx/kphotoalbum/metadata.xml +++ b/media-gfx/kphotoalbum/metadata.xml @@ -11,7 +11,6 @@ Enable map display support using kde-apps/marble Enable media-libs/phonon video backend (known to crash on some video formats) - Enable media-libs/qtav video backend (audio and video may get out of sync) Enable support for a share menu using kde-frameworks/purpose Enable media-video/vlc video backend (recommended for X11)