pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/gramofile
Module Name: pkgsrc
Committed By: nia
Date: Thu May 20 19:24:15 UTC 2021
Modified Files:
pkgsrc/audio/gramofile: Makefile distinfo
pkgsrc/audio/gramofile/patches: patch-gramofile_c
Added Files:
pkgsrc/audio/gramofile/patches: patch-Makefile patch-bplaysrc_Makefile
patch-bplaysrc_shmbuf.c patch-clrscr.c patch-errorwindow.c
patch-fmtheaders.h patch-playwav.c patch-reclp__main.c
patch-signpr__cmf.c patch-signpr__cmf2.c patch-signpr__doubmed.c
patch-signpr__mean.c patch-signpr__median.c patch-signpr__rms.c
patch-stringinput.c patch-tracksplit__parammenu.c
patch-yesnowindow.c
Removed Files:
pkgsrc/audio/gramofile/patches: patch-aa patch-ab patch-ac
Log Message:
gramofile: "update" to 1.6P (a retag). apply many local fixes to the code.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/gramofile/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/gramofile/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/gramofile/patches/patch-Makefile \
pkgsrc/audio/gramofile/patches/patch-bplaysrc_Makefile \
pkgsrc/audio/gramofile/patches/patch-bplaysrc_shmbuf.c \
pkgsrc/audio/gramofile/patches/patch-clrscr.c \
pkgsrc/audio/gramofile/patches/patch-errorwindow.c \
pkgsrc/audio/gramofile/patches/patch-fmtheaders.h \
pkgsrc/audio/gramofile/patches/patch-playwav.c \
pkgsrc/audio/gramofile/patches/patch-reclp__main.c \
pkgsrc/audio/gramofile/patches/patch-signpr__cmf.c \
pkgsrc/audio/gramofile/patches/patch-signpr__cmf2.c \
pkgsrc/audio/gramofile/patches/patch-signpr__doubmed.c \
pkgsrc/audio/gramofile/patches/patch-signpr__mean.c \
pkgsrc/audio/gramofile/patches/patch-signpr__median.c \
pkgsrc/audio/gramofile/patches/patch-signpr__rms.c \
pkgsrc/audio/gramofile/patches/patch-stringinput.c \
pkgsrc/audio/gramofile/patches/patch-tracksplit__parammenu.c \
pkgsrc/audio/gramofile/patches/patch-yesnowindow.c
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/gramofile/patches/patch-aa \
pkgsrc/audio/gramofile/patches/patch-ac
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/gramofile/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/gramofile/patches/patch-gramofile_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/gramofile/Makefile
diff -u pkgsrc/audio/gramofile/Makefile:1.21 pkgsrc/audio/gramofile/Makefile:1.22
--- pkgsrc/audio/gramofile/Makefile:1.21 Sun Jan 26 17:30:42 2020
+++ pkgsrc/audio/gramofile/Makefile Thu May 20 19:24:15 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2020/01/26 17:30:42 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2021/05/20 19:24:15 nia Exp $
#
-DISTNAME= gramofile-1.6
-PKGREVISION= 4
+DISTNAME= gramofile-1.6P
CATEGORIES= audio
-MASTER_SITES= http://www.opensourcepartners.nl/~costar/gramofile/
+MASTER_SITES= https://www.opensourcepartners.nl/~costar/gramofile/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.opensourcepartners.nl/~costar/gramofile/
Index: pkgsrc/audio/gramofile/distinfo
diff -u pkgsrc/audio/gramofile/distinfo:1.12 pkgsrc/audio/gramofile/distinfo:1.13
--- pkgsrc/audio/gramofile/distinfo:1.12 Tue Nov 3 01:12:34 2015
+++ pkgsrc/audio/gramofile/distinfo Thu May 20 19:24:15 2021
@@ -1,11 +1,25 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 01:12:34 agc Exp $
+$NetBSD: distinfo,v 1.13 2021/05/20 19:24:15 nia Exp $
-SHA1 (gramofile-1.6.tar.gz) = 6e5365d9e04801725be694fefcff5fc10ea2f912
-RMD160 (gramofile-1.6.tar.gz) = 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967
-SHA512 (gramofile-1.6.tar.gz) = 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
-Size (gramofile-1.6.tar.gz) = 108596 bytes
-SHA1 (patch-aa) = d9cfec7b0243efeb9785b65dbb5c95725d646bdb
-SHA1 (patch-ab) = 1f599c0dc94dd6d420c7ba59e75a9829180dc4df
-SHA1 (patch-ac) = 9454f027a896d4778977cb126e0b1e82050de7fb
+SHA1 (gramofile-1.6P.tar.gz) = aea717a551c27c9da460d976f5c49802c0409784
+RMD160 (gramofile-1.6P.tar.gz) = f4b81c78e6c6e80e2109d8921de8e03364910d61
+SHA512 (gramofile-1.6P.tar.gz) = 7731cfd360cfcf8615ef5072d6d50423ae7192c7be233b2ad49bb10940ed9edb977f36dccad4c2d239868f3d0c3334feed6dd6f38b34a1ff6bfc144be07be38d
+Size (gramofile-1.6P.tar.gz) = 117822 bytes
+SHA1 (patch-Makefile) = f4fea45e1fd038c9a837c2f63f5d5030d54bc93b
+SHA1 (patch-bplaysrc_Makefile) = 507c689404356f326b7b84a2ffe3f103f4ade0b6
SHA1 (patch-bplaysrc_bplay_c) = 59f0db9a664245c2d21e791c2910854f5c9ecdce
-SHA1 (patch-gramofile_c) = 8c73c1db912894bc6f7cfc3fa191f1521e5d5b8d
+SHA1 (patch-bplaysrc_shmbuf.c) = a4db34dfb56dba3075c8634cad13d94d5a065208
+SHA1 (patch-clrscr.c) = 3bae1344fa4f068c6d26bc3f4b8ec7c35293b7b1
+SHA1 (patch-errorwindow.c) = 8aeaf23400b3fbf9125b4f5189ff41d2c4551289
+SHA1 (patch-fmtheaders.h) = 573c56418b011b261b354fa46f0622e2dbe6cfff
+SHA1 (patch-gramofile_c) = accf3aee4a05accb1d92165dabb355444cca112e
+SHA1 (patch-playwav.c) = 21087eed0e7e922926ed8435b03641e1028c423c
+SHA1 (patch-reclp__main.c) = abe2a180151455e1ec6e0a9cf5cf7e80a429abd5
+SHA1 (patch-signpr__cmf.c) = 1d19753266a51e838381de22bc33cc89099b2f51
+SHA1 (patch-signpr__cmf2.c) = f3a839f31d114519f4fa8c0f163219fc5fceaf6e
+SHA1 (patch-signpr__doubmed.c) = 23cbeca1fc2a044387e6d80dd64f3ff5c2caaa35
+SHA1 (patch-signpr__mean.c) = a890f6ad682adac617af45f96f4367191a7126de
+SHA1 (patch-signpr__median.c) = 4106e28c9c321037c320986e90ae3142319a290e
+SHA1 (patch-signpr__rms.c) = b787585248cf3fcb5ac86c727ca24c2bf2d373f4
+SHA1 (patch-stringinput.c) = 3614c9ad8f7a4b14885d6103bb8bd4a62e9d77f0
+SHA1 (patch-tracksplit__parammenu.c) = 965aabf58ee36f395a65c24b765dc902152d1d36
+SHA1 (patch-yesnowindow.c) = 41ebf6f74211a2c14d7c97c3e67905d974b2e091
Index: pkgsrc/audio/gramofile/patches/patch-gramofile_c
diff -u pkgsrc/audio/gramofile/patches/patch-gramofile_c:1.1 pkgsrc/audio/gramofile/patches/patch-gramofile_c:1.2
--- pkgsrc/audio/gramofile/patches/patch-gramofile_c:1.1 Sun Aug 28 22:55:49 2011
+++ pkgsrc/audio/gramofile/patches/patch-gramofile_c Thu May 20 19:24:15 2021
@@ -1,10 +1,19 @@
-$NetBSD: patch-gramofile_c,v 1.1 2011/08/28 22:55:49 dholland Exp $
+$NetBSD: patch-gramofile_c,v 1.2 2021/05/20 19:24:15 nia Exp $
+- include missing header for exit()
- fix void main
--- gramofile.c.orig 2000-03-28 21:07:25.000000000 +0000
+++ gramofile.c
-@@ -42,7 +42,7 @@ finishmenu (int sig)
+@@ -9,6 +9,7 @@
+
+ #include "mainmenu.h"
+ #include "splashscr.h"
++#include <stdlib.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -42,7 +43,7 @@ finishmenu (int sig)
exit (0);
}
Added files:
Index: pkgsrc/audio/gramofile/patches/patch-Makefile
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-Makefile:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-Makefile Thu May 20 19:24:15 2021
@@ -0,0 +1,54 @@
+$NetBSD: patch-Makefile,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Honor CC/CFLAGS/LDFLAGS.
+
+--- Makefile.orig 2000-11-26 19:24:37.000000000 +0000
++++ Makefile
+@@ -13,28 +13,34 @@ SRCS = boxes.c buttons.c checkfile.c dir
+ OBJS = $(SRCS:.c=.o)
+ SHELL = /bin/sh
+
+-CC = gcc
+-LDFLAGS =
++#CC = gcc
++#LDFLAGS =
+
+ ########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see bplaysrc/Makefile!)
+
++OS= $(shell uname -s)
++
++ifeq ($(OS), Linux)
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+ DEPS = $(OBJS) makebplay
+ LIBS = -lncurses -lm
+ COPY_A = -a
+-
++else
++ifeq (,$(filter-out NetBSD DragonFly SunOS,$(OS)))
+ # For FreeBSD (and maybe others), use these:
+-#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
+-#DEPS = $(OBJS) makebplay
+-#LIBS = -lncurses -lm
+-#COPY_A = -p
+-
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER -DOLD_CURSES
++DEPS = $(OBJS) makebplay
++LIBS = -lcurses -lm
++COPY_A = -p
++else
+ # For IRIX (and maybe others), use these:
+-#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DSWAP_ENDIAN -DOLD_CURSES
+-#DEPS = $(OBJS)
+-#LIBS = -lcurses -lm
+-#COPY_A = -a
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER -DSWAP_ENDIAN -DOLD_CURSES
++DEPS = $(OBJS)
++LIBS = -lcurses -lm
++COPY_A = -a
++endif
++endif
+
+ ##########
+
Index: pkgsrc/audio/gramofile/patches/patch-bplaysrc_Makefile
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-bplaysrc_Makefile:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-bplaysrc_Makefile Thu May 20 19:24:15 2021
@@ -0,0 +1,42 @@
+$NetBSD: patch-bplaysrc_Makefile,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+- Honor CC/LDFLAGS/CFLAGS.
+- Need -lm for modf().
+
+--- bplaysrc/Makefile.orig 2000-03-27 21:24:46.000000000 +0000
++++ bplaysrc/Makefile
+@@ -6,18 +6,27 @@ OBJS = bplay.o sndfunc.o shmbuf.o ../yes
+ ../clrscr.o ../secshms.o
+ #SRCS = bplay.c sndfunc.o shmbuf.c
+
+-CC = gcc
+-LDFLAGS =
++#CC = gcc
++#LDFLAGS =
+
+ ########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see ../Makefile!)
+
+-# For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DREDHAT50 -DLP2CD -DVUMETER # -DDEBUG
+-LIBS = -lncurses
++OS= $(shell uname -s)
+
++ifeq (${OS}, Linux)
++# For Linux (and maybe others), use these:
++CFLAGS += -Wall -O2 -DUSEBUFFLOCK -DREDHAT50 -DLP2CD -DVUMETER # -DDEBUG
++LIBS = -lncurses -lm
++else
++ifeq (${OS}, DragonFly)
++CFLAGS += -Wall -DLP2CD -DVUMETER
++LIBS = -lcurses -lm ${LIBOSSAUDIO}
++else
+ # For FreeBSD (and maybe others), use these:
+-#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
+-#LIBS = -lncurses
++CFLAGS += -Wall -DLP2CD -DVUMETER -DOLD_CURSES -D_SEM_SEMUN_UNDEFINED # -DDEBUG
++LIBS = -lcurses -lm ${LIBOSSAUDIO}
++endif
++endif
+
+ # -DOLD_CURSES can be used here, too.
+
Index: pkgsrc/audio/gramofile/patches/patch-bplaysrc_shmbuf.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-bplaysrc_shmbuf.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-bplaysrc_shmbuf.c Thu May 20 19:24:15 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-bplaysrc_shmbuf.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Do not busy wait for confirmation after recording.
+Patch from Debian:
+https://sources.debian.org/patches/gramofile/1.6-12/20-no-busy-wait-after-rec.patch/
+
+--- bplaysrc/shmbuf.c.orig 2000-03-27 21:38:56.000000000 +0000
++++ bplaysrc/shmbuf.c
+@@ -443,7 +443,7 @@ printw(" %d",cbuff);
+ cleanupsems();
+
+ #ifdef VUMETER
+- nodelay(stdscr, TRUE);
++ nodelay(stdscr, FALSE);
+
+ /* child has displayed informative data */
+ do
Index: pkgsrc/audio/gramofile/patches/patch-clrscr.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-clrscr.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-clrscr.c Thu May 20 19:24:15 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-clrscr.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Include missing header for strlen.
+
+--- clrscr.c.orig 2000-03-28 21:07:25.000000000 +0000
++++ clrscr.c
+@@ -13,7 +13,7 @@
+ #else
+ #include <curses.h>
+ #endif
+-
++#include <string.h>
+
+ void
+ header (char *headertext)
Index: pkgsrc/audio/gramofile/patches/patch-errorwindow.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-errorwindow.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-errorwindow.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-errorwindow.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Include missing header for strlen.
+
+--- errorwindow.c.orig 2000-11-26 00:55:58.000000000 +0000
++++ errorwindow.c
+@@ -12,6 +12,7 @@
+ #include "buttons.h"
+ #include "boxes.h"
+ #include "textwindow.h"
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
Index: pkgsrc/audio/gramofile/patches/patch-fmtheaders.h
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-fmtheaders.h:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-fmtheaders.h Thu May 20 19:24:15 2021
@@ -0,0 +1,93 @@
+$NetBSD: patch-fmtheaders.h,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Use fixed sizes for fields.
+
+--- fmtheaders.h.orig 2000-03-28 21:07:26.000000000 +0000
++++ fmtheaders.h
+@@ -2,21 +2,22 @@
+ #define _FMTHEADERS_H 1
+
+ #include <sys/types.h>
++#include <stdint.h>
+
+ /* Definitions for .VOC files */
+
+ #define VOC_MAGIC "Creative Voice File\032"
+
+-#define DATALEN(bp) ((u_long)(bp.BlockLen[0]) | \
+- ((u_long)(bp.BlockLen[1]) << 8) | \
+- ((u_long)(bp.BlockLen[2]) << 16) )
++#define DATALEN(bp) ((uint32_t)(bp.BlockLen[0]) | \
++ ((uint32_t)(bp.BlockLen[1]) << 8) | \
++ ((uint32_t)(bp.BlockLen[2]) << 16) )
+
+ typedef struct vochead
+ {
+ u_char Magic[20]; /* must be VOC_MAGIC */
+- u_short BlockOffset; /* Offset to first block from top of file */
+- u_short Version; /* VOC-file version */
+- u_short IDCode; /* complement of version + 0x1234 */
++ uint16_t BlockOffset; /* Offset to first block from top of file */
++ uint16_t Version; /* VOC-file version */
++ uint16_t IDCode; /* complement of version + 0x1234 */
+ }
+ vochead;
+
+@@ -36,7 +37,7 @@ blockT1;
+
+ typedef struct blockT8
+ {
+- u_short TimeConstant;
++ uint16_t TimeConstant;
+ u_char PackMethod;
+ u_char VoiceMode;
+ }
+@@ -44,10 +45,10 @@ blockT8;
+
+ typedef struct blockT9
+ {
+- u_int SamplesPerSec;
++ uint SamplesPerSec;
+ u_char BitsPerSample;
+ u_char Channels;
+- u_short Format;
++ uint16_t Format;
+ u_char reserved[4];
+ }
+ blockT9;
+@@ -62,21 +63,21 @@ blockT9;
+ */
+ typedef struct wavhead
+ {
+- u_long main_chunk; /* 'RIFF' */
+- u_long length; /* Length of rest of file */
+- u_long chunk_type; /* 'WAVE' */
+-
+- u_long sub_chunk; /* 'fmt ' */
+- u_long sc_len; /* length of sub_chunk, =16 (rest of chunk) */
+- u_short format; /* should be 1 for PCM-code */
+- u_short modus; /* 1 Mono, 2 Stereo */
+- u_long sample_fq; /* frequence of sample */
+- u_long byte_p_sec;
+- u_short byte_p_spl; /* samplesize; 1 or 2 bytes */
+- u_short bit_p_spl; /* 8, 12 or 16 bit */
++ uint32_t main_chunk; /* 'RIFF' */
++ uint32_t length; /* Length of rest of file */
++ uint32_t chunk_type; /* 'WAVE' */
++
++ uint32_t sub_chunk; /* 'fmt ' */
++ uint32_t sc_len; /* length of sub_chunk, =16 (rest of chunk) */
++ uint16_t format; /* should be 1 for PCM-code */
++ uint16_t modus; /* 1 Mono, 2 Stereo */
++ uint32_t sample_fq; /* frequence of sample */
++ uint32_t byte_p_sec;
++ uint16_t byte_p_spl; /* samplesize; 1 or 2 bytes */
++ uint16_t bit_p_spl; /* 8, 12 or 16 bit */
+
+- u_long data_chunk; /* 'data' */
+- u_long data_length; /* samplecount (lenth of rest of block?) */
++ uint32_t data_chunk; /* 'data' */
++ uint32_t data_length; /* samplecount (lenth of rest of block?) */
+ }
+ wavhead;
+
Index: pkgsrc/audio/gramofile/patches/patch-playwav.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-playwav.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-playwav.c Thu May 20 19:24:15 2021
@@ -0,0 +1,36 @@
+$NetBSD: patch-playwav.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+fix shell quoting. from Debian:
+https://sources.debian.org/patches/gramofile/1.6-12/20-shell-quoting.patch/
+Patch by Jon Schewe <jpschewe%eggplant.mtu.net@localhost>
+
+--- playwav.c.orig 2000-03-28 21:07:25.000000000 +0000
++++ playwav.c
+@@ -44,11 +44,11 @@ playwav_playit (char *filename, int useb
+ case FILE_EXISTS:
+
+ if (usebeginendtime)
+- sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 -J %ld -T %ld %s",
++ sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 -J %ld -T %ld \"%s\"",
+ (long) (begintime * 44100),
+ (long) ((endtime - begintime) * 44100), filename);
+ else
+- sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 %s", filename);
++ sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 \"%s\"", filename);
+ /* defaults for raw files (but no -r, so .wav's supply their own
+ parameters) - you can even listen to executables in CD quality (: */
+
+@@ -771,11 +771,11 @@ playwav_main (char *startdir)
+ def_prog_mode (); /* save terminal state */
+
+ if (usebeginendtime)
+- sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 -J %ld -T %ld %s",
++ sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 -J %ld -T %ld \"%s\"",
+ (long) (begintime * 44100),
+ (long) ((endtime - begintime) * 44100), filename);
+ else
+- sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 %s", filename);
++ sprintf (shellcmd, "bplay_gramo -S -s 44100 -b 16 \"%s\"", filename);
+ /* defaults for raw files (but no -r, so .wav's supply their own
+ parameters */
+
Index: pkgsrc/audio/gramofile/patches/patch-reclp__main.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-reclp__main.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-reclp__main.c Thu May 20 19:24:15 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-reclp__main.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+Shell quoting fixes from Debian:
+https://sources.debian.org/patches/gramofile/1.6-12/20-shell-quoting.patch/
+Patch by Jon Schewe <jpschewe%eggplant.mtu.net@localhost>
+
+--- reclp_main.c.orig 2000-03-28 21:07:25.000000000 +0000
++++ reclp_main.c
+@@ -30,7 +30,7 @@ record_from_lp (char *startdir)
+
+ def_prog_mode (); /* save terminal state */
+
+- sprintf (shellcmd, "brec_gramo -S -s 44100 -b 16 -t 6000 -w %s",
++ sprintf (shellcmd, "brec_gramo -S -s 44100 -b 16 -t 6000 -w \"%s\"",
+ filename);
+ system (shellcmd);
+
Index: pkgsrc/audio/gramofile/patches/patch-signpr__cmf.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__cmf.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__cmf.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-signpr__cmf.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- signpr_cmf.c.orig 2000-11-26 00:56:00.000000000 +0000
++++ signpr_cmf.c
+@@ -31,6 +31,7 @@
+ #include "yesnowindow.h"
+ #endif
+ #include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #include <math.h>
+ #ifndef SWIG
Index: pkgsrc/audio/gramofile/patches/patch-signpr__cmf2.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__cmf2.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__cmf2.c Thu May 20 19:24:15 2021
@@ -0,0 +1,70 @@
+$NetBSD: patch-signpr__cmf2.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+- include missing header for strlen().
+- overflow fixes from Debian:
+ https://sources.debian.org/patches/gramofile/1.6-12/20-overflow-fixes.patch/
+ Patch by James Tappin <james%xena.uklinux.net@localhost>
+
+--- signpr_cmf2.c.orig 2000-11-26 00:56:00.000000000 +0000
++++ signpr_cmf2.c
+@@ -32,6 +32,7 @@
+ #include "helpline.h"
+ #include "yesnowindow.h"
+ #endif
++#include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+@@ -652,19 +653,25 @@ cond_median2_highpass (long offset, long
+
+ /* Should be /64, but the signal is extremely soft, so divide by less to
+ get more quantization levels (more accurate) */
+- sum.left /= 10;
+- sum.right /= 10;
++ sum.left /= 4;
++ sum.right /= 4;
+ #endif
+
+- if (sum.left < 32767)
+- sample.left = sum.left;
+- else
++ if (sum.left > 32767)
+ sample.left = 32767;
+-
+- if (sum.right < 32767)
+- sample.right = sum.right;
++ else if (sum.left < -32768)
++ sample.left = -32768;
+ else
++ sample.left = sum.left;
++
++
++ if (sum.right > 32767)
+ sample.right = 32767;
++ else if (sum.right < -32768)
++ sample.right = -32768;
++ else
++ sample.right = sum.right;
++
+
+ return sample;
+ }
+@@ -768,6 +775,9 @@ cond_median2_gate (long offset, long off
+ b_t.left;
+ if (i > 32767)
+ i = 32767;
++ else if (i < -32768)
++ i = -32768;
++
+ returnval.left = i;
+
+ i = (labs (w_t.right - b_t.right) * 1000)
+@@ -775,6 +785,8 @@ cond_median2_gate (long offset, long off
+ b_t.right;
+ if (i > 32767)
+ i = 32767;
++ else if (i < -32768)
++ i = -32768;
+ returnval.right = i;
+
+ return returnval;
Index: pkgsrc/audio/gramofile/patches/patch-signpr__doubmed.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__doubmed.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__doubmed.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-signpr__doubmed.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- signpr_doubmed.c.orig 2000-11-26 00:56:02.000000000 +0000
++++ signpr_doubmed.c
+@@ -17,6 +17,7 @@
+ #include "boxes.h"
+ #include "helpline.h"
+ #endif
++#include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #ifndef SWIG
Index: pkgsrc/audio/gramofile/patches/patch-signpr__mean.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__mean.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__mean.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-signpr__mean.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- signpr_mean.c.orig 2000-11-26 00:56:04.000000000 +0000
++++ signpr_mean.c
+@@ -17,6 +17,7 @@
+ #include "boxes.h"
+ #include "helpline.h"
+ #endif
++#include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #ifndef SWIG
Index: pkgsrc/audio/gramofile/patches/patch-signpr__median.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__median.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__median.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-signpr__median.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- signpr_median.c.orig 2000-11-26 00:56:05.000000000 +0000
++++ signpr_median.c
+@@ -18,6 +18,7 @@
+ #include "helpline.h"
+ #endif
+ #include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #ifndef SWIG
+ #ifndef OLD_CURSES
Index: pkgsrc/audio/gramofile/patches/patch-signpr__rms.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-signpr__rms.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-signpr__rms.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-signpr__rms.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- signpr_rms.c.orig 2000-11-26 00:56:05.000000000 +0000
++++ signpr_rms.c
+@@ -18,6 +18,7 @@
+ #include "helpline.h"
+ #endif
+ #include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #include <math.h>
+ #ifndef SWIG
Index: pkgsrc/audio/gramofile/patches/patch-stringinput.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-stringinput.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-stringinput.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-stringinput.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- stringinput.c.orig 2000-03-28 21:07:26.000000000 +0000
++++ stringinput.c
+@@ -8,6 +8,7 @@
+ */
+
+ #include "stringinput.h"
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
Index: pkgsrc/audio/gramofile/patches/patch-tracksplit__parammenu.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-tracksplit__parammenu.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-tracksplit__parammenu.c Thu May 20 19:24:15 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-tracksplit__parammenu.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+- include missing header for strlen().
+- fix format strings.
+
+--- tracksplit_parammenu.c.orig 2000-03-28 21:07:26.000000000 +0000
++++ tracksplit_parammenu.c
+@@ -14,6 +14,7 @@
+ #include "clrscr.h"
+ #include "boxes.h"
+ #include "helpline.h"
++#include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #ifndef OLD_CURSES
+@@ -212,11 +213,11 @@ tracksplit_parammenu (int *make_use_rms,
+
+ stringinput_display (&global_silence_factor_string);
+ mvprintw (global_silence_factor_string.y, 2,
+- "Global silence factor (0.1 %) :");
++ "Global silence factor (0.1 %%) :");
+
+ stringinput_display (&local_silence_threshold_string);
+ mvprintw (local_silence_threshold_string.y, 2,
+- "Local silence factor (%) :");
++ "Local silence factor (%%) :");
+
+ stringinput_display (&min_silence_blocks_string);
+ mvprintw (min_silence_blocks_string.y, 2,
Index: pkgsrc/audio/gramofile/patches/patch-yesnowindow.c
diff -u /dev/null pkgsrc/audio/gramofile/patches/patch-yesnowindow.c:1.1
--- /dev/null Thu May 20 19:24:15 2021
+++ pkgsrc/audio/gramofile/patches/patch-yesnowindow.c Thu May 20 19:24:15 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-yesnowindow.c,v 1.1 2021/05/20 19:24:15 nia Exp $
+
+include missing header for strlen().
+
+--- yesnowindow.c.orig 2000-03-28 21:07:26.000000000 +0000
++++ yesnowindow.c
+@@ -16,6 +16,7 @@
+ #else
+ #include <curses.h>
+ #endif
++#include <string.h>
+
+
+ int
Home |
Main Index |
Thread Index |
Old Index