|
@ -1,19 +1,11 @@ |
|
|
diff -u -r ../rtmpdump-2.3/librtmp/Makefile ./librtmp/Makefile
|
|
|
diff -u -r ../rtmpdump-2.4/librtmp/Makefile ./librtmp/Makefile
|
|
|
--- ../rtmpdump-2.3/librtmp/Makefile 2010-06-30 16:01:28.000000000 -0400
|
|
|
--- ../rtmpdump-2.4/librtmp/Makefile 2011-07-11 20:24:33.000000000 -0400
|
|
|
+++ ./librtmp/Makefile 2016-08-24 09:46:18.124955620 -0400
|
|
|
+++ ./librtmp/Makefile 2016-09-26 10:26:17.608653918 -0400
|
|
|
@@ -1,11 +1,5 @@
|
|
|
@@ -1,20 +1,14 @@
|
|
|
VERSION=v2.3 |
|
|
VERSION=v2.4 |
|
|
|
|
|
|
|
|
-prefix=/usr/local
|
|
|
-prefix=/usr/local
|
|
|
-
|
|
|
-
|
|
|
-CC=$(CROSS_COMPILE)gcc
|
|
|
|
|
|
-LD=$(CROSS_COMPILE)ld
|
|
|
|
|
|
-AR=$(CROSS_COMPILE)ar
|
|
|
|
|
|
-
|
|
|
|
|
|
SYS=posix |
|
|
|
|
|
CRYPTO=OPENSSL |
|
|
|
|
|
#CRYPTO=GNUTLS |
|
|
|
|
|
@@ -44,7 +38,7 @@
|
|
|
|
|
|
incdir=$(prefix)/include/librtmp |
|
|
incdir=$(prefix)/include/librtmp |
|
|
bindir=$(prefix)/bin |
|
|
bindir=$(prefix)/bin |
|
|
libdir=$(prefix)/lib |
|
|
libdir=$(prefix)/lib |
|
@ -22,11 +14,31 @@ diff -u -r ../rtmpdump-2.3/librtmp/Makefile ./librtmp/Makefile |
|
|
BINDIR=$(DESTDIR)$(bindir) |
|
|
BINDIR=$(DESTDIR)$(bindir) |
|
|
INCDIR=$(DESTDIR)$(incdir) |
|
|
INCDIR=$(DESTDIR)$(incdir) |
|
|
LIBDIR=$(DESTDIR)$(libdir) |
|
|
LIBDIR=$(DESTDIR)$(libdir) |
|
|
diff -u -r ../rtmpdump-2.3/Makefile ./Makefile
|
|
|
MANDIR=$(DESTDIR)$(mandir) |
|
|
--- ../rtmpdump-2.3/Makefile 2010-06-30 15:58:35.000000000 -0400
|
|
|
|
|
|
+++ ./Makefile 2016-08-24 09:35:22.150906938 -0400
|
|
|
-CC=$(CROSS_COMPILE)gcc
|
|
|
|
|
|
-LD=$(CROSS_COMPILE)ld
|
|
|
|
|
|
-AR=$(CROSS_COMPILE)ar
|
|
|
|
|
|
-
|
|
|
|
|
|
SYS=posix |
|
|
|
|
|
CRYPTO=OPENSSL |
|
|
|
|
|
#CRYPTO=GNUTLS |
|
|
|
|
|
@@ -67,8 +61,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
|
|
|
|
|
OPT=-O2 |
|
|
|
|
|
-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
|
|
|
|
|
|
-LDFLAGS=$(XLDFLAGS)
|
|
|
|
|
|
+CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
|
|
|
|
|
|
+LDFLAGS+=$(XLDFLAGS)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o |
|
|
|
|
|
diff -u -r ../rtmpdump-2.4/Makefile ./Makefile
|
|
|
|
|
|
--- ../rtmpdump-2.4/Makefile 2011-07-11 20:24:33.000000000 -0400
|
|
|
|
|
|
+++ ./Makefile 2016-09-26 10:27:25.931636266 -0400
|
|
|
@@ -1,10 +1,5 @@
|
|
|
@@ -1,10 +1,5 @@
|
|
|
VERSION=v2.3 |
|
|
VERSION=v2.4 |
|
|
|
|
|
|
|
|
-prefix=/usr/local
|
|
|
-prefix=/usr/local
|
|
|
-
|
|
|
-
|
|
@ -36,7 +48,7 @@ diff -u -r ../rtmpdump-2.3/Makefile ./Makefile |
|
|
SYS=posix |
|
|
SYS=posix |
|
|
#SYS=mingw |
|
|
#SYS=mingw |
|
|
|
|
|
|
|
|
@@ -20,12 +15,12 @@
|
|
|
@@ -21,8 +16,8 @@
|
|
|
|
|
|
|
|
|
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
|
|
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
|
|
OPT=-O2 |
|
|
OPT=-O2 |
|
@ -47,17 +59,12 @@ diff -u -r ../rtmpdump-2.3/Makefile ./Makefile |
|
|
|
|
|
|
|
|
bindir=$(prefix)/bin |
|
|
bindir=$(prefix)/bin |
|
|
sbindir=$(prefix)/sbin |
|
|
sbindir=$(prefix)/sbin |
|
|
-mandir=$(prefix)/man
|
|
|
@@ -38,7 +33,7 @@
|
|
|
+mandir=$(prefix)/share/man
|
|
|
LIB_RTMP=-Llibrtmp -lrtmp |
|
|
|
|
|
LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
|
|
BINDIR=$(DESTDIR)$(bindir) |
|
|
|
|
|
SBINDIR=$(DESTDIR)$(sbindir) |
|
|
|
|
|
@@ -35,7 +30,7 @@
|
|
|
|
|
|
LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
|
|
|
|
|
LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) |
|
|
|
|
|
|
|
|
|
|
|
-THREADLIB_posix=-lpthread
|
|
|
-THREADLIB_posix=-lpthread
|
|
|
+THREADLIB_posix=
|
|
|
+THREADLIB_posix=
|
|
|
|
|
|
THREADLIB_darwin=-lpthread |
|
|
THREADLIB_mingw= |
|
|
THREADLIB_mingw= |
|
|
THREADLIB=$(THREADLIB_$(SYS)) |
|
|
THREADLIB=$(THREADLIB_$(SYS)) |
|
|
SLIBS=$(THREADLIB) $(LIBS) |
|
|
|
|
|