Update to 1.9

This commit is contained in:
sthen 2009-11-16 12:05:21 +00:00
parent 08aa7b5e33
commit 776da9b962
5 changed files with 46 additions and 28 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2009/09/10 17:08:52 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2009/11/16 12:05:21 sthen Exp $
COMMENT = dump RTMP media streams
DISTNAME = flvstreamer-1.8k
DISTNAME = flvstreamer-1.9
CATEGORIES = net
@ -15,11 +15,11 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m stdc++
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=flvstreamer/source/}
WRKDIST = ${WRKDIR}/flvstreamer
USE_GMAKE = Yes
MAKE_FLAGS += CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
MAKE_FLAGS += CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" OPT="${CFLAGS}"
ALL_TARGET = linux
NO_REGRESS = Yes
do-install:

View File

@ -1,5 +1,5 @@
MD5 (flvstreamer-1.8k.tar.gz) = 5w1PKhVMBnWd6/t0JqCdag==
RMD160 (flvstreamer-1.8k.tar.gz) = g/YaJVLF2L7LkXCqshs7TjnBBmg=
SHA1 (flvstreamer-1.8k.tar.gz) = F8aKbpTn7J/Mm3o/h7KWfPyGlAo=
SHA256 (flvstreamer-1.8k.tar.gz) = p7EOILMngrAe/rHBnxAQN7W4wZv2lnYRypzcQtCcEbk=
SIZE (flvstreamer-1.8k.tar.gz) = 53676
MD5 (flvstreamer-1.9.tar.gz) = gCTCpEtP6eOdHuybWPTang==
RMD160 (flvstreamer-1.9.tar.gz) = Tmqh6sMqZEpk870azXxvpvirDCs=
SHA1 (flvstreamer-1.9.tar.gz) = hcm6FJIXXzTOWwUjbX2TFxhTLRA=
SHA256 (flvstreamer-1.9.tar.gz) = rkH8IN2DZHQQpHEDCSONL2L5aDYVXHe9xjyV8dyQOkY=
SIZE (flvstreamer-1.9.tar.gz) = 59988

View File

@ -1,16 +1,12 @@
$OpenBSD: patch-Makefile,v 1.2 2009/05/25 08:49:31 ajacoutot Exp $
--- Makefile.orig Mon May 25 00:41:57 2009
+++ Makefile Mon May 25 00:42:03 2009
@@ -12,10 +12,10 @@ clean:
rm -f *.o
$OpenBSD: patch-Makefile,v 1.3 2009/11/16 12:05:21 sthen Exp $
--- Makefile.orig Sat Nov 14 11:56:32 2009
+++ Makefile Sat Nov 14 18:40:57 2009
@@ -7,7 +7,7 @@ CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
CXXFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
LDFLAGS=-Wall $(XLDFLAGS)
LIBS=
-THREADLIB=-lpthread
+THREADLIB=-pthread
SLIBS=$(THREADLIB) $(LIBS)
streams: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o streams.o parseurl.o handshake.o
- $(CXX) $(LDFLAGS) $^ -o $@_x86 -lpthread
+ $(CXX) $(LDFLAGS) $^ -o $@ -pthread
flvstreamer: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o flvstreamer.o parseurl.o handshake.o
- $(CXX) $(LDFLAGS) $^ -o $@_x86
+ $(CXX) $(LDFLAGS) $^ -o $@
bytes.o: bytes.cpp bytes.h Makefile
log.o: log.cpp log.h Makefile
EXT=

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bytes_h,v 1.1.1.1 2009/05/24 23:57:01 sthen Exp $
--- bytes.h.orig Tue Apr 28 19:07:58 2009
+++ bytes.h Tue Apr 28 19:08:01 2009
@@ -76,7 +76,7 @@ typedef unsigned long long int uint64_t;
$OpenBSD: patch-bytes_h,v 1.2 2009/11/16 12:05:21 sthen Exp $
--- bytes.h.orig Sat Nov 14 11:55:14 2009
+++ bytes.h Sat Nov 14 18:39:35 2009
@@ -80,7 +80,7 @@ typedef unsigned long long int uint64_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

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-streams_cpp,v 1.1 2009/11/16 12:05:21 sthen Exp $
--- streams.cpp.orig Sat Nov 14 11:55:14 2009
+++ streams.cpp Sat Nov 14 19:27:17 2009
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <pthread.h>
#include <signal.h> // to catch Ctrl-C
#include <getopt.h>
@@ -40,6 +41,10 @@
int debuglevel = 1;
using namespace RTMP_LIB;
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
#define FLVSTREAMER_STREAMS_VERSION "v1.4"