CVS commit: pkgsrc/audio/terminatorx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Oct  5 12:09:26 UTC 2019

Modified Files:
        pkgsrc/audio/terminatorx: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/terminatorx/patches: patch-configure patch-src_main.cc
            patch-src_tX__audiofile.cc patch-src_tX__dialog.cc
            patch-src_tX__flash.c patch-src_tX__seqpar.cc patch-src_tX__vtt.cc
            patch-src_tX__widget.c
Removed Files:
        pkgsrc/audio/terminatorx/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-ah patch-ai
            patch-src_tX__midiin.cc patch-src_tx__dial_c

Log Message:
terminatorx: Update to 4.0.1

- Switched to GTK3
- HiDPI support
- New optional PulseAudio backend


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/audio/terminatorx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/terminatorx/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/terminatorx/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/terminatorx/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/terminatorx/patches/patch-ab \
    pkgsrc/audio/terminatorx/patches/patch-ac \
    pkgsrc/audio/terminatorx/patches/patch-ad \
    pkgsrc/audio/terminatorx/patches/patch-ae \
    pkgsrc/audio/terminatorx/patches/patch-af \
    pkgsrc/audio/terminatorx/patches/patch-ag \
    pkgsrc/audio/terminatorx/patches/patch-ah \
    pkgsrc/audio/terminatorx/patches/patch-ai \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__midiin.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tx__dial_c
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/terminatorx/patches/patch-configure \
    pkgsrc/audio/terminatorx/patches/patch-src_main.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__audiofile.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__dialog.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__flash.c \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__seqpar.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__vtt.cc \
    pkgsrc/audio/terminatorx/patches/patch-src_tX__widget.c

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

Modified files:

Index: pkgsrc/audio/terminatorx/Makefile
diff -u pkgsrc/audio/terminatorx/Makefile:1.54 pkgsrc/audio/terminatorx/Makefile:1.55
--- pkgsrc/audio/terminatorx/Makefile:1.54      Sun Jul 21 22:24:29 2019
+++ pkgsrc/audio/terminatorx/Makefile   Sat Oct  5 12:09:26 2019
@@ -1,45 +1,58 @@
-# $NetBSD: Makefile,v 1.54 2019/07/21 22:24:29 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2019/10/05 12:09:26 nia Exp $
 
-DISTNAME=      terminatorX-3.82
-PKGNAME=       ${DISTNAME:S/X/x/}
-PKGREVISION=   36
+DISTNAME=      terminatorX-4.0.1
+PKGNAME=       ${DISTNAME:S/X/x/1}
 CATEGORIES=    audio
-MASTER_SITES=  http://terminatorx.org/dist/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  https://terminatorx.org/dist/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://terminatorx.org/
+HOMEPAGE=      https://terminatorx.org/
 COMMENT=       Realtime audio synthesizer
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      mpg123-[0-9]*:../../audio/mpg123
-DEPENDS+=      sox-[0-9]*:../../audio/sox
 DEPENDS+=      vorbis-tools-[0-9]*:../../audio/vorbis-tools
 
-USE_LANGUAGES=         c c++03
-USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config
-GNU_CONFIGURE=         yes
+GNU_CONFIGURE= yes
+USE_TOOLS+=    pkg-config
+USE_LIBTOOL=   yes
+USE_LANGUAGES= c c++03
 
-LIBS+=                 ${LIBOSSAUDIO}
-CONFIGURE_ARGS+=       --disable-alsa
+CONFIGURE_ARGS+=       --disable-gtktest
+CONFIGURE_ARGS+=       --disable-scheduler
+
+.include "../../mk/oss.buildlink3.mk"
 
+.if ${OSS_TYPE} == "none"
+CONFIGURE_ARGS+=       --disable-oss
+.else
+CONFIGURE_ARGS+=       --enable-oss
+LIBS+=                 ${LIBOSSAUDIO}
 SUBST_CLASSES+=                oss
 SUBST_STAGE.oss=       pre-configure
 SUBST_FILES.oss=       src/tX_global.c
 SUBST_SED.oss=         -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.oss=     Fixing hardcoded audio device.
+.endif
+
+SUBST_CLASSES+=                prefix
+SUBST_STAGE.prefix=    pre-configure
+SUBST_MESSAGE.prefix=  Setting path to PREFIX in source files.
+SUBST_FILES.prefix+=   src/tX_global.c
+SUBST_FILES.prefix+=   src/tX_ladspa.cc
+SUBST_SED.prefix+=     -e "s|/usr/lib/ladspa|${PREFIX}/lib/ladspa|g"
+SUBST_SED.prefix+=     -e "s|/usr/share/ladspa|${PREFIX}/share/ladspa|g"
 
 .include "../../audio/ladspa/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/sox/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-
