On 2010/03/20 03:25, J.C. Roberts wrote: > I've got a rtmpdump 2.2 port working over here, but one of the patches
me too. ;) > for the existing 2.1d port just doesn't make sense to me. > > http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/rtmpdump/patches/patch-streams_c > > What is the need for the MSG_NOSIGNAL define? an earlier version needed it and I didn't remove it with the update. > At present, I've got the new 2.2 working without it. yep. Index: Makefile =================================================================== RCS file: /cvs/ports/net/rtmpdump/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 26 Feb 2010 18:46:26 -0000 1.10 +++ Makefile 20 Mar 2010 11:03:55 -0000 @@ -2,7 +2,8 @@ COMMENT = dump RTMP media streams -DISTNAME = rtmpdump-2.1d +DISTNAME = rtmpdump-2.2 +EXTRACT_SUFX = .tar.bz2 CATEGORIES = net @@ -16,8 +17,9 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c crypto pthread z -MASTER_SITES = ${HOMEPAGE}/download/ +MASTER_SITES = ${HOMEPAGE}download/ +USE_GMAKE = Yes MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" ALL_TARGET = linux @@ -26,7 +28,7 @@ NO_REGRESS = Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtmpdump cd ${WRKBUILD}; \ - ${INSTALL_PROGRAM} rtmpdump rtmpsrv rtmpsuck streams ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} rtmpdump rtmpsrv rtmpsuck rtmpgw ${PREFIX}/bin; \ ${INSTALL_DATA} README COPYING ChangeLog ${PREFIX}/share/doc/rtmpdump .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/rtmpdump/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 26 Feb 2010 18:46:26 -0000 1.6 +++ distinfo 20 Mar 2010 11:03:55 -0000 @@ -1,5 +1,5 @@ -MD5 (rtmpdump-2.1d.tar.gz) = QYmEFfg89pdpp2UPR6zsNA== -RMD160 (rtmpdump-2.1d.tar.gz) = Q6QeEp0LPIkpLBCfRjRdEyKrK1g= -SHA1 (rtmpdump-2.1d.tar.gz) = tj8bpuGs9IKCpHCHXqV4icEWmtQ= -SHA256 (rtmpdump-2.1d.tar.gz) = kvQAolBVpxluTDnpC7q4pFuNcryK+/my20pFg/vFU2c= -SIZE (rtmpdump-2.1d.tar.gz) = 89494 +MD5 (rtmpdump-2.2.tar.bz2) = HOZ1PJV1TRpytjXUiHVwlg== +RMD160 (rtmpdump-2.2.tar.bz2) = Zz6br0Jtj+DTJHHRAWSGYAgOmW0= +SHA1 (rtmpdump-2.2.tar.bz2) = gK1IeLW0jFnLZ1T6wx+BG4p9OZ0= +SHA256 (rtmpdump-2.2.tar.bz2) = Ku8wwfD72k1QHgiJKmz+CqHQIT7iv61OGSZBFXO9NzY= +SIZE (rtmpdump-2.2.tar.bz2) = 83586 Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 26 Feb 2010 18:46:26 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.5 2010/02/26 18:46:26 sthen Exp $ - -avoid gmake-isms - ---- Makefile.orig Sun Feb 21 17:31:12 2010 -+++ Makefile Tue Feb 23 21:43:51 2010 -@@ -6,7 +6,7 @@ OPT=-O2 - CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) - LDFLAGS=-Wall $(XLDFLAGS) - LIBS=-lcrypto -lz --THREADLIB=-lpthread -+THREADLIB=-pthread - SLIBS=$(THREADLIB) $(LIBS) - RTMP_OBJS=rtmp.o log.o amf.o - -@@ -35,16 +35,16 @@ clean: - rm -f *.o rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) - - rtmpdump: rtmpdump.o $(RTMP_OBJS) parseurl.o hashswf.o -- $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(LIBS) -+ $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(LIBS) - - rtmpsrv: rtmpsrv.o $(RTMP_OBJS) thread.o -- $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(SLIBS) -+ $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(SLIBS) - - rtmpsuck: rtmpsuck.o $(RTMP_OBJS) hashswf.o thread.o -- $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(SLIBS) -+ $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(SLIBS) - - streams: streams.o $(RTMP_OBJS) parseurl.o hashswf.o thread.o -- $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(SLIBS) -+ $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(SLIBS) - - log.o: log.c log.h Makefile - parseurl.o: parseurl.c parseurl.h log.h Makefile Index: patches/patch-bytes_h =================================================================== RCS file: patches/patch-bytes_h diff -N patches/patch-bytes_h --- patches/patch-bytes_h 26 Feb 2010 18:46:26 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-bytes_h,v 1.5 2010/02/26 18:46:26 sthen Exp $ ---- bytes.h.orig Thu Dec 31 05:33:57 2009 -+++ bytes.h Tue Jan 12 12:55:19 2010 -@@ -78,7 +78,7 @@ typedef unsigned char uint8_t; - - // ok, we assume to have the same float word order and byte order if float word order is not defined - #ifndef __FLOAT_WORD_ORDER --#warning "Float word order not defined, assuming the same as byte order!" -+/* #warning "Float word order not defined, assuming the same as byte order!" */ - #define __FLOAT_WORD_ORDER __BYTE_ORDER - #endif - Index: patches/patch-librtmp_Makefile =================================================================== RCS file: patches/patch-librtmp_Makefile diff -N patches/patch-librtmp_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-librtmp_Makefile 20 Mar 2010 11:03:55 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- librtmp/Makefile.orig Sat Mar 20 10:54:51 2010 ++++ librtmp/Makefile Sat Mar 20 10:54:37 2010 +@@ -3,7 +3,7 @@ LD=$(CROSS_COMPILE)ld + + DEF=-DRTMPDUMP_VERSION=\"v2.2\" + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) ++CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) + + all: librtmp.a + Index: patches/patch-librtmp_bytes_h =================================================================== RCS file: patches/patch-librtmp_bytes_h diff -N patches/patch-librtmp_bytes_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-librtmp_bytes_h 20 Mar 2010 11:03:55 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- librtmp/bytes.h.orig Sat Mar 20 10:49:18 2010 ++++ librtmp/bytes.h Sat Mar 20 10:49:31 2010 +@@ -70,7 +70,7 @@ typedef unsigned char uint8_t; + + // ok, we assume to have the same float word order and byte order if float word order is not defined + #ifndef __FLOAT_WORD_ORDER +-#warning "Float word order not defined, assuming the same as byte order!" ++/* #warning "Float word order not defined, assuming the same as byte order!" */ + #define __FLOAT_WORD_ORDER __BYTE_ORDER + #endif + Index: patches/patch-streams_c =================================================================== RCS file: patches/patch-streams_c diff -N patches/patch-streams_c --- patches/patch-streams_c 26 Feb 2010 18:46:26 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-streams_c,v 1.2 2010/02/26 18:46:26 sthen Exp $ ---- streams.c.orig Sun Jan 10 03:28:13 2010 -+++ streams.c Tue Jan 12 12:55:19 2010 -@@ -22,6 +22,7 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#include <pthread.h> - - #include <signal.h> - #include <getopt.h> -@@ -38,6 +39,10 @@ - #define RD_INCOMPLETE 2 - - #define PACKET_SIZE 1024*1024 -+ -+#ifndef MSG_NOSIGNAL -+#define MSG_NOSIGNAL 0 -+#endif - - #ifdef WIN32 - #define InitSockets() {\ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/rtmpdump/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 26 Feb 2010 18:46:26 -0000 1.2 +++ pkg/PLIST 20 Mar 2010 11:03:55 -0000 @@ -1,8 +1,8 @@ @comment $OpenBSD: PLIST,v 1.2 2010/02/26 18:46:26 sthen Exp $ @bin bin/rtmpdump +...@bin bin/rtmpgw @bin bin/rtmpsrv @bin bin/rtmpsuck -...@bin bin/streams share/doc/rtmpdump/ share/doc/rtmpdump/COPYING share/doc/rtmpdump/ChangeLog
