<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/573a7879acbb1f882ac6fbd38da31eb757162f34">https://github.com/macports/macports-ports/commit/573a7879acbb1f882ac6fbd38da31eb757162f34</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 573a7879acb sonic: Use MacPorts CFLAGS, CPPFLAGS, LDFLAGS
</span>573a7879acb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 573a7879acbb1f882ac6fbd38da31eb757162f34
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 17 18:28:56 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> sonic: Use MacPorts CFLAGS, CPPFLAGS, LDFLAGS
</span>---
audio/sonic/Portfile | 9 +++++--
audio/sonic/files/DYLD_LIBRARY_PATH.patch | 13 ++++++++++
audio/sonic/files/FLAGS.patch | 40 +++++++++++++++++++++++++++++++
audio/sonic/files/patch-sonic-mac.diff | 31 ++++++++++++------------
4 files changed, 75 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/sonic/Portfile b/audio/sonic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a38064f7ac..2c55d066b06 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/sonic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/sonic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,9 @@ PortGroup github 1.0
</span> PortGroup makefile 1.0
github.setup espeak-ng sonic 0.2.0 release-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> categories audio
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,13 +24,17 @@ checksums rmd160 4fb75a94018d16f052828cbd6b292a93e2ca0f41 \
</span> sha256 c7827ce576838467590ffa1f935fbe1049e896dfed6c515cf569ad3779c24085 \
size 5340269
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sonic-mac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles FLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sonic-mac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYLD_LIBRARY_PATH.patch
</span>
compiler.cxx_standard 1998
configure.cxxflags-append -std=c++98
makefile.override PREFIX
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0.2.0 does not contain the spectrogram feature but 0.3.0 will and we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# don't need it for espeak-ng.
</span> build.args-append USE_SPECTROGRAM=0
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/sonic/files/DYLD_LIBRARY_PATH.patch b/audio/sonic/files/DYLD_LIBRARY_PATH.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..001310eab31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/sonic/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix tests to find the dynamic library in the build tree. In the latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unreleased upstream code the executable has been changed to link with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the static library. It has been proposed that this should be changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+back: https://github.com/waywardgeek/sonic/issues/16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If they do not, then this patch will no longer be needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-08-17 18:00:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-08-17 18:11:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,4 +72,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f *.o sonic $(LIB_NAME)* libsonic.a test.wav
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ./sonic -s 2.0 ./samples/talking.wav ./test.wav
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DYLD_LIBRARY_PATH=. ./sonic -s 2.0 ./samples/talking.wav ./test.wav
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/sonic/files/FLAGS.patch b/audio/sonic/files/FLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5cd1fa3efee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/sonic/files/FLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Let environment provide default values for CFLAGS, CPPFLAGS, and LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/waywardgeek/sonic/commit/2a4d32ced397cf1e38750026f000d69185222fc5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-08-17 17:43:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-08-17 17:46:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,8 +10,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(UNAME), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SONAME=install_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#CFLAGS=-Wall -g -ansi -fPIC -pthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=-Wall -O3 -ansi -fPIC -pthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS ?= -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -Wall -ansi -fPIC -pthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_TAG=0.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=/usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,19 +20,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: sonic libsonic.so.$(LIB_TAG) libsonic.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sonic: wave.o main.o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) -o sonic wave.o main.o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) -o sonic wave.o main.o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sonic.o: sonic.c sonic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) -c sonic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -c sonic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wave.o: wave.c wave.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) -c wave.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -c wave.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main.o: main.c sonic.h wave.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) -c main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -c main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libsonic.so.$(LIB_TAG): sonic.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 sonic.o -o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 sonic.o -o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf libsonic.so.$(LIB_TAG) libsonic.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf libsonic.so.$(LIB_TAG) libsonic.so.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/sonic/files/patch-sonic-mac.diff b/audio/sonic/files/patch-sonic-mac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2736e012700..803aa421d12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/sonic/files/patch-sonic-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/sonic/files/patch-sonic-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2020-06-30 13:32:50.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2020-07-02 09:20:44.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Improved build for Mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/waywardgeek/sonic/commit/eebb020958f0fa84ee831a55f7158cee8d108819
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-08-17 17:58:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-08-17 17:58:40.000000000 -0500
</span> @@ -5,22 +5,30 @@
# safe. We call malloc, and older Linux versions only linked in the thread-safe
# malloc if -pthread is specified.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +15,7 @@
</span> +SONAME=-soname,
+SHARED_OPT=-shared
+LIB_NAME=libsonic.so
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_TAG=.0.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_TAG=.0.2.0
</span> +
UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +25,8 @@
</span> + LIB_NAME=libsonic.dylib
+ LIB_TAG=
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#CFLAGS=-Wall -g -ansi -fPIC -pthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=-Wall -O3 -ansi -fPIC -pthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS ?= -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wall -ansi -fPIC -pthread
</span> -LIB_TAG=0.2.0
-CC=gcc
-PREFIX=/usr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,22 +36,22 @@
</span> +all: sonic $(LIB_NAME)$(LIB_TAG) libsonic.a
-sonic: wave.o main.o libsonic.so.$(LIB_TAG)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) $(CFLAGS) -o sonic wave.o main.o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) $(LDFLAGS) -o sonic wave.o main.o libsonic.so.$(LIB_TAG)
</span> +sonic: wave.o main.o $(LIB_NAME)$(LIB_TAG)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) -o sonic wave.o main.o $(LIB_NAME)$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) -o sonic wave.o main.o $(LIB_NAME)$(LIB_TAG)
</span>
sonic.o: sonic.c sonic.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c sonic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,30 +39,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CPPFLAGS) $(CFLAGS) -c sonic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,30 +39,37 @@
</span> main.o: main.c sonic.h wave.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CPPFLAGS) $(CFLAGS) -c main.c
</span>
-libsonic.so.$(LIB_TAG): sonic.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) $(CFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 sonic.o -o libsonic.so.$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-$(SONAME),libsonic.so.0 sonic.o -o libsonic.so.$(LIB_TAG)
</span> - ln -sf libsonic.so.$(LIB_TAG) libsonic.so
- ln -sf libsonic.so.$(LIB_TAG) libsonic.so.0
+$(LIB_NAME)$(LIB_TAG): sonic.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(SHARED_OPT) -Wl,$(SONAME)$(LIB_NAME) sonic.o -o $(LIB_NAME)$(LIB_TAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHARED_OPT) -Wl,$(SONAME)$(LIB_NAME) sonic.o -o $(LIB_NAME)$(LIB_TAG)
</span> +ifneq ($(UNAME), Darwin)
+ ln -sf $(LIB_NAME)$(LIB_TAG) $(LIB_NAME)
+ ln -sf $(LIB_NAME)$(LIB_TAG) $(LIB_NAME).0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,14 +78,12 @@
</span> + ln -sf $(LIB_NAME)$(LIB_TAG) $(DESTDIR)$(LIBDIR)/$(LIB_NAME).0
+endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span> - rm -f $(DESTDIR)$(PREFIX)/bin/sonic
- rm -f $(DESTDIR)$(PREFIX)/include/sonic.h
- rm -f $(DESTDIR)$(PREFIX)/lib/libsonic.so.$(LIB_TAG)
- rm -f $(DESTDIR)$(PREFIX)/lib/libsonic.so
- rm -f $(DESTDIR)$(PREFIX)/lib/libsonic.so.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+uninstall:
</span> + rm -f $(DESTDIR)$(BINDIR)/sonic
+ rm -f $(DESTDIR)$(INCDIR)/sonic.h
rm -f $(DESTDIR)$(LIBDIR)/libsonic.a
</pre><pre style='margin:0'>
</pre>