CVS commit: pkgsrc/audio/audacity

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/audacity
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 10 Feb 2019 17:14:42 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Feb 10 17:14:42 UTC 2019

Modified Files:
        pkgsrc/audio/audacity: Makefile PLIST distinfo options.mk
        pkgsrc/audio/audacity/patches: patch-Makefile.in patch-am
            patch-lib-src_FileDialog_Makefile.in patch-src_effects_Effect.cpp
            patch-src_effects_EffectManager.cpp
Added Files:
        pkgsrc/audio/audacity/patches:
            patch-mac_scripts_create__info__header.sh patch-src_AudioIO.cpp
Removed Files:
        pkgsrc/audio/audacity/patches: patch-src_FFmpeg.h
            patch-src_effects_VST_VSTEffect.cpp
            patch-src_effects_lv2_LV2Effect.cpp
            patch-src_effects_nyquist_Nyquist.cpp
            patch-src_effects_vamp_LoadVamp.cpp patch-src_import_ImportFLAC.cpp

Log Message:
audacity: Update to 2.2.2

Changes in version 2.2.2:

Improvements

    * Dropout detection
      Dropout detection is controlled from a setting in Recording Preferences
      called "Detect dropouts".
      When this setting is "on" (default setting) Audacity will detect dropouts
      (brief gaps in the recording) and will insert zeroes into the recording
      to keep the other good parts synchronized. These silent spans will make
      the dropouts more obvious, but keep the duration of the recording correct.
      When recording stops, a Warning message box alerts the user and a label track,
      called "Dropouts", is added showing the lost parts, labeled with consecutive numbers.
    * Improved horizontal zooming
      For this release we have improved the way zooming using your mouse wheel
      works and provided a new Zoom Toggle function.
    * Improved vertical zooming
      We have added a context menu to the vertical scale to control vertical zooming
      Previous vertical zooming methods (left-click in the vertical ruler, left-drag
      in the vertical ruler) remain available by selecting "Advanced Vertical Zooming"
      in Track Behaviors Preferences.
    * "Extra" menu
      The "Ext-Bar" and "Ext-Command" menus have been consolidated into the "Extra" menu.
    * Theme tweaks
      The appearance and/or contrast of a few icons has been improved.
    * Easier access to changing key bindings for shortcuts
      For menu commands that are enabled (not grayed-out) if you hold the Shift key
      and click on the sub-menu item, instead of executing the command the Keyboard
      Preferences pop open at the chosen command. You can then change that (or any
      other) shortcut binding.
    * Language selection in Preferences
      Interface Preferences has been upgraded so when selecting languages the proper
      spelling of these languages is shown with accented and special characters.

Bug Fixes
   * Multiple use of "Save As" to the existing open project can result in data
     corruption/loss
   * Crash undoing during record, using Discard button of History window
   * Exporting audio in compressed formats to device with insufficient space produces
     inconsistent/truncated results
   * In Export Multiple, Cancel does not remove the file that is in progress when
     Cancel is chosen
   * Unicode page encodings fixed ( ͡° ͜ʖ ͡°)
   * Crash using SBSMS pitch change at low sample rate
   * (Mac) Equalization: "Telephone" curve displays a flat line, no sound on Preview
   * Toolbars: open undocked if previously not shown, unless Reset Toolbars first
   * Analysis effects that create labels should give focus to label track
   * Control value may be out of range when using FloatingPointValidator
   * Analysis effects produce false indication that a label is open for editing
   * Import Uncompressed File Dialog Incorrect Reference to Menu Item
   * Wave Color not grayed out in TCP dropdown menu when in Spectrogram view
   * Hover indication on note track channel toggle appears on all tracks (when
     they rerender)
   * Installer has old logo for 2.2.1 and 2.2.0
   * Un-muting with a single track unnecessarily activates the Solo button
   * Applying chain to file should zoom-to-fit

Changes in version 2.2.1:

Improvements

    * Waveform colorways
      You can optionally change the colorway of the waveforms displayed in your project.
      The setting is per track and not per project so you can have multiple colorways
          in the same project.
    * "Save Other" reverts to "Export" in the File menu
      When we made the menu changes for 2.2.0 we introduced an entry into the File menu
      called "Save Other" which led to a sub-menu for exporting various audio formats.
      Many users were confused by this change and found it hard to find where they could
      export audio from. So for 2.2.1 we have changed that menu entry to be File > Export.

