CVS commit: pkgsrc/net/rtmpdump

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sun Nov 29 22:03:12 UTC 2020

Modified Files:
        pkgsrc/net/rtmpdump: distinfo
Added Files:
        pkgsrc/net/rtmpdump/patches: patch-rtmpdump.c

Log Message:
net/rtmpdump: work around build failure on MacOS with clang12


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/rtmpdump/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/rtmpdump/patches/patch-rtmpdump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rtmpdump/distinfo
diff -u pkgsrc/net/rtmpdump/distinfo:1.10 pkgsrc/net/rtmpdump/distinfo:1.11
--- pkgsrc/net/rtmpdump/distinfo:1.10   Sun Sep 23 21:09:32 2018
+++ pkgsrc/net/rtmpdump/distinfo        Sun Nov 29 22:03:12 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/09/23 21:09:32 wiz Exp $
+$NetBSD: distinfo,v 1.11 2020/11/29 22:03:12 dbj Exp $
 
 SHA1 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 245de43e34fa8cf7c06a3604cd32cfafa981f8c0
 RMD160 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = c11b59337d7b9dd6c8136cc331ee6ade8ed4bc9e
@@ -6,3 +6,4 @@ SHA512 (rtmpdump-2.4-git-fa8646daeb19dfd
 Size (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 1030982 bytes
 SHA1 (patch-Makefile) = 0001b2c1745f4ee6eae36e780d256ff584631ab9
 SHA1 (patch-librtmp_Makefile) = 90a076de219dcf7ba6840913cb6101e007f549cf
+SHA1 (patch-rtmpdump.c) = 7ab83af82e58270e46e75d0357df1f5cead248c4

Added files:

Index: pkgsrc/net/rtmpdump/patches/patch-rtmpdump.c
diff -u /dev/null pkgsrc/net/rtmpdump/patches/patch-rtmpdump.c:1.1
--- /dev/null   Sun Nov 29 22:03:13 2020
+++ pkgsrc/net/rtmpdump/patches/patch-rtmpdump.c        Sun Nov 29 22:03:12 2020
@@ -0,0 +1,26 @@
+$NetBSD: patch-rtmpdump.c,v 1.1 2020/11/29 22:03:12 dbj Exp $
+
+On MacOS with clang 12.0.0 we get an undefined symbol
+error for CleanupSockets().  Presumably the inline is
+getting optimized away.  Work around this by using the
+same #define as the other sources in this directory.
+
+--- rtmpdump.c.orig    2018-09-23 10:40:58.000000000 +0000
++++ rtmpdump.c
+@@ -67,13 +67,11 @@ InitSockets()
+ #endif
+ }
+ 
+-inline void
+-CleanupSockets()
+-{
+ #ifdef WIN32
+-  WSACleanup();
++#define       CleanupSockets()        WSACleanup()
++#else
++#define       CleanupSockets()
+ #endif
+-}
+ 
+ #ifdef _DEBUG
+ uint32_t debugTS = 0;