[Pkg-voip-commits] [portaudio19] 84/114: Drop patches that were accepted upstream.

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script.

bdrung pushed a commit to branch master
in repository portaudio19.

commit 8dd5da9af68d1f8c1eb49536738124e95073f51c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Mar 5 11:33:24 2011 +0000

    Drop patches that were accepted upstream.
---
 debian/patches/binutils-gold-fix.patch    | 14 -------
 debian/patches/export-oss-functions.patch | 14 -------
 debian/patches/install-headers.patch      | 69 -------------------------------
 debian/patches/series                     |  3 --
 4 files changed, 100 deletions(-)

diff --git a/debian/patches/binutils-gold-fix.patch b/debian/patches/binutils-gold-fix.patch
deleted file mode 100644
index 04c49c6..0000000
--- a/debian/patches/binutils-gold-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix build failure with binutils gold.
-Author: Benjamin Drung <bdrung at debian.org>
-
---- portaudio19-19+svn20101113.orig/bindings/cpp/bin/Makefile.am
-+++ portaudio19-19+svn20101113/bindings/cpp/bin/Makefile.am
-@@ -3,7 +3,7 @@ LIBDIR = $(top_builddir)/lib
- 
- noinst_PROGRAMS = devs sine
- 
--LDADD = $(LIBDIR)/libportaudiocpp.la
-+LDADD = $(LIBDIR)/libportaudiocpp.la $(top_builddir)/$(PORTAUDIO_ROOT)/lib/libportaudio.la
- 
- devs_SOURCES = $(BINDIR)/devs.cxx
- sine_SOURCES = $(BINDIR)/sine.cxx
diff --git a/debian/patches/export-oss-functions.patch b/debian/patches/export-oss-functions.patch
deleted file mode 100644
index e8effdf..0000000
--- a/debian/patches/export-oss-functions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Export OSS functions
-Author: Benjamin Drung <bdrung at debian.org>
-
---- portaudio19-19+svn20101113.orig/Makefile.in
-+++ portaudio19-19+svn20101113/Makefile.in
-@@ -43,7 +43,7 @@ PALIB = libportaudio.la
- PAINC = include/portaudio.h
- 
- 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)
- 
- COMMON_OBJS = \
diff --git a/debian/patches/install-headers.patch b/debian/patches/install-headers.patch
deleted file mode 100644
index a9de7c7..0000000
--- a/debian/patches/install-headers.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Install headers for portAudio backends.
-Author: Benjamin Drung <bdrung at debian.org>
-
---- portaudio19-19+svn20101113.orig/configure.in
-+++ portaudio19-19+svn20101113/configure.in
-@@ -165,6 +165,7 @@ AC_SUBST(DLL_LIBS)
- AC_SUBST(CXXFLAGS)
- AC_SUBST(NASM)
- AC_SUBST(NASMOPT)
-+AC_SUBST(INCLUDES)
- 
- dnl -g is optional on darwin
- if ( echo "${host_os}" | grep ^darwin >> /dev/null ) &&
-@@ -188,6 +189,8 @@ add_objects()
-     done
- }
- 
-+INCLUDES=portaudio.h
-+
- case "${host_os}" in
-   darwin* )
-         dnl Mac OS X configuration
-@@ -317,6 +320,7 @@ case "${host_os}" in
-            DLL_LIBS="$DLL_LIBS -lasound"
-            LIBS="$LIBS -lasound"
-            OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
-+           INCLUDES="$INCLUDES pa_linux_alsa.h"
-            AC_DEFINE(PA_USE_ALSA)
-         fi
- 
-@@ -324,6 +328,7 @@ case "${host_os}" in
-            DLL_LIBS="$DLL_LIBS $JACK_LIBS"
-            CFLAGS="$CFLAGS $JACK_CFLAGS"
-            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)
-         fi
- 
-@@ -332,7 +337,8 @@ case "${host_os}" in
-            if [[ "$have_libossaudio" = "yes" ]] ; then
-                    DLL_LIBS="$DLL_LIBS -lossaudio"
-                    LIBS="$LIBS -lossaudio"
--           fi      
-+           fi
-+           INCLUDES="$INCLUDES pa_unix_oss.h"
-            AC_DEFINE(PA_USE_OSS)
-         fi
- 
---- portaudio19-19+svn20101113.orig/Makefile.in
-+++ portaudio19-19+svn20101113/Makefile.in
-@@ -38,6 +38,7 @@ LT_REVISION=@LT_REVISION@
- LT_AGE=@LT_AGE@
- 
- OTHER_OBJS = @OTHER_OBJS@
-+INCLUDES = @INCLUDES@
- 
- PALIB = libportaudio.la
- PAINC = include/portaudio.h
-@@ -158,7 +159,9 @@ install: lib/$(PALIB) portaudio-2.0.pc
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
- 	$(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) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
- 	@echo ""
diff --git a/debian/patches/series b/debian/patches/series
index 4f06a36..ebc90e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 audacity-portmixer.patch
-binutils-gold-fix.patch
-export-oss-functions.patch
-install-headers.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/portaudio19.git