Attachment 102504 Details for Bug 142312 – file.diff

[patch] file.diff

file.diff (text/plain), 4.70 KB, created by tkato432 on 2010-01-04 18:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-01-04 18:40:01 UTC

Size: 4.70 KB

patch

obsolete

>diff -urN /usr/ports/audio/fluidsynth/Makefile audio/fluidsynth/Makefile
>--- /usr/ports/audio/fluidsynth/Makefile	2008-03-20 19:43:34.000000000 +0900
>+++ audio/fluidsynth/Makefile	2009-12-21 18:13:24.000000000 +0900
>@@ -6,30 +6,33 @@
> #
> 
> PORTNAME=	fluidsynth
>-PORTVERSION=	1.0.8
>+PORTVERSION=	1.1.1
> CATEGORIES=	audio
>-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
>-MASTER_SITE_SUBDIR=	fluid
>+MASTER_SITES=	SAVANNAH/fluid
> 
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
>+OPTIONS=	JACK "Enable Jack audio support" On \
>+		LADSPA "Enable LADSPA audio support" Off \
>+		PORTAUDIO "Enable PortAudio support" Off \
>+		PULSEAUDIO "Enable PulseAudio support" Off \
>+		SNDFILE "Enable Libsndfile support" Off
> 
>-USE_GNOME=	gnomehack gnometarget pkgconfig
>+USE_GNOME=	glib20 gnomehack pkgconfig
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>+USE_AUTOTOOLS=	libtool:22
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--disable-lash --disable-ladcca
>+CONFIGURE_ARGS=	--disable-alsa-support --disable-midishare \
>+		--disable-coreaudio --disable-coremidi \
>+		--disable-dart --disable-lash \
>+		--disable-ladcca
> USE_LDCONFIG=	yes
> 
> MAN1=		fluidsynth.1
> 
>-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>-
>-OPTIONS=	JACK "Enable Jack audio support" On \
>-		LADSPA "Enable LADSPA audio support" Off
>+CPPFLAGS=	${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS=	${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -45,6 +48,27 @@
> CONFIGURE_ARGS+=	--enable-ladspa
> .endif
> 
>+.if defined(WITH_PORTAUDIO)
>+BUILD_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
>+RUN_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
>+PA2_CFLAGS=	`pkg-config --cflags-only-I portaudio-2.0`
>+PA2_LIBS=	`pkg-config --libs-only-L portaudio-2.0`
>+.else
>+CONFIGURE_ARGS+=	--disable-portaudio-support
>+.endif
>+
>+.if defined(WITH_PULSEAUDIO)
>+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
>+.else
>+CONFIGURE_ARGS+=	--disable-pulse-support
>+.endif
>+
>+.if defined(WITH_SNDFILE)
>+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
>+.else
>+CONFIGURE_ARGS+=	--disable-libsndfile-support
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's| -O2 | |g ; \
> 		 s|== "yes"|= "yes"|g' ${WRKSRC}/configure
>diff -urN /usr/ports/audio/fluidsynth/distinfo audio/fluidsynth/distinfo
>--- /usr/ports/audio/fluidsynth/distinfo	2007-12-20 03:07:33.000000000 +0900
>+++ audio/fluidsynth/distinfo	2009-12-21 18:21:42.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (fluidsynth-1.0.8.tar.gz) = e2abfd2e69fd8b28d965df968d7d44ee
>-SHA256 (fluidsynth-1.0.8.tar.gz) = 45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320
>-SIZE (fluidsynth-1.0.8.tar.gz) = 1267922
>+MD5 (fluidsynth-1.1.1.tar.gz) = 0db3da78028d255026230809c6e21b44
>+SHA256 (fluidsynth-1.1.1.tar.gz) = 55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6
>+SIZE (fluidsynth-1.1.1.tar.gz) = 756184
>diff -urN /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in audio/fluidsynth/files/patch-src__Makefile.in
>--- /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ audio/fluidsynth/files/patch-src__Makefile.in	2009-11-03 15:45:05.000000000 +0900
>@@ -0,0 +1,22 @@
>+--- src/Makefile.in.orig	2009-10-31 04:23:15.000000000 +0900
>++++ src/Makefile.in	2009-11-03 15:44:55.000000000 +0900
>+@@ -397,13 +397,15 @@
>+ 	fluid_filerenderer.c \
>+ 	fluid_aufile.c 
>+ 
>+-INCLUDES = -I$(top_srcdir)/include $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
>++INCLUDES = -I$(top_srcdir)/include \
>++  $(PORTAUDIO_CFLAGS) $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
>+   $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
>+-  $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
>++  $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
>+ 
>+-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
>++libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) \
>++  $(PORTAUDIO_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
>+   $(READLINE_LIBS) $(COREAUDIO_LIBS) $(COREMIDI_LIBS) $(JACK_LIBS) \
>+-  $(ALSA_LIBS) $(PULSE_LIBS) $(PORTAUDIO_LIBS) $(DART_LIBS)  \
>++  $(ALSA_LIBS) $(PULSE_LIBS) $(DART_LIBS)  \
>+   $(GLIB_LIBS) $(LIBSNDFILE_LIBS)
>+ 
>+ libfluidsynth_la_LDFLAGS = \
>diff -urN /usr/ports/audio/fluidsynth/pkg-plist audio/fluidsynth/pkg-plist
>--- /usr/ports/audio/fluidsynth/pkg-plist	2006-02-23 19:34:27.000000000 +0900
>+++ audio/fluidsynth/pkg-plist	2009-12-25 02:46:31.000000000 +0900
>@@ -20,6 +20,6 @@
> lib/libfluidsynth.a
> lib/libfluidsynth.la
> lib/libfluidsynth.so
>-lib/libfluidsynth.so.2
>+lib/libfluidsynth.so.4
> libdata/pkgconfig/fluidsynth.pc
> @dirrm include/fluidsynth

Actions: View | Diff

Attachments on bug 142312: 102504