[rtmpdump] r386 - in trunk: ChangeLog Makefile README librtmp/Makefile

[hyc]

Author: hyc
Date: Mon Mar 22 10:40:25 2010
New Revision: 386

Log:
v2.2b

Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/README
   trunk/librtmp/Makefile

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Mon Mar 22 10:39:07 2010	(r385)
+++ trunk/ChangeLog	Mon Mar 22 10:40:25 2010	(r386)
@@ -4,6 +4,15 @@ Copyright 2009-2010 Howard Chu
 Copyright 2009 The Flvstreamer Team
 http://rtmpdump.mplayerhq.hu/
 
+22 March 2010, v2.2b
+- fix v2.2a crashes in rtmpsrv/rtmpsuck
+- fix v2.2a .swfinfo location on Windows
+- fix typo for --auth parameter in manpages
+- add FP10 handshake support for rtmpsrv/rtmpsuck
+- avoid GNUMake vs BSDMake incompatibilities
+- add pkgconfig file for librtmp
+- more library cleanup
+
 20 March 2010, v2.2a
 - fix C++ compatibility for librtmp
 - misc library restructuring

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Mar 22 10:39:07 2010	(r385)
+++ trunk/Makefile	Mon Mar 22 10:40:25 2010	(r386)
@@ -1,16 +1,25 @@
+VERSION=v2.2b
+
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld
 
-DEF=-DRTMPDUMP_VERSION=\"v2.2a\"
+CRYPTO=OPENSSL
+#CRYPTO=GNUTLS
+LIB_GNUTLS=-lgnutls
+LIB_OPENSSL=-lssl -lcrypto
+CRYPTO_LIB=$(LIB_$(CRYPTO))
+
+DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\"
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)
-LIBS=-lssl -lcrypto -lz
-#LIBS=-lgnutls -lz
+
+LIBS=$(CRYPTO_LIB) -lz
 THREADLIB=-lpthread
+SLIBS=$(THREADLIB) $(LIBS)
+
 LIBRTMP=librtmp/librtmp.a
 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
-SLIBS=$(THREADLIB) $(LIBS)
 
 EXT=
 

Modified: trunk/README
==============================================================================
--- trunk/README	Mon Mar 22 10:39:07 2010	(r385)
+++ trunk/README	Mon Mar 22 10:40:25 2010	(r386)
@@ -1,4 +1,4 @@
-RTMP Dump v2.2a
+RTMP Dump v2.2b
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
@@ -25,7 +25,8 @@ but you may need to override the CROSS_C
 
 Please read the Makefile to see what other make variables are used.
 
-This code also requires you to have OpenSSL and zlib installed.
+This code also requires you to have OpenSSL and zlib installed. (You may
+optionally use GnuTLS instead of OpenSSL if desired.)
 
 Credit goes to team boxee for the XBMC RTMP code originally used in RTMPDumper.
 The current code is based on the XBMC code but rewritten in C by Howard Chu.

Modified: trunk/librtmp/Makefile
==============================================================================
--- trunk/librtmp/Makefile	Mon Mar 22 10:39:07 2010	(r385)
+++ trunk/librtmp/Makefile	Mon Mar 22 10:40:25 2010	(r386)
@@ -1,3 +1,5 @@
+VERSION=v2.2b
+
 prefix=/usr/local
 
 CC=$(CROSS_COMPILE)gcc
@@ -11,7 +13,6 @@ REQ_GNUTLS=gnutls
 REQ_OPENSSL=libssl,libcrypto
 CRYPTO_LIB=$(LIB_$(CRYPTO))
 CRYPTO_REQ=$(REQ_$(CRYPTO))
-VERSION=v2.2a
 
 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" -DUSE_$(CRYPTO)
 OPT=-O2