<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/d9b027b58574a9a9b6a5f204153144ef8a58aa9f">https://github.com/macports/macports-ports/commit/d9b027b58574a9a9b6a5f204153144ef8a58aa9f</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 d9b027b5857 espeak: Fix library install name and other fixes
</span>d9b027b5857 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9b027b58574a9a9b6a5f204153144ef8a58aa9f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 26 14:51:30 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> espeak: Fix library install name and other fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the makefile portgroup so that MacPorts CFLAGS, CXXFLAGS, and
</span><span style='display:block; white-space:pre;color:#404040;'> LDFLAGS are respected and a universal variant is created.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adjust description and long description.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Compute and use a branch variable in master_sites instead of hardcoding
</span><span style='display:block; white-space:pre;color:#404040;'> it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove distfile name from checksums since there is only one distfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify C++98 mode because the build fails in C++11 mode on newer
</span><span style='display:block; white-space:pre;color:#404040;'> compilers.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix test phase by specifying DYLD_LIBRARY_PATH and ESPEAK_DATA_PATH so
</span><span style='display:block; white-space:pre;color:#404040;'> that we're testing the just-built software not the already-installed
</span><span style='display:block; white-space:pre;color:#404040;'> software.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix livecheck by removing livecheck overrides; the defaults work.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patchfile to use most Macisms conditionally.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patchfile to use -dynamiclib on macOS instead of -shared.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patchfile to set the full path for the library install name.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patchfile to not override CXXFLAGS.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patchfile to not hardcode -lstdc++.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See #7507
</span>---
audio/espeak/Portfile | 38 ++++++++---------
audio/espeak/files/patch-espeak-mac.diff | 72 ++++++++++++++++++++++----------
2 files changed, 68 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/espeak/Portfile b/audio/espeak/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb4a91b2a1e..f2b5502b87b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/espeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/espeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +1,28 @@
</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 espeak
version 1.48.04
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories audio
platforms darwin
maintainers nomaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description eSpeak is a compact open source software speech synthesizer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description compact open source software speech synthesizer
</span>
long_description eSpeak is a Text to Speech engine for English and many other\
languages. Compact size with clear but artificial pronunciation.\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Available as a command-line program with many options and a shared library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Available as a command-line program with many options and as a shared library.
</span>
homepage http://espeak.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/espeak/espeak/espeak-1.48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/espeak/espeak/espeak-${branch}
</span> distname ${name}-${version}-source
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 95f45d86c86756c3bd3b359aaba3c844f4a1c23c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 95f45d86c86756c3bd3b359aaba3c844f4a1c23c \
</span> sha256 bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659 \
size 3019245
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,33 +33,30 @@ if {${os.platform} eq "darwin" && ${os.major} >= 10} {
</span> configure.args-append --with-mictype=portaudio
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.dir ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args PREFIX=${prefix} DATADIR=${prefix}/share/espeak-data \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args PREFIX=${prefix} DATADIR=${prefix}/share/espeak-data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args DATADIR=${prefix}/share/espeak-data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
set docdir ${prefix}/share/doc/${name}
post-destroot {
move ${worksrcpath}/docs ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> ReadMe \
ChangeLog.txt \
License.txt \
${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change libespeak.dylib ${prefix}/lib/libespeak.dylib ./bin/espeak"
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd ${worksrcpath}/src/espeak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd DYLD_LIBRARY_PATH=${build.dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESPEAK_DATA_PATH=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./espeak
</span> test.target
test.args "Testing." -w out.wav
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://sourceforge.net/projects/${name}/releases/rss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex <title>${name}.* - (\[0-9.a-z\-\]+)</title>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/espeak/files/patch-espeak-mac.diff b/audio/espeak/files/patch-espeak-mac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8da86753375..a7e7bb10afb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/espeak/files/patch-espeak-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/espeak/files/patch-espeak-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,57 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruEN orig/Makefile src/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/Makefile 2020-06-25 22:03:43.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2020-06-25 22:02:50.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,13 +10,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2014-02-02 04:58:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2020-06-26 14:18:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,13 +10,24 @@
</span> RELEASE = 1.48
BIN_NAME = speak
BIN2_NAME = espeak
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_NAME = libespeak.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNAME_S := $(shell uname -s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(UNAME_S),Darwin)
</span> +LIB_NAME = libespeak.dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_NAME = libespeak.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span> STATIC_LIB_NAME = libespeak.a
LIB_VERSION = 1
LIBTAG = $(LIB_VERSION).$(RELEASE)
# Use SONAME_OPT=-Wl,h, on Solaris
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SONAME_OPT=-Wl,-soname,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SONAME_OPT=-Wl,-install_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(UNAME_S),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SHARED_OPT=-dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SONAME_OPT=-Wl,-install_name,$(LIBDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SHARED_OPT=-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SONAME_OPT=-Wl,-soname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span>
# Use EXTRA_LIBS=-lm on Solaris
EXTRA_LIBS =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,11 +114,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,17 +94,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRCS1=$(speak_SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS1=$(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRCS2=$(libespeak_SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS2=$(LIB_AUDIO) -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRCS3 = espeak.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS3=-lstdc++ -L . -lespeak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS3=-L . -lespeak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS=-O2
</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;'>+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,11 +124,8 @@
</span> -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
$(LIB_NAME): $(OBJS2)
- $(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(LDFLAGS) $(SHARED_OPT) $(SONAME_OPT)$(LIB_NAME) -o $@ \
</span> $(OBJS2) $(LIBS2)
- mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
- $(LN_SF) $(LIB_NAME).$(LIBTAG) $(LIB_NAME).$(LIB_VERSION)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +59,7 @@ diff -ruEN orig/Makefile src/Makefile
</span>
$(STATIC_LIB_NAME): $(OBJS2)
$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,14 +135,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,14 +145,14 @@
</span> $(MKDIR) $(DESTDIR)$(LIBDIR)
$(MKDIR) $(DESTDIR)$(INCDIR)
$(MKDIR) $(DESTDIR)$(DATADIR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +77,8 @@ diff -ruEN orig/Makefile src/Makefile
</span> # Install development headers
$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
# Install data files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruEN orig/portaudio.h src/portaudio.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/portaudio.h 2020-06-25 22:03:43.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/portaudio.h 2020-06-25 22:25:46.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/portaudio.h.orig 2014-03-04 10:47:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/portaudio.h 2020-06-26 14:07:39.000000000 -0500
</span> @@ -1,21 +1,14 @@
-// NOTE: Copy this file to portaudio.h in order to compile with V18 portaudio
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1463,21 +1491,21 @@ diff -ruEN orig/portaudio.h src/portaudio.h
</span> #endif /* __cplusplus */
-#endif /* PORT_AUDIO_H */
+#endif /* PORTAUDIO_H */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruEN orig/speech.h src/speech.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/speech.h 2020-06-25 22:03:43.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/speech.h 2020-06-23 13:38:50.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/speech.h.orig 2014-03-04 10:47:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/speech.h 2020-06-26 14:16:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,8 +47,10 @@
</span> //#define ESPEAK_API extern "C"
#ifdef LIBRARY
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define USE_ASYNC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#define USE_ASYNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_ASYNC
</span> #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span>
#ifdef _ESPEAKEDIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruEN orig/synthdata.cpp src/synthdata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/synthdata.cpp 2020-06-25 22:03:43.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/synthdata.cpp 2020-06-23 13:38:50.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_PORTAUDIO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/synthdata.cpp.orig 2014-03-04 10:47:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/synthdata.cpp 2020-06-26 14:07:39.000000000 -0500
</span> @@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
</pre><pre style='margin:0'>
</pre>