CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 20 Oct 2019 11:10:49 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 20 11:10:49 UTC 2019

Modified Files:
        pkgsrc/audio: Makefile
        pkgsrc/audio/espeak: Makefile buildlink3.mk
        pkgsrc/audio/fluidsynth: options.mk
        pkgsrc/audio/lmms: options.mk
        pkgsrc/audio/mixxx: Makefile
        pkgsrc/audio/musescore: options.mk
        pkgsrc/audio/py-audio: Makefile
        pkgsrc/chat/mumble: options.mk
        pkgsrc/editors/xournalpp: Makefile
        pkgsrc/emulators/dolphin-emu: options.mk
        pkgsrc/emulators/hatari: Makefile
        pkgsrc/games/wordwarvi: Makefile
        pkgsrc/geography/opencpn: Makefile
        pkgsrc/graphics/denemo: Makefile
        pkgsrc/ham/fldigi: Makefile
        pkgsrc/ham/freedv: Makefile
        pkgsrc/ham/gnuradio-core: Makefile.common
Added Files:
        pkgsrc/audio/portaudio: DESCR Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/audio/portaudio/patches:
            patch-src_hostapi_alsa_pa__linux__alsa.c
            patch-src_hostapi_oss_pa__unix__oss.c
Removed Files:
        pkgsrc/audio/portaudio-devel: DESCR Makefile PLIST buildlink3.mk
            distinfo options.mk
        pkgsrc/audio/portaudio-devel/patches:
            patch-src_hostapi_alsa_pa__linux__alsa.c
            patch-src_hostapi_oss_pa__unix__oss.c

Log Message:
Rename audio/portaudio-devel to audio/portaudio


To generate a diff of this commit:
cvs rdiff -u -r1.573 -r1.574 pkgsrc/audio/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/espeak/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/espeak/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/fluidsynth/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/lmms/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/musescore/options.mk
cvs rdiff -u -r0 -r1.4 pkgsrc/audio/portaudio/DESCR \
    pkgsrc/audio/portaudio/PLIST
cvs rdiff -u -r0 -r1.24 pkgsrc/audio/portaudio/Makefile
cvs rdiff -u -r0 -r1.13 pkgsrc/audio/portaudio/buildlink3.mk
cvs rdiff -u -r0 -r1.17 pkgsrc/audio/portaudio/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/portaudio/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/audio/portaudio-devel/DESCR
cvs rdiff -u -r1.14 -r0 pkgsrc/audio/portaudio-devel/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/portaudio-devel/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/portaudio-devel/buildlink3.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/audio/portaudio-devel/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/portaudio-devel/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c \
    pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_oss_pa__unix__oss.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c \
    pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/py-audio/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/mumble/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/dolphin-emu/options.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/emulators/hatari/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/wordwarvi/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/geography/opencpn/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/denemo/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/ham/fldigi/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/ham/freedv/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/ham/gnuradio-core/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.573 pkgsrc/audio/Makefile:1.574
--- pkgsrc/audio/Makefile:1.573 Fri Oct 18 12:51:36 2019
+++ pkgsrc/audio/Makefile       Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.573 2019/10/18 12:51:36 nia Exp $
+# $NetBSD: Makefile,v 1.574 2019/10/20 11:10:47 nia Exp $
 #
 
 COMMENT=       Audio tools
@@ -377,7 +377,7 @@ SUBDIR+=    pianobar
 SUBDIR+=       picard
 SUBDIR+=       playitslowly
 SUBDIR+=       pocketsphinx
-SUBDIR+=       portaudio-devel
+SUBDIR+=       portaudio
 SUBDIR+=       pulseaudio
 SUBDIR+=       py-acoustid
 SUBDIR+=       py-ao

Index: pkgsrc/audio/espeak/Makefile
diff -u pkgsrc/audio/espeak/Makefile:1.12 pkgsrc/audio/espeak/Makefile:1.13
--- pkgsrc/audio/espeak/Makefile:1.12   Sun Jul 21 22:47:56 2019
+++ pkgsrc/audio/espeak/Makefile        Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/07/21 22:47:56 nia Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/20 11:10:47 nia Exp $
 
 MINOR_VER=     48
 DISTNAME=      espeak-1.${MINOR_VER}.04-source
