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)
