Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Aug 2015 10:16:26 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r393575 - head/audio/deadbeef
Message-ID:  <201508051016.t75AGQTp049157@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Aug  5 10:16:25 2015
New Revision: 393575
URL: https://svnweb.freebsd.org/changeset/ports/393575

Log:
  - Improve wording, accuracy, and readability of most options' descriptions
  - Drop few descriptions that have suitable default versions in standard pool
  - Remove initial LIB_DEPENDS: libsamplerate is pulled up via DSP option, and
    remaining libmad was converted to its own option
  - Since most options have their corresponding --disable/enable switches
    (FOO -> --{dis|en}able-foo), rename some options that violated this rule
    (ADP -> ADPLUG, EQ -> SUPEREQ, WAV -> WAVPACK, and WILD -> WILDMIDI) for
    consistency (in case of WAVPACK, it was actually an error to masquerade it
    as WAV)
  - Wrap overly long lines and sort USES values while here
  - Stop advertising that the build on PowerPC is broken (it builds fine on my
    Mac mini G4)
  
  Approved by:	vg (maintainer)

Modified:
  head/audio/deadbeef/Makefile
  head/audio/deadbeef/pkg-plist

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Wed Aug  5 07:39:47 2015	(r393574)
+++ head/audio/deadbeef/Makefile	Wed Aug  5 10:16:25 2015	(r393575)
@@ -13,61 +13,61 @@ COMMENT=	Ultimate music player for Unix-
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libmad.so:${PORTSDIR}/audio/libmad
-
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig gettext iconv shebangfix tar:bzip2 desktop-file-utils \
-		libtool execinfo
+USES=		desktop-file-utils execinfo gettext gmake iconv libtool \
+		pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-gtk3
-CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff -I../../plugins/gme/game-music-emu-0.6pre -I${LOCALBASE}/include
+CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \
+		-I../../plugins/gme/game-music-emu-0.6pre \
+		-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lexecinfo -lintl
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	yasmwrapper.sh
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	PULSEAUDIO GUI VFS LASTFM ART EQ SID FFAP VTX HOTKEYS OGG FFMPEG \
-		FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA AAC \
-		MMS SHN AO SHELLEXEC NLS M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP \
-		ALAC PLTBROWSER WMA
-OPTIONS_DEFAULT=	GUI VFS LASTFM ART EQ SID FFAP VTX HOSTKEYS OGG FFMPEG \
-			FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA \
-			AAC MMS SHN AO SHELLEXEC M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP \
-			HOTKEYS ALAC PLTBROWSER WMA
+OPTIONS_DEFINE=	MAD PULSEAUDIO GUI VFS LASTFM ART SUPEREQ SID FFAP VTX \
+		HOTKEYS OGG FFMPEG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY \
+		MUSEPACK WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC NLS M3U \
+		PSF ADPLUG DSP MONO2STEREO CONVERTER VFS_ZIP ALAC PLTBROWSER \
+		WMA
+OPTIONS_DEFAULT=	MAD GUI VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
+		OGG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY MUSEPACK \
+		WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC M3U PSF ADPLUG DSP \
+		MONO2STEREO CONVERTER VFS_ZIP HOTKEYS ALAC PLTBROWSER WMA
+
 PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
-GUI_DESC=		standard GTK2 user interface plugin
-VFS_DESC=		HTTP streaming vfs plugin
-LASTFM_DESC=		last.fm/libre.fm scrobbler plugin
-ART_DESC=		album art loader plugin
-EQ_DESC=		SuperEQ DSP plugin
-SID_DESC=		SID music player plugin
-FFAP_DESC=		Monkey's Audio plugin
-VTX_DESC=		libayemy VTX ZX-Spectrum music player plugin
-ADP_DESC=		adplug plugin
-HOTKEYS_DESC=		global hotkeys plugin
-CDDA_DESC=		CD-Audio plugin
-GME_DESC=		Game Music Emu plugin
-DUMB_DESC=		D.U.M.B. plugin for MOD, S3M and other
-NOTIFY_DESC=		support for OSD notifications into GTKUI plugin
-WILD_DESC=		wildmidi plugin
-TTA_DESC=		tta plugin
-SHN_DESC=		shorten plugin
-AO_DESC=		audio overload plugin
-SHELLEXEC_DESC=		shell commands plugin
-M3U_DESC=		m3u plugin
+GUI_DESC=		Standard GTK+2 user interface plugin
+VFS_DESC=		HTTP streaming VFS plugin
+LASTFM_DESC=		Last.fm/Libre.fm scrobbler plugin
+ART_DESC=		Cover artwork loader plugin
+SUPEREQ_DESC=		SuperEQ DSP plugin (equalizer)
+SID_DESC=		Commodore 64 SID music player plugin
+FFAP_DESC=		${APE_DESC}
+VTX_DESC=		VTX ZX-Spectrum music player plugin
+ADPLUG_DESC=		AdPlug audio format (OPL2/OPL3) support
+HOTKEYS_DESC=		Local and global hotkeys support
+GME_DESC=		Chiptune music support (based on GME)
+DUMB_DESC=		D.U.M.B. plugin for MOD, S3M, etc.
+NOTIFY_DESC=		OSD notification support in GTKUI plugin
+WILDMIDI_DESC=		WildMIDI synthesizer plugin
+SHN_DESC=		Shorten waveform encoder support
+AO_DESC=		Audio Overload (vintage hardware sound) plugin
+SHELLEXEC_DESC=		Shell commands execution plugin
+M3U_DESC=		M3U and PLS playlist format support
 PSF_DESC=		AOSDK-based PSF(,QSF,SSF,DSF) plugin
