<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd90aeb58dbc1f77c841a73c129a48c268d0f7ca">https://github.com/macports/macports-ports/commit/cd90aeb58dbc1f77c841a73c129a48c268d0f7ca</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cd90aeb58db cmus: update to 2.11.0
</span>cd90aeb58db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd90aeb58dbc1f77c841a73c129a48c268d0f7ca
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sat May 11 21:43:55 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmus: update to 2.11.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Link ffmpeg6, new debug variant
</span>---
audio/cmus/Portfile | 25 ++++++--
.../files/patch-revert-new-channel-layout.diff | 74 ++++++++++++++++++++++
2 files changed, 92 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/Portfile b/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94c764469e7..5d58b486cb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> # Tiger: add missing PTHREAD_RWLOCK_INITIALIZER definition for pthread.h
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cmus cmus 2.10.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cmus cmus 2.11.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories audio
maintainers {@Traace hotmail.de:xxtraacexx} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description cmus is a small and fast text mode music player for Linux \
</span> and many other UNIX like operating systems.
homepage https://cmus.github.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a6cb051f8cba5832662fb018efa29f2f954347ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d8758c50319605d58c10d10276199ce357d409d4f9d5c07963132b099af774a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 324203
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3bea87fdffbdfc19777699587144525a1616ad0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 643fdfdd8c865d162a7ec5b2bfb6d44df91dbb6a12d44666db8893fd9359ff0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 335395
</span>
depends_build port:pkgconfig
depends_lib port:libao \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,8 @@ configure.args prefix=${prefix} CONFIG_FLAC=n CONFIG_MIKMOD=n \
</span> CONFIG_JACK=n CONFIG_COREAUDIO=y CONFIG_SAMPLERATE=n \
HOSTCC="${configure.cc}" \
HOST_CFLAGS="${configure.cflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- HOST_LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_LDFLAGS="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG=0
</span>
# darwin < 12 cannot build coreaudio output
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,9 +120,14 @@ variant opus description {Support Opus files} {
</span> }
variant ffmpeg description {Support ffmpeg} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libavcodec.dylib:ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ffmpeg6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/libexec/ffmpeg6/lib/pkgconfig
</span> configure.args-delete CONFIG_FFMPEG=n
configure.args-append CONFIG_FFMPEG=y
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Revert commit 3a7d9ee which causes configure failure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/cmus/cmus/issues/1329
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-revert-new-channel-layout.diff
</span> }
variant cdda description {Support audio CD playback} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,3 +157,8 @@ variant jack description {Support native JACK output} {
</span> configure.args-delete CONFIG_JACK=n CONFIG_SAMPLERATE=n
configure.args-append CONFIG_JACK=y CONFIG_SAMPLERATE=y
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant debug description {Build debug binaries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG=0 DEBUG=2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/files/patch-revert-new-channel-layout.diff b/audio/cmus/files/patch-revert-new-channel-layout.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..28f66dfb58b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/cmus/files/patch-revert-new-channel-layout.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ip/ffmpeg.c.orig 2024-05-11 16:04:09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ip/ffmpeg.c 2024-05-11 21:19:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ffmpeg_private {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVCodecContext *codec_context;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVFormatContext *input_context;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AVCodec const *codec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AVCodec *codec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SwrContext *swr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ffmpeg_input *input;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int err = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int stream_index = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AVCodec const *codec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int64_t channel_layout = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AVCodec *codec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVCodecContext *cc = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVFormatContext *ic = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,26 +239,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Prepare for resampling. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swr = swr_alloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR >= 58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (cc->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av_channel_layout_default(&cc->ch_layout, cc->ch_layout.nb_channels);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av_opt_set_chlayout(swr, "in_chlayout", &cc->ch_layout, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av_opt_set_chlayout(swr, "out_chlayout", &cc->ch_layout, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_opt_set_int(swr, "in_channel_layout", av_get_default_channel_layout(cc->channels), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_opt_set_int(swr, "out_channel_layout", av_get_default_channel_layout(cc->channels), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_opt_set_int(swr, "in_sample_rate", cc->sample_rate, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_opt_set_int(swr, "out_sample_rate", cc->sample_rate, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_opt_set_sample_fmt(swr, "in_sample_fmt", cc->sample_fmt, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv->swr = swr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ip_data->private = priv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR >= 58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ip_data->sf = sf_rate(cc->sample_rate) | sf_channels(cc->ch_layout.nb_channels);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ip_data->sf = sf_rate(cc->sample_rate) | sf_channels(cc->channels);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (cc->sample_fmt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_SAMPLE_FMT_U8:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ip_data->sf |= sf_bits(8) | sf_signed(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,11 +265,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swr_init(swr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ip_data->sf |= sf_host_endian();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR >= 58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- channel_map_init_waveex(cc->ch_layout.nb_channels, cc->ch_layout.u.mask, ip_data->channel_map);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- channel_map_init_waveex(cc->channels, cc->channel_layout, ip_data->channel_map);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ channel_layout = cc->channel_layout;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ channel_map_init_waveex(cc->channels, channel_layout, ip_data->channel_map);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,11 +378,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (res < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ res = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output->buffer_pos = output->buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR >= 58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- output->buffer_used_len = res * cc->ch_layout.nb_channels * sizeof(int16_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output->buffer_used_len = res * cc->channels * sizeof(int16_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_frame_free(&frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>