pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/gsm
Module Name: pkgsrc
Committed By: tnn
Date: Mon Apr 28 16:16:16 UTC 2025
Modified Files:
pkgsrc/audio/gsm: Makefile distinfo
pkgsrc/audio/gsm/patches: patch-Makefile
Added Files:
pkgsrc/audio/gsm/patches: patch-src_toast.c
Log Message:
gsm: update to gsm-1.0.22
Changes: Makefile fixes
While here fix build with GCC 15.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/audio/gsm/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/gsm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/gsm/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/gsm/patches/patch-src_toast.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/gsm/Makefile
diff -u pkgsrc/audio/gsm/Makefile:1.38 pkgsrc/audio/gsm/Makefile:1.39
--- pkgsrc/audio/gsm/Makefile:1.38 Fri Dec 29 00:57:37 2023
+++ pkgsrc/audio/gsm/Makefile Mon Apr 28 16:16:16 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2023/12/29 00:57:37 zafer Exp $
+# $NetBSD: Makefile,v 1.39 2025/04/28 16:16:16 tnn Exp $
-DISTNAME= gsm-1.0.19
+DISTNAME= gsm-1.0.22
CATEGORIES= audio
MASTER_SITES= https://www.quut.com/gsm/
@@ -9,12 +9,14 @@ HOMEPAGE= http://www.quut.com/gsm/
COMMENT= Audio converter and library for converting u-law to gsm encoding
LICENSE= mit
-WRKSRC= ${WRKDIR}/gsm-1.0-pl19
+WRKSRC= ${WRKDIR}/gsm-1.0-pl22
USE_LIBTOOL= yes
NO_CONFIGURE= yes
MAKE_ENV+= ROOT=${WRKSRC}
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}${PREFIX}
+BUILDLINK_TRANSFORM+= rm:-Wall
+
INSTALLATION_DIRS= bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
post-install:
Index: pkgsrc/audio/gsm/distinfo
diff -u pkgsrc/audio/gsm/distinfo:1.15 pkgsrc/audio/gsm/distinfo:1.16
--- pkgsrc/audio/gsm/distinfo:1.15 Tue Oct 26 09:59:00 2021
+++ pkgsrc/audio/gsm/distinfo Mon Apr 28 16:16:16 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 09:59:00 nia Exp $
+$NetBSD: distinfo,v 1.16 2025/04/28 16:16:16 tnn Exp $
-BLAKE2s (gsm-1.0.19.tar.gz) = 76f2d5cd78c23af6983982edaca4f8c383e93c8e9c6341b1394c5796b935062d
-SHA512 (gsm-1.0.19.tar.gz) = f69b4bf2d918b118b5de90b8ab88fd026008ac7432f07b872b81fe52cdc781f605dca8eedcdaebc8beb974cef388496c618f92a41961c62057009964159f8392
-Size (gsm-1.0.19.tar.gz) = 64665 bytes
-SHA1 (patch-Makefile) = 4e989df8ea5b9eded47fb8a6cd2f8bb4a1dca30f
+BLAKE2s (gsm-1.0.22.tar.gz) = 4af72a479341e85539c2844cefde727fd4993a636e0c19b0fcfb2a7602aaae76
+SHA512 (gsm-1.0.22.tar.gz) = f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2
+Size (gsm-1.0.22.tar.gz) = 66583 bytes
+SHA1 (patch-Makefile) = 2464498f4084410c73c1671aaa3e6416ab1dbd17
+SHA1 (patch-src_toast.c) = acdbc4a3bd15acfd468f1a9d82dbb14b7b9ed5f7
Index: pkgsrc/audio/gsm/patches/patch-Makefile
diff -u pkgsrc/audio/gsm/patches/patch-Makefile:1.1 pkgsrc/audio/gsm/patches/patch-Makefile:1.2
--- pkgsrc/audio/gsm/patches/patch-Makefile:1.1 Sat Jun 15 08:41:30 2019
+++ pkgsrc/audio/gsm/patches/patch-Makefile Mon Apr 28 16:16:16 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.1 2019/06/15 08:41:30 adam Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/04/28 16:16:16 tnn Exp $
Do not overwrite compiler flags.
Use proper installation tools and paths.
---- Makefile.orig 2018-05-06 02:07:28.000000000 +0000
+--- Makefile.orig 2022-08-04 18:46:46.107815841 +0000
+++ Makefile
@@ -43,7 +43,6 @@ WAV49 = -DWAV49
# CC = /usr/lang/acc
@@ -48,7 +48,7 @@ Use proper installation tools and paths.
+DIRNAME = dirname
AR = ar
ARFLAGS = cr
- RMFLAGS =
+ RMFLAGS = -f
@@ -114,7 +113,6 @@ RANLIB = ranlib
# Local Directories
@@ -140,68 +140,68 @@ Use proper installation tools and paths.
fi
gsmuninstall:
-@@ -351,52 +358,34 @@ toastuninstall:
+@@ -351,53 +358,34 @@ toastuninstall:
fi
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $(TOAST) $@
- chmod 755 $@
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN)
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
+- -rm $(RMFLAGS) $@
+- $(LN) $? $@
+ ${LN} -f toast $@
$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
+- -rm $(RMFLAGS) $@
+- $(LN) $? $@
+ ${LN} -f toast $@
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
-
-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
-- -rm $@
+- -rm $(RMFLAGS) $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC)
-+
+
+$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM)
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB)
-
# Distribution
+
Added files:
Index: pkgsrc/audio/gsm/patches/patch-src_toast.c
diff -u /dev/null pkgsrc/audio/gsm/patches/patch-src_toast.c:1.1
--- /dev/null Mon Apr 28 16:16:16 2025
+++ pkgsrc/audio/gsm/patches/patch-src_toast.c Mon Apr 28 16:16:16 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_toast.c,v 1.1 2025/04/28 16:16:16 tnn Exp $
+
+Fix signal handler prototypes.
+
+--- src/toast.c.orig 2025-04-28 16:06:28.092523246 +0000
++++ src/toast.c
+@@ -211,7 +211,7 @@ static char * suffix P2((name, suf), cha
+ }
+
+
+-static void catch_signals P1((fun), SIGHANDLER_T (*fun) ())
++static void catch_signals P1((fun), SIGHANDLER_T (*fun) (int))
+ {
+ #ifdef SIGHUP
+ signal( SIGHUP, fun );
+@@ -230,7 +230,7 @@ static void catch_signals P1((fun), SIGH
+ #endif
+ }
+
+-static SIGHANDLER_T onintr P0()
++static SIGHANDLER_T onintr P1((signum), int signum)
+ {
+ char * tmp = outname;
+
+@@ -253,7 +253,7 @@ static char * emalloc P1((len), size_t l
+ if (!(s = malloc(len))) {
+ fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n",
+ progname, (int)len);
+- onintr();
++ onintr(SIGTERM);
+ exit(1);
+ }
+ return s;
Home |
Main Index |
Thread Index |
Old Index