svn commit: r438165 - in head/audio/cmus: . files
Tobias Kortkamp
tobik at FreeBSD.org
Mon Apr 10 13:25:25 UTC 2017
Author: tobik
Date: Mon Apr 10 13:25:23 2017
New Revision: 438165
URL: https://svnweb.freebsd.org/changeset/ports/438165
Log:
Update to 2.8.0-rc0
- Fix build with devel/ncurses installed [1], which erroneously
redefines _POSIX_C_SOURCE as 200112L globally via its pkg-config
file and hides strndup from cmus. A workaround for this was applied
to cmus in DPorts commit d2907fe but it never made it back to
FreeBSD.
Changes: https://github.com/cmus/cmus/releases/tag/v2.8.0-rc0
PR: 216325, 214475 [1]
Reported by: Oleg Gushchenkov <gor at clogic.com.ua> [1]
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D10242
Added:
head/audio/cmus/files/patch-Makefile (contents, props changed)
head/audio/cmus/files/patch-ip_mp4.c (contents, props changed)
Deleted:
head/audio/cmus/files/patch-configure
head/audio/cmus/files/patch-ffmpeg.c
head/audio/cmus/files/patch-mp4.c
head/audio/cmus/files/patch-sndio.c
Modified:
head/audio/cmus/Makefile
head/audio/cmus/distinfo
head/audio/cmus/pkg-plist
Modified: head/audio/cmus/Makefile
==============================================================================
--- head/audio/cmus/Makefile Mon Apr 10 13:24:23 2017 (r438164)
+++ head/audio/cmus/Makefile Mon Apr 10 13:25:23 2017 (r438165)
@@ -2,15 +2,19 @@
# $FreeBSD$
PORTNAME= cmus
-PORTVERSION= 2.7.1
+DISTVERSION= 2.8.0-rc0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= audio
+DIST_SUBDIR= cmus
+
+# Fixes for playback of 24-bit files with the sndio/OSS output plugins
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES= 6a85680.patch:-p1 0fb39d8.patch:-p1
MAINTAINER= tobik at FreeBSD.org
COMMENT= Console-based music player with really cool features
-LICENSE= GPLv2
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
@@ -31,15 +35,15 @@ MAKE_ARGS= V=2
# follow shell value semantics i.e. later assignments overwrite
# previous assignments. The options here appear in the same order as
# ${WRKSRC}/configure --help. Please keep it that way.
-_CMUS_CONFIGURE_OPTS= CDDB CDIO DISCID FLAC MAD MODPLUG MIKMOD MPC \
- VORBIS TREMOR OPUS WAV WAVPACK MP4 AAC FFMPEG \
- VTX CUE ROAR PULSE ALSA JACK SAMPLERATE AO \
- ARTS OSS SNDIO SUN WAVEOUT
+_CMUS_CONFIGURE_OPTS= AAC ALSA AO ARTS CDDB CDIO COREAUDIO CUE DISCID \
+ FFMPEG FLAC JACK MAD MIKMOD MODPLUG MP4 MPC MPRIS OPUS OSS \
+ PULSE ROAR SAMPLERATE SNDIO SUN TREMOR VORBIS VTX WAVEOUT \
+ WAVPACK WAV
.for opt in ${_CMUS_CONFIGURE_OPTS}
CONFIGURE_ARGS+= CONFIG_${opt}=n
.endfor
-OPTIONS_DEFAULT= AAC FFMPEG FLAC MAD MP4 OSS SNDIO VORBIS WAV
+OPTIONS_DEFAULT= AAC FFMPEG FLAC MAD MP4 OPUS OSS SNDIO VORBIS WAV
OPTIONS_SUB= yes
OPTIONS_GROUP= OUT IN
@@ -131,9 +135,12 @@ WAV_CONFIGURE_ON= CONFIG_WAV=y
WAVPACK_CONFIGURE_ON= CONFIG_WAVPACK=y
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
+post-patch:
+# From DPorts: prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
+ @${REINPLACE_CMD} -e 's@\(NCURSES_CFLAGS=\).*@\1""@g' \
+ ${WRKSRC}/configure
# Doc/cmus.txt is used to generate the man pages. Fix paths to point
# to the correct directories.
-post-patch:
@${REINPLACE_CMD} \
-e 's,/usr/share/doc/cmus/examples,${EXAMPLESDIR},g' \
-e 's,/usr/share/cmus,${DATADIR},g' \
Modified: head/audio/cmus/distinfo
==============================================================================
--- head/audio/cmus/distinfo Mon Apr 10 13:24:23 2017 (r438164)
+++ head/audio/cmus/distinfo Mon Apr 10 13:25:23 2017 (r438165)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1469160686
-SHA256 (cmus-cmus-v2.7.1_GH0.tar.gz) = 8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165
-SIZE (cmus-cmus-v2.7.1_GH0.tar.gz) = 296818
+TIMESTAMP = 1490271541
+SHA256 (cmus/cmus-cmus-v2.8.0-rc0_GH0.tar.gz) = b594087f16053f4db49e89d72b1c6dbb12e221373e806e62b3e97c327de1dac9
+SIZE (cmus/cmus-cmus-v2.8.0-rc0_GH0.tar.gz) = 315613
+SHA256 (cmus/6a85680.patch) = 504c3c792be330d0f7bfda2101c4d7a24bd94aa38761def5e58f91d6fe081778
+SIZE (cmus/6a85680.patch) = 3400
+SHA256 (cmus/0fb39d8.patch) = 6b35f6e4e1a4e78598c3b125a764e2975298189467c82e868e19c6569901e3f7
+SIZE (cmus/0fb39d8.patch) = 785
Added: head/audio/cmus/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/cmus/files/patch-Makefile Mon Apr 10 13:25:23 2017 (r438165)
@@ -0,0 +1,13 @@
+Don't run git during the build
+
+--- Makefile.orig 2016-11-20 12:29:46 UTC
++++ Makefile
+@@ -9,7 +9,7 @@ _ver2 = $(shell git rev-parse --verify -
+ # hand-made
+ _ver3 = v2.8.0-rc0
+
+-VERSION = $(or $(_ver0),$(_ver1),$(_ver2),$(_ver3))
++VERSION = $(_ver3)
+
+ all: main plugins man
+
Added: head/audio/cmus/files/patch-ip_mp4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/cmus/files/patch-ip_mp4.c Mon Apr 10 13:25:23 2017 (r438165)
@@ -0,0 +1,15 @@
+This patch is needed because multimedia/mp4v2 doesn't currently have
+MP4LogSetLevel. It requires mp4v2 >= 2.0.0.
+
+--- ip/mp4.c.orig 2016-11-20 12:29:46 UTC
++++ ip/mp4.c
+@@ -154,9 +154,6 @@ static int mp4_open(struct input_plugin_
+ if (ip_data->remote)
+ return -IP_ERROR_FUNCTION_NOT_SUPPORTED;
+
+- /* kindly ask mp4v2 to not spam stderr */
+- MP4LogSetLevel(MP4_LOG_NONE);
+-
+ /* init private struct */
+ priv = xnew(struct mp4_private, 1);
+ *priv = priv_init;
Modified: head/audio/cmus/pkg-plist
==============================================================================
--- head/audio/cmus/pkg-plist Mon Apr 10 13:24:23 2017 (r438164)
+++ head/audio/cmus/pkg-plist Mon Apr 10 13:25:23 2017 (r438165)
@@ -7,6 +7,9 @@
%%DATADIR%%/gray-88.theme
%%DATADIR%%/green-mono-88.theme
%%DATADIR%%/green.theme
+%%DATADIR%%/gruvbox-alt.theme
+%%DATADIR%%/gruvbox.theme
+%%DATADIR%%/jellybeans.theme
%%DATADIR%%/night.theme
%%DATADIR%%/rc
%%DATADIR%%/solarized-dark.theme
More information about the svn-ports-head
mailing list