@@ -44,6 +44,6 @@ do-install:
        cd ${WRKSRC}/espeak-data && \
                ${PAX} -rw -pp . ${DESTDIR}${PREFIX}/share/espeak-data
 
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/espeak/buildlink3.mk
diff -u pkgsrc/audio/espeak/buildlink3.mk:1.3 pkgsrc/audio/espeak/buildlink3.mk:1.4
--- pkgsrc/audio/espeak/buildlink3.mk:1.3       Sun Jul 21 22:47:56 2019
+++ pkgsrc/audio/espeak/buildlink3.mk   Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/07/21 22:47:56 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2019/10/20 11:10:47 nia Exp $
 
 BUILDLINK_TREE+=       espeak
 
@@ -8,7 +8,7 @@ ESPEAK_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.espeak+= espeak>=1.26
 BUILDLINK_PKGSRCDIR.espeak?=   ../../audio/espeak
 
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .endif # ESPEAK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -espeak

Index: pkgsrc/audio/fluidsynth/options.mk
diff -u pkgsrc/audio/fluidsynth/options.mk:1.1 pkgsrc/audio/fluidsynth/options.mk:1.2
--- pkgsrc/audio/fluidsynth/options.mk:1.1      Wed Oct 16 19:25:44 2019
+++ pkgsrc/audio/fluidsynth/options.mk  Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/10/16 19:25:44 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/20 11:10:47 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fluidsynth
 PKG_SUPPORTED_OPTIONS=         alsa jack portaudio pulseaudio
@@ -22,7 +22,7 @@ CMAKE_ARGS+=  -Denable-jack=OFF
 
 .if !empty(PKG_OPTIONS:Mportaudio)
 CMAKE_ARGS+=   -Denable-portaudio=ON
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -Denable-portaudio=OFF
 .endif

Index: pkgsrc/audio/lmms/options.mk
diff -u pkgsrc/audio/lmms/options.mk:1.2 pkgsrc/audio/lmms/options.mk:1.3
--- pkgsrc/audio/lmms/options.mk:1.2    Mon Jun 17 07:31:12 2019
+++ pkgsrc/audio/lmms/options.mk        Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/06/17 07:31:12 nia Exp $
+# $NetBSD: options.mk,v 1.3 2019/10/20 11:10:47 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lmms
 
@@ -24,7 +24,7 @@ CMAKE_ARGS+=  -DWANT_JACK=OFF
 
 .if !empty(PKG_OPTIONS:Mportaudio)
 CMAKE_ARGS+=   -DWANT_PORTAUDIO=ON
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DWANT_PORTAUDIO=OFF
 .endif

Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.7 pkgsrc/audio/mixxx/Makefile:1.8
--- pkgsrc/audio/mixxx/Makefile:1.7     Sun Oct  6 13:45:42 2019
+++ pkgsrc/audio/mixxx/Makefile Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/06 13:45:42 nia Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/20 11:10:47 nia Exp $
 
 DISTNAME=      mixxx-2.2.2
 CATEGORIES=    audio
@@ -90,7 +90,7 @@ do-install:
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../audio/lv2/buildlink3.mk"
 .include "../../audio/opusfile/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../audio/rubberband/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"

Index: pkgsrc/audio/musescore/options.mk
diff -u pkgsrc/audio/musescore/options.mk:1.1 pkgsrc/audio/musescore/options.mk:1.2
--- pkgsrc/audio/musescore/options.mk:1.1       Wed Oct 16 23:22:08 2019
+++ pkgsrc/audio/musescore/options.mk   Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/10/16 23:22:08 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/20 11:10:47 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.musescore
 PKG_SUPPORTED_OPTIONS=         alsa jack portaudio pulseaudio
@@ -29,7 +29,7 @@ CMAKE_ARGS+=  -DBUILD_JACK=OFF
 
 .if !empty(PKG_OPTIONS:Mportaudio)
 CMAKE_ARGS+=   -DBUILD_PORTAUDIO=ON
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DBUILD_PORTAUDIO=OFF
 .endif

