<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/948ab38d4b3d4dd796a387647a116ba7608b7d21">https://github.com/macports/macports-ports/commit/948ab38d4b3d4dd796a387647a116ba7608b7d21</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 948ab38d4b3 live555: update to 2022.02.07, etc
</span>948ab38d4b3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 948ab38d4b3d4dd796a387647a116ba7608b7d21
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Thu Feb 24 16:16:35 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> live555: update to 2022.02.07, etc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update to latest release
</span><span style='display:block; white-space:pre;color:#404040;'> remove tcp patch now upstreamed
</span><span style='display:block; white-space:pre;color:#404040;'> rework config patch
</span><span style='display:block; white-space:pre;color:#404040;'> address openssl dependency via portgroup
</span>---
multimedia/live555/Portfile | 16 ++++++++------
multimedia/live555/files/patch-config.macosx.diff | 14 ++++++------
...ive555-test-for-tcp-functions-before-using.diff | 25 ----------------------
3 files changed, 16 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/live555/Portfile b/multimedia/live555/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e6d29545e2..9dbbc7bb2e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/live555/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/live555/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name live555
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2019.09.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2022.02.07
</span> revision 0
categories multimedia
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +24,9 @@ homepage http://www.live555.com/liveMedia/
</span> master_sites ${homepage}public/ \
http://mirror.sobukus.de/files/src/live555/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 381b514794a0cbc14cf842dc9b4ef93a63014e67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7c04db4ba5048b301e27853f10004bbbbf059f3cf2686db6067d0d3e396625fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 653756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f638eb5d51065ca8f0b4536a074229d36bc7b3c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6f0c1f8a71ceb506bcbf969b02b4b0c3697b4e15daeb6dcba9872c8745ce92c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 687757
</span>
distname live.${version}
worksrcdir live
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,8 @@ worksrcdir live
</span> depends_build-append \
port:cctools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-config.macosx.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-config.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#\
</span> patch-live555-test-for-tcp-functions-before-using.diff
# Configure settings remain in installed Makefiles, so be minimalistic
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +58,7 @@ post-patch {
</span> s|@CXXFLAGS@|${configure.cxxflags}|g
s|@LDFLAGS@|${configure.ldflags}|g
s|@LIBTOOL@|${prefix}/bin/libtool|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/config.macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/config.macosx-bigsur
</span> }
set files_0 ${workpath}/files-0.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +96,7 @@ destroot {
</span> }
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args macosx-bigsur
</span> }
platform linux {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/live555/files/patch-config.macosx.diff b/multimedia/live555/files/patch-config.macosx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1239acb6428..eb347ff5ea7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/live555/files/patch-config.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/live555/files/patch-config.macosx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.macosx.orig 2018-02-28 10:44:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.macosx 2018-03-02 14:07:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.macosx-bigsur 2022-02-07 05:36:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.macosx 2022-02-24 15:32:37.000000000 -0500
</span> @@ -1,15 +1,16 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-COMPILE_OPTS = $(INCLUDES) -I. -I/usr/local/include $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1
</span> +ARCHFLAGS = @ARCHFLAGS@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1 @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1 @CPPFLAGS@
</span> C = c
-C_COMPILER = cc
-C_FLAGS = $(COMPILE_OPTS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+C_COMPILER = @CC@ $(ARCHFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++C_COMPILER = @CC@ $(ARCHFLAGS)
</span> +C_FLAGS = $(COMPILE_OPTS) @CFLAGS@
CPP = cpp
-CPLUSPLUS_COMPILER = c++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> +CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall @CXXFLAGS@
OBJ = o
-LINK = c++ -o
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LINK_OPTS = -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LINK_OPTS = -L. -L/usr/local/ssl/lib
</span> +LINK = $(CPLUSPLUS_COMPILER) -o
+LINK_OPTS = -L. @LDFLAGS@
CONSOLE_LINK_OPTS = $(LINK_OPTS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,4 +24,4 @@
</span> +LIBRARY_LINK = @LIBTOOL@ -s -o
LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_FOR_CONSOLE_APPLICATION =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/live555/files/patch-live555-test-for-tcp-functions-before-using.diff b/multimedia/live555/files/patch-live555-test-for-tcp-functions-before-using.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cc42c0efc1f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/live555/files/patch-live555-test-for-tcp-functions-before-using.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- groupsock/GroupsockHelper.cpp.orig 2018-09-10 23:05:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ groupsock/GroupsockHelper.cpp 2018-09-10 23:07:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,17 +236,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef TCP_KEEPCNT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int const keepalive_count = 5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, (void*)&keepalive_count, sizeof keepalive_count) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return False;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef TCP_KEEPINTVL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int const keepalive_interval = 20;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, (void*)&keepalive_interval, sizeof keepalive_interval) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return False;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return True;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>