On Mon, Jun 15, 2020 at 02:57:55PM +0200, Raphael Graf wrote: > Attached are the following new ports: > audio/lv2 LADSPA V2 Plugin API > audio/lilv library for simple use of LV2 plugins in applications > audio/suil library for loading and wrapping LV2 plugin UIs > converters/sratom library for serialising LV2 atoms to/from RDF > textproc/serd library for RDF syntax > textproc/sord library for storing RDF data in memory > > Audacity is currently building all of them locally. > Having these libs in ports makes maintaining/updating audacity easier. > (All of them are very similar ports-wise) > > Apart from audacity, there are not many consumers (yet). > - audio/calf is currently using "--without-lv2" > - multimedia/gstreamer-0.10/plugins-bad has "--disable-lv2" > > I've also attached an update to audacity 2.4.1 which uses these new ports. The > update may not be perfect yet, but should work fine for testing lv2 and > family. > > Comments are welcome >
Sorry, the audacity diff was not right, here is a better version.
lv2.tar.gz
Description: application/tar-gz
lilv.tar.gz
Description: application/tar-gz
serd.tar.gz
Description: application/tar-gz
sord.tar.gz
Description: application/tar-gz
sratom.tar.gz
Description: application/tar-gz
suil.tar.gz
Description: application/tar-gz
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.75
diff -u -p -u -p -r1.75 Makefile
--- Makefile 24 Jan 2020 05:20:37 -0000 1.75
+++ Makefile 16 Jun 2020 11:37:43 -0000
@@ -6,7 +6,7 @@ COMMENT= free audio editor
# so can't be fetched automatically
GH_ACCOUNT= audacity
GH_PROJECT= audacity
-GH_TAGNAME= Audacity-2.3.3
+GH_TAGNAME= Audacity-2.4.1
DISTNAME= ${GH_TAGNAME:L}
CATEGORIES= audio
@@ -16,114 +16,58 @@ HOMEPAGE= https://www.audacityteam.org/
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += FLAC FLAC++ ICE SDL2 SM SoundTouch X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
-WANTLIB += Xxf86vm aom atk-1.0 atk-bridge-2.0 avcodec avformat
-WANTLIB += avutil bz2 c cairo cairo-gobject crypto dav1d epoxy
-WANTLIB += expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gsm gthread-2.0 gtk-3 harfbuzz iconv id3tag intl jpeg
-WANTLIB += lzma m mad mspack notify ogg opus pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png portaudio portmidi samplerate
-WANTLIB += sndfile sndio soxr speex ssl swresample theoradec theoraenc
-WANTLIB += tiff usbhid vamp-hostsdk vorbis vorbisenc vorbisfile
-WANTLIB += vpx wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
-WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
-WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 x264 x265 xcb xcb-render
-WANTLIB += xcb-shm xml2 xvidcore z zstd
-# dlopened
+WANTLIB += FLAC FLAC++ SoundTouch atk-1.0 avcodec avformat avutil
+WANTLIB += c cairo cairo-gobject expat gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz id3tag intl lilv-0
+WANTLIB += m mad ogg pango-1.0 pangocairo-1.0 portaudio portmidi
+WANTLIB += serd-0 sndfile sord-0 soxr sratom-0 suil-0 vamp-hostsdk
+WANTLIB += vorbis vorbisenc vorbisfile wx_baseu-3.0 wx_baseu_net-3.0
+WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
+WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
+WANTLIB += z
+## dlopened
WANTLIB += mp3lame
COMPILER = base-clang ports-gcc base-gcc
-MODULES= lang/python
+MODULES= devel/cmake \
+ lang/python
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
shells/bash
-# Used to build suild, not installed by default
-# See ${WRKSRC}/lib-src/lv2/suil and https://drobilla.net/software/suil
-BUILD_DEPENDS+= x11/gtk+2
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
- audio/libsoxr \
- audio/flac \
- audio/lame \
- audio/libvorbis \
audio/libid3tag \
audio/libmad \
- audio/portaudio-svn>=1406p1 \
+ audio/libsoxr \
+ audio/lilv \
+ audio/portaudio-svn \
audio/portmidi \
audio/soundtouch \
+ audio/suil \
audio/vamp-plugin-sdk \
- graphics/ffmpeg
+ converters/sratom \
+ graphics/ffmpeg \
+ textproc/serd \
+ textproc/sord
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
-SEPARATE_BUILD= No
-USE_GMAKE= Yes
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.15
-CONFIGURE_STYLE= autoreconf
-CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" OBJCXX="${CXX}" \
- CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
${CFLAGS}" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${LDFLAGS}"
-
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \
- ${WRKSRC}/lib-src/lib-widget-extra \
- ${WRKSRC}/lib-src/portsmf \
- ${WRKSRC}/lib-src/FileDialog \
- ${WRKSRC}/lib-src/sbsms \
- ${WRKSRC}/lib-src/libnyquist
-
-CONFIGURE_ARGS= --disable-dynamic-loading \
- --enable-ladspa \
- --enable-nyquist \
- --enable-unicode \
- --with-expat=system \
- --with-ffmpeg=system \
- --with-lame=system \
- --with-lib-preferences=system \
- --with-libflac=system \
- --with-libid3tag=system \
- --with-libmad=system \
- --with-libsndfile=system \
- --with-libsoxr=system \
- --with-libvamp=system \
- --with-libvorbis=system \
- --with-lv2=local \
- --with-midi=yes \
- --with-portaudio=system \
- --with-portmidi=system \
- --with-sbsms=local \
- --with-soundtouch=system \
- --with-widgetextra=local \
- --without-liblrdf \
- --without-libtwolame \
- --without-portmixer \
- --without-redland
-
-.if ${MACHINE_ARCH} != "amd64"
-CONFIGURE_ARGS+= --disable-sse
-.endif
+CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \
+ -Daudacity_lib_preference=system \
+ -Daudacity_use_expat=system \
+ -Daudacity_use_ffmpeg=linked \
+ -Daudacity_use_lame=system \
+ -Daudacity_use_lv2=system \
+ -Daudacity_use_portaudio=system \
+ -Daudacity_use_portmixer=off \
+ -Daudacity_use_portsmf=local \
+ -Daudacity_use_twolame=off \
+ -Daudacity_use_sbsms=local \
+ -Daudacity_use_vamp=system
NO_TEST= Yes
-
-# dummy Makefile to disable portmixer
-post-extract:
- printf 'all:\ninstall:\n' > ${WRKSRC}/lib-src/portmixer/Makefile
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/images/AudacityLogo.xpm \
- ${PREFIX}/share/pixmaps/audacity.xpm
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/src/audacity.desktop \
- ${PREFIX}/share/applications/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/mime/packages
- ${INSTALL_DATA} ${WRKSRC}/src/audacity.xml \
- ${PREFIX}/share/mime/packages/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/audacity/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo 24 Jan 2020 05:20:37 -0000 1.16
+++ distinfo 16 Jun 2020 11:37:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (audacity-2.3.3.tar.gz) = QE5sSWk97clCEvxVJZdAWNhIU2Al4Z2jE1muArq+i9c=
-SIZE (audacity-2.3.3.tar.gz) = 62073352
+SHA256 (audacity-2.4.1.tar.gz) = UCQPB0cTc6flwt9lzCbu6qztmghQrR+Vy3lfFx6jAJ8=
+SIZE (audacity-2.4.1.tar.gz) = 63935461
Index: patches/patch-cmake-proxies_CMakeLists_txt
===================================================================
RCS file: patches/patch-cmake-proxies_CMakeLists_txt
diff -N patches/patch-cmake-proxies_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake-proxies_CMakeLists_txt 16 Jun 2020 11:37:43 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: cmake-proxies/CMakeLists.txt
+--- cmake-proxies/CMakeLists.txt.orig
++++ cmake-proxies/CMakeLists.txt
+@@ -150,7 +150,7 @@ addlib( lame lame LAME YES
+ addlib( lib-widget-extra libextra EXTRA YES YES "" )
+ addlib( libsndfile sndfile SNDFILE YES YES "sndfile >=
1.0.28" )
+ addlib( libsoxr soxr SOXR YES YES "soxr >=
0.1.1" )
+-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
++addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio >=
19" )
+
+ # Optional libraries
+ #
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 24 Jan 2020 05:20:37 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.4 2020/01/24 05:20:37 bket Exp $
-
-- check if -latomic is needed
-- disable jack
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -200,12 +200,16 @@ if test x$enable_universal_binary = xyes; then
- esac
- fi
-
--dnl Check if $CXX is clang by evaluating the version string because
--dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just
empty).
--dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
--dnl Use /dev/null to suppress grep output to shell.
--if ($CXX --version | grep 'clang version' > /dev/null); then
-- LDFLAGS="${LDFLAGS} -latomic"
-+AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+ #include <atomic>
-+ #include <cstdint>
-+ std::atomic<std::int64_t> v;
-+ int main() {
-+ return v;
-+ }
-+]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
-+if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
-+ LDFLAGS="${LDFLAGS} -latomic"
- fi
-
- if test x$enable_sse = xyes; then
-@@ -646,10 +650,6 @@ case "${host_os}" in
- AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
- if [[ $have_alsa = "yes" ]] ; then
- LIBS="$LIBS -lasound"
-- fi
-- PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-- if [[ $have_jack = "yes" ]] ; then
-- LIBS="$LIBS $JACK_LIBS"
- fi
- AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no,
-lm)
- if [[ $have_asihpi = "yes" ]] ; then
Index: patches/patch-lib-src_FileDialog_Makefile_am
===================================================================
RCS file: patches/patch-lib-src_FileDialog_Makefile_am
diff -N patches/patch-lib-src_FileDialog_Makefile_am
--- patches/patch-lib-src_FileDialog_Makefile_am 24 Jan 2020 05:20:37
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib-src_FileDialog_Makefile_am,v 1.2 2020/01/24 05:20:37 bket
Exp $
-
-- do not build a shared library
-
-Index: lib-src/FileDialog/Makefile.am
---- lib-src/FileDialog/Makefile.am.orig
-+++ lib-src/FileDialog/Makefile.am
-@@ -1,7 +1,7 @@
- AM_LIBTOOLFLAGS = --tag CC
- ACLOCAL_AMFLAGS = -I m4
-
--lib_LTLIBRARIES = libFileDialog.la
-+noinst_LTLIBRARIES = libFileDialog.la
-
- libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
- libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
Index: patches/patch-lib-src_lib-widget-extra_Makefile_am
===================================================================
RCS file: patches/patch-lib-src_lib-widget-extra_Makefile_am
diff -N patches/patch-lib-src_lib-widget-extra_Makefile_am
--- patches/patch-lib-src_lib-widget-extra_Makefile_am 26 Mar 2019 18:26:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib-src_lib-widget-extra_Makefile_am,v 1.1 2019/03/26 18:26:45
rapha Exp $
-
-- do not build a shared library
-
-Index: lib-src/lib-widget-extra/Makefile.am
---- lib-src/lib-widget-extra/Makefile.am.orig
-+++ lib-src/lib-widget-extra/Makefile.am
-@@ -5,7 +5,7 @@ EXTRA_DIST = libwidgetextra.pc.in
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libwidgetextra.pc
-
--lib_LTLIBRARIES = libwidgetextra.la
-+noinst_LTLIBRARIES = libwidgetextra.la
-
- libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
- libwidgetextra_la_LIBADD = $(WX_LIBS)
Index: patches/patch-lib-src_libnyquist_Makefile_am
===================================================================
RCS file: patches/patch-lib-src_libnyquist_Makefile_am
diff -N patches/patch-lib-src_libnyquist_Makefile_am
--- patches/patch-lib-src_libnyquist_Makefile_am 26 Mar 2019 18:26:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lib-src_libnyquist_Makefile_am,v 1.1 2019/03/26 18:26:45 rapha
Exp $
-
-- don't use the bundled portaudio and sndfile libraries
-
-Index: lib-src/libnyquist/Makefile.am
---- lib-src/libnyquist/Makefile.am.orig
-+++ lib-src/libnyquist/Makefile.am
-@@ -2,9 +2,6 @@
- # Makefile(.in) for libnyquist using Autotools (but not libtool).
- # Written by Richard Ash following Gary Vaughan's Autobook
-
--PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
--SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
--
- # tell aclocal that extra macros can be found in autotools/m4/
- ACLOCAL_AMFLAGS = -I autotools/m4
-
Index: patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h
===================================================================
RCS file:
/cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h
--- patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h 5 Mar
2019 16:36:58 -0000 1.2
+++ patches/patch-lib-src_libnyquist_nyquist_nyqstk_include_Stk_h 16 Jun
2020 11:37:43 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-lib-src_libnyquist_nyqui
Index: lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
--- lib-src/libnyquist/nyquist/nyqstk/include/Stk.h.orig
+++ lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-@@ -126,6 +126,10 @@ class Stk (public)
+@@ -160,6 +160,10 @@ class Stk (public)
//! Static method which sets the STK rawwave path.
static void setRawwavePath(std::string path);
Index: patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h
===================================================================
RCS file:
/cvs/ports/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h
--- patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h 10 Mar 2019
11:45:50 -0000 1.3
+++ patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h 16 Jun 2020
11:37:43 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-lib-src_libnyquist_nyqui
Index: lib-src/libnyquist/nyquist/xlisp/xlisp.h
--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -150,10 +150,17 @@ extern long ptrtoabs();
+@@ -151,10 +151,17 @@ extern long ptrtoabs();
#define XL_BIG_ENDIAN
#endif
Index: patches/patch-lib-src_lv2_build
===================================================================
RCS file: patches/patch-lib-src_lv2_build
diff -N patches/patch-lib-src_lv2_build
--- patches/patch-lib-src_lv2_build 5 Mar 2019 16:36:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-lib-src_lv2_build,v 1.1 2019/03/05 16:36:58 jca Exp $
-
-- fix path to bash
-
-Index: lib-src/lv2/build
---- lib-src/lv2/build.orig
-+++ lib-src/lv2/build
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- srcdir=.
- while [ $# -gt 0 ]
Index: patches/patch-lib-src_lv2_configure
===================================================================
RCS file: patches/patch-lib-src_lv2_configure
diff -N patches/patch-lib-src_lv2_configure
--- patches/patch-lib-src_lv2_configure 5 Mar 2019 16:36:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$OpenBSD: patch-lib-src_lv2_configure,v 1.1 2019/03/05 16:36:58 jca Exp $
-
-- fix bashisms (script invoked with /bin/sh .../configure ...)
-- no libdl on OpenBSD
-
-Index: lib-src/lv2/configure
---- lib-src/lv2/configure.orig
-+++ lib-src/lv2/configure
-@@ -1,13 +1,12 @@
--#!/bin/bash
-+#!/bin/sh
-
- srcdir=.
- while [ $# -gt 0 ]
- do
-- if [[ "$1" =~ --srcdir=.* ]]
-- then
-+ case $1 in --srcdir=*)
- srcdir=${1#*=}
-- break
-- fi
-+ ;;
-+ esac
- shift
- done
-
-@@ -16,7 +15,7 @@ function waf
- pkg="$1"
- shift
- mkdir -p ${pkg}
-- pushd >/dev/null ${pkg}
-+ (cd ${pkg} || exit 1
-
- if [ ! -e "waflib" ]
- then
-@@ -32,8 +31,9 @@ function waf
- done
-
- $(which python python2 | tail -1) waf --prefix="." --include="." $@
configure || exit 1
-- popd >/dev/null
-
-+)
-+
- if [ "${pkg}" == "lv2" ]
- then
- eval $(sed -e '/^VERSION/!d;s/ //g;s/.*VERSION/version/' ${pkg}/wscript)
-@@ -54,7 +54,7 @@ includedir=.
- Name: ${pkg}
- Version: ${version}
- Description: Temporary fake config file
--Libs: -L\${libdir} ${lib} -ldl -lm
-+Libs: -L\${libdir} ${lib} -lm
- Cflags: -I\${includedir}/${pkg}${major}
- EOF
-
Index: patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c
===================================================================
RCS file: patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c
diff -N patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c
--- patches/patch-lib-src_lv2_suil_src_x11_in_gtk2_c 5 Mar 2019 16:36:58
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib-src_lv2_suil_src_x11_in_gtk2_c,v 1.1 2019/03/05 16:36:58
jca Exp $
-
-- missing header
-
-Index: lib-src/lv2/suil/src/x11_in_gtk2.c
---- lib-src/lv2/suil/src/x11_in_gtk2.c.orig
-+++ lib-src/lv2/suil/src/x11_in_gtk2.c
-@@ -17,6 +17,7 @@
- #include <string.h>
-
- #include <gtk/gtk.h>
-+#include <gtk/gtkx.h>
- #include <gdk/gdkx.h>
-
- #include "./suil_internal.h"
Index: patches/patch-m4_audacity_checklib_portaudio_m4
===================================================================
RCS file: patches/patch-m4_audacity_checklib_portaudio_m4
diff -N patches/patch-m4_audacity_checklib_portaudio_m4
--- patches/patch-m4_audacity_checklib_portaudio_m4 26 Mar 2019 18:26:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-m4_audacity_checklib_portaudio_m4,v 1.1 2019/03/26 18:26:45
rapha Exp $
-
-- force-disable check for Pa_GetStreamHostApiType, likely not needed
- anyway. (Seems only used in portmixer, which we disable.) We want to
- try to use audio/portaudio instead.
-
-Index: m4/audacity_checklib_portaudio.m4
---- m4/audacity_checklib_portaudio.m4.orig
-+++ m4/audacity_checklib_portaudio.m4
-@@ -16,7 +16,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
-
- if test "$PORTAUDIO_SYSTEM_AVAILABLE" = "yes"; then
- AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h],
-- [have_portaudio_support=yes],
[have_portaudio_support=no])
-+ [have_portaudio_support=yes],
[have_portaudio_support=yes])
-
- if test "$have_portaudio_support" = "yes"; then
- PORTAUDIO_SYSTEM_AVAILABLE="yes"
Index: patches/patch-src_AudacityApp_cpp
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_AudacityApp_cpp,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_AudacityApp_cpp
--- patches/patch-src_AudacityApp_cpp 24 Jan 2020 05:20:37 -0000 1.8
+++ patches/patch-src_AudacityApp_cpp 16 Jun 2020 11:37:43 -0000
@@ -5,7 +5,7 @@ Don't hardcode shared libraries version
Index: src/AudacityApp.cpp
--- src/AudacityApp.cpp.orig
+++ src/AudacityApp.cpp
-@@ -642,12 +642,12 @@ class GnomeShutdown
+@@ -666,12 +666,12 @@ class GnomeShutdown
{
mArgv[0].reset(strdup("Audacity"));
Index: patches/patch-src_AudioIO_cpp
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_AudioIO_cpp,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-src_AudioIO_cpp
--- patches/patch-src_AudioIO_cpp 24 Jan 2020 05:20:37 -0000 1.11
+++ patches/patch-src_AudioIO_cpp 16 Jun 2020 11:37:43 -0000
@@ -6,7 +6,15 @@ $OpenBSD: patch-src_AudioIO_cpp,v 1.11 2
Index: src/AudioIO.cpp
--- src/AudioIO.cpp.orig
+++ src/AudioIO.cpp
-@@ -797,18 +797,15 @@ static double streamStartTime = 0; // bias system time
+@@ -484,7 +484,6 @@ time warp info and AudioIOListener and whether the pla
+ #define ROUND(x) (int) ((x)+0.5)
+ //#include <string.h>
+ // #include "../lib-src/portmidi/pm_common/portmidi.h"
+- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+ #include "NoteTrack.h"
+ #endif
+
+@@ -811,18 +810,15 @@ static double streamStartTime = 0; // bias system time
static double SystemTime(bool usingAlsa)
{
#ifdef __WXGTK__
@@ -27,7 +35,7 @@ Index: src/AudioIO.cpp
}
#endif
-@@ -3606,7 +3603,7 @@ void AudioIoCallback::ComputeMidiTimings(
+@@ -3659,7 +3655,7 @@ void AudioIoCallback::ComputeMidiTimings(
}
/* GSW: Save timeInfo in case MidiPlayback needs it */
Index: patches/patch-src_AudioIO_h
===================================================================
RCS file: patches/patch-src_AudioIO_h
diff -N patches/patch-src_AudioIO_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_AudioIO_h 16 Jun 2020 11:37:43 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Use system version of portmidi headers
+
+Index: src/AudioIO.h
+--- src/AudioIO.h.orig
++++ src/AudioIO.h
+@@ -28,8 +28,8 @@
+ // TODO: Put the relative paths into automake.
+
+ #ifdef EXPERIMENTAL_MIDI_OUT
+-#include "../lib-src/portmidi/pm_common/portmidi.h"
+-#include "../lib-src/portmidi/porttime/porttime.h"
++#include "portmidi.h"
++#include "porttime.h"
+ #include <cstring> // Allegro include fails if this header isn't included do
to no memcpy
+ #include "../lib-src/header-substitutes/allegro.h"
+
Index: patches/patch-src_tracks_ui_Scrubbing_cpp
===================================================================
RCS file: patches/patch-src_tracks_ui_Scrubbing_cpp
diff -N patches/patch-src_tracks_ui_Scrubbing_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tracks_ui_Scrubbing_cpp 16 Jun 2020 11:37:43 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Upstream commit 4ac96376bb6f5832e735e08314e930e9d8ae926d
+
+Index: src/tracks/ui/Scrubbing.cpp
+--- src/tracks/ui/Scrubbing.cpp.orig
++++ src/tracks/ui/Scrubbing.cpp
+@@ -222,7 +222,6 @@ Scrubber::Scrubber(AudacityProject *project)
+ #endif
+
+ , mProject(project)
+- , mWindow( FindProjectFrame( project ) )
+ , mPoller { std::make_unique<ScrubPoller>(*this) }
+ , mOptions {}
+
Index: patches/patch-src_tracks_ui_Scrubbing_h
===================================================================
RCS file: patches/patch-src_tracks_ui_Scrubbing_h
diff -N patches/patch-src_tracks_ui_Scrubbing_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tracks_ui_Scrubbing_h 16 Jun 2020 11:37:43 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Upstream commit 4ac96376bb6f5832e735e08314e930e9d8ae926d
+
+Index: src/tracks/ui/Scrubbing.h
+--- src/tracks/ui/Scrubbing.h.orig
++++ src/tracks/ui/Scrubbing.h
+@@ -177,7 +177,6 @@ class Scrubber final (private)
+ #endif
+
+ AudacityProject *mProject;
+- wxWindowRef mWindow;
+
+ DECLARE_EVENT_TABLE()
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacity/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST 24 Jan 2020 05:20:37 -0000 1.18
+++ pkg/PLIST 16 Jun 2020 11:37:43 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2020/01/24 05:20:37 bket Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/audacity
@man man/man1/audacity.1
share/appdata/
@@ -6,16 +6,6 @@ share/appdata/audacity.appdata.xml
share/applications/audacity.desktop
share/audacity/
share/audacity/EQDefaultCurves.xml
-share/audacity/include/
-share/audacity/include/audacity/
-share/audacity/include/audacity/ComponentInterface.h
-share/audacity/include/audacity/ConfigInterface.h
-share/audacity/include/audacity/EffectAutomationParameters.h
-share/audacity/include/audacity/EffectInterface.h
-share/audacity/include/audacity/ImporterInterface.h
-share/audacity/include/audacity/ModuleInterface.h
-share/audacity/include/audacity/PluginInterface.h
-share/audacity/include/audacity/Types.h
share/audacity/nyquist/
share/audacity/nyquist/aud-do-support.lsp
share/audacity/nyquist/dspprims.lsp
@@ -23,9 +13,9 @@ share/audacity/nyquist/envelopes.lsp
share/audacity/nyquist/equalizer.lsp
share/audacity/nyquist/evalenv.lsp
share/audacity/nyquist/fileio.lsp
-share/audacity/nyquist/follow.lsp
share/audacity/nyquist/init.lsp
share/audacity/nyquist/misc.lsp
+share/audacity/nyquist/nyinit-dbg.lsp
share/audacity/nyquist/nyinit.lsp
share/audacity/nyquist/nyqmisc.lsp
share/audacity/nyquist/nyquist-plot.txt
@@ -53,11 +43,13 @@ share/audacity/nyquist/sal.lsp
share/audacity/nyquist/seq.lsp
share/audacity/nyquist/seqfnint.lsp
share/audacity/nyquist/seqmidi.lsp
+share/audacity/nyquist/sliders.lsp
share/audacity/nyquist/sndfnint.lsp
+share/audacity/nyquist/spec-plot.lsp
+share/audacity/nyquist/spectral-analysis.lsp
share/audacity/nyquist/stk.lsp
share/audacity/nyquist/system.lsp
share/audacity/nyquist/test.lsp
-share/audacity/nyquist/upic.sal
share/audacity/nyquist/velocity.lsp
share/audacity/nyquist/xlinit.lsp
share/audacity/nyquist/xm.lsp
@@ -74,10 +66,12 @@ share/audacity/plug-ins/clipfix.ny
share/audacity/plug-ins/crossfadeclips.ny
share/audacity/plug-ins/crossfadetracks.ny
share/audacity/plug-ins/delay.ny
+share/audacity/plug-ins/eq-xml-to-txt-converter.ny
share/audacity/plug-ins/equalabel.ny
share/audacity/plug-ins/highpass.ny
share/audacity/plug-ins/limiter.ny
share/audacity/plug-ins/lowpass.ny
+share/audacity/plug-ins/noisegate.ny
share/audacity/plug-ins/notch.ny
share/audacity/plug-ins/nyquist-plug-in-installer.ny
share/audacity/plug-ins/pluck.ny
@@ -86,17 +80,18 @@ share/audacity/plug-ins/rissetdrum.ny
share/audacity/plug-ins/rms.ny
share/audacity/plug-ins/sample-data-export.ny
share/audacity/plug-ins/sample-data-import.ny
+share/audacity/plug-ins/spectral-delete.ny
share/audacity/plug-ins/tremolo.ny
share/audacity/plug-ins/vocalrediso.ny
share/audacity/plug-ins/vocoder.ny
share/doc/audacity/
share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt
-share/icons/hicolor/16x16/apps/audacity.png
-share/icons/hicolor/22x22/apps/audacity.png
-share/icons/hicolor/24x24/apps/audacity.png
-share/icons/hicolor/32x32/apps/audacity.png
-share/icons/hicolor/48x48/apps/audacity.png
+share/icons/hicolor/16x16/audacity.png
+share/icons/hicolor/22x22/audacity.png
+share/icons/hicolor/24x24/audacity.png
+share/icons/hicolor/32x32/audacity.png
+share/icons/hicolor/48x48/audacity.png
share/icons/hicolor/scalable/apps/audacity.svg
share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/LC_MESSAGES/audacity.mo
@@ -166,9 +161,9 @@ share/locale/zh_TW/LC_MESSAGES/audacity.
share/mime/packages/audacity.xml
share/pixmaps/
share/pixmaps/audacity.xpm
-@tag update-mime-database
-@tag update-desktop-database
share/pixmaps/audacity16.xpm
share/pixmaps/audacity32.xpm
share/pixmaps/gnome-mime-application-x-audacity-project.xpm
+@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-mime-database
