commit: f8686c82fa21fd3f89c9d655748a57f4bf9029cc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 11:12:22 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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)
