| 1 |
commit: bf5d8421329b1533e0365dffa6b570355f435938 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 17:13:14 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 17:13:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf5d8421 |
| 7 |
|
| 8 |
kde-apps/k3b: Drop IUSE ffmpeg |
| 9 |
|
| 10 |
Build broken by ffmpeg-5, but functionality already broken before. |
| 11 |
|
| 12 |
See also: https://invent.kde.org/multimedia/k3b/-/merge_requests/23 |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/831621 |
| 15 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
kde-apps/k3b/k3b-21.12.49.9999.ebuild | 10 +++------- |
| 19 |
kde-apps/k3b/k3b-9999.ebuild | 10 +++------- |
| 20 |
2 files changed, 6 insertions(+), 14 deletions(-) |
| 21 |
|
| 22 |
diff --git a/kde-apps/k3b/k3b-21.12.49.9999.ebuild b/kde-apps/k3b/k3b-21.12.49.9999.ebuild |
| 23 |
index 111910a8bc..c8dbe4cd34 100644 |
| 24 |
--- a/kde-apps/k3b/k3b-21.12.49.9999.ebuild |
| 25 |
+++ b/kde-apps/k3b/k3b-21.12.49.9999.ebuild |
| 26 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
| 27 |
LICENSE="GPL-2 FDL-1.2" |
| 28 |
SLOT="5" |
| 29 |
KEYWORDS="" |
| 30 |
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
| 31 |
+IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
| 32 |
|
| 33 |
REQUIRED_USE=" |
| 34 |
flac? ( taglib ) |
| 35 |
@@ -52,7 +52,6 @@ DEPEND=" |
| 36 |
>=kde-frameworks/solid-${KFMIN}:5 |
| 37 |
media-libs/libsamplerate |
| 38 |
dvd? ( media-libs/libdvdread:= ) |
| 39 |
- ffmpeg? ( media-video/ffmpeg:0= ) |
| 40 |
flac? ( >=media-libs/flac-1.2[cxx] ) |
| 41 |
mp3? ( media-sound/lame ) |
| 42 |
mad? ( media-libs/libmad ) |
| 43 |
@@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) |
| 44 |
src_configure() { |
| 45 |
local mycmakeargs=( |
| 46 |
-DK3B_BUILD_API_DOCS=OFF |
| 47 |
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF |
| 48 |
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON |
| 49 |
-DK3B_ENABLE_HAL_SUPPORT=OFF |
| 50 |
-DK3B_ENABLE_MUSICBRAINZ=OFF |
| 51 |
@@ -89,7 +89,6 @@ src_configure() { |
| 52 |
-DK3B_DEBUG=$(usex debug) |
| 53 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
| 54 |
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) |
| 55 |
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) |
| 56 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
| 57 |
-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) |
| 58 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
| 59 |
@@ -107,14 +106,11 @@ src_configure() { |
| 60 |
pkg_postinst() { |
| 61 |
ecm_pkg_postinst |
| 62 |
|
| 63 |
- echo |
| 64 |
elog "If you get warnings on start-up, uncheck the \"Check system" |
| 65 |
elog "configuration\" option in the \"Misc\" settings window." |
| 66 |
- echo |
| 67 |
- |
| 68 |
+ elog |
| 69 |
local group=cdrom |
| 70 |
use kernel_linux || group=operator |
| 71 |
elog "Make sure you have proper read/write permissions on optical device(s)." |
| 72 |
elog "Usually, it is sufficient to be in the ${group} group." |
| 73 |
- echo |
| 74 |
} |
| 75 |
|
| 76 |
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild |
| 77 |
index 111910a8bc..c8dbe4cd34 100644 |
| 78 |
--- a/kde-apps/k3b/k3b-9999.ebuild |
| 79 |
+++ b/kde-apps/k3b/k3b-9999.ebuild |
| 80 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
| 81 |
LICENSE="GPL-2 FDL-1.2" |
| 82 |
SLOT="5" |
| 83 |
KEYWORDS="" |
| 84 |
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
| 85 |
+IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
| 86 |
|
| 87 |
REQUIRED_USE=" |
| 88 |
flac? ( taglib ) |
| 89 |
@@ -52,7 +52,6 @@ DEPEND=" |
| 90 |
>=kde-frameworks/solid-${KFMIN}:5 |
| 91 |
media-libs/libsamplerate |
| 92 |
dvd? ( media-libs/libdvdread:= ) |
| 93 |
- ffmpeg? ( media-video/ffmpeg:0= ) |
| 94 |
flac? ( >=media-libs/flac-1.2[cxx] ) |
| 95 |
mp3? ( media-sound/lame ) |
| 96 |
mad? ( media-libs/libmad ) |
| 97 |
@@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) |
| 98 |
src_configure() { |
| 99 |
local mycmakeargs=( |
| 100 |
-DK3B_BUILD_API_DOCS=OFF |
| 101 |
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF |
| 102 |
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON |
| 103 |
-DK3B_ENABLE_HAL_SUPPORT=OFF |
| 104 |
-DK3B_ENABLE_MUSICBRAINZ=OFF |
| 105 |
@@ -89,7 +89,6 @@ src_configure() { |
| 106 |
-DK3B_DEBUG=$(usex debug) |
| 107 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
| 108 |
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) |
| 109 |
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) |
| 110 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
| 111 |
-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) |
| 112 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
| 113 |
@@ -107,14 +106,11 @@ src_configure() { |
| 114 |
pkg_postinst() { |
| 115 |
ecm_pkg_postinst |
| 116 |
|
| 117 |
- echo |
| 118 |
elog "If you get warnings on start-up, uncheck the \"Check system" |
| 119 |
elog "configuration\" option in the \"Misc\" settings window." |
| 120 |
- echo |
| 121 |
- |
| 122 |
+ elog |
| 123 |
local group=cdrom |
| 124 |
use kernel_linux || group=operator |
| 125 |
elog "Make sure you have proper read/write permissions on optical device(s)." |
| 126 |
elog "Usually, it is sufficient to be in the ${group} group." |
| 127 |
- echo |
| 128 |
} |
Archives