On Sat, 20 Mar 2010 11:05:37 +0000 Stuart Henderson <s...@spacehopper.org> wrote:
> 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. Sweet! --I thought I had missed something obvious. ;) I don't know if setting EXTRACT_SUFX automatically handles the build depend of bzip2, but to be safe, I added it. --I'm not sure if this is correct? We need OpenSSL in wantlib. As far as installing the new librtmp.a and rtmp.h I figured it wouldn't hurt since it might eventually become a dependency for other stuff (mplayer?). I know the XMBC porting attempt will need it (if they don't include their own copy of rtmpdump). Lastly, 2.2 has two entirely new man pages that need to be installed. You might want to keep the following around for after unlock. If OK by you, I'll send the patch to get rid of the gmake-isms upstream. jon Index: Makefile =================================================================== RCS file: /cvs/ports/net/rtmpdump/Makefile,v retrieving revision 1.10 diff -N -u -p Makefile --- Makefile 26 Feb 2010 18:46:26 -0000 1.10 +++ Makefile 20 Mar 2010 11:58:46 -0000 @@ -2,21 +2,23 @@ COMMENT = dump RTMP media streams -DISTNAME = rtmpdump-2.1d - +DISTNAME = rtmpdump-2.2 +EXTRACT_SUFX= .tar.bz2 CATEGORIES = net -HOMEPAGE = http://rtmpdump.mplayerhq.hu/ +HOMEPAGE = http://rtmpdump.mplayerhq.hu +MASTER_SITES = ${HOMEPAGE}/download/ -# GPLv2+ +# GPLv2+ LGPL PERMIT_PACKAGE_CDROM = No PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =No PERMIT_DISTFILES_FTP = Yes -WANTLIB = c crypto pthread z +# SHARED_LIBS = librtmp -MASTER_SITES = ${HOMEPAGE}/download/ +WANTLIB = c crypto pthread ssl z +BUILD_DEPENDS+= :bzip2-*:archivers/bzip2 MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" ALL_TARGET = linux @@ -26,7 +28,11 @@ NO_REGRESS = Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtmpdump cd ${WRKBUILD}; \ - ${INSTALL_PROGRAM} rtmpdump rtmpsrv rtmpsuck streams ${PREFIX}/bin; \ - ${INSTALL_DATA} README COPYING ChangeLog ${PREFIX}/share/doc/rtmpdump + ${INSTALL_PROGRAM} rtmpdump rtmpgw rtmpsrv rtmpsuck ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} librtmp/librtmp.a ${PREFIX}/lib; \ + ${INSTALL_PROGRAM} librtmp/rtmp.h ${PREFIX}/include; \ + ${INSTALL_MAN} rtmpdump.1 ${PREFIX}/man/man1; \ + ${INSTALL_MAN} rtmpgw.8 ${PREFIX}/man/man8; \ + ${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 -N -u -p distinfo --- distinfo 26 Feb 2010 18:46:26 -0000 1.6 +++ distinfo 20 Mar 2010 11:58:46 -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: /cvs/ports/net/rtmpdump/patches/patch-Makefile,v retrieving revision 1.5 diff -N -u -p patches/patch-Makefile --- patches/patch-Makefile 26 Feb 2010 18:46:26 -0000 1.5 +++ patches/patch-Makefile 20 Mar 2010 11:58:46 -0000 @@ -1,36 +1,41 @@ -$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 +$OpenBSD$ +--- Makefile.orig Fri Mar 5 13:26:48 2010 ++++ Makefile Fri Mar 19 20:00:59 2010 @@ -6,7 +6,7 @@ OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) LDFLAGS=-Wall $(XLDFLAGS) LIBS=-lcrypto -lz -THREADLIB=-lpthread +THREADLIB=-pthread + LIBRTMP=librtmp/librtmp.a 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) +@@ -33,22 +33,22 @@ cross: - rtmpdump: rtmpdump.o $(RTMP_OBJS) parseurl.o hashswf.o + clean: + rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) +- @$(MAKE) -C librtmp clean ++ @cd librtmp && $(MAKE) clean + + $(LIBRTMP): +- @$(MAKE) -C librtmp all CC="$(CC)" CFLAGS="$(CFLAGS)" ++ @cd librtmp && $(MAKE) all CC="$(CC)" CFLAGS="$(CFLAGS)" + + rtmpdump: rtmpdump.o parseurl.o $(LIBRTMP) - $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(LIBS) + $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(LIBS) - rtmpsrv: rtmpsrv.o $(RTMP_OBJS) thread.o + rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP) - $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(SLIBS) + $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(SLIBS) - rtmpsuck: rtmpsuck.o $(RTMP_OBJS) hashswf.o thread.o + rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP) - $(CC) $(LDFLAGS) $^ -o $...@$(EXT) $(SLIBS) + $(CC) $(LDFLAGS) $> -o $...@$(EXT) $(SLIBS) - streams: streams.o $(RTMP_OBJS) parseurl.o hashswf.o thread.o + rtmpgw: rtmpgw.o parseurl.o thread.o $(LIBRTMP) - $(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 + parseurl.o: parseurl.c parseurl.h Makefile + rtmpgw.o: rtmpgw.c librtmp/rtmp.h librtmp/log.h librtmp/amf.h Makefile cvs server: warning: patches/patch-bytes_h was lost ? patches/patch-bytes_h Index: patches/patch-librtmp_bytes_h =================================================================== RCS file: patches/patch-librtmp_bytes_h diff -N -u -p patches/patch-librtmp_bytes_h --- /dev/null 20 Mar 2010 05:58:46 -0000 +++ patches/patch-librtmp_bytes_h 20 Mar 2010 11:58:46 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- librtmp/bytes.h.orig Fri Mar 19 19:20:12 2010 ++++ librtmp/bytes.h Fri Mar 19 19:20:21 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: /cvs/ports/net/rtmpdump/patches/patch-streams_c,v retrieving revision 1.2 diff -N -u -p patches/patch-streams_c --- patches/patch-streams_c 26 Feb 2010 18:46:26 -0000 1.2 +++ /dev/null 20 Mar 2010 11:31:01 -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 -N -u -p pkg/PLIST --- pkg/PLIST 26 Feb 2010 18:46:26 -0000 1.2 +++ pkg/PLIST 20 Mar 2010 11:58:46 -0000 @@ -1,8 +1,12 @@ @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 +include/rtmp.h +lib/librtmp.a +...@man man/man1/rtmpdump.1 +...@man man/man8/rtmpgw.8 share/doc/rtmpdump/ share/doc/rtmpdump/COPYING share/doc/rtmpdump/ChangeLog
