[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
Date: Sun, 23 Apr 2023 11:42:02 +0000 (UTC)	[thread overview]
Message-ID: <1682250110.628dd1818e157aa1bcb61f345750943974a65c80.asturm@gentoo> (raw)

commit:     628dd1818e157aa1bcb61f345750943974a65c80
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:41:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628dd181

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.

Closes: https://bugs.gentoo.org/904010
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/k3b/{k3b-22.12.3.ebuild => k3b-22.12.3-r1.ebuild} | 10 ++++++----
 kde-apps/k3b/{k3b-23.04.0.ebuild => k3b-23.04.0-r1.ebuild} | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kde-apps/k3b/k3b-22.12.3.ebuild b/kde-apps/k3b/k3b-22.12.3-r1.ebuild
similarity index 91%
rename from kde-apps/k3b/k3b-22.12.3.ebuild
rename to kde-apps/k3b/k3b-22.12.3-r1.ebuild
index 3b480cf39c26..e2d10e921f7e 100644
--- a/kde-apps/k3b/k3b-22.12.3.ebuild
+++ b/kde-apps/k3b/k3b-22.12.3-r1.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="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac lame mad 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-23.04.0.ebuild b/kde-apps/k3b/k3b-23.04.0-r1.ebuild
similarity index 91%
rename from kde-apps/k3b/k3b-23.04.0.ebuild
rename to kde-apps/k3b/k3b-23.04.0-r1.ebuild
index f3a010b8b1e8..27165eb02634 100644
--- a/kde-apps/k3b/k3b-23.04.0.ebuild
+++ b/kde-apps/k3b/k3b-23.04.0-r1.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="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac lame mad 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:42 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-23 11:42 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-03  5:29 [gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/ Eli Schwartz
2024-07-14  5:59 Arthur Zamarin
2024-07-13 22:44 Sam James
2024-06-17 18:49 Andreas Sturmlechner
2024-04-25 20:41 Andreas Sturmlechner
2024-04-23  6:33 Arthur Zamarin
2024-04-23  6:25 Arthur Zamarin
2024-04-23  5:26 Arthur Zamarin
2021-09-27 14:14 Yixun Lan
2020-12-18  9:00 Michał Górny
2020-10-16 17:46 Georgy Yakovlev
2020-04-25 17:21 Mikle Kolyada
2020-01-09 18:20 Andreas Sturmlechner
2018-12-01 17:00 Mikle Kolyada
2017-08-18 20:58 Andreas Sturmlechner
2017-08-12 11:59 Andreas Sturmlechner
2017-08-02 21:37 Andreas Sturmlechner
2017-08-02 21:32 Andreas Sturmlechner
2017-08-02 21:32 Andreas Sturmlechner

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3b480cf39c2 dfblob:e2d10e921f7 dfblob:f3a010b8b1e
dfblob:27165eb0263 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/" )
	(help)

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=1682250110.628dd1818e157aa1bcb61f345750943974a65c80.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