From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
Date: Mon, 30 Jan 2023 21:14:05 +0000 (UTC) [thread overview]
Message-ID: <1675113084.874b32c81812fca380c00b5726d28a0efd8c417f.asturm@gentoo> (raw)
commit: 874b32c81812fca380c00b5726d28a0efd8c417f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 21:04:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 21:11:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=874b32c8
kde-apps/k3b: Re-add IUSE ffmpeg
This reverts commits bf5d8421329b1533e0365dffa6b570355f435938 and
6a1427f974d5a62b4c398b698632912e1bd2d395.
Upstream commits:
7341cec22caca61c0b048537c47ba529b4653a64
b5134345d51a6215e8328288b61f611ceed7c803
88dfdd9b8f71c5e5d092c6d6ebab6d3e73e744da
Bug: https://bugs.gentoo.org/831621
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/k3b/k3b-22.12.49.9999.ebuild | 4 +++-
kde-apps/k3b/k3b-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kde-apps/k3b/k3b-22.12.49.9999.ebuild b/kde-apps/k3b/k3b-22.12.49.9999.ebuild
index a8a70674de..46bca58022 100644
--- a/kde-apps/k3b/k3b-22.12.49.9999.ebuild
+++ b/kde-apps/k3b/k3b-22.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 flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis"
REQUIRED_USE="flac? ( taglib )"
@@ -48,6 +48,7 @@ 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] )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
@@ -81,6 +82,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-DK3B_DEBUG=$(usex debug)
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
index a8a70674de..46bca58022 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 flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis"
REQUIRED_USE="flac? ( taglib )"
@@ -48,6 +48,7 @@ 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] )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
@@ -81,6 +82,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-DK3B_DEBUG=$(usex debug)
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
next reply other threads:[~2023-01-30 21:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 21:14 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-04-23 11:38 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=1675113084.874b32c81812fca380c00b5726d28a0efd8c417f.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