Bug Fixes

   * Release 2.2.1 was mainly a maintenance release.
     Soon after the release of 2.2.0 we discovered some problematical bugs in Audacity:
       Bug #1767 - Opening a second project from Mac's Finder produces a second
         inaccessible instance of Audacity
       Bug #1770 - Crash applying certain chain files
       Bug #1783 - Preview fails when selection extends before zero
       Bug #1787 - Auto-scroll stopped working in 2.2.0
       Bug #1765 - Using File > Open to import audio gives wrong zoom level
         and no scroll bar slider

Changes in version 2.2.0:

    * Four Selectable themes provided, with new 'Light' theme as default,
      plus option to customize
    * Many menu changes:
        * Menus Reorganized
        * Extended menu bar provided
        * New keyboard commands for working with clips
    * Help buttons ? in Preferences, Effects, Generators and Analyzers - and
      other places
    * Non-Greying out of effects when no selection (and explanatory dialog
      with help button)
    * Playback of MIDI (and Allegro) files imported into Note Tracks is
      now available.
    * 'Center' option in Selection Toolbar
    * Stem plots
    * Major overhaul to documentation/manual including many new images and
      streamlined text on landing pages for in-program help.

Other Changes

    * Append-record is now the default (use Shift + Record for old behavior,
        to record on a new track)
    * The Esc key now cancels all click-and-drag actions. It also chooses among
      overlapping mouse click targets, which is especially useful in the Multi-Tool.
    * Sync-Lock button removed (use menu item or keyboard shortcut instead)
    * New preferences and preference pages
    * Overhaul of much code:
        * Overhaul of envelope handling code to deal with some anomalies
        * Overhaul of exception handling for greater safety
   *  New Logo

Bug Fixes

   * Major work on bug fixing. 198 bugs that were in 2.1.3 were fixed for 2.2.0.
        * The most serious bug fixed this time round was bug 437 which was
          about what happens when Audacity is recording and runs out of storage.
        * Most of the bugs fixed were more minor, such as bug 463 which was
          about a case in which the numbering on the timeline could display
          incorrect times.

Changes in version 2.1.3:

 * Interface:
   * (macOS) Support for horizontal scroll on Magic Mouse / Trackpad and for
     Trackpad pinch/expand zoom gestures.
   * Pinned option on waveform makes waveform move and recording/playing head
     stay still.
   * Timer Record options to save/export/exit after recording.
   * Scrub Ruler and optional Scrub Toolbar.
   * New shortcuts ALT+RIGHT and ALT+LEFT (move to labels without editing).

 * Effects:
   * Effects no longer grayed out when paused.
   * New Distortion effect (replaces Leveller).
   * SBSMS (higher quality but slower) option on Change Tempo / Change Pitch
     effects.
   * New Rhythm Track generator (replaces Click Track).
   * New Generator for Sample Data Import.
   * Nyquist effects now significantly faster.

 * Other Changes:
   * Upgraded the PortAudio library to v19 rev r1966.  This gives Audacity
     Windows 10 support.
   * (Windows) DirectSound now records 24-bit samples.
   * (macOS) Audacity.app now has its resources inside it rather than in a
     separate folder, so installation to /Applications/ is cleaner.
   * (macOS) Audacity 2.1.3 provides partial support for Sierra. Details at
     http://wiki.audacityteam.org/wiki/Partial_Support_for_Mac_Sierra_in_2.1.3 .

Bug fixes:

 Over 60 bugs fixed, including five longstanding bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/audio/audacity/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/audacity/PLIST
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/audacity/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/audacity/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/audacity/patches/patch-Makefile.in \
    pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in \
    pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp \
    pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/audacity/patches/patch-am
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/audacity/patches/patch-mac_scripts_create__info__header.sh
cvs rdiff -u -r0 -r1.3 pkgsrc/audio/audacity/patches/patch-src_AudioIO.cpp
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/audacity/patches/patch-src_FFmpeg.h \
    pkgsrc/audio/audacity/patches/patch-src_effects_VST_VSTEffect.cpp \
    pkgsrc/audio/audacity/patches/patch-src_effects_vamp_LoadVamp.cpp \
    pkgsrc/audio/audacity/patches/patch-src_import_ImportFLAC.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp \
    pkgsrc/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp

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

Modified files:

