Index: head/audio/cmus/Makefile =================================================================== --- head/audio/cmus/Makefile (revision 491555) +++ head/audio/cmus/Makefile (revision 491556) @@ -1,165 +1,162 @@ # Created by: Adam Weinberger # $FreeBSD$ PORTNAME= cmus DISTVERSIONPREFIX= v -DISTVERSION= 2.8.0-rc0 -PORTREVISION= 9 +DISTVERSION= 2.8.0 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_FILE= ${WRKSRC}/COPYING USES= compiler:c11 gmake iconv ncurses pkgconfig USE_GITHUB= yes 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 ${MAKE_ARGS_${ARCH:U}} -MAKE_ARGS_powerpc= COMPAT_LIBS="-latomic" # undefined reference to `__atomic_fetch_add_8' +MAKE_ARGS= ICONV_CFLAGS="-I${ICONV_INCLUDE_PATH}" \ + ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \ + ${MAKE_ARGS_${ARCH:U}} \ + V=2 +# undefined reference to `__atomic_fetch_add_8' +MAKE_ARGS_powerpc= COMPAT_LIBS="-latomic" # 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= AAC ALSA AO ARTS CDDB CDIO COREAUDIO CUE DISCID \ - FFMPEG FLAC JACK MAD MIKMOD MODPLUG MP4 MPC MPRIS OPUS OSS \ + FFMPEG FLAC JACK MAD MIKMOD BASS 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_DEFINE= EXAMPLES OPTIONS_DEFAULT= AAC FFMPEG FLAC MAD MODPLUG 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: # Doc/cmus.txt is used to generate the man pages. Fix paths to point # to the correct directories. @${REINPLACE_CMD} \ -e 's,/usr/share/doc/cmus/examples,${EXAMPLESDIR},g' \ -e 's,/usr/share/cmus,${DATADIR},g' \ ${WRKSRC}/Doc/cmus.txt post-configure: # Prevent passing wrong flags from devel/ncurses' pkg-config file to the build @${REINPLACE_CMD} -e 's|-D_POSIX_C_SOURCE=200112L||g; s|-D_XOPEN_SOURCE=600||g' \ ${WRKSRC}/config.mk 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 491555) +++ head/audio/cmus/distinfo (revision 491556) @@ -1,7 +1,3 @@ -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 +TIMESTAMP = 1548755814 +SHA256 (cmus-cmus-v2.8.0_GH0.tar.gz) = 756ce2c6241b2104dc19097488225de559ac1802a175be0233cfb6fbc02f3bd2 +SIZE (cmus-cmus-v2.8.0_GH0.tar.gz) = 317243 Index: head/audio/cmus/files/patch-ip_ffmpeg.c =================================================================== --- head/audio/cmus/files/patch-ip_ffmpeg.c (revision 491555) +++ head/audio/cmus/files/patch-ip_ffmpeg.c (nonexistent) @@ -1,15 +0,0 @@ -https://github.com/cmus/cmus/commit/b595b8cd7fee - ---- ip/ffmpeg.c.orig 2016-11-20 12:29:46 UTC -+++ ip/ffmpeg.c -@@ -252,8 +252,8 @@ static int ffmpeg_open(struct input_plugin_data *ip_da - break; - } - -- if (codec->capabilities & CODEC_CAP_TRUNCATED) -- cc->flags |= CODEC_FLAG_TRUNCATED; -+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ cc->flags |= AV_CODEC_FLAG_TRUNCATED; - - #if (LIBAVCODEC_VERSION_INT < ((53<<16)+(8<<8)+0)) - if (avcodec_open(cc, codec) < 0) { Property changes on: head/audio/cmus/files/patch-ip_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/pkg-plist =================================================================== --- head/audio/cmus/pkg-plist (revision 491555) +++ head/audio/cmus/pkg-plist (revision 491556) @@ -1,43 +1,44 @@ %%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%%/dracula.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