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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 050CD15ACFB for ; Sun, 23 Apr 2023 11:38:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE936E099B; Sun, 23 Apr 2023 11:38:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4A68E099B for ; Sun, 23 Apr 2023 11:38:50 +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 A0F43340F76 for ; Sun, 23 Apr 2023 11:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09F337DE for ; Sun, 23 Apr 2023 11:38:48 +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: <1682249882.f8686c82fa21fd3f89c9d655748a57f4bf9029cc.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-23.04.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: f8686c82fa21fd3f89c9d655748a57f4bf9029cc X-VCS-Branch: master Date: Sun, 23 Apr 2023 11:38:48 +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: 7b3a2851-a0cc-4afd-9a5c-235bdca15338 X-Archives-Hash: 3ddb8ed76a9fa50915c31de1e7b076fa commit: f8686c82fa21fd3f89c9d655748a57f4bf9029cc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 23 11:12:22 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 23 11:38:02 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8686c82 kde-apps/k3b: Re-add IUSE (rename mp3 => lame), sox Remaining *_ENCODER_PLUGIN flags appear to still work fine without external encoder, just like ogg which had not been dropped. This partially reverts commit 922fbdd8be012b4d8c9c936a0fdcfa8cd48058b8. Bug: https://bugs.gentoo.org/904010 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-23.04.49.9999.ebuild | 10 ++++++---- kde-apps/k3b/k3b-9999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/kde-apps/k3b/k3b-23.04.49.9999.ebuild b/kde-apps/k3b/k3b-23.04.49.9999.ebuild index d110f86551..bef68a474d 100644 --- a/kde-apps/k3b/k3b-23.04.49.9999.ebuild +++ b/kde-apps/k3b/k3b-23.04.49.9999.ebuild @@ -16,9 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" -REQUIRED_USE="flac? ( taglib )" +REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -50,6 +50,7 @@ DEPEND=" dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) + lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -65,6 +66,7 @@ RDEPEND="${DEPEND} dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 ) + sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " @@ -74,8 +76,6 @@ src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF - -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF - -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -84,9 +84,11 @@ src_configure() { -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) + -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) + -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild index d110f86551..bef68a474d 100644 --- a/kde-apps/k3b/k3b-9999.ebuild +++ b/kde-apps/k3b/k3b-9999.ebuild @@ -16,9 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" -REQUIRED_USE="flac? ( taglib )" +REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -50,6 +50,7 @@ DEPEND=" dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) + lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -65,6 +66,7 @@ RDEPEND="${DEPEND} dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 ) + sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " @@ -74,8 +76,6 @@ src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF - -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF - -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -84,9 +84,11 @@ src_configure() { -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) + -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) + -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)