Index: pkgsrc/audio/py-audio/Makefile
diff -u pkgsrc/audio/py-audio/Makefile:1.1 pkgsrc/audio/py-audio/Makefile:1.2
--- pkgsrc/audio/py-audio/Makefile:1.1  Mon Apr  2 08:41:28 2018
+++ pkgsrc/audio/py-audio/Makefile      Sun Oct 20 11:10:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/02 08:41:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/20 11:10:47 nia Exp $
 
 DISTNAME=      PyAudio-0.2.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyA/a/}
@@ -11,5 +11,5 @@ COMMENT=      Python bindings for PortAudio
 LICENSE=       mit
 
 .include "../../lang/python/egg.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/mumble/options.mk
diff -u pkgsrc/chat/mumble/options.mk:1.3 pkgsrc/chat/mumble/options.mk:1.4
--- pkgsrc/chat/mumble/options.mk:1.3   Mon Sep 16 22:46:20 2019
+++ pkgsrc/chat/mumble/options.mk       Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/09/16 22:46:20 nia Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/20 11:10:48 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mumble
 PKG_SUPPORTED_OPTIONS=         alsa pulseaudio portaudio
@@ -21,7 +21,7 @@ CONFIG_OPTIONS+=      CONFIG+=no-pulseaudio
 .endif
 
 .if !empty(PKG_OPTIONS:Mportaudio)
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .else
 CONFIG_OPTIONS+=       CONFIG+=no-portaudio
 .endif

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.2 pkgsrc/editors/xournalpp/Makefile:1.3
--- pkgsrc/editors/xournalpp/Makefile:1.2       Sat Oct 19 12:46:05 2019
+++ pkgsrc/editors/xournalpp/Makefile   Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/19 12:46:05 nia Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/20 11:10:48 nia Exp $
 
 DISTNAME=      xournalpp-1.0.15
 PKGREVISION=   1
@@ -27,7 +27,7 @@ DEPENDS+=     tex-standalone-[0-9]*:../../pr
 
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/lua53/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"

Index: pkgsrc/emulators/dolphin-emu/options.mk
diff -u pkgsrc/emulators/dolphin-emu/options.mk:1.3 pkgsrc/emulators/dolphin-emu/options.mk:1.4
--- pkgsrc/emulators/dolphin-emu/options.mk:1.3 Thu Jun 13 19:44:35 2019
+++ pkgsrc/emulators/dolphin-emu/options.mk     Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/06/13 19:44:35 nia Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/20 11:10:48 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.dolphin-emu
 PKG_SUPPORTED_OPTIONS=         alsa libao llvm openal portaudio pulseaudio
@@ -32,7 +32,7 @@ CMAKE_ARGS+=  -DENABLE_OPENAL=ON
 
 .if !empty(PKG_OPTIONS:Mportaudio)
 CMAKE_ARGS+=   -DENABLE_PORTAUDIO=ON
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)

Index: pkgsrc/emulators/hatari/Makefile
diff -u pkgsrc/emulators/hatari/Makefile:1.52 pkgsrc/emulators/hatari/Makefile:1.53
--- pkgsrc/emulators/hatari/Makefile:1.52       Mon Sep  2 13:19:59 2019
+++ pkgsrc/emulators/hatari/Makefile    Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/09/02 13:19:59 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/10/20 11:10:48 nia Exp $
 
 DISTNAME=      hatari-2.0.0
 PKGREVISION=   1
@@ -35,7 +35,7 @@ REPLACE_PYTHON+=      tools/hconsole/hconsole
 
 INSTALLATION_DIRS+=    share/doc/hatari
 
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/games/wordwarvi/Makefile
diff -u pkgsrc/games/wordwarvi/Makefile:1.9 pkgsrc/games/wordwarvi/Makefile:1.10
--- pkgsrc/games/wordwarvi/Makefile:1.9 Sun Jul 21 22:24:53 2019
+++ pkgsrc/games/wordwarvi/Makefile     Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/07/21 22:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/20 11:10:48 nia Exp $
 #
 
 DISTNAME=      wordwarvi-1.0.2
