pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/gramofile gramofile: "update" to 1.6P (a retag)....
details: https://anonhg.NetBSD.org/pkgsrc/rev/2830eeebf1a5
branches: trunk
changeset: 452961:2830eeebf1a5
user: nia <nia%pkgsrc.org@localhost>
date: Thu May 20 19:24:15 2021 +0000
description:
gramofile: "update" to 1.6P (a retag). apply many local fixes to the code.
diffstat:
audio/gramofile/Makefile | 7 +-
audio/gramofile/distinfo | 32 ++++-
audio/gramofile/patches/patch-Makefile | 54 +++++++++++
audio/gramofile/patches/patch-aa | 51 ----------
audio/gramofile/patches/patch-ab | 37 -------
audio/gramofile/patches/patch-ac | 93 -------------------
audio/gramofile/patches/patch-bplaysrc_Makefile | 42 ++++++++
audio/gramofile/patches/patch-bplaysrc_shmbuf.c | 17 +++
audio/gramofile/patches/patch-clrscr.c | 15 +++
audio/gramofile/patches/patch-errorwindow.c | 14 ++
audio/gramofile/patches/patch-fmtheaders.h | 93 +++++++++++++++++++
audio/gramofile/patches/patch-gramofile_c | 13 ++-
audio/gramofile/patches/patch-playwav.c | 36 +++++++
audio/gramofile/patches/patch-reclp__main.c | 17 +++
audio/gramofile/patches/patch-signpr__cmf.c | 14 ++
audio/gramofile/patches/patch-signpr__cmf2.c | 70 ++++++++++++++
audio/gramofile/patches/patch-signpr__doubmed.c | 14 ++
audio/gramofile/patches/patch-signpr__mean.c | 14 ++
audio/gramofile/patches/patch-signpr__median.c | 14 ++
audio/gramofile/patches/patch-signpr__rms.c | 14 ++
audio/gramofile/patches/patch-stringinput.c | 14 ++
audio/gramofile/patches/patch-tracksplit__parammenu.c | 29 +++++
audio/gramofile/patches/patch-yesnowindow.c | 14 ++
23 files changed, 522 insertions(+), 196 deletions(-)
diffs (truncated from 826 to 300 lines):
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/Makefile
--- a/audio/gramofile/Makefile Thu May 20 19:24:13 2021 +0000
+++ b/audio/gramofile/Makefile Thu May 20 19:24:15 2021 +0000
@@ -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/
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/distinfo
--- a/audio/gramofile/distinfo Thu May 20 19:24:13 2021 +0000
+++ b/audio/gramofile/distinfo Thu May 20 19:24:15 2021 +0000
@@ -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
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/gramofile/patches/patch-Makefile Thu May 20 19:24:15 2021 +0000
@@ -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
+
+ ##########
+
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/patches/patch-aa
--- a/audio/gramofile/patches/patch-aa Thu May 20 19:24:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2012/02/15 21:37:48 hans Exp $
-
---- Makefile.orig 2000-03-28 15:23:58.000000000 -0500
-+++ 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
- 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 -O2 -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 -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DSWAP_ENDIAN -DOLD_CURSES
-+DEPS = $(OBJS)
-+LIBS = -lcurses -lm
-+COPY_A = -a
-+endif
-+endif
-
- ##########
-
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/patches/patch-ab
--- a/audio/gramofile/patches/patch-ab Thu May 20 19:24:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2012/02/15 21:37:48 hans Exp $
-
---- 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!)
-
-+OS= $(shell uname -s)
-+
-+ifeq (${OS}, Linux)
- # For Linux (and maybe others), use these:
- CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DREDHAT50 -DLP2CD -DVUMETER # -DDEBUG
- LIBS = -lncurses
--
-+else
-+ifeq (${OS}, DragonFly)
-+CFLAGS = -Wall -O2 -DLP2CD -DVUMETER
-+LIBS = -lcurses ${LIBOSSAUDIO}
-+else
- # For FreeBSD (and maybe others), use these:
--#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
--#LIBS = -lncurses
-+CFLAGS = -Wall -O2 -DLP2CD -DVUMETER -DOLD_CURSES -D_SEM_SEMUN_UNDEFINED # -DDEBUG
-+LIBS = -lcurses ${LIBOSSAUDIO}
-+endif
-+endif
-
- # -DOLD_CURSES can be used here, too.
-
diff -r 072f4ff5d0ed -r 2830eeebf1a5 audio/gramofile/patches/patch-ac
--- a/audio/gramofile/patches/patch-ac Thu May 20 19:24:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2012/06/27 22:23:42 sbd Exp $
-
-Use fixed size 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' */
Home |
Main Index |
Thread Index |
Old Index