Index: pkgsrc/audio/audacity/Makefile
diff -u pkgsrc/audio/audacity/Makefile:1.117 pkgsrc/audio/audacity/Makefile:1.118
--- pkgsrc/audio/audacity/Makefile:1.117        Thu Jan  3 09:51:58 2019
+++ pkgsrc/audio/audacity/Makefile      Sun Feb 10 17:14:42 2019
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.117 2019/01/03 09:51:58 bsiegert Exp $
+# $NetBSD: Makefile,v 1.118 2019/02/10 17:14:42 nia Exp $
 
-DISTNAME=              audacity-minsrc-2.1.2
-PKGNAME=               ${DISTNAME:S/-minsrc//1}
-PKGREVISION=           15
+DISTNAME=              audacity-2.2.2
 CATEGORIES=            audio
-# sadly fosshub.com does not provice hot link
-MASTER_SITES=          ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=          .tar.xz
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=audacity/}
+GITHUB_PROJECT=                Audacity
+GITHUB_TAG=            Audacity-${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://audacityteam.org/
+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}
+
+.include "../../mk/bsd.prefs.mk"
+
+EXTRACT_USING=         bsdtar
 USE_LIBTOOL=           yes
 USE_TOOLS+=            automake autoreconf bash
 USE_TOOLS+=            gmake intltool msgfmt msgmerge pkg-config
@@ -32,11 +35,14 @@ CONFIGURE_ARGS+=    --with-libsndfile=syste
 CONFIGURE_ARGS+=       --with-lv2=system
 CONFIGURE_ARGS+=       --with-midi=local
 CONFIGURE_ARGS+=       --with-portaudio=local
-CONFIGURE_ARGS+=       --with-sbsms=system
 CONFIGURE_ARGS+=       --with-soundtouch=system
 CONFIGURE_ARGS+=       --with-twolame=system
 CONFIGURE_ARGS+=       --with-vorbis=system
 CONFIGURE_ARGS+=       --with-libsoxr=system
+.if ${OPSYS} != "Linux"
+CONFIGURE_ARGS+=       --without-alsa
+CONFIGURE_ENV+=                ac_cv_header_pa_linux_alsa_h=no
+.endif
 CONFIGURE_ARGS+=       --without-xaudio
 
 CONFIG_GUESS_OVERRIDE=         \
@@ -47,15 +53,23 @@ CONFIG_SUB_OVERRIDE=                \
 CFLAGS.SunOS+= -fPIC
 
 PTHREAD_AUTO_VARS=     yes
-BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+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
 
