Attachment 130655 Details for Bug 174635 – portaudio2.diff

[patch] portaudio2.diff

portaudio2.diff (text/x-patch), 11.55 KB, created by nemysis on 2012-12-30 22:01:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-12-30 22:01:03 UTC

Size: 11.55 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/Makefile ./Makefile
>--- /usr/ports/audio/portaudio/Makefile	2012-12-30 19:03:28.000000000 +0100
>+++ ./Makefile	2012-12-30 22:53:43.000000000 +0100
>@@ -1,72 +1,100 @@
>-# Created by: michaelnottebrock@gmx.net and lioux@FreeBSD.org
>-# $FreeBSD: head/audio/portaudio/Makefile 309683 2012-12-30 17:57:04Z mva $
>+# New ports collection makefile for:	portaudio
>+# Date created:		18 May 2003
>+# Whom:			michaelnottebrock@gmx.net and lioux@FreeBSD.org
>+#
>+# $FreeBSD: head/audio/portaudio2/Makefile 300895 2012-07-14 12:56:14Z beat $
>+#
> 
> PORTNAME=	portaudio
>-PORTVERSION=	18.1
>-PORTREVISION=	3
>+PORTVERSION=	19.20111121
> CATEGORIES=	audio
> MASTER_SITES=	http://www.portaudio.com/archives/
>-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}
>+DISTNAME=	pa_stable_v${DISTVERSION:S/./_/}
>+EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	nemysis@gmx.ch
> COMMENT=	Portable cross-platform Audio API
> 
> LICENSE=	MIT
> 
>-USE_ZIP=	yes
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \
>+			--without-alsa \
>+			--libdir=${PREFIX}/lib/${PORTNAME}2 \
>+			--includedir=${PREFIX}/include/${PORTNAME}2
>+
> USE_GMAKE=	yes
> USE_DOS2UNIX=	yes
>+USE_PKGCONFIG=	build
> USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
>-
>-PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
>-SHLIB_VERSION=	0
>+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> PORTDOCS=	*
> 
>+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
>+
> DOCSRCDIR1=	${WRKSRC}
> DOC_FILES1=	README.txt index.html
> 
>-DOCSRCDIR2=	${WRKSRC}/docs
>-DOCSDIR2=	${DOCSDIR}/docs
>-DOC_FILES2=	*.html *.txt *.pdf
>+OPTIONS_DEFINE=	JACK PATEST DOXYGEN
> 
>-OPTIONS_DEFINE=		PATEST
>-OPTIONS_DEFAULT=	PATEST
>+OPTIONS_DEFAULT=	PATEST DOXYGEN
> 
> PATEST_DESC=	PortAudio Test Programs
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MPATEST}
>+.if ${PORT_OPTIONS:MDOXYGEN}
>+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
>+.endif
>+
>+.if ${PORT_OPTIONS:MJACK}
>+CONFIGURE_ARGS+=--with-jack
>+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
>+.else
>+CONFIGURE_ARGS+=--without-jack
>+.endif
>+
>+.if defined(WITH_PATEST)
> PLIST_SUB+=	PATEST=""
> .else
> PLIST_SUB+=	PATEST="@comment "
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' ${WRKSRC}/pa_unix_oss/pa_unix.h
>-	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/pa_unix_oss/pa_unix_oss.c
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/configure.in \
>-		${WRKSRC}/pa_unix_oss/Makefile
>-
>-pre-configure:
>-	@${CHMOD} +x ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' ${WRKSRC}/ltmain.sh
>+	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
>+		${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript
>+	@${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|g' \
>+		${WRKSRC}/Makefile.in
> 
> post-install:
>-	@${LN} -sf libportaudio.so \
>-		${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION}
> .if ${PORT_OPTIONS:MPATEST}
>+	@(cd ${WRKSRC}/bin && for i in *; do ${MV} "$$i" "$${i}"-2; done)
>+#.for i in ${WRKSRC}/bin/*
>+#	${MV} $i $i-2
>+#	${MV} "$$i" "$$i"-2
>+#.endfor
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
> .endif
>+
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
>-	${MKDIR} ${DOCSDIR2}
>-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
>+.endif
>+
>+.if ${PORT_OPTIONS:MDOXYGEN}
>+	@cd ${WRKSRC} && doxygen
>+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR})
>+.endif
>+
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/distinfo ./distinfo
>--- /usr/ports/audio/portaudio/distinfo	2012-12-05 00:40:55.000000000 +0100
>+++ ./distinfo	2012-12-22 15:29:25.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (portaudio_v18_1.zip) = 9da7f1ba0b8029f934d5a8300199e29095127e6abfa03dbb3c1ce40e10751f0a
>-SIZE (portaudio_v18_1.zip) = 550130
>+SHA256 (pa_stable_v19_20111121.tgz) = 9c26d1330d506496789edafe55b0386f20d83c4aa2c0e3f81fbeb0f114ab1b99
>+SIZE (pa_stable_v19_20111121.tgz) = 1422825
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports/audio/portaudio/files/patch-Makefile.in	2012-12-05 00:40:55.000000000 +0100
>+++ ./files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,59 +0,0 @@
>---- Makefile.in.orig	2011-03-12 12:04:08.000000000 -0600
>-+++ Makefile.in	2011-03-12 12:04:22.000000000 -0600
>-@@ -15,6 +15,7 @@
>- DLL_LIBS = @DLL_LIBS@
>- 
>- OTHER_OBJS = @OTHER_OBJS@
>-+OTHER_SHOBJS = @OTHER_SHOBJS@
>- 
>- PALIB = libportaudio.a
>- PADLL = @PADLL@
>-@@ -25,6 +26,10 @@
>- 	pa_common/pa_convert.o \
>- 	pa_common/pa_lib.o
>- 
>-+COMMON_SHOBJS = \
>-+	pa_common/pa_convert.So \
>-+	pa_common/pa_lib.So
>-+
>- TESTS = \
>- 	bin/patest_buffer \
>- 	bin/patest_clip \
>-@@ -50,8 +55,15 @@
>- 	bin/patest_underflow \
>- 	bin/patest_wire
>- 
>-+.SUFFIXES: .o .So
>-+
>-+.c.So:
>-+	$(CC) $(CFLAGS) -fPIC -o $*.So -c $?
>-+
>- OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
>- 
>-+SHOBJS = $(COMMON_SHOBJS) $(OTHER_SHOBJS)
>-+
>- all: lib/$(PALIB) lib/$(PADLLV) tests
>- 
>- tests: bin/ $(TESTS)
>-@@ -60,8 +72,8 @@
>- 	$(AR) ruv lib/$(PALIB) $(OBJS)
>- 	$(RANLIB) lib/$(PALIB)
>- 
>--lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
>--	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
>-+lib/$(PADLLV): lib/ $(SHOBJS) Makefile $(PAINC)
>-+	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(SHOBJS) $(DLL_LIBS)
>- 
>- $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
>- 	$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
>-@@ -89,8 +101,8 @@
>- %.o: %.c Makefile $(PAINC)
>- 	$(CC) -c $(CFLAGS) $< -o $@
>- 
>--bin:
>-+bin/:
>- 	mkdir bin
>- 
>--lib:
>-+lib/:
>- 	mkdir lib
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/files/patch-configure ./files/patch-configure
>--- /usr/ports/audio/portaudio/files/patch-configure	2012-12-05 00:40:55.000000000 +0100
>+++ ./files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>@@ -1,18 +0,0 @@
>---- configure.orig	Mon Mar 15 15:52:38 2004
>-+++ configure	Mon Mar 15 15:53:00 2004
>-@@ -1972,6 +1972,7 @@
>- fi
>- 
>- 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
>-+	OTHER_SHOBJS="pa_unix_oss/pa_unix_oss.So pa_unix_oss/pa_unix.So";
>- 	LIBS="-lm -lpthread";
>- 	PADLL="libportaudio.so";
>- 	SHARED_FLAGS="-shared";
>-@@ -2404,6 +2405,7 @@
>- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
>- s,@AR@,$AR,;t t
>- s,@OTHER_OBJS@,$OTHER_OBJS,;t t
>-+s,@OTHER_SHOBJS@,$OTHER_SHOBJS,;t t
>- s,@PADLL@,$PADLL,;t t
>- s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
>- s,@DLL_LIBS@,$DLL_LIBS,;t t
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/files/patch-pa_tests-patest__record.c ./files/patch-pa_tests-patest__record.c
>--- /usr/ports/audio/portaudio/files/patch-pa_tests-patest__record.c	2012-12-30 19:03:28.000000000 +0100
>+++ ./files/patch-pa_tests-patest__record.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- pa_tests/patest_record.c.orig	2012-12-22 13:48:25.000000000 +0100
>-+++ pa_tests/patest_record.c	2012-12-22 13:48:25.000000000 +0100
>-@@ -138,10 +138,10 @@
>-     SAMPLE *wptr = (SAMPLE*)outputBuffer;
>-     unsigned int i;
>-     int finished;
>-+    int framesToPlay, samplesToPlay, samplesPerBuffer;
>-     unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
>-     (void) inputBuffer; /* Prevent unused variable warnings. */
>-     (void) outTime;
>--    int framesToPlay, samplesToPlay, samplesPerBuffer;
>- 
>-     if( framesLeft < framesPerBuffer )
>-     {
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/files/patch-pa_tests-patest__wire.c ./files/patch-pa_tests-patest__wire.c
>--- /usr/ports/audio/portaudio/files/patch-pa_tests-patest__wire.c	2012-12-30 19:03:28.000000000 +0100
>+++ ./files/patch-pa_tests-patest__wire.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>---- pa_tests/patest_wire.c.orig	2012-12-22 13:48:25.000000000 +0100
>-+++ pa_tests/patest_wire.c	2012-12-22 13:48:25.000000000 +0100
>-@@ -74,9 +74,9 @@
>-     SAMPLE *out = (SAMPLE*)outputBuffer;
>-     SAMPLE *in = (SAMPLE*)inputBuffer;
>-     unsigned int i;
>--    (void) outTime;
>-     int samplesPerFrame;
>-     int numSamples;
>-+    (void) outTime;
>-     
>-     samplesPerFrame = (int) userData;
>-     numSamples =  framesPerBuffer * samplesPerFrame;
>diff -ruN --exclude=CVS /usr/ports/audio/portaudio/pkg-plist ./pkg-plist
>--- /usr/ports/audio/portaudio/pkg-plist	2012-12-30 19:03:28.000000000 +0100
>+++ ./pkg-plist	2012-12-30 20:29:13.000000000 +0100
>@@ -1,28 +1,63 @@
>-%%PATEST%%bin/patest_buffer
>-%%PATEST%%bin/patest_clip
>-%%PATEST%%bin/patest_dither
>-%%PATEST%%bin/patest_hang
>-%%PATEST%%bin/patest_latency
>-%%PATEST%%bin/patest_leftright
>-%%PATEST%%bin/patest_longsine
>-%%PATEST%%bin/patest_many
>-%%PATEST%%bin/patest_maxsines
>-%%PATEST%%bin/patest_multi_sine
>-%%PATEST%%bin/patest_pink
>-%%PATEST%%bin/patest_record
>-%%PATEST%%bin/patest_ringmix
>-%%PATEST%%bin/patest_saw
>-%%PATEST%%bin/patest_sine
>-%%PATEST%%bin/patest_sine8
>-%%PATEST%%bin/patest_sine_formats
>-%%PATEST%%bin/patest_sine_time
>-%%PATEST%%bin/patest_stop
>-%%PATEST%%bin/patest_sync
>-%%PATEST%%bin/patest_toomanysines
>-%%PATEST%%bin/patest_underflow
>-%%PATEST%%bin/patest_wire
>-include/portaudio.h
>-lib/libportaudio.a
>-lib/libportaudio.so
>-lib/libportaudio.so.0.0.18
>-lib/libportaudio.so.%%SHLIB_VERSION%%
>+%%PATEST%%bin/pa_devs-2
>+%%PATEST%%bin/pa_fuzz-2
>+%%PATEST%%bin/pa_minlat-2
>+%%PATEST%%bin/paex_pink-2
>+%%PATEST%%bin/paex_read_write_wire-2
>+%%PATEST%%bin/paex_record-2
>+%%PATEST%%bin/paex_saw-2
>+%%PATEST%%bin/paex_sine-2
>+%%PATEST%%bin/paex_write_sine-2
>+%%PATEST%%bin/paex_write_sine_nonint-2
>+%%PATEST%%bin/paqa_devs-2
>+%%PATEST%%bin/paqa_errs-2
>+%%PATEST%%bin/paqa_latency-2
>+%%PATEST%%bin/patest1-2
>+%%PATEST%%bin/patest_buffer-2
>+%%PATEST%%bin/patest_callbackstop-2
>+%%PATEST%%bin/patest_clip-2
>+%%PATEST%%bin/patest_dither-2
>+%%PATEST%%bin/patest_hang-2
>+%%PATEST%%bin/patest_in_overflow-2
>+%%PATEST%%bin/patest_latency-2
>+%%PATEST%%bin/patest_leftright-2
>+%%PATEST%%bin/patest_longsine-2
>+%%PATEST%%bin/patest_many-2
>+%%PATEST%%bin/patest_maxsines-2
>+%%PATEST%%bin/patest_mono-2
>+%%PATEST%%bin/patest_multi_sine-2
>+%%PATEST%%bin/patest_out_underflow-2
>+%%PATEST%%bin/patest_prime-2
>+%%PATEST%%bin/patest_ringmix-2
>+%%PATEST%%bin/patest_sine8-2
>+%%PATEST%%bin/patest_sine_channelmaps-2
>+%%PATEST%%bin/patest_sine_formats-2
>+%%PATEST%%bin/patest_sine_srate-2
>+%%PATEST%%bin/patest_sine_time-2
>+%%PATEST%%bin/patest_start_stop-2
>+%%PATEST%%bin/patest_stop-2
>+%%PATEST%%bin/patest_stop_playout-2
>+%%PATEST%%bin/patest_toomanysines-2
>+%%PATEST%%bin/patest_two_rates-2
>+%%PATEST%%bin/patest_underflow-2
>+%%PATEST%%bin/patest_wire-2
>+include/portaudio2/portaudio.h
>+lib/portaudio2/libportaudio.a
>+lib/portaudio2/libportaudio.la
>+lib/portaudio2/libportaudio.so
>+lib/portaudio2/libportaudio.so.2
>+libdata/pkgconfig/portaudio-2.0.pc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pa_devs.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pa_fuzz.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_mono_asio_channel_select.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_pink.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_read_write_wire.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_record.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_saw.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_sine.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_wmme_ac3.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_wmme_surround.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_write_sine.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/paex_write_sine_nonint.c
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>+@dirrm lib/portaudio2
>+@dirrm include/portaudio2
>===> Done

Actions: View | Diff

Attachments on bug 174635: 130654 | 130655 | 130656 | 130657