| 1 |
commit: 8459f8d0911bb834a323b9882af40b5bc21022cb |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 29 04:39:03 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 29 04:39:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8459f8d0 |
| 7 |
|
| 8 |
media-sound/cmus: removed obsolete 2.8.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/cmus/Manifest | 1 - |
| 14 |
media-sound/cmus/cmus-2.8.0.ebuild | 151 --------------------- |
| 15 |
media-sound/cmus/files/cmus-2.8.0-elogind.patch | 22 --- |
| 16 |
.../files/cmus-2.8.0-ffmpeg-deprecations.patch | 124 ----------------- |
| 17 |
media-sound/cmus/files/cmus-2.8.0-opus.patch | 22 --- |
| 18 |
5 files changed, 320 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest |
| 21 |
index 4e5e1131446..c5a79155862 100644 |
| 22 |
--- a/media-sound/cmus/Manifest |
| 23 |
+++ b/media-sound/cmus/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc |
| 26 |
DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05 |
| 27 |
|
| 28 |
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 1cc9fb01d88..00000000000 |
| 31 |
--- a/media-sound/cmus/cmus-2.8.0.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,151 +0,0 @@ |
| 34 |
-# Copyright 1999-2020 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=7 |
| 38 |
- |
| 39 |
-inherit bash-completion-r1 toolchain-funcs |
| 40 |
- |
| 41 |
-if [[ ${PV} == "9999" ]] ; then |
| 42 |
- EGIT_REPO_URI="https://github.com/cmus/cmus.git" |
| 43 |
- inherit git-r3 |
| 44 |
-else |
| 45 |
- SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
| 46 |
- KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
| 47 |
-fi |
| 48 |
- |
| 49 |
-DESCRIPTION="Ncurses based music player with plugin support for many formats" |
| 50 |
-HOMEPAGE="https://cmus.github.io/" |
| 51 |
- |
| 52 |
-LICENSE="GPL-2" |
| 53 |
-SLOT="0" |
| 54 |
-IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate |
| 55 |
- +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode |
| 56 |
- +vorbis wavpack" |
| 57 |
- |
| 58 |
-REQUIRED_USE="?? ( elogind systemd )" |
| 59 |
- |
| 60 |
-BDEPEND=" |
| 61 |
- virtual/pkgconfig |
| 62 |
-" |
| 63 |
-DEPEND=" |
| 64 |
- sys-libs/ncurses:0=[unicode?] |
| 65 |
- aac? ( media-libs/faad2 ) |
| 66 |
- alsa? ( >=media-libs/alsa-lib-1.0.11 ) |
| 67 |
- ao? ( media-libs/libao ) |
| 68 |
- cddb? ( media-libs/libcddb ) |
| 69 |
- cdio? ( dev-libs/libcdio-paranoia ) |
| 70 |
- discid? ( media-libs/libdiscid ) |
| 71 |
- elogind? ( sys-auth/elogind ) |
| 72 |
- ffmpeg? ( media-video/ffmpeg:= ) |
| 73 |
- flac? ( media-libs/flac ) |
| 74 |
- jack? ( virtual/jack ) |
| 75 |
- libsamplerate? ( media-libs/libsamplerate ) |
| 76 |
- mad? ( >=media-libs/libmad-0.14 ) |
| 77 |
- mikmod? ( media-libs/libmikmod:0 ) |
| 78 |
- modplug? ( >=media-libs/libmodplug-0.7 ) |
| 79 |
- mp4? ( >=media-libs/libmp4v2-1.9:0 ) |
| 80 |
- musepack? ( >=media-sound/musepack-tools-444 ) |
| 81 |
- opus? ( media-libs/opusfile ) |
| 82 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 83 |
- systemd? ( sys-apps/systemd ) |
| 84 |
- tremor? ( media-libs/tremor ) |
| 85 |
- !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) |
| 86 |
- wavpack? ( media-sound/wavpack ) |
| 87 |
-" |
| 88 |
-RDEPEND="${DEPEND} |
| 89 |
- pidgin? ( |
| 90 |
- dev-python/dbus-python |
| 91 |
- net-im/pidgin |
| 92 |
- ) |
| 93 |
-" |
| 94 |
- |
| 95 |
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs |
| 96 |
-REQUIRED_USE="tremor? ( vorbis ) |
| 97 |
- mp4? ( aac )" # enabling mp4 adds -lfaad |
| 98 |
- |
| 99 |
-DOCS=( AUTHORS README.md ) |
| 100 |
- |
| 101 |
-PATCHES=( |
| 102 |
- "${FILESDIR}/${P}-elogind.patch" |
| 103 |
- "${FILESDIR}/${P}-ffmpeg-deprecations.patch" |
| 104 |
- "${FILESDIR}/${P}-opus.patch" |
| 105 |
-) |
| 106 |
- |
| 107 |
-S="${WORKDIR}/${P/_/-}" |
| 108 |
- |
| 109 |
-src_configure() { |
| 110 |
- my_config() { |
| 111 |
- local value |
| 112 |
- use ${1} && value=a || value=n |
| 113 |
- myconf+=( ${2}=${value} ) |
| 114 |
- } |
| 115 |
- |
| 116 |
- local debuglevel=1 |
| 117 |
- use debug && debuglevel=2 |
| 118 |
- local myconf=( |
| 119 |
- CONFIG_CUE=y |
| 120 |
- CONFIG_ARTS=n |
| 121 |
- CONFIG_SUN=n |
| 122 |
- CONFIG_SNDIO=n |
| 123 |
- CONFIG_WAVEOUT=n |
| 124 |
- CONFIG_VTX=n |
| 125 |
- CONFIG_ROAR=n |
| 126 |
- ) |
| 127 |
- |
| 128 |
- my_config cddb CONFIG_CDDB |
| 129 |
- my_config cdio CONFIG_CDIO |
| 130 |
- my_config discid CONFIG_DISCID |
| 131 |
- my_config flac CONFIG_FLAC |
| 132 |
- my_config mad CONFIG_MAD |
| 133 |
- my_config modplug CONFIG_MODPLUG |
| 134 |
- my_config mikmod CONFIG_MIKMOD |
| 135 |
- my_config musepack CONFIG_MPC |
| 136 |
- my_config vorbis CONFIG_VORBIS |
| 137 |
- my_config tremor CONFIG_TREMOR |
| 138 |
- my_config opus CONFIG_OPUS |
| 139 |
- my_config wavpack CONFIG_WAVPACK |
| 140 |
- my_config mp4 CONFIG_MP4 |
| 141 |
- my_config aac CONFIG_AAC |
| 142 |
- my_config ffmpeg CONFIG_FFMPEG |
| 143 |
- my_config pulseaudio CONFIG_PULSE |
| 144 |
- my_config alsa CONFIG_ALSA |
| 145 |
- my_config jack CONFIG_JACK |
| 146 |
- my_config libsamplerate CONFIG_SAMPLERATE |
| 147 |
- my_config ao CONFIG_AO |
| 148 |
- my_config oss CONFIG_OSS |
| 149 |
- |
| 150 |
- if use elogind || use systemd; then |
| 151 |
- myconf+=( CONFIG_MPRIS=a ) |
| 152 |
- else |
| 153 |
- myconf+=( CONFIG_MPRIS=n ) |
| 154 |
- fi |
| 155 |
- |
| 156 |
- ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \ |
| 157 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
| 158 |
- libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die |
| 159 |
-} |
| 160 |
- |
| 161 |
-src_compile() { |
| 162 |
- tc-export_build_env BUILD_CC |
| 163 |
- emake V=2 \ |
| 164 |
- CC="$(tc-getCC)" LD="$(tc-getCC)" \ |
| 165 |
- HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \ |
| 166 |
- HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}" |
| 167 |
-} |
| 168 |
- |
| 169 |
-src_install() { |
| 170 |
- default |
| 171 |
- |
| 172 |
- if ! use examples; then |
| 173 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples || die |
| 174 |
- fi |
| 175 |
- |
| 176 |
- insinto /usr/share/zsh/site-functions |
| 177 |
- doins contrib/_cmus |
| 178 |
- |
| 179 |
- newbashcomp contrib/${PN}.bash-completion ${PN} |
| 180 |
- |
| 181 |
- if use pidgin; then |
| 182 |
- newbin contrib/cmus-updatepidgin.py cmus-updatepidgin |
| 183 |
- fi |
| 184 |
-} |
| 185 |
|
| 186 |
diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch |
| 187 |
deleted file mode 100644 |
| 188 |
index e1309c78911..00000000000 |
| 189 |
--- a/media-sound/cmus/files/cmus-2.8.0-elogind.patch |
| 190 |
+++ /dev/null |
| 191 |
@@ -1,22 +0,0 @@ |
| 192 |
-From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001 |
| 193 |
-From: Shiba <3816409+shibotto@××××××××××××××××××××.com> |
| 194 |
-Date: Tue, 12 Feb 2019 15:29:43 +0100 |
| 195 |
-Subject: [PATCH] Add support for elogind (#846) |
| 196 |
- |
| 197 |
---- |
| 198 |
- configure | 2 +- |
| 199 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 200 |
- |
| 201 |
-diff --git a/configure b/configure |
| 202 |
-index 1f46c30a..4627126e 100755 |
| 203 |
---- a/configure |
| 204 |
-+++ b/configure |
| 205 |
-@@ -289,7 +289,7 @@ check_vorbis() |
| 206 |
- |
| 207 |
- check_libsystemd() |
| 208 |
- { |
| 209 |
-- pkg_config LIBSYSTEMD "libsystemd" |
| 210 |
-+ pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3" |
| 211 |
- return $? |
| 212 |
- } |
| 213 |
- |
| 214 |
|
| 215 |
diff --git a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch |
| 216 |
deleted file mode 100644 |
| 217 |
index 941f47e3d49..00000000000 |
| 218 |
--- a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch |
| 219 |
+++ /dev/null |
| 220 |
@@ -1,124 +0,0 @@ |
| 221 |
-From 9877eb02381fd4c57059f9c77be03127c28d8f88 Mon Sep 17 00:00:00 2001 |
| 222 |
-From: Niko E <nefthy@××××××××××××××××××××.com> |
| 223 |
-Date: Mon, 11 Feb 2019 09:09:21 +0100 |
| 224 |
-Subject: [PATCH] Fixes ffmpeg deprecations (#861) |
| 225 |
- |
| 226 |
-- av_register_all is no longer needed since 4.0 |
| 227 |
-- AVStream::codec is deprecated since 3.1 |
| 228 |
-- avcodec_decode_audio4 is deprecated since 3.1 |
| 229 |
---- |
| 230 |
- ip/ffmpeg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ |
| 231 |
- 1 file changed, 42 insertions(+) |
| 232 |
- |
| 233 |
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c |
| 234 |
-index eaad5c4f..418a37f8 100644 |
| 235 |
---- a/ip/ffmpeg.c |
| 236 |
-+++ b/ip/ffmpeg.c |
| 237 |
-@@ -128,9 +128,11 @@ static void ffmpeg_init(void) |
| 238 |
- |
| 239 |
- av_log_set_level(AV_LOG_QUIET); |
| 240 |
- |
| 241 |
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100) |
| 242 |
- /* We could register decoders explicitly to save memory, but we have to |
| 243 |
- * be careful about compatibility. */ |
| 244 |
- av_register_all(); |
| 245 |
-+#endif |
| 246 |
- } |
| 247 |
- |
| 248 |
- static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 249 |
-@@ -143,6 +145,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 250 |
- AVCodec *codec; |
| 251 |
- AVCodecContext *cc = NULL; |
| 252 |
- AVFormatContext *ic = NULL; |
| 253 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 254 |
-+ AVCodecParameters *cp = NULL; |
| 255 |
-+#endif |
| 256 |
- SwrContext *swr = NULL; |
| 257 |
- |
| 258 |
- ffmpeg_init(); |
| 259 |
-@@ -162,11 +167,20 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 260 |
- } |
| 261 |
- |
| 262 |
- for (i = 0; i < ic->nb_streams; i++) { |
| 263 |
-+ |
| 264 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 265 |
-+ cp = ic->streams[i]->codecpar; |
| 266 |
-+ if (cp->codec_type == AVMEDIA_TYPE_AUDIO) { |
| 267 |
-+ stream_index = i; |
| 268 |
-+ break; |
| 269 |
-+ } |
| 270 |
-+#else |
| 271 |
- cc = ic->streams[i]->codec; |
| 272 |
- if (cc->codec_type == AVMEDIA_TYPE_AUDIO) { |
| 273 |
- stream_index = i; |
| 274 |
- break; |
| 275 |
- } |
| 276 |
-+#endif |
| 277 |
- } |
| 278 |
- |
| 279 |
- if (stream_index == -1) { |
| 280 |
-@@ -175,7 +189,13 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 281 |
- break; |
| 282 |
- } |
| 283 |
- |
| 284 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 285 |
-+ codec = avcodec_find_decoder(cp->codec_id); |
| 286 |
-+ cc = avcodec_alloc_context3(codec); |
| 287 |
-+ avcodec_parameters_to_context(cc, cp); |
| 288 |
-+#else |
| 289 |
- codec = avcodec_find_decoder(cc->codec_id); |
| 290 |
-+#endif |
| 291 |
- if (!codec) { |
| 292 |
- d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id)); |
| 293 |
- err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; |
| 294 |
-@@ -196,6 +216,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 295 |
- |
| 296 |
- if (err < 0) { |
| 297 |
- /* Clean up. cc is never opened at this point. (See above assumption.) */ |
| 298 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 299 |
-+ avcodec_free_context(&cc); |
| 300 |
-+#endif |
| 301 |
- avformat_close_input(&ic); |
| 302 |
- return err; |
| 303 |
- } |
| 304 |
-@@ -207,6 +230,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) |
| 305 |
- priv->input = ffmpeg_input_create(); |
| 306 |
- if (priv->input == NULL) { |
| 307 |
- avcodec_close(cc); |
| 308 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 309 |
-+ avcodec_free_context(&cc); |
| 310 |
-+#endif |
| 311 |
- avformat_close_input(&ic); |
| 312 |
- free(priv); |
| 313 |
- return -IP_ERROR_INTERNAL; |
| 314 |
-@@ -252,6 +278,9 @@ static int ffmpeg_close(struct input_plugin_data *ip_data) |
| 315 |
- struct ffmpeg_private *priv = ip_data->private; |
| 316 |
- |
| 317 |
- avcodec_close(priv->codec_context); |
| 318 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 319 |
-+ avcodec_free_context(&priv->codec_context); |
| 320 |
-+#endif |
| 321 |
- avformat_close_input(&priv->input_context); |
| 322 |
- swr_free(&priv->swr); |
| 323 |
- ffmpeg_input_free(priv->input); |
| 324 |
-@@ -305,7 +334,20 @@ static int ffmpeg_fill_buffer(AVFormatContext *ic, AVCodecContext *cc, struct ff |
| 325 |
- AVPacket avpkt; |
| 326 |
- av_new_packet(&avpkt, input->curr_pkt_size); |
| 327 |
- memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size); |
| 328 |
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101) |
| 329 |
-+ if (avcodec_send_packet(cc, &avpkt) == 0) { |
| 330 |
-+ got_frame = !avcodec_receive_frame(cc, frame); |
| 331 |
-+ if (got_frame) |
| 332 |
-+ len = input->curr_pkt_size; |
| 333 |
-+ else |
| 334 |
-+ len = 0; |
| 335 |
-+ } else { |
| 336 |
-+ got_frame = 0; |
| 337 |
-+ len = 0; |
| 338 |
-+ } |
| 339 |
-+#else |
| 340 |
- len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt); |
| 341 |
-+#endif |
| 342 |
- #if LIBAVCODEC_VERSION_MAJOR >= 56 |
| 343 |
- av_packet_unref(&avpkt); |
| 344 |
- #else |
| 345 |
|
| 346 |
diff --git a/media-sound/cmus/files/cmus-2.8.0-opus.patch b/media-sound/cmus/files/cmus-2.8.0-opus.patch |
| 347 |
deleted file mode 100644 |
| 348 |
index ea95fa8536c..00000000000 |
| 349 |
--- a/media-sound/cmus/files/cmus-2.8.0-opus.patch |
| 350 |
+++ /dev/null |
| 351 |
@@ -1,22 +0,0 @@ |
| 352 |
-From 0be981476e019e9fddb5529a73aadf004e94656b Mon Sep 17 00:00:00 2001 |
| 353 |
-From: tomty89 <tom.ty89@×××××.com> |
| 354 |
-Date: Tue, 12 Feb 2019 18:55:09 +0800 |
| 355 |
-Subject: [PATCH] ip/ffmpeg: enable opus support (#865) |
| 356 |
- |
| 357 |
---- |
| 358 |
- ip/ffmpeg.c | 2 +- |
| 359 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 360 |
- |
| 361 |
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c |
| 362 |
-index 04b916cc..427257c7 100644 |
| 363 |
---- a/ip/ffmpeg.c |
| 364 |
-+++ b/ip/ffmpeg.c |
| 365 |
-@@ -519,7 +519,7 @@ const int ip_priority = 30; |
| 366 |
- const char *const ip_extensions[] = { |
| 367 |
- "aa", "aac", "ac3", "aif", "aifc", "aiff", "ape", "au", "fla", "flac", |
| 368 |
- "m4a", "m4b", "mka", "mkv", "mp+", "mp2", "mp3", "mp4", "mpc", "mpp", |
| 369 |
-- "ogg", "shn", "tak", "tta", "wav", "webm", "wma", "wv", |
| 370 |
-+ "ogg", "opus", "shn", "tak", "tta", "wav", "webm", "wma", "wv", |
| 371 |
- #ifdef USE_FALLBACK_IP |
| 372 |
- "*", |
| 373 |
- #endif |
Archives