Date: Sun, 14 Oct 2012 00:44:32 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172678: [PATCH] audio/portaudio: update to 19.20111121, take maintainership, OptionsNG Message-ID: <20121013224437.6C7535CA@hub.freebsd.org> Resent-Message-ID: <201210132250.q9DMo0wG093138@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172678
>Category: ports
>Synopsis: [PATCH] audio/portaudio: update to 19.20111121, take maintainership, OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 13 22:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Update to 19.20111121
- Take maintainership
Removed file(s):
- files/patch-Makefile.in
- files/patch-configure
- files/patch-pa_tests::patest_record.c
- files/patch-pa_tests::patest_wire.c
Makefile changed:
+LICENSE= MIT
+OPTIONS_DEFINE= ALSA JACK PATEST DOXYGEN
+.include <bsd.port.options.mk>
Changed
+post-patch:
+.if defined(WITH_PATEST)
Changed pkg-plist
+%%PATEST%%bin/pa_devs
Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
portlint -A
WARN: Makefile: [70]: use ${VARIABLE}, instead of $(VARIABLE).
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors.
0 fatal errors and 3 warnings found.
WARN: Makefile: [70] because is used
@${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(libdir)/pkgconfig|$$(DESTDIR)$$(PREFIX)/libdata/pkgconfig|g' \
port test: clean
Build log
https://redports.org/buildarchive/20121013175137-33493/
>Fix:
--- portaudio-19.20111121.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/portaudio/Makefile ./Makefile
--- /usr/ports/audio/portaudio/Makefile 2012-05-05 19:46:40.000000000 +0200
+++ ./Makefile 2012-10-13 19:49:25.000000000 +0200
@@ -6,57 +6,89 @@
#
PORTNAME= portaudio
-PORTVERSION= 18.1
-PORTREVISION= 2
+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= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= Portable cross-platform Audio API
-USE_ZIP= yes
-USE_GMAKE= yes
+LICENSE= MIT
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig
+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
+
+OPTIONS_DEFINE= ALSA JACK PATEST DOXYGEN
+
+OPTIONS_DEFAULT= PATEST DOXYGEN
+
+PATEST_DESC= PortAudio Test Programs
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOXYGEN}
+BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
+.endif
-PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION}
-SHLIB_VERSION= 0
+.if ${PORT_OPTIONS:MALSA}
+CONFIGURE_ARGS+=--with-alsa
+LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
+.else
+CONFIGURE_ARGS+=--without-alsa
+.endif
-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 "
+.if ${PORT_OPTIONS:MJACK}
+CONFIGURE_ARGS+=--with-jack
+LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
.else
-PLIST_SUB+= WITH_PATESTS=""
+CONFIGURE_ARGS+=--without-jack
.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}|'
-pre-configure:
-# Make configure executable
- @${CHMOD} +x ${WRKSRC}/configure
-
-.if !defined(WITH_PATESTS)
-post-configure:
- @${REINPLACE_CMD} -e 's|tests$$||' ${WRKSRC}/Makefile
+.if defined(WITH_PATEST)
+PLIST_SUB+= PATEST=""
+.else
+PLIST_SUB+= PATEST="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(libdir)/pkgconfig|$$(DESTDIR)$$(PREFIX)/libdata/pkgconfig|g' \
+ ${WRKSRC}/Makefile.in
+ @${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
+
post-install:
-.if defined(WITH_PATESTS)
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
+.if ${PORT_OPTIONS:MPATEST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+.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
- @${LN} -sf libportaudio.so \
- ${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/audio/portaudio/distinfo ./distinfo
--- /usr/ports/audio/portaudio/distinfo 2011-03-19 13:28:53.000000000 +0100
+++ ./distinfo 2012-10-12 22:24:35.000000000 +0200
@@ -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 2011-03-12 19:12:57.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 2004-03-16 00:54:11.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 2003-12-07 15:40:31.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 2003-12-07 15:40:31.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 2009-12-21 03:15:46.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 2003-12-07 16:30:01.000000000 +0100
+++ ./pkg-plist 2012-10-12 22:39:14.000000000 +0200
@@ -1,28 +1,61 @@
-%%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/pa_devs
+%%PATEST%%bin/pa_fuzz
+%%PATEST%%bin/pa_minlat
+%%PATEST%%bin/paex_pink
+%%PATEST%%bin/paex_read_write_wire
+%%PATEST%%bin/paex_record
+%%PATEST%%bin/paex_saw
+%%PATEST%%bin/paex_sine
+%%PATEST%%bin/paex_write_sine
+%%PATEST%%bin/paex_write_sine_nonint
+%%PATEST%%bin/paqa_devs
+%%PATEST%%bin/paqa_errs
+%%PATEST%%bin/paqa_latency
+%%PATEST%%bin/patest1
+%%PATEST%%bin/patest_buffer
+%%PATEST%%bin/patest_callbackstop
+%%PATEST%%bin/patest_clip
+%%PATEST%%bin/patest_dither
+%%PATEST%%bin/patest_hang
+%%PATEST%%bin/patest_in_overflow
+%%PATEST%%%%PATEST%%bin/patest_latency
+%%PATEST%%bin/patest_leftright
+%%PATEST%%bin/patest_longsine
+%%PATEST%%bin/patest_many
+%%PATEST%%bin/patest_maxsines
+%%PATEST%%bin/patest_mono
+%%PATEST%%bin/patest_multi_sine
+%%PATEST%%bin/patest_out_underflow
+%%PATEST%%bin/patest_prime
+%%PATEST%%bin/patest_ringmix
+%%PATEST%%bin/patest_sine8
+%%PATEST%%bin/patest_sine_channelmaps
+%%PATEST%%bin/patest_sine_formats
+%%PATEST%%bin/patest_sine_srate
+%%PATEST%%bin/patest_sine_time
+%%PATEST%%bin/patest_start_stop
+%%PATEST%%bin/patest_stop
+%%PATEST%%bin/patest_stop_playout
+%%PATEST%%bin/patest_toomanysines
+%%PATEST%%bin/patest_two_rates
+%%PATEST%%bin/patest_underflow
+%%PATEST%%bin/patest_wire
include/portaudio.h
lib/libportaudio.a
+lib/libportaudio.la
lib/libportaudio.so
-lib/libportaudio.so.0.0.18
-lib/libportaudio.so.%%SHLIB_VERSION%%
+lib/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%%
--- portaudio-19.20111121.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121013224437.6C7535CA>