+post-install:
+       ${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"
@@ -63,23 +77,22 @@ pre-configure:
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../audio/lv2/buildlink3.mk"
+.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
 BUILDLINK_API_DEPENDS.twolame+=        twolame>=0.3.9
 .include "../../audio/twolame/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsbsms/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-#.include "../../audio/portaudio-devel/buildlink3.mk" # Needs Pa_GetStreamHostApiType
 .include "../../audio/suil/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.flac+=   flac>=1.3.0
 .include "../../audio/flac/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/audio/audacity/PLIST
diff -u pkgsrc/audio/audacity/PLIST:1.13 pkgsrc/audio/audacity/PLIST:1.14
--- pkgsrc/audio/audacity/PLIST:1.13    Sun Jun  5 01:02:38 2016
+++ pkgsrc/audio/audacity/PLIST Sun Feb 10 17:14:42 2019
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2016/06/05 01:02:38 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/02/10 17:14:42 nia Exp $
 bin/audacity
+lib/libFileDialog.so.0
 man/man1/audacity.1
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
@@ -62,7 +63,6 @@ share/audacity/plug-ins/SpectralEditShel
 share/audacity/plug-ins/StudioFadeOut.ny
 share/audacity/plug-ins/adjustable-fade.ny
 share/audacity/plug-ins/beat.ny
-share/audacity/plug-ins/clicktrack.ny
 share/audacity/plug-ins/clipfix.ny
 share/audacity/plug-ins/crossfadeclips.ny
 share/audacity/plug-ins/crossfadetracks.ny
@@ -73,8 +73,10 @@ share/audacity/plug-ins/limiter.ny
 share/audacity/plug-ins/lowpass.ny
 share/audacity/plug-ins/notch.ny
 share/audacity/plug-ins/pluck.ny
+share/audacity/plug-ins/rhythmtrack.ny
 share/audacity/plug-ins/rissetdrum.ny
 share/audacity/plug-ins/sample-data-export.ny
+share/audacity/plug-ins/sample-data-import.ny
 share/audacity/plug-ins/tremolo.ny
 share/audacity/plug-ins/vocalrediso.ny
 share/audacity/plug-ins/vocalremover.ny
@@ -102,6 +104,7 @@ ${PLIST.nls}share/locale/de/LC_MESSAGES/
 ${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

Index: pkgsrc/audio/audacity/distinfo
diff -u pkgsrc/audio/audacity/distinfo:1.36 pkgsrc/audio/audacity/distinfo:1.37
--- pkgsrc/audio/audacity/distinfo:1.36 Tue Jul 31 21:10:29 2018
+++ pkgsrc/audio/audacity/distinfo      Sun Feb 10 17:14:42 2019
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.36 2018/07/31 21:10:29 jperkin Exp $
+$NetBSD: distinfo,v 1.37 2019/02/10 17:14:42 nia Exp $
 
-SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6
-RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c
-SHA512 (audacity-minsrc-2.1.2.tar.xz) = 46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
-Size (audacity-minsrc-2.1.2.tar.xz) = 7233500 bytes
-SHA1 (patch-Makefile.in) = 8a770c2ab0494359c22d7f8e1b548fb83c2c00ff
+SHA1 (audacity-2.2.2.tar.gz) = 84b0f29c7e07bcc0ef7d946d16f4d094a1612778
+RMD160 (audacity-2.2.2.tar.gz) = 6ceee54811742b071af6823d8e69bea1da039fec
+SHA512 (audacity-2.2.2.tar.gz) = 311a5f3413e7faf40dc5639b2b9f8b0d03d1a410c50d894ca7abf3fe5733a29b710ccf7e3215d97dd9142e93c0ab5e13955dfd13146b03f927f74465459a6457
+Size (audacity-2.2.2.tar.gz) = 25947462 bytes
+SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
-SHA1 (patch-am) = 732764ddf9546524bea13f45cb8d3ffa00c76eb1
+SHA1 (patch-am) = 1f380ec8022c5849c0297ba181c9ff6223516476
 SHA1 (patch-lib-src_FileDialog_Makefile.am) = a1bf7353f970f24dde1f069427d16b0473e2fa71
-SHA1 (patch-lib-src_FileDialog_Makefile.in) = fe4569e6f7d4fbd54e0aa2dd84e7474adb2ff764
+SHA1 (patch-lib-src_FileDialog_Makefile.in) = 60ee705c6096cbb32278fca8ab73d634126aaca4
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
@@ -16,12 +16,8 @@ SHA1 (patch-lib-src_libnyquist_nyquist_x
 SHA1 (patch-lib-src_portaudio-v19_Makefile.in) = 9e86fbd93d322322b8416ef6b43ba5c98141c986
 SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
 SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
-SHA1 (patch-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d
-SHA1 (patch-src_effects_Effect.cpp) = ceca279b2d9e0044141a2ad5151390983ae41c23
-SHA1 (patch-src_effects_EffectManager.cpp) = 78e2d1290170e61b0363e5fa453bb11a5b28d411
+SHA1 (patch-mac_scripts_create__info__header.sh) = 3fa02a88a2dffbabf58adcb5be2e5798d28ae643
+SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
+SHA1 (patch-src_effects_Effect.cpp) = 46c0ce811ef331367058081f6e5f95daa96e990d
+SHA1 (patch-src_effects_EffectManager.cpp) = d0d8609fffb8de4108e75f78ef66ca2c3261b19e
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
-SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
-SHA1 (patch-src_effects_lv2_LV2Effect.cpp) = b001b79df1e924ef0635436f5b8d02db5fa00dd6
-SHA1 (patch-src_effects_nyquist_Nyquist.cpp) = 980336375efe53d311b1187b5285ea5c7fe4c4a9
-SHA1 (patch-src_effects_vamp_LoadVamp.cpp) = 5e57289e99d8ac5323b869138d13b67b5ad8a3d6
-SHA1 (patch-src_import_ImportFLAC.cpp) = 9064b5f24cfd837d9a5d5bb74450bcfd0096b099

Index: pkgsrc/audio/audacity/options.mk
diff -u pkgsrc/audio/audacity/options.mk:1.2 pkgsrc/audio/audacity/options.mk:1.3
--- pkgsrc/audio/audacity/options.mk:1.2        Tue Apr 21 03:34:22 2015
+++ pkgsrc/audio/audacity/options.mk    Sun Feb 10 17:14:42 2019
@@ -1,33 +1,18 @@
-# $NetBSD: options.mk,v 1.2 2015/04/21 03:34:22 rodent Exp $
+# $NetBSD: options.mk,v 1.3 2019/02/10 17:14:42 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.audacity
-PKG_SUPPORTED_OPTIONS=         alsa debug jack ladspa nls
-PKG_SUGGESTED_OPTIONS+=                gtk2 ladspa nls
-PKG_OPTIONS_OPTIONAL_GROUPS+=  gui
-PKG_OPTIONS_GROUP.gui=         gtk2 gtk3
+PKG_SUPPORTED_OPTIONS=         debug jack ladspa nls
+PKG_SUGGESTED_OPTIONS+=                ladspa nls
 PLIST_VARS+=                   nls
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Malsa)
-.include "../../audio/alsa-lib/buildlink3.mk"
-BROKEN=                                error: 'ESTRPIPE' undeclared
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=               --enable-debug=yes
 .else
 CONFIGURE_ARGS+=               --enable-debug=no
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk2)
-.include "../../x11/gtk2/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mgtk3)
-.include "../../x11/gtk3/buildlink3.mk"
-CONFIGURE_ARGS+=               --enable-gtk3
-BROKEN=                                gtk3 option needs work
-.endif
-
 .if !empty(PKG_OPTIONS:Mjack)
 .include "../../audio/jack/buildlink3.mk"
 .endif

Index: pkgsrc/audio/audacity/patches/patch-Makefile.in
diff -u pkgsrc/audio/audacity/patches/patch-Makefile.in:1.1 pkgsrc/audio/audacity/patches/patch-Makefile.in:1.2
--- pkgsrc/audio/audacity/patches/patch-Makefile.in:1.1 Fri Sep 18 08:46:20 2015
+++ pkgsrc/audio/audacity/patches/patch-Makefile.in     Sun Feb 10 17:14:42 2019
@@ -1,15 +1,24 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/09/18 08:46:20 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp $
 
-Do not install a shell script over the real executable.
+Fix installation of binaries.
 
---- Makefile.in.orig   2015-03-04 23:58:48.000000000 +0000
+--- Makefile.in.orig   2018-02-14 07:11:20.000000000 +0000
 +++ Makefile.in
-@@ -414,7 +414,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = help images lib-src po src tests
- ACLOCAL_AMFLAGS = -I m4
--bin_SCRIPTS = audacity$(EXEEXT)
-+bin_SCRIPTS = 
- dist_doc_DATA = LICENSE.txt README.txt
- dist_pkgdata_DATA = presets/EQDefaultCurves.xml
- nobase_dist_pkgdata_DATA = \
+@@ -1160,7 +1160,7 @@ install-dvi: install-dvi-recursive
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-binPROGRAMS
++install-exec-am:
+ 
+ install-html: install-html-recursive
+ 
+@@ -1215,7 +1215,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distcleancheck distdir distuninstallcheck dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-binPROGRAMS install-data install-data-am \
++      install-data install-data-am \
+       install-dist_docDATA install-dist_pkgdataDATA install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
Index: pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in
diff -u pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in:1.1 pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in:1.2
--- pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in:1.1      Sun Jun  5 01:02:38 2016
+++ pkgsrc/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.in  Sun Feb 10 17:14:42 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.1 2016/06/05 01:02:38 ryoon Exp $
+$NetBSD: patch-lib-src_FileDialog_Makefile.in,v 1.2 2019/02/10 17:14:42 nia Exp $
 
 * Do not build shared library
 * Fix libtool tag issue
 
---- lib-src/FileDialog/Makefile.in.orig        2016-01-13 14:36:43.000000000 +0000
+--- lib-src/FileDialog/Makefile.in.orig        2018-02-14 07:11:20.000000000 +0000
 +++ lib-src/FileDialog/Makefile.in
 @@ -1,7 +1,7 @@
 -# Makefile.in generated by automake 1.14.1 from Makefile.am.
@@ -97,16 +97,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  am__DEPENDENCIES_1 =
  @GTK_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
  libFileDialog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -213,7 +185,7 @@ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
- am__v_OBJCXX_1 = 
- OBJCXXLD = $(OBJCXX)
- OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--      --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
-+      --tag=CXX --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
- am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
-@@ -265,6 +237,17 @@ ETAGS = etags
+@@ -269,6 +241,17 @@ ETAGS = etags
  CTAGS = ctags
  CSCOPE = cscope
  AM_RECURSIVE_TARGETS = cscope
@@ -124,7 +115,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -416,7 +399,7 @@ top_build_prefix = @top_build_prefix@
+@@ -420,7 +403,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
@@ -133,7 +124,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) \
        -Wno-deprecated-declarations $(am__append_1)
  libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_2)
