Attachment 97546 Details for Bug 136305 – file.diff

[patch] file.diff

file.diff (text/plain), 5.10 KB, created by David Horn on 2009-07-04 01:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Horn

Created: 2009-07-04 01:30:04 UTC

Size: 5.10 KB

patch

obsolete

>diff -u musicpd-orig/Makefile musicpd/Makefile
>--- musicpd-orig/Makefile	2009-03-18 12:45:43.000000000 -0400
>+++ musicpd/Makefile	2009-07-03 19:33:47.000000000 -0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	musicpd
>-PORTVERSION=	0.14.2
>+PORTVERSION=	0.15
> CATEGORIES=	audio ipv6
> MASTER_SITES=	SF
> DISTNAME=	mpd-${PORTVERSION}
>@@ -14,7 +14,8 @@
> MAINTAINER=	jo.lindqvist@gmail.com
> COMMENT=	A remote-controllable music daemon
> 
>-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
>+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
>+		curl.5:${PORTSDIR}/ftp/curl
> 
> USE_GMAKE=	yes
> USE_BZIP2=	yes
>@@ -34,21 +35,26 @@
> 
> SUB_FILES=	pkg-message
> 
>-OPTIONS=	FLAC		"Support FLAC audio format"		on \
>-		VORBIS		"Support OGG Vorbis audio format"	on \
>+OPTIONS=	ID3TAG          "Support ID3 v1/v2 tags"                on \
>+		IPV6            "Support IPv6 protocol"                 on \
>+		FLAC            "Support FLAC audio format"             on \
>+		VORBIS          "Support OGG Vorbis audio format"       on \
>+		WAV             "Support WAV audio format"              on \
>+		FFMPEG          "Support FFMPEG (wma aiff ac3 ape...)"  on \
> 		TREMOR		"Support Tremor (integer-only Vorbis)"	off \
>-		WAV		"Support WAV audio format"		on \
> 		AAC		"Support MP4/AAC audio format"		off \
> 		MUSEPACK	"Support MPC audio format"		off \
>-		MOD		"Support MOD audio format"		off \
>-		FFMPEG		"Support FFMPEG (wma aiff ac3 ape...)"	on \
>-	        ID3TAG		"Support ID3 v1/v2 tags"		on \
>-		IPV6		"Support IPv6 protocol"			on \
>+		MIKMOD		"Support MOD audio format"		off \
>+		MODPLUG		"Support MODPLUG decoder"		off \
>+		ARCHIVE		"Support bzip2/zip/iso9660 archive"	off \
>+		MMS             "Support MMS stream input"              off \
>+		LASTFM		"Support Last.FM stream input (experimental)"	off \
> 		AO		"Support libao audio library"		off \
> 		PULSEAUDIO	"Support PulseAudio sound server"	off \
> 		JACK		"Support JACK audio server"		off \
> 		SHOUTCAST	"Support for OGG Icecast and Shoutcast"	off \
> 		LAME		"Support for MP3 Icecast Streams"	off \
>+		HTTPD		"Support for httpd output streaming"	off \
> 		SAMPLERATE	"Support sample rate conversion"	off
> 
> .include <bsd.port.pre.mk>
>@@ -61,7 +67,7 @@
> .endif
> 
> .if defined(WITHOUT_VORBIS)
>-CONFIGURE_ARGS+=--disable-oggvorbis
>+CONFIGURE_ARGS+=--disable-vorbis
> .else
> LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
> .endif
>@@ -78,10 +84,17 @@
> .endif
> 
> .if defined(WITH_LAME)
>-CONFIGURE_ARGS+=--enable-shout-mp3
>+CONFIGURE_ARGS+=--enable-lame-encoder \
>+		--enable-shout
> LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
> .else
>-CONFIGURE_ARGS+=--disable-shout-mp3
>+CONFIGURE_ARGS+=--disable-lame-encoder
>+.endif
>+
>+.if defined(WITH_HTTPD)
>+CONFIGURE_ARGS+=--enable-httpd-output
>+.else
>+CONFIGURE_ARGS+=--disable-httpd-output
> .endif
> 
> .if defined(WITHOUT_WAV)
>@@ -96,10 +109,26 @@
> CONFIGURE_ARGS+=--disable-mpc
> .endif
> 
>-.if defined(WITH_MOD)
>+.if defined(WITH_MIKMOD)
> LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
>+CONFIGURE_ARGS+=--enable-mikmod
>+.else
>+CONFIGURE_ARGS+=--disable-mikmod
>+.endif
>+
>+.if defined(WITH_MODPLUG)
>+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
>+CONFIGURE_ARGS+=--enable-modplug
> .else
>-CONFIGURE_ARGS+=--disable-mod
>+CONFIGURE_ARGS+=--disable-modplug
>+.endif
>+
>+.if defined(WITH_ARCHIVE)
>+CONFIGURE_ARGS+=--enable-bzip2 \
>+		--enable-zip \
>+		--enable-iso9660
>+LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib \
>+		iso9660.5:${PORTSDIR}/sysutils/libcdio
> .endif
> 
> .if defined(WITHOUT_FFMPEG)
>@@ -110,6 +139,19 @@
> 		avutil.1:${PORTSDIR}/multimedia/ffmpeg
> .endif
> 
>+.if defined(WITH_LASTFM)
>+CONFIGURE_ARGS+=--enable-lastfm
>+.else
>+CONFIGURE_ARGS+=--disable-lastfm
>+.endif
>+
>+.if defined(WITH_MMS)
>+CONFIGURE_ARGS+=--enable-mms
>+LIBDEPENDS+=	libmms.0:${PORTSDIR}/net/libmms
>+.else
>+CONFIGURE_ARGS+=--disable-mms
>+.endif
>+
> .if defined(WITHOUT_ID3TAG)
> CONFIGURE_ARGS+=--disable-id3
> .else
>@@ -123,6 +165,8 @@
> .if defined(WITH_AO)
> CONFIGURE_ARGS+=--enable-ao
> LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
>+.else
>+CONFIGURE_ARGS+=--disable-ao
> .endif
> 
> .if defined(WITH_PULSEAUDIO)
>@@ -141,14 +185,17 @@
> # also with tremor since the latter does not support vorbis encoding
> .if defined(WITH_SHOUTCAST) && !defined(WITH_TREMOR)
> LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
>+CONFIGURE_ARGS+=--enable-vorbis-encoder \
>+		--enable-shout
> .else
>-CONFIGURE_ARGS+=--disable-shout-ogg
>+CONFIGURE_ARGS+=--disable-vorbis-encoder
> .endif
> 
> .if defined(WITHOUT_SAMPLERATE)
> CONFIGURE_ARGS+=--disable-lsr
> .else
> LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
>+CONFIGURE_ARGS+=--enable-lsr
> .endif
> 
> .if defined(NOPORTDOCS)
>diff -u musicpd-orig/distinfo musicpd/distinfo
>--- musicpd-orig/distinfo	2009-03-18 12:45:43.000000000 -0400
>+++ musicpd/distinfo	2009-07-02 23:33:48.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (mpd-0.14.2.tar.bz2) = 66817a4b4c05454e6488f6b821f2a6a3 
>-SHA256 (mpd-0.14.2.tar.bz2) = 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20 
>-SIZE (mpd-0.14.2.tar.bz2) = 287115 
>+SIZE (mpd-0.15.tar.bz2) = 385833 
>+MD5 (mpd-0.15.tar.bz2) = 2ed93a60bd703ba46d6794e12cfb5f1d
>+SHA256 (mpd-0.15.tar.bz2) = 38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
>Common subdirectories: musicpd-orig/files and musicpd/files

Actions: View | Diff

Attachments on bug 136305: 97546