<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c3d247be2cc7de4f45b308d9295b08f94a3de2b3">https://github.com/macports/macports-ports/commit/c3d247be2cc7de4f45b308d9295b08f94a3de2b3</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 c3d247b cmus: bump to 2.8.0 + add ppc support
</span>c3d247b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3d247be2cc7de4f45b308d9295b08f94a3de2b3
</span>Author: Traace <xxtraacexx@hotmail.de>
AuthorDate: Mon Feb 18 11:25:40 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> cmus: bump to 2.8.0 + add ppc support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add new maintainer Traace
</span><span style='display:block; white-space:pre;color:#404040;'> Updated cmus to 2.8.0 & Fix ppc support
</span><span style='display:block; white-space:pre;color:#404040;'> Including flag latomic to fix 64-bit atomic. PPC ISA dont have this instruction.
</span><span style='display:block; white-space:pre;color:#404040;'> Removed +vorbis +wav +mad +cdio | Vorbis and mad are in configure.args already.
</span><span style='display:block; white-space:pre;color:#404040;'> cdio gets triggered via cdda varaint (not default)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Added portgroup legacy support to make it work on osx 10.4 tiger.
</span><span style='display:block; white-space:pre;color:#404040;'> Added compiler blacklist to fix build issues on osx that uses clang.
</span><span style='display:block; white-space:pre;color:#404040;'> Added check "if arch is x86 or ppc "and moved its flags.
</span>---
audio/cmus/Portfile | 61 +++++++++++-----
audio/cmus/files/patch-ffmpeg-3.0.diff | 127 ---------------------------------
audio/cmus/files/patch-ffmpeg-4.0.diff | 13 ----
3 files changed, 44 insertions(+), 157 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 96bc9c4..3b9474c 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;'>@@ -1,12 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cmus cmus 2.7.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Tiger: add missing PTHREAD_RWLOCK_INITIALIZER definition for pthread.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cmus cmus 2.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories audio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {g5pw @g5pw} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@g5pw g5pw} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {@Traace hotmail.de:xxtraacexx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> license GPL-2+
description ncurses based music player
long_description cmus is a small and fast text mode music player for Linux \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +20,9 @@ long_description cmus is a small and fast text mode music player for Linux \
</span> homepage https://cmus.github.io/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3a9ff85f3279ff74af5d46cca2d8bf5b79671c6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56bbdb487cf15285dea630a71e31b094276e143cb4c15c411b1b3549ec6f23b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 81091c678f3534d006b77f1fe9621ae05022f028 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7986b1d86749c7f20f853cd6b35ffc13aac1c9d4d24cc5480292da0d904962d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 317286
</span>
depends_build port:pkgconfig
depends_lib port:libao \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +32,28 @@ depends_lib port:libao \
</span> port:libiconv \
port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ffmpeg-3.0.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> universal_variant no
build.args V=2
# ccache: invalid option -- L
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# checking for C11 (with atomics support)... no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is a C11 feature; looking for compatible compilers, we find these references
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://stackoverflow.com/questions/26440606/xcode-and-c11-stdatomic-h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://stackoverflow.com/questions/20326604/stdatomic-h-in-gcc-4-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# indicates compatible compilers are Xcode > Xcode 7, clang > 3.7, and gcc > 4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append { clang < 700 } macports-clang-3.3 macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang-5.0 tested, and also likely installed on these systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.fallback-append macports-clang-5.0 macports-clang-6.0 macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.fallback-append macports-gcc-6 macports-gcc-7 macports-gcc-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args
configure.args prefix=${prefix} CONFIG_FLAC=n CONFIG_MIKMOD=n \
CONFIG_MODPLUG=n CONFIG_MPC=n CONFIG_FFMPEG=n \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,21 +61,28 @@ configure.args prefix=${prefix} CONFIG_FLAC=n CONFIG_MIKMOD=n \
</span> CONFIG_WAVPACK=n CONFIG_OPUS=n CONFIG_CUE=n \
CONFIG_CDIO=n CONFIG_CDDB=n CONFIG_DISCID=n \
CONFIG_AO=y CONFIG_PULSE=n CONFIG_OSS=n \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG_JACK=n CONFIG_SAMPLERATE=n \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG_JACK=n CONFIG_COREAUDIO=y CONFIG_SAMPLERATE=n \
</span> HOSTCC="${configure.cc}" \
HOST_CFLAGS="${configure.cflags}" \
HOST_LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add missing non-POSIX SIGWINCH definition for Darwin signal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# darwin < 12 cannot build coreaudio output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace CONFIG_COREAUDIO=y CONFIG_COREAUDIO=n
</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;'>+# Tiger: add missing non-POSIX SIGWINCH definition for Darwin signal.h
</span> platform darwin 8 {
patchfiles-append patch-cmus-uicurses-sigwinch-tiger.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|-R${prefix}/lib|-rpath ${prefix}/lib|g" config.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# at present, this library seems to be needed when building with gcc on PPC only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -latomic
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +aac +cdio +cue +ffmpeg +flac +mad +mikmod +mpc +vorbis +wav +wavpack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +aac +cue +ffmpeg +flac +mikmod +mpc +wavpack
</span>
variant aac description {Support aac files} {
depends_lib-append port:faad2 path:lib/libmp4v2.dylib:mp4v2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,8 +129,8 @@ variant ffmpeg description {Support ffmpeg} {
</span> variant cdda description {Support audio CD playback} {
depends_lib-append port:libcdio \
port:libcdio-paranoia \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcddb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdiscid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcddb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdiscid
</span> configure.args-delete CONFIG_CDIO=n CONFIG_CDDB=n CONFIG_DISCID=n
configure.args-append CONFIG_CDIO=y CONFIG_CDDB=y CONFIG_DISCID=y
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,9 +147,9 @@ variant pulseaudio description {Support native PulseAudio output} {
</span> configure.args-append CONFIG_PULSE=y
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# at present, jack is building on 10.7+
</span> variant jack description {Support native JACK output} {
depends_lib-append port:jack
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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/files/patch-ffmpeg-3.0.diff b/audio/cmus/files/patch-ffmpeg-3.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7543977..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/cmus/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,127 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-07-13 03:00:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-04-22 15:22:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,7 +387,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ffmpeg api changes so frequently that it is best to compile the module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libs="$LDDLFLAGS $FFMPEG_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cflags="$SOFLAGS $FFMPEG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cflags="-std=gnu99 $SOFLAGS $FFMPEG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$HAVE_FFMPEG_AVCODEC_H" = y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags="$cflags -DHAVE_FFMPEG_AVCODEC_H"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ffmpeg.c.orig 2015-07-13 03:00:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ffmpeg.c 2016-04-22 15:22:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavformat/avio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libswresample/swresample.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/opt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVUTIL_VERSION_MAJOR >= 53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libavutil/channel_layout.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/audioconvert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef AVUTIL_MATHEMATICS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/mathematics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,7 +119,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void ffmpeg_input_free(struct ffmpeg_input *input)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref(&input->pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_free_packet(&input->pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(input);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +243,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- codec = avcodec_find_decoder(cc->codec_id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!codec) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_print("codec not found: %d, %s\n", cc->codec_id, cc->codec_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -248,7 +260,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (avcodec_open2(cc, codec, NULL) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d_print("could not open codec: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_print("could not open codec: %d, %s\n", cc->codec_id, cc->codec_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,7 +363,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ffmpeg_output *output, SwrContext *swr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVFrame *frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVFrame *frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int got_frame;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,10 +379,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (input->curr_pkt_size <= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref(&input->pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_free_packet(&input->pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (av_read_frame(ic, &input->pkt) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Force EOF once we can read no longer. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avcodec_free_frame(&frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -399,7 +425,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_new_packet(&avpkt, input->curr_pkt_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref(&avpkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_free_packet(&avpkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (len < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,7 +456,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output->buffer_pos = output->buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output->buffer_used_len = res * cc->channels * sizeof(int16_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avcodec_free_frame(&frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return output->buffer_used_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -566,7 +600,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long bitrate = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (LIBAVFORMAT_VERSION_INT > ((51<<16)+(43<<8)+0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ape codec returns silly numbers */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBAVCODEC_VERSION_MAJOR >= 55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (priv->codec->id == AV_CODEC_ID_APE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (priv->codec->id == CODEC_ID_APE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (priv->input->curr_duration > 0) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/files/patch-ffmpeg-4.0.diff b/audio/cmus/files/patch-ffmpeg-4.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 080b2e5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/cmus/files/patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ffmpeg.c.orig 2018-04-25 15:47:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ffmpeg.c 2018-04-25 15:48:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,8 +252,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (codec->capabilities & CODEC_CAP_TRUNCATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cc->flags |= CODEC_FLAG_TRUNCATED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cc->flags |= AV_CODEC_FLAG_TRUNCATED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (LIBAVCODEC_VERSION_INT < ((53<<16)+(8<<8)+0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (avcodec_open(cc, codec) < 0) {
</span></pre><pre style='margin:0'>
</pre>