-@@ -441,7 +424,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -445,7 +428,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign Makefile
@@ -141,7 +132,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
-@@ -461,33 +443,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -465,33 +447,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  $(am__aclocal_m4_deps):
  
@@ -178,16 +169,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
        locs=`for p in $$list; do echo $$p; done | \
              sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
              sort -u`; \
-@@ -521,7 +479,7 @@ win/libFileDialog_la-FileDialogPrivate.l
-       win/$(DEPDIR)/$(am__dirstamp)
- 
- libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $(EXTRA_libFileDialog_la_DEPENDENCIES) 
--      $(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
-+      $(AM_V_OBJCXXLD)$(OBJCXXLINK)  $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-@@ -742,15 +700,15 @@ dist-xz: distdir
+@@ -746,15 +704,15 @@ dist-xz: distdir
        $(am__post_remove_distdir)
  
  dist-tarZ: distdir
@@ -207,7 +189,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
-@@ -786,17 +744,17 @@ distcheck: dist
+@@ -790,17 +748,17 @@ distcheck: dist
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
@@ -229,7 +211,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
-@@ -853,9 +811,6 @@ check-am: all-am
+@@ -857,9 +815,6 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES)
  installdirs:
@@ -239,7 +221,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -894,7 +849,7 @@ maintainer-clean-generic:
+@@ -898,7 +853,7 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
  clean: clean-am
  
