| 1 |
commit: 874b32c81812fca380c00b5726d28a0efd8c417f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 21:04:05 2023 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 21:11:24 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=874b32c8 |
| 7 |
|
| 8 |
kde-apps/k3b: Re-add IUSE ffmpeg |
| 9 |
|
| 10 |
This reverts commits bf5d8421329b1533e0365dffa6b570355f435938 and |
| 11 |
6a1427f974d5a62b4c398b698632912e1bd2d395. |
| 12 |
|
| 13 |
Upstream commits: |
| 14 |
7341cec22caca61c0b048537c47ba529b4653a64 |
| 15 |
b5134345d51a6215e8328288b61f611ceed7c803 |
| 16 |
88dfdd9b8f71c5e5d092c6d6ebab6d3e73e744da |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/831621 |
| 19 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 20 |
|
| 21 |
kde-apps/k3b/k3b-22.12.49.9999.ebuild | 4 +++- |
| 22 |
kde-apps/k3b/k3b-9999.ebuild | 4 +++- |
| 23 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 24 |
|
| 25 |
diff --git a/kde-apps/k3b/k3b-22.12.49.9999.ebuild b/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
| 26 |
index a8a70674de..46bca58022 100644 |
| 27 |
--- a/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
| 28 |
+++ b/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
| 29 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
| 30 |
LICENSE="GPL-2 FDL-1.2" |
| 31 |
SLOT="5" |
| 32 |
KEYWORDS="" |
| 33 |
-IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" |
| 34 |
+IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" |
| 35 |
|
| 36 |
REQUIRED_USE="flac? ( taglib )" |
| 37 |
|
| 38 |
@@ -48,6 +48,7 @@ DEPEND=" |
| 39 |
>=kde-frameworks/solid-${KFMIN}:5 |
| 40 |
media-libs/libsamplerate |
| 41 |
dvd? ( media-libs/libdvdread:= ) |
| 42 |
+ ffmpeg? ( media-video/ffmpeg:0= ) |
| 43 |
flac? ( >=media-libs/flac-1.2:=[cxx] ) |
| 44 |
mad? ( media-libs/libmad ) |
| 45 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 46 |
@@ -81,6 +82,7 @@ src_configure() { |
| 47 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON |
| 48 |
-DK3B_DEBUG=$(usex debug) |
| 49 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
| 50 |
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) |
| 51 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
| 52 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
| 53 |
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) |
| 54 |
|
| 55 |
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild |
| 56 |
index a8a70674de..46bca58022 100644 |
| 57 |
--- a/kde-apps/k3b/k3b-9999.ebuild |
| 58 |
+++ b/kde-apps/k3b/k3b-9999.ebuild |
| 59 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
| 60 |
LICENSE="GPL-2 FDL-1.2" |
| 61 |
SLOT="5" |
| 62 |
KEYWORDS="" |
| 63 |
-IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" |
| 64 |
+IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" |
| 65 |
|
| 66 |
REQUIRED_USE="flac? ( taglib )" |
| 67 |
|
| 68 |
@@ -48,6 +48,7 @@ DEPEND=" |
| 69 |
>=kde-frameworks/solid-${KFMIN}:5 |
| 70 |
media-libs/libsamplerate |
| 71 |
dvd? ( media-libs/libdvdread:= ) |
| 72 |
+ ffmpeg? ( media-video/ffmpeg:0= ) |
| 73 |
flac? ( >=media-libs/flac-1.2:=[cxx] ) |
| 74 |
mad? ( media-libs/libmad ) |
| 75 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 76 |
@@ -81,6 +82,7 @@ src_configure() { |
| 77 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON |
| 78 |
-DK3B_DEBUG=$(usex debug) |
| 79 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
| 80 |
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) |
| 81 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
| 82 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
| 83 |
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) |
Archives