<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/b19ebaabc1634275e2e789a39d2da072fab74afb">https://github.com/macports/macports-ports/commit/b19ebaabc1634275e2e789a39d2da072fab74afb</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 b19ebaabc16 cmus: 2.12.0
</span>b19ebaabc16 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b19ebaabc1634275e2e789a39d2da072fab74afb
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Sat Oct 26 14:03:05 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmus: 2.12.0
</span>---
audio/cmus/Portfile | 18 +++-------
audio/cmus/files/patch-configure-swresample.diff | 45 ------------------------
2 files changed, 5 insertions(+), 58 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 de36fff7665..8c865840c25 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.11.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.12.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 3bea87fdffbdfc19777699587144525a1616ad0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 643fdfdd8c865d162a7ec5b2bfb6d44df91dbb6a12d44666db8893fd9359ff0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 335395
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3d9f9c27371371bef3c3e9e9a3a514c7bdde268c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5c04f14cc57e864b51b0ba92aca0f96f4fef72ce250c90bd91e96a1f4e490fd3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 348740
</span>
depends_build port:pkgconfig
depends_lib port:libao \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,6 @@ configure.ccache no
</span> compiler.blacklist-append *gcc-3.* *gcc-4.*
compiler.blacklist-append { clang < 700 } macports-clang-3.3 macports-clang-3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://github.com/cmus/cmus/pull/1367
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove in the next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure-swresample.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin i386 {
# clang-5.0 tested, and also likely installed on these systems
compiler.fallback-append macports-clang-5.0 macports-clang-6.0 macports-clang-7.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,10 +132,6 @@ variant ffmpeg description {Support ffmpeg} {
</span> -I${prefix}/libexec/ffmpeg${ffmpeg_ver}/include
configure.ldflags-prepend \
-L${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/cmus/cmus/pull/1330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|LIBAVCODEC_VERSION_MAJOR >= 58|LIBAVCODEC_VERSION_MAJOR >= 60|g" ip/ffmpeg.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant cdda description {Support audio CD playback} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/files/patch-configure-swresample.diff b/audio/cmus/files/patch-configure-swresample.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d7566115eba..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/cmus/files/patch-configure-swresample.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 866264595..e51c9d59b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,9 +18,6 @@ include scripts/lib.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 49de7b31f..cd663d61d 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -471,21 +471,14 @@ check_aac()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_ffmpeg()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_FFMPEG_AVCODEC_H=y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pkg_config FFMPEG "libavformat libavcodec" || return $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if check_header "libavcodec/avcodec.h" $FFMPEG_CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_FFMPEG_AVCODEC_H=n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_header "ffmpeg/avcodec.h" $FFMPEG_CFLAGS || return $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pkg_config FFMPEG "libavformat libavcodec libswresample" || return $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # check the existence of specific headers since they've been renamed before
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_header "libavformat/avformat.h" $FFMPEG_CFLAGS || return $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_header "libavcodec/avcodec.h" $FFMPEG_CFLAGS || return $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_header "libswresample/swresample.h" $FFMPEG_CFLAGS || return $?
</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;'>-- 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;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- topdir=`dirname "$0"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg_code=`cat "$topdir"/ip/ffmpeg.c | sed 's/\\\n//g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg_checking "for successful build of ffmpeg.c"
</span></pre><pre style='margin:0'>
</pre>