<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/300260f7db93cea663b821ca2f9e5f495c9a666d">https://github.com/macports/macports-ports/commit/300260f7db93cea663b821ca2f9e5f495c9a666d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 300260f7db93cea663b821ca2f9e5f495c9a666d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 22 23:06:54 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> rtmpdump: Update to 2.4-20210219; fix overlinking
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60455
</span>---
www/rtmpdump/Portfile | 48 ++++++++++++----------
www/rtmpdump/files/patch-Makefile.diff | 22 +++++++---
www/rtmpdump/files/patch-librtmp-Makefile.diff | 35 ++++++++++++++--
.../files/patch-librtmp-librtmp.pc.in.diff | 16 ++++++++
4 files changed, 92 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/Portfile b/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f6a645559b..3de01280c89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,19 @@
</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 rtmpdump
<span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch c5f04a58fc2aeea6296ca7c44ee4734c18401aa3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch f1b83c10d8beb43fcc70a6e88cf4325499f25857
</span> set git_shortcommit [string range ${git.branch} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20210219
</span> version 2.4-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d0721e047024c0617bba48bd8e4b3078a538e581 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 143037
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 71267f8eac903eb78bfa13f99189f343b5bdce38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c68e05989a93c002e3ba8df3baef0021c17099aa2123a9c096a5cc8e029caf95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 143043
</span>
categories www net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,25 +30,31 @@ distname ${git.branch}
</span>
depends_lib port:gnutls
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The Makefile explicitly links with these additional libraries when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gnutls is used. This may be a case of overlinking; the correct thing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to do may be to fix the Makefile not to link to those libraries,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of adding these dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nettle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> worksrcdir ${name}-${git_shortcommit}
patchfiles patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-librtmp-librtmp.pc.in.diff \
</span> patch-librtmp-Makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args prefix="${prefix}" CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args-delete -w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The Makefile never adds this flag to specify to look in local directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for include files. Seems like a good things to add.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The Makefile provides no way to specify the library path for the dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that doesn't put the flag in the wrong place so remove it from LDFLAGS here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and patch it into the Makefile in the right place.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.prefix_name \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append OPT="${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XLDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span>
pre-destroot {
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/files/patch-Makefile.diff b/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b4b7614ec92..e20689813ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-12-23 13:09:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2019-03-09 08:32:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix VERSION.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use gnutls instead of openssl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix overlinking.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -L flag for MacPorts libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix mandir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-02-19 11:54:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-04-22 22:41:08.000000000 -0500
</span> @@ -1,4 +1,4 @@
-VERSION=v2.4
+VERSION=2.4
prefix=/usr/local
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,9 +8,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,13 +8,13 @@
</span> SYS=posix
#SYS=mingw
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +21,15 @@
</span> -#CRYPTO=GNUTLS
+CRYPTO=GNUTLS
LIBZ=-lz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_POLARSSL=-lpolarssl $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_GNUTLS=-L$(prefix)/lib -lgnutls $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_OPENSSL=-L$(prefix)/lib -lssl -lcrypto $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_POLARSSL=-L$(prefix)/lib -lpolarssl $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_LIB=$(LIB_$(CRYPTO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_=-DNO_CRYPTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_DEF=$(DEF_$(CRYPTO))
</span> @@ -26,7 +26,7 @@
bindir=$(prefix)/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/files/patch-librtmp-Makefile.diff b/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1900024067c..2b4f92bb584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librtmp/Makefile.orig 2015-12-23 13:09:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librtmp/Makefile 2019-03-09 08:35:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix VERSION.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix mandir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use gnutls instead of openssl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix overlinking.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -L flag for MacPorts libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librtmp/Makefile.orig 2021-02-19 11:54:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librtmp/Makefile 2022-04-22 22:41:19.000000000 -0500
</span> @@ -1,11 +1,11 @@
-VERSION=v2.4
+VERSION=2.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +19,7 @@
</span> BINDIR=$(DESTDIR)$(bindir)
INCDIR=$(DESTDIR)$(incdir)
LIBDIR=$(DESTDIR)$(libdir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,8 +16,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,27 +16,26 @@
</span> AR=$(CROSS_COMPILE)ar
SYS=posix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,3 +30,27 @@
</span> DEF_POLARSSL=-DUSE_POLARSSL
DEF_OPENSSL=-DUSE_OPENSSL
DEF_GNUTLS=-DUSE_GNUTLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_=-DNO_CRYPTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-REQ_GNUTLS=gnutls,hogweed,nettle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++REQ_GNUTLS=gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ REQ_OPENSSL=libssl,libcrypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PUB_GNUTLS=-lgmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBZ=-lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_posix=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_darwin=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_mingw=-lws2_32 -lwinmm -lgdi32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_POLARSSL=-lpolarssl $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_GNUTLS=-L$(prefix)/lib -lgnutls $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_OPENSSL=-L$(prefix)/lib -lssl -lcrypto $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_POLARSSL=-L$(prefix)/lib -lpolarssl $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE_LIBS=$(LIBS_$(SYS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_REQ=$(REQ_$(CRYPTO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_DEF=$(DEF_$(CRYPTO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PUBLIC_LIBS=$(PUB_$(CRYPTO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PUBLIC_LIBS=$(LIBZ) $(PUB_$(CRYPTO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SO_VERSION=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOX_posix=so
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/files/patch-librtmp-librtmp.pc.in.diff b/www/rtmpdump/files/patch-librtmp-librtmp.pc.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03c77847fa5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/files/patch-librtmp-librtmp.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix overlinking.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.debian.org/745216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librtmp/librtmp.pc.in.orig 2021-02-19 11:54:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librtmp/librtmp.pc.in 2022-04-22 21:48:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,8 +6,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Name: librtmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Description: RTMP implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Requires: @CRYPTO_REQ@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Requires.private: @CRYPTO_REQ@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ URL: http://rtmpdump.mplayerhq.hu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Libs.private: @PRIVATE_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Libs: -L${libdir} -lrtmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Libs.private: @PUBLIC_LIBS@ @PRIVATE_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cflags: -I${incdir}
</span></pre><pre style='margin:0'>
</pre>