Attachment 219892 Details for Bug 251317 – Patch for musicpd

[patch] Patch for musicpd

musicpd-sidplayfb-fix2.patch (text/plain), 4.81 KB, created by Daniel Engberg on 2020-11-22 18:02:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-11-22 18:02:00 UTC

Size: 4.81 KB

patch

obsolete

>diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
>index b23f5da2651e..d6f78cae2bba 100644
>--- a/audio/musicpd/Makefile
>+++ b/audio/musicpd/Makefile
>@@ -1,10 +1,11 @@
> # $FreeBSD$
> 
> PORTNAME=	musicpd
>-PORTVERSION=	0.22.3
>+DISTVERSION=	0.22.3
>+PORTREVISION=	1
> CATEGORIES=	audio
>-MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
>-DISTNAME=	mpd-${PORTVERSION}
>+MASTER_SITES=	https://www.musicpd.org/download/mpd/${DISTVERSION:R}/
>+DISTNAME=	mpd-${DISTVERSION}
> 
> MAINTAINER=	riggs@FreeBSD.org
> COMMENT=	Remote-controllable music daemon
>@@ -16,23 +17,22 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
> LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
> 		libicudata.so:devel/icu
> 
>-USES=		compiler:c++17-lang gnome meson pkgconfig python:build tar:xz
>+USES=		compiler:c++17-lang gnome localbase:ldflags meson pkgconfig \
>+		python:build tar:xz
> 
> USE_GNOME=	glib20
> 
>+CXXFLAGS+=	-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
>+
> USE_RC_SUBR=	${PORTNAME}
> MESON_ARGS=	-Dauto_features=disabled \
> 		-Dbzip2=enabled \
> 		-Ddocumentation=enabled \
> 		-Dhttpd=true \
> 		-Dicu=enabled \
>-		-Doss=enabled \
> 		-Dpipe=true \
> 		-Dsyslog=enabled \
> 		-Dzlib=enabled
>-CFLAGS+=	-I${PREFIX}/include
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PORTDOCS=	AUTHORS README.md NEWS
> 
>@@ -51,7 +51,7 @@ OPTIONS_MULTI=	DOCUMENTATION FILE_FORMAT
> OPTIONS_MULTI_FILE_FORMAT=	\
> 			ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \
> 			GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \
>-			OPUS SIDPLAY2 SNDFILE TWOLAME \
>+			OPUS SIDPLAYFP SNDFILE TWOLAME \
> 			VORBIS WAVPACK WILDMIDI
> 
> OPTIONS_GROUP=	ACCESS PLAYBACK
>@@ -59,7 +59,7 @@ OPTIONS_GROUP=	ACCESS PLAYBACK
> OPTIONS_GROUP_ACCESS=	CDPARANOIA CURL MMS NFS PLAYLISTS QOBUZ \
> 			SMB SOUNDCLOUD TIDAL YAJL
> 
>-OPTIONS_GROUP_PLAYBACK=	AO JACK OPENAL PULSEAUDIO \
>+OPTIONS_GROUP_PLAYBACK=	AO JACK OPENAL OSS PULSEAUDIO \
> 			SHOUTCAST SNDIO
> 
> ADPLUG_DESC=	AdPlug support
>@@ -70,7 +70,7 @@ PROXYDB_DESC=	Proxy database support via libmpdclient
> LAME_DESC=	Support for MP3 Icecast Streams
> PLAYLISTS_DESC=	Enable extra playlist support (wma, RSS)
> QOBUZ_DESC=	Streaming service support: Qobuz
>-SIDPLAY2_DESC=	Sidplay support (C64 mono and stereo files)
>+SIDPLAYFP_DESC=	C64 SID support via libsidplayfp
> SOUNDCLOUD_DESC=Streaming service support: SoundCloud
> TIDAL_DESC=	Streaming service support: TIDAL (currently defunct)
> TWOLAME_DESC=	TwoLAME support (mp2)
>@@ -79,8 +79,7 @@ WILDMIDI_DESC=	WildMIDI support (MIDI files)
> YAJL_DESC=	JSON support via libyajl
> ZZIP_DESC=	Support for zzip archives
> 
>-OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG \
>-		PLAYLISTS SNDFILE VORBIS VORBISENC
>+OPTIONS_DEFAULT=CURL FFMPEG FLAC LAME PLAYLISTS OSS SNDFILE VORBIS VORBISENC
> 
> # Decoder plugins
> ADPLUG_MESON_ENABLED=	adplug
>@@ -116,9 +115,8 @@ OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
> 			libogg.so:audio/libogg
> PLAYLISTS_MESON_ENABLED=expat
> PLAYLISTS_LIB_DEPENDS=	libexpat.so:textproc/expat2
>-SIDPLAY2_MESON_ENABLED=	sidplay
>-SIDPLAY2_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
>-SIDPLAY2_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
>+SIDPLAYFP_MESON_ENABLED=	sidplay
>+SIDPLAYFP_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
> SNDFILE_MESON_ENABLED=	sndfile
> SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
> VORBIS_MESON_ENABLED=	vorbis
>@@ -151,6 +149,7 @@ JACK_LIB_DEPENDS=	libjack.so:audio/jack
> JACK_CXXFLAGS=		-Wno-register
> OPENAL_MESON_ENABLED=	openal
> OPENAL_USES=		openal
>+OSS_MESON_ENABLED=	oss
> PULSEAUDIO_MESON_ENABLED=	pulse
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> SHOUTCAST_MESON_ENABLED=shout
>@@ -234,14 +233,6 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's,^#$[^"]*"$~/,\1/var/mpd/,g' \
> 		-e 's,^#$user[^"]*"$nobody,\1${MPDUSER},g' \
> 		${WRKSRC}/doc/mpdconf.example
>-# Uncomment OSS audio output part from mpd.conf; dragons!
>-	start=$$(expr $$(${SED} -n '/^#	type	*"oss"/=' \
>-		${WRKSRC}/doc/mpdconf.example) - 1); \
>-	 finish=$$(for n in $$(${JOT} 10 $$start); do \
>-		     [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \
>-				"#}" ] && ${ECHO_CMD} $$n || true; done); \
>-	 ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \
>-		${WRKSRC}/doc/mpdconf.example
> # Fix man pages for executable names
> 	@${REINPLACE_CMD} \
> 		-e 's#^``mpd#``${PORTNAME}#' \
>@@ -257,6 +248,16 @@ post-patch:
> 		-e "s#'mpd.conf doc#'${PORTNAME}.conf doc#" \
> 		${WRKSRC}/doc/conf.py
> 
>+post-patch-OSS-on:
>+# Uncomment OSS audio output part from mpd.conf; dragons!
>+	start=$$(expr $$(${SED} -n '/^#	type	*"oss"/=' \
>+		${WRKSRC}/doc/mpdconf.example) - 1); \
>+	 finish=$$(for n in $$(${JOT} 10 $$start); do \
>+		     [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \
>+				"#}" ] && ${ECHO_CMD} $$n || true; done); \
>+	 ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \
>+		${WRKSRC}/doc/mpdconf.example
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \
> 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Actions: View | Diff

Attachments on bug 251317: 219892