me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Applied patches for Debian Linux for ticket 166.

Browse source
This commit is contained in:
philburk 2011-03-02 17:03:23 +00:00
commit c8dcb76f19
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile.in
View file

@ -38,12 +38,13 @@ LT_REVISION=@LT_REVISION@
LT_AGE=@LT_AGE@ LT_AGE=@LT_AGE@
OTHER_OBJS = @OTHER_OBJS@ OTHER_OBJS = @OTHER_OBJS@
INCLUDES = @INCLUDES@
PALIB = libportaudio.la PALIB = libportaudio.la
PAINC = include/portaudio.h PAINC = include/portaudio.h
PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \ PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \
-export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio)_.*" \ -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS)_.*" \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
COMMON_OBJS = \ COMMON_OBJS = \
@ -171,7 +172,9 @@ install: lib/$(PALIB) portaudio-2.0.pc
$(INSTALL) -d $(DESTDIR)$(libdir) $(INSTALL) -d $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(includedir) $(INSTALL) -d $(DESTDIR)$(includedir)
$(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC) $(DESTDIR)$(includedir)/portaudio.h for include in $(INCLUDES); do \
$(INSTALL_DATA) -m 644 $(top_srcdir)/include/$$include $(DESTDIR)$(includedir)/$$include; \
done
$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc $(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
@echo "" @echo ""

2
bindings/cpp/bin/Makefile.am
View file

@ -3,7 +3,7 @@ LIBDIR = $(top_builddir)/lib
noinst_PROGRAMS = devs sine noinst_PROGRAMS = devs sine
LDADD = $(LIBDIR)/libportaudiocpp.la LDADD = $(LIBDIR)/libportaudiocpp.la $(top_builddir)/$(PORTAUDIO_ROOT)/lib/libportaudio.la
devs_SOURCES = $(BINDIR)/devs.cxx devs_SOURCES = $(BINDIR)/devs.cxx
sine_SOURCES = $(BINDIR)/sine.cxx sine_SOURCES = $(BINDIR)/sine.cxx

8
configure.in
View file

@ -165,6 +165,7 @@ AC_SUBST(DLL_LIBS)
AC_SUBST(CXXFLAGS) AC_SUBST(CXXFLAGS)
AC_SUBST(NASM) AC_SUBST(NASM)
AC_SUBST(NASMOPT) AC_SUBST(NASMOPT)
AC_SUBST(INCLUDES)
dnl -g is optional on darwin dnl -g is optional on darwin
if ( echo "${host_os}" | grep ^darwin >> /dev/null ) && if ( echo "${host_os}" | grep ^darwin >> /dev/null ) &&
@ -188,6 +189,8 @@ add_objects()
done done
} }
INCLUDES=portaudio.h
case "${host_os}" in case "${host_os}" in
darwin* ) darwin* )
dnl Mac OS X configuration dnl Mac OS X configuration
@ -317,6 +320,7 @@ case "${host_os}" in
DLL_LIBS="$DLL_LIBS -lasound" DLL_LIBS="$DLL_LIBS -lasound"
LIBS="$LIBS -lasound" LIBS="$LIBS -lasound"
OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
INCLUDES="$INCLUDES pa_linux_alsa.h"
AC_DEFINE(PA_USE_ALSA) AC_DEFINE(PA_USE_ALSA)
fi fi
@ -324,6 +328,7 @@ case "${host_os}" in
DLL_LIBS="$DLL_LIBS $JACK_LIBS" DLL_LIBS="$DLL_LIBS $JACK_LIBS"
CFLAGS="$CFLAGS $JACK_CFLAGS" CFLAGS="$CFLAGS $JACK_CFLAGS"
OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o" OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
INCLUDES="$INCLUDES pa_jack.h"
AC_DEFINE(PA_USE_JACK) AC_DEFINE(PA_USE_JACK)
fi fi
@ -332,7 +337,8 @@ case "${host_os}" in
if [[ "$have_libossaudio" = "yes" ]] ; then if [[ "$have_libossaudio" = "yes" ]] ; then
DLL_LIBS="$DLL_LIBS -lossaudio" DLL_LIBS="$DLL_LIBS -lossaudio"
LIBS="$LIBS -lossaudio" LIBS="$LIBS -lossaudio"
fi fi
INCLUDES="$INCLUDES pa_unix_oss.h"
AC_DEFINE(PA_USE_OSS) AC_DEFINE(PA_USE_OSS)
fi fi