Attachment #41329 for bug #64717

View | Details | Raw Unified | Return to bug 64717
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/audio/musicpd/Makefile (-3 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= musicpd	8	PORTNAME= musicpd
9	PORTVERSION= 0.10.0	9	PORTVERSION= 0.10.2
10	PORTREVISION= 1
11	CATEGORIES= audio ipv6	10	CATEGORIES= audio ipv6
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 25-31 Link Here
25	OPTIONS= FLAC "Support for FLAC Audio" on \	24	OPTIONS= FLAC "Support for FLAC Audio" on \
26	VORBIS "Support for OGG Vorbis Audio" on \	25	VORBIS "Support for OGG Vorbis Audio" on \
27	WAV "Support for WAV Audio" on \	26	WAV "Support for WAV Audio" on \
28	ICONV "Support for international characters" on	27	AAC "Support for MP4/AAC Audio" off \
		28	ICONV "Support for international characters" on \
		29	IPV6 "Support for IPV6" on
29		30
30	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
31		32
Lines 37-42 Link Here
37	RC_SUFX= .sh	38	RC_SUFX= .sh
38	.endif	39	.endif
39		40
		41	#.if ${OSVERSION} < 500000
		42	#EXTRA_PATCHES+= ${PATCHDIR}/src-mp4ff::mp4ff_int_types.h.patch
		43	#.endif
		44
40	.ifdef(WITHOUT_FLAC)	45	.ifdef(WITHOUT_FLAC)
41	CONFIGURE_ARGS+=--disable-flac	46	CONFIGURE_ARGS+=--disable-flac
42	.else	47	.else
Lines 55-64 Link Here
55	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libaudiofile	60	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libaudiofile
56	.endif	61	.endif
57		62
		63	.ifdef(WITH_AAC)
		64	LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
		65	.else
		66	CONFIGURE_ARGS+=--disable-aac
		67	.endif
		68
58	.ifdef(WITHOUT_ICONV)	69	.ifdef(WITHOUT_ICONV)
59	CONFIGURE_ARGS+=--disable-iconv	70	CONFIGURE_ARGS+=--disable-iconv
60	.else	71	.else
61	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv	72	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
		73	.endif
		74
		75	.ifdef(WITHOUT_IPV6)
		76	CONFIGURE_ARGS+=--disable-ipv6
62	.endif	77	.endif
63		78
64	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	79	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

Lines 1-2 Link Here

(-)/usr/ports/audio/musicpd/distinfo (-2 / +2 lines)
1	MD5 (mpd-0.10.0.tar.gz) = bfb1b185fe603e81d7099422267d0ea6	1	MD5 (mpd-0.10.2.tar.gz) = a8d7f7299fb367e4110c3b6c8c8f6887
2	SIZE (mpd-0.10.0.tar.gz) = 783063	2	SIZE (mpd-0.10.2.tar.gz) = 815198




# required
port                   "2100"
music_directory        "/mp3"
playlist_directory     "/mp3"
log_file               "/var/log/mpd.log"
error_file             "/var/log/mpd.error"

# optional
max_connections        "5"
max_command_list_size  "2048"
max_output_buffer_size "2048"
connection_timeout     "60"
db_file                "/mp3/.mpddb"
state_file             "/mp3/.mpdstate"
save_absolute_paths_in_playlists "no"

max_playlist_length    "4096"
buffer_before_play     "25%"
bind_to_address	       "any"

mixer_type             "oss"
mixer_device           "/dev/mixer"

ao_driver              "oss"
ao_driver_options      "dsp=/dev/dsp"
audio_write_size       "1024"

#user                   "mp3"
log_level            "default"

mixer_device         "/dev/mixer"
max_playlist_length  "4096"
buffer_before_play   "25%"
bind_to_address	     "any"

mixer_type           "oss"
mixer_device         "/dev/mixer"

# log_level can be "default", "secure", "verbose"
log_level              "default"
#password               "password@read,add,control,admin"
#default_permissions    "read,add,control,admin"
#filesystem_charset     "UTF-8"

Lines 1-10 Link Here

(-)/usr/ports/audio/musicpd/files/patch-ogg_decode.c (-10 lines)
1	--- src/ogg_decode.c.orig Tue Sep 30 13:46:36 2003
2	+++ src/ogg_decode.c Tue Sep 30 13:46:55 2003
3	@@ -28,6 +28,7 @@
4	#include <stdlib.h>
5	#include <string.h>
6	#include <vorbis/vorbisfile.h>
7	+#include <sys/time.h>
8
9	int ogg_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
10	{

Lines 1-11 Link Here

(-)/usr/ports/audio/musicpd/files/patch-src:flac_decode.c (-11 lines)
1	--- src/flac_decode.c Tue Mar 9 20:29:35 2004
2	+++ src/flac_decode.c Tue Mar 9 20:29:59 2004
3	@@ -188,7 +188,7 @@
4	if(data->dc->seek) return 0;
5
6	#ifdef WORDS_BIGENDIAN
7	- pcm_changeBufferEndianness(chunk,CHUNK_SIZE,data->af->bits);
8	+ pcm_changeBufferEndianness(data->chunk,CHUNK_SIZE,data->af->bits);
9	#endif
10	memcpy(data->cb->chunks+data->cb->end*CHUNK_SIZE,data->chunk,
11	CHUNK_SIZE);

Lines 1-5 Link Here

(-)/usr/ports/audio/musicpd/pkg-descr (-1 / +1 lines)
1	Music Player Daemon (MPD) allows remote access for playing music	1	Music Player Daemon (MPD) allows remote access for playing music
2	(MP3's, Ogg's, and Flac's) and managing playlists.	2	(MP3, MP4, Ogg, and Flac) and managing playlists.
3	The design focus is on integrating a computer into a stereo system	3	The design focus is on integrating a computer into a stereo system
4	that provides control for music playback over a local network.	4	that provides control for music playback over a local network.

Return to bug 64717

Lines 1-27 Link Here

(-)/usr/ports/audio/musicpd/files/mpd.conf.sample (-22 / +29 lines)
1	# required	1	# required
2	port "2100"	2	port "2100"
3	music_directory "/mp3"	3	music_directory "/mp3"
4	playlist_directory "/mp3"	4	playlist_directory "/mp3"
5	log_file "/var/log/mpd.log"	5	log_file "/var/log/mpd.log"
6	error_file "/var/log/mpd.error"	6	error_file "/var/log/mpd.error"
7		7
8	# optional	8	# optional
9	max_connections "5"	9	max_connections "5"
10	connection_timeout "60"	10	max_command_list_size "2048"
11	db_file "/mp3/.mpddb"	11	max_output_buffer_size "2048"
		12	connection_timeout "60"
		13	db_file "/mp3/.mpddb"
		14	state_file "/mp3/.mpdstate"
		15	save_absolute_paths_in_playlists "no"
		16
		17	max_playlist_length "4096"
		18	buffer_before_play "25%"
		19	bind_to_address "any"
		20
		21	mixer_type "oss"
		22	mixer_device "/dev/mixer"
		23
		24	ao_driver "oss"
		25	ao_driver_options "dsp=/dev/dsp"
		26	audio_write_size "1024"
12		27
13	# log_level can be "default", "secure", "verbose"	28	#user "mp3"
14	log_level "default"
15
16	mixer_device "/dev/mixer"
17	max_playlist_length "4096"
18	buffer_before_play "25%"
19	bind_to_address "any"
20
21	mixer_type "oss"
22	mixer_device "/dev/mixer"
23		29
24	ao_driver "oss"	30	# log_level can be "default", "secure", "verbose"
25	ao_driver_options "dsp=/dev/dsp"	31	log_level "default"
26		32	#password "password@read,add,control,admin"
27	#user "mp3"	33	#default_permissions "read,add,control,admin"
		34	#filesystem_charset "UTF-8"