@@ -248,7 +230,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
        mostlyclean-am
  
  distclean: distclean-am
-@@ -922,7 +877,7 @@ install-dvi: install-dvi-am
+@@ -926,7 +881,7 @@ install-dvi: install-dvi-am
  
  install-dvi-am:
  
@@ -257,7 +239,7 @@ $NetBSD: patch-lib-src_FileDialog_Makefi
  
  install-html: install-html-am
  
-@@ -964,26 +919,28 @@ ps: ps-am
+@@ -968,26 +923,28 @@ ps: ps-am
  
  ps-am:
  
Index: pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp
diff -u pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp:1.1 pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp:1.2
--- pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp:1.1      Tue Jul 31 21:10:29 2018
+++ pkgsrc/audio/audacity/patches/patch-src_effects_Effect.cpp  Sun Feb 10 17:14:42 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_effects_Effect.cpp,v 1.1 2018/07/31 21:10:29 jperkin Exp $
+$NetBSD: patch-src_effects_Effect.cpp,v 1.2 2019/02/10 17:14:42 nia Exp $
 
 SunOS needs alloca.h for alloca().
 
---- src/effects/Effect.cpp.orig        2016-01-13 14:31:24.000000000 +0000
+--- src/effects/Effect.cpp.orig        2018-02-14 07:11:20.000000000 +0000
 +++ src/effects/Effect.cpp
-@@ -54,6 +54,10 @@ greater use in future.
+@@ -61,6 +61,10 @@ greater use in future.
  #include <Cocoa/Cocoa.h>
  #endif
  
@@ -13,5 +13,5 @@ SunOS needs alloca.h for alloca().
 +#endif
 +
  #include "../Experimental.h"
+ #include "../commands/ScreenshotCommand.h"
  
- static const int kDummyID = 20000;
Index: pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp
diff -u pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp:1.1 pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp:1.2
--- pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp:1.1       Tue Jul 31 21:10:29 2018
+++ pkgsrc/audio/audacity/patches/patch-src_effects_EffectManager.cpp   Sun Feb 10 17:14:42 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_effects_EffectManager.cpp,v 1.1 2018/07/31 21:10:29 jperkin Exp $
+$NetBSD: patch-src_effects_EffectManager.cpp,v 1.2 2019/02/10 17:14:42 nia Exp $
 
 SunOS needs alloca.h for alloca().
 
