Attachment #169229 for bug #208728

Lines 4-10 Link Here

(-)audio/praat/Makefile (-3 / +1 lines)
4	PORTNAME= praat	4	PORTNAME= praat
5	PORTVERSION= 5.4.08	5	PORTVERSION= 5.4.08
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= audio science	8	CATEGORIES= audio science
9		9
10	MAINTAINER= bacon4000@gmail.com	10	MAINTAINER= bacon4000@gmail.com
Lines 19-26 USE_GNOME= gtk20 Link Here
19	MAKEFILE= makefile	19	MAKEFILE= makefile
20	PLIST_FILES= bin/praat man/man1/praat.1.gz	20	PLIST_FILES= bin/praat man/man1/praat.1.gz
21		21
22	LIB_DEPENDS+= libasound.so:audio/alsa-lib
23
24	.include <bsd.port.pre.mk>	22	.include <bsd.port.pre.mk>
25		23
26	.if ${OSVERSION} < 1000000	24	.if ${OSVERSION} < 1000000





CXX ?= g++

CFLAGS = -std=gnu99 -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1

CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode

LINK ?= $(CXX)

EXECUTABLE = praat

LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lpthread -ltinfow

AR = ar
RANLIB = ls
ICON =
MAIN_ICON =
PA_BACKEND = pa_unix_oss.o




--- external/portaudio/Makefile.orig	2015-05-20 01:47:31 UTC
+++ external/portaudio/Makefile
@@ -3,8 +3,9 @@
 
 include ../../makefile.defs
 
+PA_BACKEND ?= pa_linux_alsa.o
 OBJECTS = \
-	pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o \
+	pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) \
 	pa_win_hostapis.o pa_win_util.o pa_win_wmme.o pa_win_waveformat.o \
 	pa_front.o pa_debugprint.o pa_cpuload.o \
 	pa_allocation.o pa_process.o pa_converters.o pa_dither.o \

Line 0 Link Here

(-)audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (+11 lines)
	1	--- external/portaudio/pa_unix_hostapis.c.orig 2015-05-20 01:47:31 UTC
	2	+++ external/portaudio/pa_unix_hostapis.c
	3	@@ -60,6 +60,8 @@ PaUtilHostApiInitializer *paHostApiIniti
	4	{
	5	#if defined (linux) && defined (ALSA)
	6	PaAlsa_Initialize, // ppgb
	7	+ #else
	8	+ PaOSS_Initialize,
	9	#endif
	10	0 /* NULL terminated array */
	11	};

Return to bug 208728

Lines 8-24 CC ?= gcc Link Here

(-)audio/praat/files/makefile.defs.freebsd.alsa (-3 / +4 lines)
8		8
9	CXX ?= g++	9	CXX ?= g++
10		10
11	CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1	11	CFLAGS = -std=gnu99 -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1
12		12
13	CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode	13	CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode
14		14
15	LINK ?= $(CXX)	15	LINK ?= $(CXX)
16		16
17	EXECUTABLE = praat	17	EXECUTABLE = praat
18		18
19	LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lasound -lpthread -ltinfow	19	LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lpthread -ltinfow
20		20
21	AR = ar	21	AR = ar
22	RANLIB = ls	22	RANLIB = ls
23	ICON =	23	ICON =
24	MAIN_ICON =	24	MAIN_ICON =
		25	PA_BACKEND = pa_unix_oss.o

Line 0 Link Here

(-)audio/praat/files/patch-external_portaudio_Makefile (+13 lines)
	1	--- external/portaudio/Makefile.orig 2015-05-20 01:47:31 UTC
	2	+++ external/portaudio/Makefile
	3	@@ -3,8 +3,9 @@
	4
	5	include ../../makefile.defs
	6
	7	+PA_BACKEND ?= pa_linux_alsa.o
	8	OBJECTS = \
	9	- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o \
	10	+ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) \
	11	pa_win_hostapis.o pa_win_util.o pa_win_wmme.o pa_win_waveformat.o \
	12	pa_front.o pa_debugprint.o pa_cpuload.o \
	13	pa_allocation.o pa_process.o pa_converters.o pa_dither.o \