From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
Date: Sun, 23 Apr 2023 11:38:48 +0000 (UTC) [thread overview]
Message-ID: <1682249882.f8686c82fa21fd3f89c9d655748a57f4bf9029cc.asturm@gentoo> (raw)
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)
next reply other threads:[~2023-04-23 11:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-23 11:38 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-03 5:30 [gentoo-commits] proj/kde:master commit in: kde-apps/k3b/ Eli Schwartz
2024-04-21 20:53 Andreas Sturmlechner
2024-02-25 20:12 Sam James
2024-02-25 19:44 Sam James
2024-01-07 13:26 Andreas Sturmlechner
2023-09-01 19:17 Andreas Sturmlechner
2023-08-27 16:21 Andreas Sturmlechner
2023-08-25 8:25 Andreas Sturmlechner
2023-04-23 11:42 Andreas Sturmlechner
2023-01-30 21:14 Andreas Sturmlechner
2023-01-30 21:01 Andreas Sturmlechner
2022-09-10 8:51 Sam James
2022-03-24 14:53 Andreas Sturmlechner
2022-02-21 17:14 Andreas Sturmlechner
2020-12-18 11:50 Andreas Sturmlechner
2020-09-17 20:07 Andreas Sturmlechner
2020-01-09 18:24 Andreas Sturmlechner
2019-09-12 20:53 Andreas Sturmlechner
2017-12-25 10:30 Michael Palimaka
2017-08-26 13:04 Michael Palimaka
2017-08-02 23:22 Andreas Sturmlechner
2017-07-09 18:35 Andreas Sturmlechner
2017-05-07 22:23 Andreas Sturmlechner
2017-03-20 7:11 Andreas Sturmlechner
2017-03-09 17:24 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1682249882.f8686c82fa21fd3f89c9d655748a57f4bf9029cc.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox