Attachment #119167 for bug #161631

Lines 6-76 Link Here

(-)audio/fluidsynth/Makefile (-23 / +46 lines)
6	#	6	#
7		7
8	PORTNAME= fluidsynth	8	PORTNAME= fluidsynth
9	PORTVERSION= 1.1.1	9	PORTVERSION= 1.1.5
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= SAVANNAH/fluid	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
12		12
13	MAINTAINER= multimedia@FreeBSD.org	13	MAINTAINER= multimedia@FreeBSD.org
14	COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications	14	COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications
15		15
		16	LICENSE= GPLv2 # (or later)
		17	LICENSE_FILE= ${WRKSRC}/COPYING
		18
16	OPTIONS= JACK "Enable Jack audio support" On \	19	OPTIONS= JACK "Enable Jack audio support" On \
		20	ALSA "Enable ALSA audio support" Off \
		21	DBUS "Enable D-Bus support" Off \
17	LADSPA "Enable LADSPA audio support" Off \	22	LADSPA "Enable LADSPA audio support" Off \
		23	LASH "Enable LASH audio support" Off \
18	PORTAUDIO "Enable PortAudio support" Off \	24	PORTAUDIO "Enable PortAudio support" Off \
19	PULSEAUDIO "Enable PulseAudio support" Off \	25	PULSEAUDIO "Enable PulseAudio support" Off \
20	SNDFILE "Enable Libsndfile support" Off	26	SNDFILE "Enable Libsndfile support" Off
21		27
22	USE_GNOME= glib20 gnomehack pkgconfig	28	USE_BZIP2= yes
23	USE_GMAKE= yes	29	USE_GNOME= glib20 pkgconfig
24	USE_AUTOTOOLS= libtool	30	USE_CMAKE= yes
25	CONFIGURE_ARGS= --disable-alsa-support --disable-midishare \	31	CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \
26	--disable-coreaudio --disable-coremidi \	32	-Denable-midishare:BOOL=FALSE
27	--disable-dart --disable-lash \
28	--disable-ladcca
29	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
30		34
31	MAN1= fluidsynth.1	35	CFLAGS+= ${PTHREAD_CFLAGS}
		36	LDFLAGS+= ${PTHREAD_LIBS}
32		37
33	CPPFLAGS+= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	38	MAN1= fluidsynth.1
34	LDFLAGS+= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
35		39
36	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
37		41
38	.if defined(WITH_JACK)	42	.if defined(WITH_JACK)
39	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack	43	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
40	.else	44	.else
41	CONFIGURE_ARGS+= --disable-jack-support	45	CMAKE_ARGS+= -Denable-jack:BOOL=FALSE
		46	.endif
		47
		48	.if defined(WITH_ALSA)
		49	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
		50	.else
		51	CMAKE_ARGS+= -Denable-alsa:BOOL=FALSE
		52	.endif
		53
		54	.if defined(WITH_DBUS)
		55	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
		56	.else
		57	CMAKE_ARGS+= -Denable-dbus:BOOL=FALSE
42	.endif	58	.endif
43		59
44	.if defined(WITH_LADSPA)	60	.if defined(WITH_LADSPA)
45	BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa	61	BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
46	RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa	62	RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
47	CONFIGURE_ARGS+= --enable-ladspa	63	CMAKE_ARGS+= -Denable-ladspa:BOOL=TRUE
		64	.endif
		65
		66	.if defined(WITH_LASH)
		67	LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash
		68	.else
		69	CMAKE_ARGS+= -Denable-lash:BOOL=FALSE
