<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96734881fa6d59efef72b6fab5ca5ebcda9acc5d">https://github.com/macports/macports-ports/commit/96734881fa6d59efef72b6fab5ca5ebcda9acc5d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96734881fa6 libgsm: update to 1.0.22
</span>96734881fa6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96734881fa6d59efef72b6fab5ca5ebcda9acc5d
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sat Nov 11 06:40:45 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> libgsm: update to 1.0.22
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - assume maintainership
</span><span style='display:block; white-space:pre;color:#404040;'> - use `makefile` portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> - install `tcat` as `gsm-tcat`
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67865
</span>---
audio/libgsm/Portfile | 35 +++++++------
audio/libgsm/files/patch-makefile-more.diff | 31 -----------
audio/libgsm/files/patch-makefile.diff | 80 +++++++++++++++++++----------
3 files changed, 73 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libgsm/Portfile b/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ceec01f884..d379671c65f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,29 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name libgsm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license public-domain
categories audio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:herby.gillot @herbygillot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> description library and tools to convert to/frm gsm audio format
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.quut.com/gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.quut.com/gsm
</span> distname gsm-${version}
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e268a667257aa42d5ddbb76c9a8b519f0a7cdb2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64549
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f941151dc3bcf27ccb393bb1fdcdedabe80d6c34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66583
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir gsm-1.0-pl18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir gsm-1.0-pl22
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefile.diff patch-makefile-more.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-makefile.diff
</span>
post-patch {
reinplace "s|@@VERSION@@|${version}|g" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,6 @@ post-patch {
</span> variant universal {}
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot.env INSTALL_ROOT=${destroot}${prefix}
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +48,9 @@ post-destroot {
</span> system -W ${destroot}${prefix} \
"install_name_tool -change ./lib/libgsm.${version}.dylib ${prefix}/lib/libgsm.${version}.dylib ./bin/untoast"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rename tcat to gsm-tcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/67865
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/tcat ${destroot}${prefix}/bin/gsm-tcat
</span> }
# this is only a partial test of the software's adding algorithm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +61,10 @@ post-destroot {
</span> # to test the encoding and decoding, see <https://ccrma.stanford.edu/~fujishim/199/gsm_survey.html>
# to convert samples to gsm for testing, see <https://convertio.co/wav-gsm/>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tcat has been installed as gsm-tcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex gsm-(\\d+(?:\\.\\d+)*)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libgsm/files/patch-makefile-more.diff b/audio/libgsm/files/patch-makefile-more.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e997883aae0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libgsm/files/patch-makefile-more.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.orig 2019-04-11 11:37:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile 2019-04-11 11:37:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Leave INSTALL_ROOT empty (or just don't execute "make install") to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not install gsm and toast outside of this directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT ?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where do you want to install the gsm library, header file, and manpages?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,8 +80,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GSM_INSTALL_ROOT = $(INSTALL_ROOT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where do you want to install the toast binaries and their manpage?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Other tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libgsm/files/patch-makefile.diff b/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b644d2fa86f..b338008f6eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: <jochen@scram.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: New patch generated from libgsm 1.0.10-14 diff.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgsm-1.0.12~/Makefile 2007-11-01 15:37:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgsm-1.0.12/Makefile 2007-11-01 15:43:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Makefile 2023-11-11 06:19:26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Makefile 2023-11-11 06:24:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Leave INSTALL_ROOT empty (or just don't execute "make install") to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not install gsm and toast outside of this directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INSTALL_ROOT ?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where do you want to install the gsm library, header file, and manpages?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,8 +80,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GSM_INSTALL_ROOT = $(INSTALL_ROOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where do you want to install the toast binaries and their manpage?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,12 +91,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Other tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> SHELL = /bin/sh
-LN = ln
+LN = ln -s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,25 +37,25 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
</span> ARFLAGS = cr
@@ -140,6 +140,7 @@
# Targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> LIBGSM = $(LIB)/libgsm.a
+LIBGSMSO= $(LIB)/libgsm.@@VERSION@@.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
@@ -279,7 +280,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Target rules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
+all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
@-echo $(ROOT): Done.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,6 +300,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,24 +300,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # The basic API: libgsm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
+ $(LD) -o $(LIBGSMSO) -dynamiclib -Wl,-compatibility_version,1,-current_version,@@VERSION@@,-install_name,$(LIBGSMSO) $(GSM_OBJECTS) -lc
+ ln -fs libgsm.@@VERSION@@.dylib lib/libgsm.1.dylib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,32 +64,36 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
</span> $(LIBGSM): $(LIB) $(GSM_OBJECTS)
-rm $(RMFLAGS) $(LIBGSM)
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -308,15 +314,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RANLIB) $(LIBGSM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LIBGSMO) $(LDLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(UNTOAST): $(BIN) $(TOAST)
-rm $(RMFLAGS) $(UNTOAST)
- $(LN) $(TOAST) $(UNTOAST)
+ $(LN) toast $(UNTOAST)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(TCAT): $(BIN) $(TOAST)
-rm $(RMFLAGS) $(TCAT)
- $(LN) $(TOAST) $(TCAT)
+ $(LN) toast $(TCAT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # The local bin and lib directories
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,7 +432,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,7 +433,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> clean: semi-clean
-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
- $(TOAST) $(TCAT) $(UNTOAST) \
+ $(LIBGSMSO) $(LIB)/libgsm.1.dylib \
+ $(LIB)/libgsm.dylib \
+ $(TOAST) $(TCAT) $(UNTOAST) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ROOT)/gsm-1.0.tar.Z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(ROOT)/gsm-1.0.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>