pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio audio: Allow audacity to use the system's portau...
details: https://anonhg.NetBSD.org/pkgsrc/rev/89dfecca67d5
branches: trunk
changeset: 342872:89dfecca67d5
user: nia <nia%pkgsrc.org@localhost>
date: Sat Oct 26 17:22:07 2019 +0000
description:
audio: Allow audacity to use the system's portaudio.
This should make it easier to diagnose and fix recording problems later.
Probably.
diffstat:
audio/audacity/Makefile | 130 ++++-----
audio/audacity/PLIST | 112 ++++----
audio/audacity/distinfo | 3 +-
audio/audacity/options.mk | 45 ---
audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in | 17 -
audio/portaudio/Makefile | 10 +-
audio/portaudio/PLIST | 3 +-
audio/portaudio/distinfo | 12 +-
audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c | 52 +++-
audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c | 39 ++-
10 files changed, 219 insertions(+), 204 deletions(-)
diffs (truncated from 593 to 300 lines):
diff -r 60a2cbfb8d90 -r 89dfecca67d5 audio/audacity/Makefile
--- a/audio/audacity/Makefile Sat Oct 26 17:01:38 2019 +0000
+++ b/audio/audacity/Makefile Sat Oct 26 17:22:07 2019 +0000
@@ -1,99 +1,82 @@
-# $NetBSD: Makefile,v 1.125 2019/10/20 09:59:13 nia Exp $
+# $NetBSD: Makefile,v 1.126 2019/10/26 17:22:08 nia Exp $
+
+DISTNAME= audacity-2.3.2
+PKGREVISION= 2
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
+GITHUB_PROJECT= Audacity
+GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.audacityteam.org/
+COMMENT= Audio editor
+LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
+
+WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+
+EXTRACT_USING= bsdtar
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+
+USE_TOOLS+= automake autoreconf bash
+USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
+USE_TOOLS+= xgettext zip:run
-DISTNAME= audacity-2.3.2
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
-GITHUB_PROJECT= Audacity
-GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
+USE_LANGUAGES= c gnu++11
+
+# configure: error: Audacity requires at least GCC 4.9
+GCC_REQD+= 4.9
+
+WRAPPER_SHELL= ${BASH}
+CONFIG_SHELL= ${BASH}
+
+CONFIGURE_ARGS+= --enable-ladspa
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.audacityteam.org/
-COMMENT= Audio editor
-LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
-
-WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+CONFIGURE_ARGS+= --with-libmad="no"
+CONFIGURE_ARGS+= --with-expat="system"
+CONFIGURE_ARGS+= --with-libsndfile="system"
+CONFIGURE_ARGS+= --with-libsoxr="system"
+CONFIGURE_ARGS+= --with-portaudio="system"
+CONFIGURE_ARGS+= --with-sbsms="local" # system version doesn't work
+CONFIGURE_ARGS+= --with-portmidi="local"
+CONFIGURE_ARGS+= --with-ffmpeg="system"
+CONFIGURE_ARGS+= --with-lame="system"
+CONFIGURE_ARGS+= --with-libflac="system"
+CONFIGURE_ARGS+= --with-libid3tag="system"
+CONFIGURE_ARGS+= --with-libtwolame="system"
+CONFIGURE_ARGS+= --with-libvamp="system"
+CONFIGURE_ARGS+= --with-libvorbis="system"
+CONFIGURE_ARGS+= --with-lv2="system"
+CONFIGURE_ARGS+= --with-soundtouch="system"
.include "../../mk/bsd.prefs.mk"
-EXTRACT_USING= bsdtar
-USE_LIBTOOL= yes
-USE_TOOLS+= automake autoreconf bash
-USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
-USE_TOOLS+= xgettext zip:run
-USE_LANGUAGES= c c++
-# configure: error: Audacity requires at least GCC 4.9
-GCC_REQD+= 4.9
-
-WRAPPER_SHELL= ${BASH}
-CONFIG_SHELL= ${BASH}
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --enable-nyquist=yes
-CONFIGURE_ARGS+= --with-expat=system
-CONFIGURE_ARGS+= --with-ffmpeg=system
-CONFIGURE_ARGS+= --with-lame=system
-CONFIGURE_ARGS+= --with-libflac=system
-CONFIGURE_ARGS+= --with-libid3tag=system
-CONFIGURE_ARGS+= --with-libsamplerate=system
-CONFIGURE_ARGS+= --with-libsndfile=system
-CONFIGURE_ARGS+= --with-libtwolame=system
-CONFIGURE_ARGS+= --with-libvamp=local
-CONFIGURE_ARGS+= --with-libvorbis=system
-CONFIGURE_ARGS+= --with-lv2=system
-CONFIGURE_ARGS+= --with-midi=local
-# configure: error: Your version of portaudio does not include
-# required Pa_GetStreamHostApiType function
-CONFIGURE_ARGS+= --with-portaudio=local
-CONFIGURE_ARGS+= --with-sbsms=local
-CONFIGURE_ARGS+= --with-soundtouch=system
-CONFIGURE_ARGS+= --with-libsoxr=system
-CONFIGURE_ARGS+= --with-widgetextra=local
-
-# for internal portaudio...
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --with-alsa
-.else
-CONFIGURE_ARGS+= --without-alsa
-CONFIGURE_ENV+= ac_cv_header_pa_linux_alsa_h=no
-.endif
-
.if ${MACHINE_ARCH} == "i386"
# 64 bit atomic ops are required
-CXXFLAGS+= -march=i586
+CXXFLAGS+= -march=i586
.endif
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
CONFIGURE_ARGS+= --disable-sse
.endif
-.include "../../mk/oss.buildlink3.mk"
+CFLAGS.SunOS+= -fPIC
-.if !empty(OSS_TYPE) && ${OSS_TYPE} != "none"
-CONFIGURE_ARGS+= --with-oss
-.else
-CONFIGURE_ARGS+= --without-oss
-.endif
+LIBS.NetBSD+= -lcompat
CONFIG_GUESS_OVERRIDE= \
config.guess */config.guess */*/config.guess */*/*/config.guess
CONFIG_SUB_OVERRIDE= \
config.sub */config.sub */*/config.sub */*/*/config.sub
-CFLAGS.SunOS+= -fPIC
-
PTHREAD_AUTO_VARS= yes
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./build/vamp-plugin.map
-LIBS.NetBSD+= -lcompat
-
INSTALLATION_DIRS+= lib
# regen Makefile.in to avoid being built as shared libraries
pre-configure:
- cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv
cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
@@ -101,8 +84,6 @@
${INSTALL_LIB} ${WRKSRC}/lib-src/FileDialog/.libs/libFileDialog.so.0.0.0 \
${DESTDIR}${PREFIX}/lib/libFileDialog.so.0
-.include "options.mk"
-
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../audio/alsa-lib/buildlink3.mk"
@@ -111,13 +92,17 @@
.include "../../audio/soundtouch/buildlink3.mk"
BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9
.include "../../audio/twolame/buildlink3.mk"
+.include "../../audio/ladspa/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsoxr/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+BUILDLINK_API_DEPENDS.portaudio+= portaudio>=190600.20161030nb1
+.include "../../audio/portaudio/buildlink3.mk"
.include "../../audio/suil/buildlink3.mk"
+.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
.include "../../audio/flac/buildlink3.mk"
@@ -126,5 +111,6 @@
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 60a2cbfb8d90 -r 89dfecca67d5 audio/audacity/PLIST
--- a/audio/audacity/PLIST Sat Oct 26 17:01:38 2019 +0000
+++ b/audio/audacity/PLIST Sat Oct 26 17:22:07 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/06/04 23:09:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/10/26 17:22:08 nia Exp $
bin/audacity
lib/libFileDialog.so.0
man/man1/audacity.1
@@ -92,61 +92,61 @@
share/icons/hicolor/32x32/apps/audacity.png
share/icons/hicolor/48x48/apps/audacity.png
share/icons/hicolor/scalable/apps/audacity.svg
-${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/cs/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/cy/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/da/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/de/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/el/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/es/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/eu/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/eu_ES/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fa/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ga/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/gl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/he/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hu/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hy/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/id/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/it/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ja/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ka/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/km/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ko/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/lt/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/mk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/my/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/nb/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/oc/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pt_PT/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ro/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ru/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sr_RS/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sv/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ta/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/tg/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/tr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/uk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/vi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/audacity.mo
+share/locale/af/LC_MESSAGES/audacity.mo
+share/locale/ar/LC_MESSAGES/audacity.mo
+share/locale/be/LC_MESSAGES/audacity.mo
+share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/bn/LC_MESSAGES/audacity.mo
+share/locale/bs/LC_MESSAGES/audacity.mo
+share/locale/ca/LC_MESSAGES/audacity.mo
+share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
+share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/cy/LC_MESSAGES/audacity.mo
+share/locale/da/LC_MESSAGES/audacity.mo
+share/locale/de/LC_MESSAGES/audacity.mo
+share/locale/el/LC_MESSAGES/audacity.mo
+share/locale/es/LC_MESSAGES/audacity.mo
+share/locale/eu/LC_MESSAGES/audacity.mo
+share/locale/eu_ES/LC_MESSAGES/audacity.mo
+share/locale/fa/LC_MESSAGES/audacity.mo
+share/locale/fi/LC_MESSAGES/audacity.mo
+share/locale/fr/LC_MESSAGES/audacity.mo
+share/locale/ga/LC_MESSAGES/audacity.mo
+share/locale/gl/LC_MESSAGES/audacity.mo
+share/locale/he/LC_MESSAGES/audacity.mo
+share/locale/hi/LC_MESSAGES/audacity.mo
+share/locale/hr/LC_MESSAGES/audacity.mo
+share/locale/hu/LC_MESSAGES/audacity.mo
+share/locale/hy/LC_MESSAGES/audacity.mo
+share/locale/id/LC_MESSAGES/audacity.mo
+share/locale/it/LC_MESSAGES/audacity.mo
+share/locale/ja/LC_MESSAGES/audacity.mo
+share/locale/ka/LC_MESSAGES/audacity.mo
+share/locale/km/LC_MESSAGES/audacity.mo
+share/locale/ko/LC_MESSAGES/audacity.mo
+share/locale/lt/LC_MESSAGES/audacity.mo
+share/locale/mk/LC_MESSAGES/audacity.mo
+share/locale/my/LC_MESSAGES/audacity.mo
+share/locale/nb/LC_MESSAGES/audacity.mo
+share/locale/nl/LC_MESSAGES/audacity.mo
+share/locale/oc/LC_MESSAGES/audacity.mo
+share/locale/pl/LC_MESSAGES/audacity.mo
+share/locale/pt_BR/LC_MESSAGES/audacity.mo
+share/locale/pt_PT/LC_MESSAGES/audacity.mo
+share/locale/ro/LC_MESSAGES/audacity.mo
Home |
Main Index |
Thread Index |
Old Index