-DSP_DESC=		libsamplerate (SRC) plugin
-MONO2STEREO_DESC=	mono2stereo DSP plugin
-CONVERTER_DESC=		Build converter
-VFS_ZIP_DESC=		ZIP support
-ALAC_DESC=		ALAC plugin
-PLTBROWSER_DESC=	Playlist browser gui plugin
-WMA_DESC=		WMA plugin
+DSP_DESC=		High-quality sample rate conversion support
+MONO2STEREO_DESC=	Mono to stereo converter DSP plugin
+CONVERTER_DESC=		Plugin for converting files from/to any formats
+VFS_ZIP_DESC=		Play files directly from ZIP archives
+PLTBROWSER_DESC=	Playlist browser GUI plugin
 
 OPTIONS_SUB=	yes
 
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_CONFIGURE_OFF=	--disable-mad
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
@@ -85,7 +85,7 @@ ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/
 ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
 
-EQ_CONFIGURE_OFF=	--disable-supereq
+SUPEREQ_CONFIGURE_OFF=	--disable-supereq
 
 SID_CONFIGURE_OFF=	--disable-sid
 
@@ -94,7 +94,7 @@ FFAP_CONFIGURE_OFF=	--disable-ffap
 
 VTX_CONFIGURE_OFF=	--disable-vtx
 
-ADP_CONFIGURE_OFF=	--disable-adplug
+ADPLUG_CONFIGURE_OFF=	--disable-adplug
 
 HOTKEYS_CONFIGURE_OFF=	--disable-hotkeys
 
@@ -112,8 +112,8 @@ FLAC_CONFIGURE_OFF=	--disable-flac
 SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--disable-sndfile
 
-WAV_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
-WAV_CONFIGURE_OFF=	--disable-wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_OFF=	--disable-wavpack
 
 CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
 			libcddb.so:${PORTSDIR}/audio/libcddb
@@ -128,8 +128,8 @@ NOTIFY_CONFIGURE_OFF=	--disable-notify
 
 MUSEPACK_CONFIGURE_OFF=	--disable-musepack
 
-WILD_RUN_DEPENDS=	${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
-WILD_CONFIGURE_OFF=	--disable-wildmidi
+WILDMIDI_RUN_DEPENDS=	${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
+WILDMIDI_CONFIGURE_OFF=	--disable-wildmidi
 
 TTA_CONFIGURE_OFF=	--disable-tta
 
@@ -193,8 +193,4 @@ post-patch:
 		-e 's,libavformat ,libavformat0 ,g' \
 		${WRKSRC}/configure
 
-.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
-BROKEN=		Does not build on powerpc-9: fails to compile
-.endif
-
 .include <bsd.port.mk>

Modified: head/audio/deadbeef/pkg-plist
==============================================================================
--- head/audio/deadbeef/pkg-plist	Wed Aug  5 07:39:47 2015	(r393574)
+++ head/audio/deadbeef/pkg-plist	Wed Aug  5 10:16:25 2015	(r393575)
@@ -1,8 +1,8 @@
 bin/deadbeef
 include/deadbeef/deadbeef.h
 %%GUI%%include/deadbeef/gtkui_api.h
-%%ADP%%lib/deadbeef/adplug.a
-%%ADP%%lib/deadbeef/adplug.so
+%%ADPLUG%%lib/deadbeef/adplug.a
+%%ADPLUG%%lib/deadbeef/adplug.so
 %%CDDA%%lib/deadbeef/cdda.a
 %%CDDA%%lib/deadbeef/cdda.so
 %%FFAP%%lib/deadbeef/ffap.a
@@ -13,8 +13,8 @@ include/deadbeef/deadbeef.h
 %%FLAC%%lib/deadbeef/flac.so
 %%HOTKEYS%%lib/deadbeef/hotkeys.so
 %%HOTKEYS%%lib/deadbeef/hotkeys.a
-lib/deadbeef/mpgmad.a
-lib/deadbeef/mpgmad.so
+%%MAD%%lib/deadbeef/mpgmad.a
+%%MAD%%lib/deadbeef/mpgmad.so
 %%MUSEPACK%%lib/deadbeef/musepack.so
 %%MUSEPACK%%lib/deadbeef/musepack.a
 lib/deadbeef/oss.a
@@ -29,10 +29,10 @@ lib/deadbeef/oss.so
 %%OGG%%lib/deadbeef/vorbis.so
 %%VTX%%lib/deadbeef/vtx.a
 %%VTX%%lib/deadbeef/vtx.so
-%%WAV%%lib/deadbeef/wavpack.a
-%%WAV%%lib/deadbeef/wavpack.so
-%%WILD%%lib/deadbeef/wildmidi.so
-%%WILD%%lib/deadbeef/wildmidi.a
+%%WAVPACK%%lib/deadbeef/wavpack.a
+%%WAVPACK%%lib/deadbeef/wavpack.so
+%%WILDMIDI%%lib/deadbeef/wildmidi.so
+%%WILDMIDI%%lib/deadbeef/wildmidi.a
 %%TTA%%lib/deadbeef/tta.so
 %%TTA%%lib/deadbeef/tta.a
 %%DCA%%lib/deadbeef/dca.so
@@ -53,8 +53,8 @@ lib/deadbeef/oss.so
 %%ART%%lib/deadbeef/artwork.so
 %%SID%%lib/deadbeef/sid.so
 %%SID%%lib/deadbeef/sid.a
-%%EQ%%lib/deadbeef/supereq.so
-%%EQ%%lib/deadbeef/supereq.a
+%%SUPEREQ%%lib/deadbeef/supereq.so
+%%SUPEREQ%%lib/deadbeef/supereq.a
 %%GME%%lib/deadbeef/gme.so
 %%GME%%lib/deadbeef/gme.a
 %%DUMB%%lib/deadbeef/ddb_dumb.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508051016.t75AGQTp049157>