Date: Sat, 22 Dec 2012 13:40:00 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172678: [PATCH] audio/portaudio: update to 19.20111121, take maintainership, OptionsNG Message-ID: <201212221340.qBMDe0So025605@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172678; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org, mva@FreeBSD.org
Cc:
Subject: Re: ports/172678: [PATCH] audio/portaudio: update to 19.20111121,
take maintainership, OptionsNG
Date: Sat, 22 Dec 2012 14:32:45 +0100
--MP_/JJ/ShK/V30r83f7lJdxVvAo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Thanks this is now update for audio/portaudio
Makefile changed:
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
+PORTDOCS= *
+OPTIONS_DEFINE= PATEST
+OPTIONS_DEFAULT= PATEST
+PATEST_DESC= PortAudio Test Programs
+.include <bsd.port.options.mk>
Changed and refined:
post-patch:
post-install
pkg-descr
pkg-plist
Patches no use more :: now is __
Removed files:
files/patch-pa_tests::patest_record.c
files/patch-pa_tests::patest_wire.c
Added files:
files/patch-pa_tests-patest__record.c
files/patch-pa_tests-patest__wire.c
--MP_/JJ/ShK/V30r83f7lJdxVvAo
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=portaudio.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/audio/portaudio/Makefile ./Makefile
--- /usr/ports/audio/portaudio/Makefile 2012-12-05 00:40:55.000000000 +0100
+++ ./Makefile 2012-12-22 14:16:22.000000000 +0100
@@ -2,61 +2,72 @@
# Date created: 18 May 2003
# Whom: michaelnottebrock@gmx.net and lioux@FreeBSD.org
#
-# $FreeBSD: head/audio/portaudio/Makefile 300895 2012-07-14 12:56:14Z beat $
+# $FreeBSD: ports/audio/portaudio/Makefile,v 1.14 2012/05/05 17:46:40 ak Exp $
#
PORTNAME= portaudio
PORTVERSION= 18.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.portaudio.com/archives/
DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= Portable cross-platform Audio API
+LICENSE= MIT
+
USE_ZIP= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_DOS2UNIX= yes
USE_LDCONFIG= yes
-USE_DOS2UNIX= yes
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
+
+PORTDOCS= *
+
+DOCSRCDIR1= ${WRKSRC}
+DOC_FILES1= README.txt index.html
-PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION}
-SHLIB_VERSION= 0
+DOCSRCDIR2= ${WRKSRC}/docs
+DOCSDIR2= ${DOCSDIR}/docs
+DOC_FILES2= *.html *.txt *.pdf
-pre-everything::
-.if !defined(WITH_PATESTS)
- @${ECHO_MSG}
- @${ECHO_MSG} "You can additionally build portaudio's testsuite by defining WITH_PATESTS."
- @${ECHO_MSG}
-PLIST_SUB+= WITH_PATESTS="@comment "
+OPTIONS_DEFINE= PATEST
+
+OPTIONS_DEFAULT= PATEST
+
+PATEST_DESC= PortAudio Test Programs
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PATEST)
+PLIST_SUB+= PATEST=""
.else
-PLIST_SUB+= WITH_PATESTS=""
+PLIST_SUB+= PATEST="@comment "
.endif
post-patch:
-# replace obsolete headers, and fix up thread library
- @${FIND} ${WRKSRC} -type f \
- | ${XARGS} -x -n 10 \
- ${REINPLACE_CMD} -E \
- -e 's|malloc.h|stdlib.h|' \
- -e 's|machine\/soundcard.h|sys\/soundcard.h|' \
- -e 's|-lpthread|${PTHREAD_LIBS}|'
+ @${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:
-# Make configure executable
@${CHMOD} +x ${WRKSRC}/configure
-.if !defined(WITH_PATESTS)
-post-configure:
- @${REINPLACE_CMD} -e 's|tests$$||' ${WRKSRC}/Makefile
+post-install:
+.if ${PORT_OPTIONS:MPATEST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
.endif
-post-install:
-.if defined(WITH_PATESTS)
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR2}
+ ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
.endif
- @${LN} -sf libportaudio.so \
- ${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION}
.include <bsd.port.mk>
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 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-pa_tests-patest__record.c 2012-12-22 13:59:24.000000000 +0100
@@ -0,0 +1,14 @@
+--- 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 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-pa_tests-patest__wire.c 2012-12-22 13:58:32.000000000 +0100
@@ -0,0 +1,13 @@
+--- 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/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-05 00:40:55.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 Sun Dec 7 14:48:31 2003
-+++ pa_tests/patest_record.c Sun Dec 7 14:48:53 2003
-@@ -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-05 00:40:55.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 Sun Dec 7 14:49:15 2003
-+++ pa_tests/patest_wire.c Sun Dec 7 14:49:52 2003
-@@ -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-descr ./pkg-descr
--- /usr/ports/audio/portaudio/pkg-descr 2012-12-05 00:40:55.000000000 +0100
+++ ./pkg-descr 2012-10-09 19:05:26.000000000 +0200
@@ -1,9 +1,12 @@
-PortAudio is a free, cross platform, open-source, audio I/O library.
-It lets you write simple audio programs in 'C' that will compile
-and run on many platforms including Windows, Macintosh (8,9,X),
-Unix (OSS), SGI, and BeOS. PortAudio is intended to promote the
-exchange of audio synthesis software between developers on different
-platforms, and was recently selected as the audio component of a
-larger PortMusic project that includes MIDI and sound file support.
+PortAudio is a free, cross-platform, open-source, audio I/O library.
+It lets you write simple audio programs in 'C' or C++ that will compile and run
+on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA).
+It is intended to promote the exchange of audio software between developers
+on different platforms. Many applications use PortAudio for Audio I/O.
+
+PortAudio provides a very simple API for recording and/or playing sound using
+a simple callback function or a blocking read/write interface.
+Example programs are included that play sine waves, process audio input
+(guitar fuzz), record and playback audio, list available audio devices, etc.
WWW: http://www.portaudio.com/
diff -ruN --exclude=CVS /usr/ports/audio/portaudio/pkg-plist ./pkg-plist
--- /usr/ports/audio/portaudio/pkg-plist 2012-12-05 00:40:55.000000000 +0100
+++ ./pkg-plist 2012-12-22 13:46:19.000000000 +0100
@@ -1,28 +1,27 @@
-%%WITH_PATESTS%%bin/patest_buffer
-%%WITH_PATESTS%%bin/patest_clip
-%%WITH_PATESTS%%bin/patest_dither
-%%WITH_PATESTS%%bin/patest_hang
-%%WITH_PATESTS%%bin/patest_latency
-%%WITH_PATESTS%%bin/patest_leftright
-%%WITH_PATESTS%%bin/patest_longsine
-%%WITH_PATESTS%%bin/patest_many
-%%WITH_PATESTS%%bin/patest_maxsines
-%%WITH_PATESTS%%bin/patest_multi_sine
-%%WITH_PATESTS%%bin/patest_pink
-%%WITH_PATESTS%%bin/patest_record
-%%WITH_PATESTS%%bin/patest_ringmix
-%%WITH_PATESTS%%bin/patest_saw
-%%WITH_PATESTS%%bin/patest_sine
-%%WITH_PATESTS%%bin/patest_sine8
-%%WITH_PATESTS%%bin/patest_sine_formats
-%%WITH_PATESTS%%bin/patest_sine_time
-%%WITH_PATESTS%%bin/patest_stop
-%%WITH_PATESTS%%bin/patest_sync
-%%WITH_PATESTS%%bin/patest_toomanysines
-%%WITH_PATESTS%%bin/patest_underflow
-%%WITH_PATESTS%%bin/patest_wire
+%%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%%
===> Done
--MP_/JJ/ShK/V30r83f7lJdxVvAo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212221340.qBMDe0So025605>