-.include "../../mk/oss.buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/terminatorx/PLIST
diff -u pkgsrc/audio/terminatorx/PLIST:1.2 pkgsrc/audio/terminatorx/PLIST:1.3
--- pkgsrc/audio/terminatorx/PLIST:1.2  Sun Jun 14 17:32:23 2009
+++ pkgsrc/audio/terminatorx/PLIST      Sat Oct  5 12:09:26 2019
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/05 12:09:26 nia Exp $
 bin/terminatorX
 man/man1/terminatorX.1
-share/omf/terminatorX/terminatorX-manual-C.omf
-share/terminatorX/doc/terminatorX-manual/C/figures/signalflow.png
-share/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml
+share/appdata/terminatorX.appdata.xml
+share/applications/terminatorX.desktop
+share/icons/hicolor/512x512/apps/terminatorX.png
+share/icons/hicolor/512x512/mimetypes/terminatorX-mime.png
+share/mime-info/terminatorX.keys
+share/mime-info/terminatorX.mime
+share/pixmaps/terminatorX.xpm

Index: pkgsrc/audio/terminatorx/distinfo
diff -u pkgsrc/audio/terminatorx/distinfo:1.9 pkgsrc/audio/terminatorx/distinfo:1.10
--- pkgsrc/audio/terminatorx/distinfo:1.9       Tue Nov  3 01:12:52 2015
+++ pkgsrc/audio/terminatorx/distinfo   Sat Oct  5 12:09:26 2019
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:12:52 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/10/05 12:09:26 nia Exp $
 
-SHA1 (terminatorX-3.82.tar.bz2) = 8d492fc759ffb77c2549190081077e12f765233f
-RMD160 (terminatorX-3.82.tar.bz2) = b70c688101844a07eddcd3e090cd6e805e93f066
-SHA512 (terminatorX-3.82.tar.bz2) = 9fbb297ecffc50d5bf39daff9dcdc619879b255673072af2d843f97b26e4fb667a8a4cf831a6debbfe95631acd938dad1edfc988db7c02421ece3170ffc1b1f0
-Size (terminatorX-3.82.tar.bz2) = 395755 bytes
-SHA1 (patch-aa) = 12100a880e86430acec603721b0e3110731225e3
-SHA1 (patch-ab) = 16e264ac60c0ec65c525baddc5c3e71d039cc0c3
-SHA1 (patch-ac) = 4a86d5f59ecf6c072589bf5e57d7ab0ef4d7d7eb
-SHA1 (patch-ad) = e3125815472b334882bc190405a2ff217a018fb3
-SHA1 (patch-ae) = 5412826df902f180d93de078ec1a5bcc8a6b1bfa
-SHA1 (patch-af) = 7129f695f1c7e79800d123b4a3d5db7a8f6c3f5d
-SHA1 (patch-ag) = 53094ee9beb48478ee4ea3c375422c858fc2fc81
-SHA1 (patch-ah) = f2d7ca4631b177840b88d82d614e11ba779b4ef5
-SHA1 (patch-ai) = 7fe25f7b29fcb807b00bee363337f163f0171813
-SHA1 (patch-src_tX__midiin.cc) = 4e5b34e5c99ecc6a5c750cc2e5c9fe700b1871fb
-SHA1 (patch-src_tx__dial_c) = b2c6824b1c103d3f86943d6040e741aab6158cb9
+SHA1 (terminatorX-4.0.1.tar.gz) = a51b51471698bb954592877f1c2495c00a39c374
+RMD160 (terminatorX-4.0.1.tar.gz) = 75a1d0d86152d95a956ee652e056b1f1479d1b63
+SHA512 (terminatorX-4.0.1.tar.gz) = dae7d401870db39692d57e1fe5df47be7b50179a8cd739b60bdfda211cbe29e8abdc116bda23a286ddf49533e76175ac2a5811e0516b1a7d50b7873f7db4715b
+Size (terminatorX-4.0.1.tar.gz) = 1928137 bytes
+SHA1 (patch-configure) = ab0e0f7b49c854bffab957a460ff4602ca6ad519
+SHA1 (patch-src_main.cc) = 327a9067e571236d47a5ba7448c71c6460f01701
+SHA1 (patch-src_tX__audiofile.cc) = 37c2ce405a8740705bf9811ddc782cedf57f5f1a
+SHA1 (patch-src_tX__dialog.cc) = 1ba42dffc0bfe5fe786f2ca8f27b0e582dba02c3
+SHA1 (patch-src_tX__flash.c) = dbcbac5742b90915d953702c45083c8cbec2589a
+SHA1 (patch-src_tX__seqpar.cc) = e2db0feaa01fbbd3b4f84b93abfdc409fcd1ca7d
+SHA1 (patch-src_tX__vtt.cc) = 9947e84f1b0067935f750989d37919b88587149f
+SHA1 (patch-src_tX__widget.c) = eed43a8a4143035074645cfe33d4d14990f35494