@@ -18,6 +18,6 @@ MAKE_FLAGS+=  PREFIX=${PREFIX}
 MAKE_ENV+=     MANDIR=${PREFIX}/${PKGMANDIR}
 
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/opencpn/Makefile
diff -u pkgsrc/geography/opencpn/Makefile:1.35 pkgsrc/geography/opencpn/Makefile:1.36
--- pkgsrc/geography/opencpn/Makefile:1.35      Thu Aug 22 12:23:15 2019
+++ pkgsrc/geography/opencpn/Makefile   Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/22 12:23:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/20 11:10:48 nia Exp $
 
 DISTNAME=      OpenCPN-5.0.0
 PKGNAME=       ${DISTNAME:S/OpenCPN/opencpn/}
@@ -46,7 +46,7 @@ LDFLAGS+=     ${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../textproc/tinyxml/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/graphics/denemo/Makefile
diff -u pkgsrc/graphics/denemo/Makefile:1.58 pkgsrc/graphics/denemo/Makefile:1.59
--- pkgsrc/graphics/denemo/Makefile:1.58        Sun Jul 21 22:24:56 2019
+++ pkgsrc/graphics/denemo/Makefile     Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/07/21 22:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2019/10/20 11:10:48 nia Exp $
 #
 
 DISTNAME=      denemo-0.9.2
@@ -33,7 +33,7 @@ post-install:
 .include "../../audio/aubio/buildlink3.mk"
 .include "../../audio/libsmf/buildlink3.mk"
 .include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 # Depends on lilypond which is still guile 1.8.
 .include "../../lang/guile/buildlink3.mk"

Index: pkgsrc/ham/fldigi/Makefile
diff -u pkgsrc/ham/fldigi/Makefile:1.112 pkgsrc/ham/fldigi/Makefile:1.113
--- pkgsrc/ham/fldigi/Makefile:1.112    Wed Sep 18 14:17:11 2019
+++ pkgsrc/ham/fldigi/Makefile  Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2019/09/18 14:17:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.113 2019/10/20 11:10:48 nia Exp $
 
 DISTNAME=      fldigi-4.1.01
 PKGREVISION=   4
@@ -44,7 +44,7 @@ CXXFLAGS+=    -Wno-error=c++11-narrowing
 
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../ham/hamlib/buildlink3.mk"

Index: pkgsrc/ham/freedv/Makefile
diff -u pkgsrc/ham/freedv/Makefile:1.17 pkgsrc/ham/freedv/Makefile:1.18
--- pkgsrc/ham/freedv/Makefile:1.17     Sun Jul 21 22:25:07 2019
+++ pkgsrc/ham/freedv/Makefile  Sun Oct 20 11:10:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/21 22:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/10/20 11:10:48 nia Exp $
 
 DISTNAME=      freedv-1.1
 PKGREVISION=   9
@@ -34,7 +34,7 @@ pre-configure:
 .include "../../ham/hamlib/buildlink3.mk"
 .include "../../audio/sox/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
-.include "../../audio/portaudio-devel/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.20 pkgsrc/ham/gnuradio-core/Makefile.common:1.21
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.20       Mon Oct 14 12:40:27 2019
+++ pkgsrc/ham/gnuradio-core/Makefile.common    Sun Oct 20 11:10:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2019/10/14 12:40:27 mef Exp $
+# $NetBSD: Makefile.common,v 1.21 2019/10/20 11:10:49 nia Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -135,7 +135,7 @@ do-install:
 
 .include       "../../audio/gsm/buildlink3.mk"
 .include       "../../audio/jack/buildlink3.mk"
-.include       "../../audio/portaudio-devel/buildlink3.mk"
+.include       "../../audio/portaudio/buildlink3.mk"
 
 .include       "../../devel/boost-headers/buildlink3.mk"
 .include       "../../devel/boost-libs/buildlink3.mk"

Added files:

Index: pkgsrc/audio/portaudio/DESCR
diff -u /dev/null pkgsrc/audio/portaudio/DESCR:1.4
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/DESCR        Sun Oct 20 11:10:49 2019
@@ -0,0 +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 provides a very simple API for recording and/or playing sound
+using a simple callback function.  Example programs are included that
+synthesize sine waves and pink noise, perform fuzz distortion on a guitar,
+list available audio devices, etc.
Index: pkgsrc/audio/portaudio/PLIST
diff -u /dev/null pkgsrc/audio/portaudio/PLIST:1.4
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/PLIST        Sun Oct 20 11:10:49 2019
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST,v 1.4 2019/10/20 11:10:49 nia Exp $
+${PLIST.alsa}include/portaudio2/pa_linux_alsa.h
+include/portaudio2/portaudio.h
+include/portaudio2/portaudiocpp/AutoSystem.hxx
+include/portaudio2/portaudiocpp/BlockingStream.hxx
+include/portaudio2/portaudiocpp/CFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/CallbackInterface.hxx
+include/portaudio2/portaudiocpp/CallbackStream.hxx
+include/portaudio2/portaudiocpp/CppFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/Device.hxx
+include/portaudio2/portaudiocpp/DirectionSpecificStreamParameters.hxx
+include/portaudio2/portaudiocpp/Exception.hxx
+include/portaudio2/portaudiocpp/HostApi.hxx
+include/portaudio2/portaudiocpp/InterfaceCallbackStream.hxx
+include/portaudio2/portaudiocpp/MemFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/PortAudioCpp.hxx
+include/portaudio2/portaudiocpp/SampleDataFormat.hxx
+include/portaudio2/portaudiocpp/Stream.hxx
+include/portaudio2/portaudiocpp/StreamParameters.hxx
+include/portaudio2/portaudiocpp/System.hxx
+include/portaudio2/portaudiocpp/SystemDeviceIterator.hxx
+include/portaudio2/portaudiocpp/SystemHostApiIterator.hxx
+lib/pkgconfig/portaudio-2.0.pc
+lib/pkgconfig/portaudiocpp.pc
+lib/portaudio2/libportaudio.la
+lib/portaudio2/libportaudiocpp.la

Index: pkgsrc/audio/portaudio/Makefile
diff -u /dev/null pkgsrc/audio/portaudio/Makefile:1.24
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/Makefile     Sun Oct 20 11:10:49 2019
@@ -0,0 +1,54 @@
+# $NetBSD: Makefile,v 1.24 2019/10/20 11:10:49 nia Exp $
+
+DISTNAME=      pa_stable_v190600_20161030
+PKGNAME=       ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
+CATEGORIES=    audio
+MASTER_SITES=  http://www.portaudio.com/archives/
+EXTRACT_SUFX=  .tgz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.portaudio.com/
+COMMENT=       Portable cross-platform audio API
+LICENSE=       mit
+
+CONFLICTS+=    portaudio-devel-[0-9]*
+SUPERSEDES+=   portaudio-devel-[0-9]*
+
+USE_LANGUAGES= c c++
+USE_TOOLS+=    gmake pkg-config
+USE_LIBTOOL=   yes
+GNU_CONFIGURE= yes
+
+GNU_CONFIGURE_LIBSUBDIR=       portaudio2
+
+NOT_FOR_PLATFORM=      Interix-*-*
+
+CONFIGURE_ARGS+=       --enable-cxx
+CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/portaudio2
+CONFIGURE_ARGS+=       --disable-mac-universal
+
+LDFLAGS+=              ${LIBOSSAUDIO}
+PKGCONFIG_OVERRIDE=    portaudio-2.0.pc.in
+WRKSRC=                        ${WRKDIR}/portaudio
+
+INSTALLATION_DIRS=     include/portaudio2 lib/portaudio2 lib/pkgconfig
+
+SUBST_CLASSES+=                pthread
+SUBST_STAGE.pthread=   pre-configure
+SUBST_MESSAGE.pthread= Fixing -lpthread references.
+SUBST_FILES.pthread=   configure
+SUBST_SED.pthread=     -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g'
+SUBST_SED.pthread+=    -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
+
+SUBST_CLASSES+=                pc
+SUBST_STAGE.pc=                pre-configure
+SUBST_MESSAGE.pc=      Fixing pkgconfig directory
+SUBST_FILES.pc=                Makefile.in bindings/cpp/Makefile.in
+SUBST_SED.pc=          -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g'
+
+CFLAGS.Darwin+=                -Wno-deprecated-declarations
+
+.include "options.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/portaudio/buildlink3.mk
diff -u /dev/null pkgsrc/audio/portaudio/buildlink3.mk:1.13
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/buildlink3.mk        Sun Oct 20 11:10:49 2019
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.13 2019/10/20 11:10:49 nia Exp $
+
+BUILDLINK_TREE+=       portaudio
+
+.if !defined(PORTAUDIO_BUILDLINK3_MK)
+PORTAUDIO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.portaudio+=      portaudio>=19
+BUILDLINK_PKGSRCDIR.portaudio?=                ../../audio/portaudio
+BUILDLINK_INCDIRS.portaudio?=          include/portaudio2
+BUILDLINK_LIBDIRS.portaudio+=          lib/portaudio2
+BUILDLINK_CPPFLAGS.portaudio+=         -I${BUILDLINK_PREFIX.portaudio}/include/portaudio2
+.endif # PORTAUDIO_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -portaudio

Index: pkgsrc/audio/portaudio/distinfo
diff -u /dev/null pkgsrc/audio/portaudio/distinfo:1.17
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/distinfo     Sun Oct 20 11:10:49 2019
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.17 2019/10/20 11:10:49 nia Exp $
+
+SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8
+RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13
+SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
+Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes
+SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = b83c77d1dd23ab16f940dc11228bee3460d2a58b
+SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 81b6633bdb1cac8d3397bd7ebb6da1e28b68e3df

Index: pkgsrc/audio/portaudio/options.mk
diff -u /dev/null pkgsrc/audio/portaudio/options.mk:1.1
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/options.mk   Sun Oct 20 11:10:49 2019
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2019/10/20 11:10:49 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.portaudio
+PKG_SUPPORTED_OPTIONS=         alsa jack
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa=            yes
+CONFIGURE_ARGS+=       --with-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-alsa
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=       --with-jack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-jack
+.endif

Index: pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c:1.1
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c     Sun Oct 20 11:10:49 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.1 2019/10/20 11:10:49 nia Exp $
+
+Support building on non-Linux systems.
+
+--- src/hostapi/alsa/pa_linux_alsa.c.orig      2016-10-30 01:23:04.000000000 +0000
++++ src/hostapi/alsa/pa_linux_alsa.c
+@@ -79,6 +79,10 @@
+ 
+ #include "pa_linux_alsa.h"
+ 
++#ifndef ESTRPIPE
++    #define ESTRPIPE EPIPE
++#endif
++
+ /* Add missing define (for compatibility with older ALSA versions) */
+ #ifndef SND_PCM_TSTAMP_ENABLE
+     #define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP
Index: pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
diff -u /dev/null pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c:1.1
--- /dev/null   Sun Oct 20 11:10:49 2019
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c        Sun Oct 20 11:10:49 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.1 2019/10/20 11:10:49 nia Exp $
+
+Don't write an endless stream of silence when preparing the stream.
+
+--- src/hostapi/oss/pa_unix_oss.c.orig 2016-10-30 01:23:04.000000000 +0000
++++ src/hostapi/oss/pa_unix_oss.c
+@@ -1479,6 +1479,7 @@ static PaError PaOssStream_Prepare( PaOs
+ 
+         /* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
+          * OSS will complain. */
++#ifndef __NetBSD__
+         PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
+         while (1)
+         {
+@@ -1486,6 +1487,7 @@ static PaError PaOssStream_Prepare( PaOs
+                 break;
+         }
+         PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) );
++#endif
+     }
+ 
+     if( stream->sharedDevice )

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index