Package: puredata / 0.46.2-1

debian_system_portaudio.patch Patch series | download
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
68
69
70
71
72
73
74
Author: IOhannes m zm�lnig
Description: use system installation of portaudio/portmidi
 rather than Pd's own copy
--- puredata.orig/Makefile.am
+++ puredata/Makefile.am
@@ -12,14 +12,6 @@
 EXTRA_SUBDIRS += asio
 endif
 
-if PORTAUDIO
-EXTRA_SUBDIRS += portaudio
-endif
-
-if PORTMIDI
-EXTRA_SUBDIRS += portmidi
-endif
-
 # files that are included but not built
 EXTRA_DIST = LICENSE.txt README.txt INSTALL.txt
 
@@ -27,7 +19,7 @@
 SUBDIRS = $(EXTRA_SUBDIRS) src man tcl po extra
 
 # subdirs that are always included in the dist, etc.
-DIST_SUBDIRS = asio extra man po portaudio portmidi src tcl
+DIST_SUBDIRS = asio extra man po src tcl
 
 BUILT_SOURCES = 
 if MSGFMT
--- puredata.orig/configure.ac
+++ puredata/configure.ac
@@ -5,11 +5,6 @@
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4/generated])
 
-if test -d "$srcdir/portaudio"; then
-  AC_CONFIG_SUBDIRS([portaudio])
-fi
-
-
 AC_CANONICAL_HOST
 
 # you will need to install iPhone XCode on Mac OS X to use this:
@@ -251,7 +246,6 @@
 AC_CONFIG_FILES([Makefile
                 asio/Makefile
                 man/Makefile
-                portmidi/Makefile
                 tcl/Makefile
                 po/Makefile
                 src/Makefile
--- puredata.orig/src/Makefile.am
+++ puredata/src/Makefile.am
@@ -84,8 +84,8 @@
 endif
 
 if PORTAUDIO
-pd_CFLAGS += -DUSEAPI_PORTAUDIO  -I$(top_srcdir)/portaudio/include
-pd_LDADD += $(top_builddir)/portaudio/lib/libportaudio.la
+pd_CFLAGS += -DUSEAPI_PORTAUDIO
+pd_LDADD += -lportaudio
 pd_SOURCES += s_audio_pa.c s_audio_paring.c
 endif
 
@@ -95,8 +95,7 @@
 endif
 
 if PORTMIDI
-INCLUDES += -I$(top_srcdir)/portmidi/pm_common -I$(top_srcdir)/portmidi/porttime
-pd_LDADD += $(top_builddir)/portmidi/libportmidi.la
+pd_LDADD += -lportmidi -lporttime
 pd_SOURCES += s_midi_pm.c
 endif