---- src/effects/EffectManager.cpp.orig 2016-01-13 14:31:24.000000000 +0000
+--- src/effects/EffectManager.cpp.orig 2018-02-14 07:11:20.000000000 +0000
 +++ src/effects/EffectManager.cpp
 @@ -15,6 +15,10 @@
  #include <wx/stopwatch.h>
@@ -13,5 +13,5 @@ SunOS needs alloca.h for alloca().
 +#endif
 +
  #include "../Experimental.h"
+ #include "../widgets/ErrorDialog.h"
  
- #if defined(EXPERIMENTAL_EFFECTS_RACK)

Index: pkgsrc/audio/audacity/patches/patch-am
diff -u pkgsrc/audio/audacity/patches/patch-am:1.7 pkgsrc/audio/audacity/patches/patch-am:1.8
--- pkgsrc/audio/audacity/patches/patch-am:1.7  Sun Jun  5 01:02:38 2016
+++ pkgsrc/audio/audacity/patches/patch-am      Sun Feb 10 17:14:42 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-am,v 1.7 2016/06/05 01:02:38 ryoon Exp $
+$NetBSD: patch-am,v 1.8 2019/02/10 17:14:42 nia Exp $
 
 Don't hardcode TMPDIR.
 
---- src/AudacityApp.cpp.orig   2016-01-13 14:31:23.000000000 +0000
+--- src/AudacityApp.cpp.orig   2018-02-14 07:11:20.000000000 +0000
 +++ src/AudacityApp.cpp
-@@ -1182,7 +1182,7 @@ bool AudacityApp::OnInit()
+@@ -1281,7 +1281,7 @@ bool AudacityApp::OnInit()
     wxString home = wxGetHomeDir();
  
     /* On Unix systems, the default temp dir is in /var/tmp. */
--   defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId().c_str());
-+   defaultTempDir.Printf(wxT("%s/.audacity1.2-%s"), home.c_str(), wxGetUserId().c_str());
+-   defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId());
++   defaultTempDir.Printf(wxT("%s/audacity-%s"), home.c_str(), wxGetUserId());
  
-    wxString pathVar = wxGetenv(wxT("AUDACITY_PATH"));
-    if (pathVar != wxT(""))
+ // DA: Path env variable.
+ #ifndef EXPERIMENTAL_DA

Added files:

Index: pkgsrc/audio/audacity/patches/patch-mac_scripts_create__info__header.sh
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-mac_scripts_create__info__header.sh:1.1
--- /dev/null   Sun Feb 10 17:14:42 2019
+++ pkgsrc/audio/audacity/patches/patch-mac_scripts_create__info__header.sh     Sun Feb 10 17:14:42 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-mac_scripts_create__info__header.sh,v 1.1 2019/02/10 17:14:42 nia Exp $
+
+Portability fix.
+
+--- mac/scripts/create_info_header.sh.orig     2018-02-14 07:11:20.000000000 +0000
++++ mac/scripts/create_info_header.sh
+@@ -21,7 +21,7 @@ done
+ cd ${TOPLEVEL}
+ mkdir -p mac/build
+ eval $(g++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
+-if [ $CONFIGURATION == 'Debug' ]
++if [ $CONFIGURATION = 'Debug' ]
+ then
+     AUDACITY_EXECUTABLE=Audacity
+ else

Index: pkgsrc/audio/audacity/patches/patch-src_AudioIO.cpp
diff -u /dev/null pkgsrc/audio/audacity/patches/patch-src_AudioIO.cpp:1.3
--- /dev/null   Sun Feb 10 17:14:42 2019
+++ pkgsrc/audio/audacity/patches/patch-src_AudioIO.cpp Sun Feb 10 17:14:42 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_AudioIO.cpp,v 1.3 2019/02/10 17:14:42 nia Exp $
+
+CLOCK_MONOTONIC_RAW is Linux-specific.
+
+--- src/AudioIO.cpp.orig       2018-02-14 07:11:20.000000000 +0000
++++ src/AudioIO.cpp
+@@ -985,7 +985,11 @@ static double SystemTime(bool usingAlsa)
+    if (usingAlsa) {
+       struct timespec now;
+       // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time
++#ifdef CLOCK_MONOTONIC_RAW
+       clock_gettime(CLOCK_MONOTONIC_RAW, &now);
++#else
++      clock_gettime(CLOCK_MONOTONIC, &now);
++#endif
+       //return now.tv_sec + now.tv_nsec * 0.000000001;
+       return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime;
+    }

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