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 ECCD415808B for ; Mon, 21 Feb 2022 17:14:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22C74E0953; Mon, 21 Feb 2022 17:14:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 F3DAAE0953 for ; Mon, 21 Feb 2022 17:14:38 +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 0DB6934365C for ; Mon, 21 Feb 2022 17:14:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78E0CD0 for ; Mon, 21 Feb 2022 17:14:36 +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: <1645463606.bf5d8421329b1533e0365dffa6b570355f435938.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/k3b/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/k3b/k3b-21.12.49.9999.ebuild kde-apps/k3b/k3b-9999.ebuild X-VCS-Directories: kde-apps/k3b/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bf5d8421329b1533e0365dffa6b570355f435938 X-VCS-Branch: master Date: Mon, 21 Feb 2022 17:14:36 +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: aa0392e5-fe8a-40cc-bc86-771009b5aad3 X-Archives-Hash: 248c864b46ef719d263538cbddfa1df5 commit: bf5d8421329b1533e0365dffa6b570355f435938 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 17:13:14 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 17:13:26 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf5d8421 kde-apps/k3b: Drop IUSE ffmpeg Build broken by ffmpeg-5, but functionality already broken before. See also: https://invent.kde.org/multimedia/k3b/-/merge_requests/23 Bug: https://bugs.gentoo.org/831621 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-21.12.49.9999.ebuild | 10 +++------- kde-apps/k3b/k3b-9999.ebuild | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/kde-apps/k3b/k3b-21.12.49.9999.ebuild b/kde-apps/k3b/k3b-21.12.49.9999.ebuild index 111910a8bc..c8dbe4cd34 100644 --- a/kde-apps/k3b/k3b-21.12.49.9999.ebuild +++ b/kde-apps/k3b/k3b-21.12.49.9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -52,7 +52,6 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) @@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -89,7 +89,6 @@ src_configure() { -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) - -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) @@ -107,14 +106,11 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - echo elog "If you get warnings on start-up, uncheck the \"Check system" elog "configuration\" option in the \"Misc\" settings window." - echo - + elog local group=cdrom use kernel_linux || group=operator elog "Make sure you have proper read/write permissions on optical device(s)." elog "Usually, it is sufficient to be in the ${group} group." - echo } diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild index 111910a8bc..c8dbe4cd34 100644 --- a/kde-apps/k3b/k3b-9999.ebuild +++ b/kde-apps/k3b/k3b-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -52,7 +52,6 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) @@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -89,7 +89,6 @@ src_configure() { -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) - -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) @@ -107,14 +106,11 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - echo elog "If you get warnings on start-up, uncheck the \"Check system" elog "configuration\" option in the \"Misc\" settings window." - echo - + elog local group=cdrom use kernel_linux || group=operator elog "Make sure you have proper read/write permissions on optical device(s)." elog "Usually, it is sufficient to be in the ${group} group." - echo }