summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch
blob: 87c43fb14d7c11bfa22f24357e03e1da25925d02 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Issutracker : #i46879#
CWS         : N/A
Author      : NAKATA Maho <maho@openoffice.org> (JCA)
Description : Need to include <sys/soundcard.h> to use sound and passes
              correct pthread related flags

Index: portaudio/portaudio_v18_1.patch
===================================================================
RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
retrieving revision 1.1
diff -u -r1.1 portaudio_v18_1.patch
--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
+++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
@@ -12,7 +12,7 @@
   	;;
   
     mingw* )
---- 1883,1902 ----
+--- 1883,1921 ----
   case "${host_os}" in
     darwin* )
   
@@ -30,6 +30,25 @@
 ! 	PADLL="libportaudio.so";
 ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
 ! 	CFLAGS="-O2 -fPIC"
+! 	;;
+! 
+!   freebsd* )
+! 	if test "$OSVERSION" -lt "500016"; then
+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
+!              PTHREAD_LIBS="-pthread"
+!         elif test "$OSVERSION" -lt "502102"; then
+!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
+!              PTHREAD_LIBS="-lc_r"
+!         else
+!              PTHREAD_CFLAGS=""
+!              PTHREAD_LIBS="-pthread"
+!         fi
+! 
+! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
+! 	LIBS="-lm ${PTHREAD_LIBS}";
+! 	PADLL="libportaudio.so";
+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
   	;;
   
     mingw* )
@@ -52,3 +71,18 @@
   LIBINST = /usr/local/lib
   
   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
+
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
+***************
+*** 43,48 ****
+--- 43,50 ----
+  
+  #ifdef __linux__
+  #include <linux/soundcard.h>
++ #elif defined (__FreeBSD__)
++ #include <sys/soundcard.h>
+  #else
+  #include <machine/soundcard.h> /* JH20010905 */
+  #endif
+