- update rtmpdump to 2.0
- update patches - update WANTLIB and MASTER_SITES ok sthen@
This commit is contained in:
benoit
parent
42f1af53a4
commit
861f8cd0bc
@ -1,25 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2009/11/19 01:06:07 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2009/12/26 08:49:08 benoit Exp $
|
||||
|
||||
COMMENT = dump RTMP media streams
|
||||
|
||||
DISTNAME = rtmpdump-1.9
|
||||
EXTRACT_SUFX = .tgz
|
||||
DISTNAME = rtmpdump-2.0
|
||||
PKGNAME = ${DISTNAME:S/-v/-/}
|
||||
|
||||
CATEGORIES = net
|
||||
|
||||
HOMEPAGE = http://rtmpdump.mplayerhq.hu/
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM = No
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =No
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB = c m stdc++ crypto
|
||||
WANTLIB = c crypto
|
||||
|
||||
HOMEPAGE = http://rtmpdump.mplayerhq.hu/
|
||||
MASTER_SITES = ${HOMEPAGE}
|
||||
MASTER_SITES = ${HOMEPAGE}/download/
|
||||
|
||||
MAKE_FLAGS += CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
|
||||
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
|
||||
ALL_TARGET = linux
|
||||
|
||||
NO_REGRESS = Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (rtmpdump-1.9.tgz) = 8oYn3Yn0p+NQkDXpltAhrg==
|
||||
RMD160 (rtmpdump-1.9.tgz) = 852yhlorJZxMk3Su5x0dQKvf2ao=
|
||||
SHA1 (rtmpdump-1.9.tgz) = 6a9zPSzQi+hUQ5Bm8oV4QmMMFtM=
|
||||
SHA256 (rtmpdump-1.9.tgz) = mdexrWG7wVxkatKKfR838g6UzcftAVgzubHHG+RXTm0=
|
||||
SIZE (rtmpdump-1.9.tgz) = 65714
|
||||
MD5 (rtmpdump-2.0.tar.gz) = wWsNs+vsv0Ig1FcowPU68w==
|
||||
RMD160 (rtmpdump-2.0.tar.gz) = LBMLt1QHSZvmtTuhfmkzJA1EkCw=
|
||||
SHA1 (rtmpdump-2.0.tar.gz) = frkelwPS5KUUv/QFmyE2FsGWb6k=
|
||||
SHA256 (rtmpdump-2.0.tar.gz) = oF+DZrv+2qJeNn3P57gjBAlzf2H2CZGVotChuy1GbRY=
|
||||
SIZE (rtmpdump-2.0.tar.gz) = 77974
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
$OpenBSD: patch-Makefile,v 1.3 2009/11/19 01:06:07 sthen Exp $
|
||||
$OpenBSD: patch-Makefile,v 1.4 2009/12/26 08:49:10 benoit Exp $
|
||||
|
||||
avoid gmake-isms
|
||||
|
||||
--- Makefile.orig Thu Nov 12 13:00:48 2009
|
||||
+++ Makefile Thu Nov 19 01:00:33 2009
|
||||
--- Makefile.orig Mon Dec 21 13:39:51 2009
|
||||
+++ Makefile Fri Dec 25 17:01:53 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+.SUFFIXES: .cpp
|
||||
+.cpp.o:
|
||||
+ $(CXX) $(CXXFLAGS) -c $< -o $@
|
||||
+
|
||||
CC=$(CROSS_COMPILE)gcc
|
||||
CXX=$(CROSS_COMPILE)g++
|
||||
LD=$(CROSS_COMPILE)ld
|
||||
@@ -7,7 +11,7 @@ CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
|
||||
CXXFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
|
||||
|
||||
@@ -5,7 +9,7 @@
|
||||
CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
|
||||
LDFLAGS=-Wall $(XLDFLAGS)
|
||||
LIBS=-lcrypto
|
||||
-THREADLIB=-lpthread
|
||||
@ -21,16 +21,16 @@ avoid gmake-isms
|
||||
SLIBS=$(THREADLIB) $(LIBS)
|
||||
|
||||
EXT=
|
||||
@@ -40,10 +44,10 @@ clean:
|
||||
@@ -38,10 +42,10 @@
|
||||
rm -f *.o rtmpdump$(EXT) streams$(EXT)
|
||||
|
||||
streams: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o streams.o parseurl.o dh.o handshake.o
|
||||
- $(CXX) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
|
||||
+ $(CXX) $(LDFLAGS) $> -o $@$(EXT) $(SLIBS)
|
||||
streams: log.o rtmp.o amf.o streams.o parseurl.o
|
||||
- $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
|
||||
+ $(CC) $(LDFLAGS) $> -o $@$(EXT) $(SLIBS)
|
||||
|
||||
rtmpdump: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o rtmpdump.o parseurl.o dh.o handshake.o
|
||||
- $(CXX) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
|
||||
+ $(CXX) $(LDFLAGS) $> -o $@$(EXT) $(LIBS)
|
||||
rtmpdump: log.o rtmp.o amf.o rtmpdump.o parseurl.o
|
||||
- $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) $> -o $@$(EXT) $(LIBS)
|
||||
|
||||
bytes.o: bytes.c bytes.h Makefile
|
||||
log.o: log.c log.h Makefile
|
||||
parseurl.o: parseurl.c parseurl.h log.h Makefile
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-bytes_h,v 1.3 2009/11/19 01:06:07 sthen Exp $
|
||||
--- bytes.h.orig Sat Nov 7 06:33:38 2009
|
||||
+++ bytes.h Thu Nov 19 00:57:53 2009
|
||||
@@ -80,7 +80,7 @@ typedef unsigned long long int uint64_t;
|
||||
$OpenBSD: patch-bytes_h,v 1.4 2009/12/26 08:49:10 benoit Exp $
|
||||
--- bytes.h~ Mon Dec 21 13:39:51 2009
|
||||
+++ bytes.h Fri Dec 25 17:37:24 2009
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
// ok, we assume to have the same float word order and byte order if float word order is not defined
|
||||
#ifndef __FLOAT_WORD_ORDER
|
||||
|
||||
22
net/rtmpdump/patches/patch-streams_c
Normal file
22
net/rtmpdump/patches/patch-streams_c
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-streams_c,v 1.1 2009/12/26 08:49:10 benoit Exp $
|
||||
--- streams.c~ Mon Dec 21 13:39:51 2009
|
||||
+++ streams.c Fri Dec 25 17:04:28 2009
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
+#include <pthread.h>
|
||||
|
||||
#include <signal.h>
|
||||
#include <getopt.h>
|
||||
@@ -44,6 +45,10 @@
|
||||
#define RD_INCOMPLETE 2
|
||||
|
||||
#define PACKET_SIZE 1024*1024
|
||||
+
|
||||
+#ifndef MSG_NOSIGNAL
|
||||
+#define MSG_NOSIGNAL 0
|
||||
+#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#define InitSockets() {\
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-streams_cpp,v 1.1 2009/11/19 01:06:07 sthen Exp $
|
||||
--- streams.cpp.orig Sat Nov 7 06:33:38 2009
|
||||
+++ streams.cpp Thu Nov 19 01:01:58 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 RTMPDUMP_STREAMS_VERSION "v1.4"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user