update to cmus-2.12.0, from David Uhden Collado

This commit is contained in:
sthen
2025-02-24 12:12:56 +00:00
parent 63c2188d00
commit 2b7b4fa1bb
5 changed files with 9 additions and 26 deletions
+1 -2
View File
@@ -1,12 +1,11 @@
COMMENT-main= ncurses-based music player
COMMENT-ffmpeg= ffmpeg input plugin for cmus (.aac, .mp4...)
V= 2.10.0
V= 2.12.0
GH_ACCOUNT= cmus
GH_PROJECT= cmus
GH_TAGNAME= v${V}
REVISION= 2
CATEGORIES= audio
HOMEPAGE= https://cmus.github.io/
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (cmus-2.10.0.tar.gz) = /0AGhXSBCn3jmQ9PacnEfvSeN70x0pjTcui82vuXP/8=
SIZE (cmus-2.10.0.tar.gz) = 324121
SHA256 (cmus-2.12.0.tar.gz) = RLls1fhLDYTDMJfEhFQjLV5qGc0zubZQO6nBO2aGv8c=
SIZE (cmus-2.12.0.tar.gz) = 348685
+1 -1
View File
@@ -3,7 +3,7 @@ Fix install(1) usage.
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -272,17 +272,21 @@ plugins: $(ip-y) $(op-y)
@@ -275,17 +275,21 @@ plugins: $(ip-y) $(op-y)
man: $(man1) $(man7)
install-main: main
+5 -5
View File
@@ -9,12 +9,12 @@ final build.
Index: configure
--- configure.orig
+++ configure
@@ -439,7 +439,7 @@ check_ffmpeg()
fi
@@ -478,7 +478,7 @@ check_ffmpeg()
check_header "libswresample/swresample.h" $FFMPEG_CFLAGS || return $?
# ffmpeg api changes so frequently that it is best to compile the module
libs="$LDDLFLAGS $FFMPEG_LIBS"
- cflags="$SOFLAGS $FFMPEG_CFLAGS"
+ cflags="-std=gnu99 $SOFLAGS $FFMPEG_CFLAGS"
if test "$HAVE_FFMPEG_AVCODEC_H" = y
then
cflags="$cflags -DHAVE_FFMPEG_AVCODEC_H"
topdir=`dirname "$0"`
ffmpeg_code=`cat "$topdir"/ip/ffmpeg.c | sed 's/\\\n//g'`
msg_checking "for successful build of ffmpeg.c"
-16
View File
@@ -1,16 +0,0 @@
Remove AV_CODEC_{CAP,FLAG}_TRUNCATED for FFmpeg 6 compatibility
https://github.com/cmus/cmus/commit/07ce2dc7082a1ed8704c21fd3f2877c8ba6b12f9
Index: ip/ffmpeg.c
--- ip/ffmpeg.c.orig
+++ ip/ffmpeg.c
@@ -202,9 +202,6 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
break;
}
- if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
- cc->flags |= AV_CODEC_FLAG_TRUNCATED;
-
if (avcodec_open2(cc, codec, NULL) < 0) {
d_print("could not open codec: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;