48	.endif	70	.endif
49		71
50	.if defined(WITH_PORTAUDIO)	72	.if defined(WITH_PORTAUDIO)
51	BUILD_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2	73	BUILD_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
52	RUN_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2	74	RUN_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
53	PA2_CFLAGS= `pkg-config --cflags-only-I portaudio-2.0`	75	CMAKE_ARGS+= -Denable-portaudio:BOOL=TRUE
54	PA2_LIBS= `pkg-config --libs-only-L portaudio-2.0`
55	.else
56	CONFIGURE_ARGS+= --disable-portaudio-support
57	.endif	76	.endif
58		77
59	.if defined(WITH_PULSEAUDIO)	78	.if defined(WITH_PULSEAUDIO)
60	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio	79	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
61	.else	80	.else
62	CONFIGURE_ARGS+= --disable-pulse-support	81	CMAKE_ARGS+= -Denable-pulseaudio:BOOL=FALSE
63	.endif	82	.endif
64		83
65	.if defined(WITH_SNDFILE)	84	.if defined(WITH_SNDFILE)
66	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile	85	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
67	.else	86	.else
68	CONFIGURE_ARGS+= --disable-libsndfile-support	87	CMAKE_ARGS+= -Denable-libsndfile:BOOL=FALSE
69	.endif	88	.endif
70		89
71	post-patch:	90	post-patch:
72	@${REINPLACE_CMD} -e 's\| -O2 \| \|g ; \	91	@${REINPLACE_CMD} -e \
73	s\|== "yes"\|= "yes"\|g' ${WRKSRC}/configure	92	'/Linux/s\|^\|#\| ; \
74	@${REINPLACE_CMD} -e '197 s/,/ /' ${WRKSRC}/include/fluidsynth/synth.h	93	/CMAKE_C_FLAGS_RELEASE/s\|-O2\|\| ; \
		94	s\|enable_midishare\|enable-midishare\| ; \
		95	s\|$${LIB_INSTALL_DIR}$${LIB_SUFFIX}/pkgconfig\|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt
		96	@${REINPLACE_CMD} -e \
		97	's\|share/man\|man\|' ${WRKSRC}/cmake_admin/DefaultDirs.cmake
75		98
76	.include <bsd.port.post.mk>	99	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)audio/fluidsynth/distinfo (-2 / +2 lines)
1	SHA256 (fluidsynth-1.1.1.tar.gz) = 55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6	1	SHA256 (fluidsynth-1.1.5.tar.bz2) = 44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4
2	SIZE (fluidsynth-1.1.1.tar.gz) = 756184	2	SIZE (fluidsynth-1.1.5.tar.bz2) = 800195




--- src/CMakeLists.txt.orig	2011-09-04 16:38:58.000000000 +0900
+++ src/CMakeLists.txt	2011-09-05 16:30:18.000000000 +0900
@@ -42,6 +42,11 @@
   include_directories ( ${READLINE_INCLUDE_DIR} )
 endif ( READLINE_SUPPORT )
 
+if ( PORTAUDIO_SUPPORT )
+  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
+  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
+endif ( PORTAUDIO_SUPPORT )
+
 if ( PULSE_SUPPORT )
   set ( fluid_pulse_SOURCES drivers/fluid_pulse.c )
   include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} )
@@ -70,11 +75,6 @@
   include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} )
 endif ( JACK_SUPPORT )
 
-if ( PORTAUDIO_SUPPORT )
-  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
-  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
-endif ( PORTAUDIO_SUPPORT )
-
 if ( WINDOWS_SUPPORT )
   set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c )
 endif ( WINDOWS_SUPPORT )