Added files:

Index: pkgsrc/audio/terminatorx/patches/patch-configure
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-configure:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-configure    Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Fix shell portability.
+
+--- configure.orig     2016-07-24 14:24:22.000000000 +0000
++++ configure
+@@ -5177,7 +5177,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test "$GLIB_COMPILE_RESOURCES" == ""; then :
++if test "$GLIB_COMPILE_RESOURCES" = ""; then :
+ 
+               as_fn_error $? "glib-compile-resources not found" "$LINENO" 5
+ 
Index: pkgsrc/audio/terminatorx/patches/patch-src_main.cc
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_main.cc:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_main.cc  Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_main.cc,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/main.cc.orig   2016-07-24 14:24:08.000000000 +0000
++++ src/main.cc
+@@ -27,7 +27,7 @@
+ 
+ #include <stdio.h>
+ #include "tX_mastergui.h"
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include <stdio.h>
+ #ifndef WIN32
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__audiofile.cc
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__audiofile.cc:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__audiofile.cc Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tX__audiofile.cc,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/tX_audiofile.cc.orig   2016-07-24 14:24:08.000000000 +0000
++++ src/tX_audiofile.cc
+@@ -30,7 +30,7 @@
+ #include "tX_audiofile.h"
+ 
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "wav_file.h"
+ #include "tX_loaddlg.h"
+ #include "tX_endian.h"
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__dialog.cc
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__dialog.cc:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__dialog.cc    Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tX__dialog.cc,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Fix function argument list when building without ALSA.
+
+--- src/tX_dialog.cc.orig      2016-07-24 14:24:08.000000000 +0000
++++ src/tX_dialog.cc
+@@ -244,7 +244,7 @@ void append_alsa_device_list(GtkComboBox
+       }
+ }
+ #else
+-void append_alsa_device_list(GtkComboBoxText *combo) {
++void append_alsa_device_list(GtkComboBoxText *combo, char *current) {
+ }
+ #endif
+ 
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__flash.c
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__flash.c:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__flash.c      Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tX__flash.c,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/tX_flash.c.orig        2016-07-24 14:24:08.000000000 +0000
++++ src/tX_flash.c
+@@ -27,7 +27,7 @@
+ #include "tX_flash.h"
+ #include "tX_types.h"
+ #include "tX_global.h"
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #ifndef WIN32
+ #include <unistd.h>
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__seqpar.cc
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__seqpar.cc:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__seqpar.cc    Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tX__seqpar.cc,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/tX_seqpar.cc.orig      2016-07-24 14:24:08.000000000 +0000
++++ src/tX_seqpar.cc
+@@ -28,7 +28,7 @@
+ #include "tX_sequencer.h"
+ #include "tX_extdial.h"
+ #include "tX_engine.h"
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #define TX_SEQPAR_DEFAULT_SCALE 0.05
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__vtt.cc
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__vtt.cc:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__vtt.cc       Sat Oct  5 12:09:26 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tX__vtt.cc,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/tX_vtt.cc.orig 2016-07-24 14:24:08.000000000 +0000
++++ src/tX_vtt.cc
+@@ -28,7 +28,7 @@
+ #include "tX_vtt.h"
+ #include "tX_global.h"
+ #include <stdio.h>
+-#include "malloc.h"
++#include <stdlib.h>
+ #include <math.h>
+ #include "tX_mastergui.h"
+ #include "tX_sequencer.h"
Index: pkgsrc/audio/terminatorx/patches/patch-src_tX__widget.c
diff -u /dev/null pkgsrc/audio/terminatorx/patches/patch-src_tX__widget.c:1.1
--- /dev/null   Sat Oct  5 12:09:26 2019
+++ pkgsrc/audio/terminatorx/patches/patch-src_tX__widget.c     Sat Oct  5 12:09:26 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tX__widget.c,v 1.1 2019/10/05 12:09:26 nia Exp $
+
+Use standard stdlib.h instead of non-standard malloc.h.
+
+--- src/tX_widget.c.orig       2016-07-24 14:24:08.000000000 +0000
++++ src/tX_widget.c
+@@ -28,7 +28,6 @@
+ #include "tX_widget.h"
+ #include "tX_types.h"
+ #include "tX_global.h"
+-#include <malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+