Index: head/audio/cmus/Makefile =================================================================== --- head/audio/cmus/Makefile (revision 438164) +++ head/audio/cmus/Makefile (revision 438165) @@ -1,153 +1,160 @@ # Created by: Adam Weinberger # $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@FreeBSD.org COMMENT= Console-based music player with really cool features -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes USES= gmake iconv ncurses pkgconfig HAS_CONFIGURE= yes CONFIGURE_ARGS= prefix=${PREFIX} mandir=${MANPREFIX}/man \ exampledir=${EXAMPLESDIR} # So the build does not use gcc for compiling ttman CONFIGURE_ARGS+= HOSTCC=${CC} # Verbose build makes it easier to spot problems MAKE_ARGS= V=2 # Disable all configure options first. These will be overwritten by # enabled port options later. The args to cmus' configure script # 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 OPTIONS_GROUP_OUT= AO JACK OSS PULSEAUDIO SNDIO OPTIONS_GROUP_IN= AAC CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \ MODPLUG MP4 MUSEPACK OPUS SAMPLERATE TREMOR \ VORBIS WAV WAVPACK DISCID_DESC= libdiscid CDDA identification support IN_DESC= Input plugins OUT_DESC= Output plugins AAC_CONFIGURE_ON= CONFIG_AAC=y AAC_LIB_DEPENDS= libfaad.so:audio/faad AO_CONFIGURE_ON= CONFIG_AO=y AO_LIB_DEPENDS= libao.so:audio/libao CDDB_CONFIGURE_ON= CONFIG_CDDB=y CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb CDIO_CONFIGURE_ON= CONFIG_CDIO=y CDIO_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ libcdio.so:sysutils/libcdio CUE_CONFIGURE_ON= CONFIG_CUE=y CUE_LIB_DEPENDS= libcue.so:textproc/libcue DISCID_CONFIGURE_ON= CONFIG_DISCID=y DISCID_LIB_DEPENDS= libdiscid.so:audio/libdiscid FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ON= CONFIG_FFMPEG=y FLAC_CONFIGURE_ON= CONFIG_FLAC=y FLAC_LIB_DEPENDS= libFLAC.so:audio/flac JACK_CONFIGURE_ON= CONFIG_JACK=y JACK_LIB_DEPENDS= libjack.so:audio/jack MAD_CONFIGURE_ON= CONFIG_MAD=y MAD_LIB_DEPENDS= libmad.so:audio/libmad MIKMOD_CONFIGURE_ON= CONFIG_MIKMOD=y MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MODPLUG_CONFIGURE_ON= CONFIG_MODPLUG=y MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MP4_CONFIGURE_ON= CONFIG_MP4=y MP4_LIB_DEPENDS= libfaad.so:audio/faad \ libmp4v2.so:multimedia/mp4v2 MUSEPACK_CONFIGURE_ON= CONFIG_MPC=y MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack OPUS_CONFIGURE_ON= CONFIG_OPUS=y OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile OSS_CONFIGURE_ON= CONFIG_OSS=y PULSEAUDIO_CONFIGURE_ON= CONFIG_PULSE=y PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio # Requires a port of RoarAudio #ROAR_CONFIGURE_ON= CONFIG_ROAR=y #ROAR_LIB_DEPENDS= ????:???? SAMPLERATE_IMPLIES= JACK SAMPLERATE_CONFIGURE_ON= CONFIG_SAMPLERATE=y SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SNDIO_CONFIGURE_ON= CONFIG_SNDIO=y SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio TREMOR_IMPLIES= VORBIS TREMOR_CONFIGURE_ON= CONFIG_TREMOR=y TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor VORBIS_CONFIGURE_ON= CONFIG_VORBIS=y VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis # VTX requires libayemu which isn't ported yet #VTX_CONFIGURE_ON= CONFIG_VTX=y #VTX_LIB_DEPENDS= libayemu.so:????? 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' \ ${WRKSRC}/Doc/cmus.txt post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so # Install bash and zsh completion files ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/contrib/cmus.bash-completion \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/_cmus.bash ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/contrib/_cmus \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_cmus .include Index: head/audio/cmus/distinfo =================================================================== --- head/audio/cmus/distinfo (revision 438164) +++ head/audio/cmus/distinfo (revision 438165) @@ -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 Index: head/audio/cmus/files/patch-configure =================================================================== --- head/audio/cmus/files/patch-configure (revision 438164) +++ head/audio/cmus/files/patch-configure (nonexistent) @@ -1,12 +0,0 @@ -Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48 ---- configure.orig 2016-08-03 15:18:16 UTC -+++ configure -@@ -21,7 +21,7 @@ check_cflags() - check_sndio() - { - case `uname -s` in -- OpenBSD) -+ OpenBSD|FreeBSD) - check_library SNDIO "" "-lsndio" - return $? - esac Property changes on: head/audio/cmus/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cmus/files/patch-ffmpeg.c =================================================================== --- head/audio/cmus/files/patch-ffmpeg.c (revision 438164) +++ head/audio/cmus/files/patch-ffmpeg.c (nonexistent) @@ -1,47 +0,0 @@ ---- ffmpeg.c.orig 2015-07-13 10:00:56 UTC -+++ ffmpeg.c -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #ifndef AVUTIL_MATHEMATICS_H - #include - #endif -@@ -347,7 +347,7 @@ static int ffmpeg_fill_buffer(AVFormatCo - struct ffmpeg_output *output, SwrContext *swr) - { - #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0)) -- AVFrame *frame = avcodec_alloc_frame(); -+ AVFrame *frame = av_frame_alloc(); - int got_frame; - #endif - while (1) { -@@ -363,7 +363,7 @@ static int ffmpeg_fill_buffer(AVFormatCo - if (av_read_frame(ic, &input->pkt) < 0) { - /* Force EOF once we can read no longer. */ - #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0)) -- avcodec_free_frame(&frame); -+ av_frame_free(&frame); - #endif - return 0; - } -@@ -426,7 +426,7 @@ static int ffmpeg_fill_buffer(AVFormatCo - res = 0; - output->buffer_pos = output->buffer; - output->buffer_used_len = res * cc->channels * sizeof(int16_t); -- avcodec_free_frame(&frame); -+ av_frame_free(&frame); - return output->buffer_used_len; - } - #endif -@@ -566,7 +566,7 @@ static long ffmpeg_current_bitrate(struc - long bitrate = -1; - #if (LIBAVFORMAT_VERSION_INT > ((51<<16)+(43<<8)+0)) - /* ape codec returns silly numbers */ -- if (priv->codec->id == CODEC_ID_APE) -+ if (priv->codec->id == AV_CODEC_ID_APE) - return -1; - #endif - if (priv->input->curr_duration > 0) { Property changes on: head/audio/cmus/files/patch-ffmpeg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cmus/files/patch-sndio.c =================================================================== --- head/audio/cmus/files/patch-sndio.c (revision 438164) +++ head/audio/cmus/files/patch-sndio.c (nonexistent) @@ -1,24 +0,0 @@ -Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48 ---- sndio.c.orig 2015-07-13 10:00:56 UTC -+++ sndio.c -@@ -20,7 +20,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -82,6 +81,12 @@ static int sndio_set_sf(sample_format_t - par.le = 1; - - switch (sf_get_bits(sndio_sf)) { -+ case 32: -+ par.bits = 32; -+ break; -+ case 24: -+ par.bits = 24; -+ break; - case 16: - par.bits = 16; - break; Property changes on: head/audio/cmus/files/patch-sndio.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cmus/files/patch-mp4.c =================================================================== --- head/audio/cmus/files/patch-mp4.c (revision 438164) +++ head/audio/cmus/files/patch-mp4.c (nonexistent) @@ -1,14 +0,0 @@ -This patch is needed because multimedia/mp4v2 doesn't currently have -MP4LogSetLevel. It requires mp4v2 >= 2.0.0. - ---- mp4.c.orig 2015-07-13 10:00:56 UTC -+++ mp4.c -@@ -155,7 +155,7 @@ static int mp4_open(struct input_plugin_ - return -IP_ERROR_FUNCTION_NOT_SUPPORTED; - - /* kindly ask mp4v2 to not spam stderr */ -- MP4LogSetLevel(MP4_LOG_NONE); -+ //MP4LogSetLevel(MP4_LOG_NONE); - - /* init private struct */ - priv = xnew(struct mp4_private, 1); Property changes on: head/audio/cmus/files/patch-mp4.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cmus/files/patch-Makefile =================================================================== --- head/audio/cmus/files/patch-Makefile (nonexistent) +++ head/audio/cmus/files/patch-Makefile (revision 438165) @@ -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 + Property changes on: head/audio/cmus/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/cmus/files/patch-ip_mp4.c =================================================================== --- head/audio/cmus/files/patch-ip_mp4.c (nonexistent) +++ head/audio/cmus/files/patch-ip_mp4.c (revision 438165) @@ -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; Property changes on: head/audio/cmus/files/patch-ip_mp4.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/cmus/pkg-plist =================================================================== --- head/audio/cmus/pkg-plist (revision 438164) +++ head/audio/cmus/pkg-plist (revision 438165) @@ -1,40 +1,43 @@ %%AAC%%lib/cmus/ip/aac.so %%AO%%lib/cmus/op/ao.so %%CDIO%%lib/cmus/ip/cdio.so %%CUE%%lib/cmus/ip/cue.so %%DATADIR%%/cyan.theme %%DATADIR%%/default.theme %%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 %%DATADIR%%/solarized-light.theme %%DATADIR%%/xterm-white.theme %%DATADIR%%/zenburn.theme %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmus-status-display %%FFMPEG%%lib/cmus/ip/ffmpeg.so %%FLAC%%lib/cmus/ip/flac.so %%JACK%%lib/cmus/op/jack.so %%MAD%%lib/cmus/ip/mad.so %%MIKMOD%%lib/cmus/ip/mikmod.so %%MODPLUG%%lib/cmus/ip/modplug.so %%MP4%%lib/cmus/ip/mp4.so %%MUSEPACK%%lib/cmus/ip/mpc.so %%OPUS%%lib/cmus/ip/opus.so %%OSS%%lib/cmus/op/oss.so %%PULSEAUDIO%%lib/cmus/op/pulse.so @comment %%ROAR%%lib/cmus/op/roar.so %%SNDIO%%lib/cmus/op/sndio.so %%VORBIS%%lib/cmus/ip/vorbis.so @comment %%VTX%%lib/cmus/ip/vtx.so %%WAV%%lib/cmus/ip/wav.so %%WAVPACK%%lib/cmus/ip/wavpack.so bin/cmus bin/cmus-remote etc/bash_completion.d/_cmus.bash man/man1/cmus-remote.1.gz man/man1/cmus.1.gz man/man7/cmus-tutorial.7.gz share/zsh/site-functions/_cmus