@@ -207,6 +207,8 @@
 )
 
 link_directories (
+    ${PORTAUDIO_LIBDIR}
+    ${PORTAUDIO_LIBRARY_DIRS}
     ${GLIB_LIBDIR}
     ${GLIB_LIBRARY_DIRS}
     ${LASH_LIBDIR}
@@ -219,8 +221,6 @@
     ${ALSA_LIBRARY_DIRS}
     ${PULSE_LIBDIR}
     ${PULSE_LIBRARY_DIRS}
-    ${PORTAUDIO_LIBDIR}
-    ${PORTAUDIO_LIBRARY_DIRS}
     ${LIBSNDFILE_LIBDIR}
     ${LIBSNDFILE_LIBRARY_DIRS}
     ${DBUS_LIBDIR}
@@ -280,13 +280,13 @@
 endif ( LIBFLUID_CPPFLAGS )
 
 target_link_libraries ( libfluidsynth
+    ${PORTAUDIO_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${LASH_LIBRARIES}
     ${LADCCA_LIBRARIES}
     ${JACK_LIBRARIES}
     ${ALSA_LIBRARIES}
     ${PULSE_LIBRARIES}
-    ${PORTAUDIO_LIBRARIES}
     ${LIBSNDFILE_LIBRARIES}
     ${DBUS_LIBRARIES}
     ${READLINE_LIBS}




--- 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 = \




--- src/bindings/fluid_rtkit.c.orig	2011-09-04 16:38:58.000000000 +0900
+++ src/bindings/fluid_rtkit.c	2011-09-05 17:07:06.000000000 +0900
@@ -34,7 +34,7 @@
 #include "fluid_rtkit.h"
 
 
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -44,12 +44,27 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/syscall.h>
 #include <sys/resource.h>
+#include <sys/param.h>
 
+#if defined(__FreeBSD__)
+#include <pthread_np.h>
+#endif
 
 static pid_t _gettid(void) {
+#if defined(__FreeBSD__)
+#if __FreeBSD__version > 900030
+        return pthread_getthreadid_np();
+#else
+        long tid;
+        syscall(SYS_thr_self, &tid);
+        return tid;	
+#endif
+#else
         return (pid_t) syscall(SYS_gettid);
+#endif
 }
 
 static int translate_error(const char *name) {

Lines 17-25 Link Here

(-)audio/fluidsynth/pkg-plist (-3 / +2 lines)
17	include/fluidsynth/types.h	17	include/fluidsynth/types.h
18	include/fluidsynth/version.h	18	include/fluidsynth/version.h
19	include/fluidsynth/voice.h	19	include/fluidsynth/voice.h
20	lib/libfluidsynth.a
21	lib/libfluidsynth.la
22	lib/libfluidsynth.so	20	lib/libfluidsynth.so
23	lib/libfluidsynth.so.4	21	lib/libfluidsynth.so.1
		22	lib/libfluidsynth.so.1.5.1
24	libdata/pkgconfig/fluidsynth.pc	23	libdata/pkgconfig/fluidsynth.pc
25	@dirrm include/fluidsynth	24	@dirrm include/fluidsynth

Return to bug 161631

Line 0 Link Here

(-)audio/fluidsynth/files/patch-src__CMakeLists.txt (+59 lines)
	1	--- src/CMakeLists.txt.orig 2011-09-04 16:38:58.000000000 +0900
	2	+++ src/CMakeLists.txt 2011-09-05 16:30:18.000000000 +0900
	3	@@ -42,6 +42,11 @@
	4	include_directories ( ${READLINE_INCLUDE_DIR} )
	5	endif ( READLINE_SUPPORT )
	6
	7	+if ( PORTAUDIO_SUPPORT )
	8	+ set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
	9	+ include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
	10	+endif ( PORTAUDIO_SUPPORT )
	11	+
	12	if ( PULSE_SUPPORT )
	13	set ( fluid_pulse_SOURCES drivers/fluid_pulse.c )
	14	include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} )
	15	@@ -70,11 +75,6 @@
	16	include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} )
	17	endif ( JACK_SUPPORT )
	18
	19	-if ( PORTAUDIO_SUPPORT )
	20	- set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
	21	- include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
	22	-endif ( PORTAUDIO_SUPPORT )
	23	-
	24	if ( WINDOWS_SUPPORT )
	25	set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c )
	26	endif ( WINDOWS_SUPPORT )
	27	@@ -207,6 +207,8 @@
	28	)
	29
	30	link_directories (
	31	+ ${PORTAUDIO_LIBDIR}
	32	+ ${PORTAUDIO_LIBRARY_DIRS}
	33	${GLIB_LIBDIR}
	34	${GLIB_LIBRARY_DIRS}
	35	${LASH_LIBDIR}
	36	@@ -219,8 +221,6 @@
	37	${ALSA_LIBRARY_DIRS}
	38	${PULSE_LIBDIR}
	39	${PULSE_LIBRARY_DIRS}
	40	- ${PORTAUDIO_LIBDIR}
	41	- ${PORTAUDIO_LIBRARY_DIRS}
	42	${LIBSNDFILE_LIBDIR}
	43	${LIBSNDFILE_LIBRARY_DIRS}
	44	${DBUS_LIBDIR}
	45	@@ -280,13 +280,13 @@
	46	endif ( LIBFLUID_CPPFLAGS )
	47
	48	target_link_libraries ( libfluidsynth
	49	+ ${PORTAUDIO_LIBRARIES}
	50	${GLIB_LIBRARIES}
	51	${LASH_LIBRARIES}
	52	${LADCCA_LIBRARIES}
	53	${JACK_LIBRARIES}
	54	${ALSA_LIBRARIES}
	55	${PULSE_LIBRARIES}
	56	- ${PORTAUDIO_LIBRARIES}
	57	${LIBSNDFILE_LIBRARIES}
	58	${DBUS_LIBRARIES}
	59	${READLINE_LIBS}

Lines 1-22 Link Here

(-)audio/fluidsynth/files/patch-src__Makefile.in (-22 lines)
1	--- src/Makefile.in.orig 2009-10-31 04:23:15.000000000 +0900
2	+++ src/Makefile.in 2009-11-03 15:44:55.000000000 +0900
3	@@ -397,13 +397,15 @@
4	fluid_filerenderer.c \
5	fluid_aufile.c
6
7	-INCLUDES = -I$(top_srcdir)/include $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
8	+INCLUDES = -I$(top_srcdir)/include \
9	+ $(PORTAUDIO_CFLAGS) $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
10	$(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
11	- $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
12	+ $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
13
14	-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
15	+libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) \
16	+ $(PORTAUDIO_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
17	$(READLINE_LIBS) $(COREAUDIO_LIBS) $(COREMIDI_LIBS) $(JACK_LIBS) \
18	- $(ALSA_LIBS) $(PULSE_LIBS) $(PORTAUDIO_LIBS) $(DART_LIBS) \
19	+ $(ALSA_LIBS) $(PULSE_LIBS) $(DART_LIBS) \
20	$(GLIB_LIBS) $(LIBSNDFILE_LIBS)
21
22	libfluidsynth_la_LDFLAGS = \

Line 0 Link Here

(-)audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c (+39 lines)
	1	--- src/bindings/fluid_rtkit.c.orig 2011-09-04 16:38:58.000000000 +0900
	2	+++ src/bindings/fluid_rtkit.c 2011-09-05 17:07:06.000000000 +0900
	3	@@ -34,7 +34,7 @@
	4	#include "fluid_rtkit.h"
	5
	6
	7	-#if defined(__linux__) \|\| defined(__APPLE__)
	8	+#if defined(__linux__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
	9
	10	#ifndef _GNU_SOURCE
	11	#define _GNU_SOURCE
	12	@@ -44,12 +44,27 @@
	13	#include <string.h>
	14	#include <unistd.h>
	15	#include <sys/types.h>
	16	+#include <sys/time.h>
	17	#include <sys/syscall.h>
	18	#include <sys/resource.h>
	19	+#include <sys/param.h>
	20
	21	+#if defined(__FreeBSD__)
	22	+#include <pthread_np.h>
	23	+#endif
	24
	25	static pid_t _gettid(void) {
	26	+#if defined(__FreeBSD__)
	27	+#if __FreeBSD__version > 900030
	28	+ return pthread_getthreadid_np();
	29	+#else
	30	+ long tid;
	31	+ syscall(SYS_thr_self, &tid);
	32	+ return tid;
	33	+#endif
	34	+#else
	35	return (pid_t) syscall(SYS_gettid);
	36	+#endif
	37	}
	38
	39	static int translate_error(const char *name) {