X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a43f8ae3a618debc62187c94e816a4c23e10a20f..b90bae2100e56f8102ca10a41e76375122922ec7:/packages/rtmpdump/Makefile.patch

diff --git a/packages/rtmpdump/Makefile.patch b/packages/rtmpdump/Makefile.patch
index 4d2bfc96..4963785d 100644
--- a/packages/rtmpdump/Makefile.patch
+++ b/packages/rtmpdump/Makefile.patch
@@ -1,10 +1,45 @@
-diff --git a/Makefile b/Makefile
-index 7470eb4..03dd0e9 100644
---- a/Makefile
-+++ b/Makefile
+diff -u -r ../rtmpdump-2.4/librtmp/Makefile ./librtmp/Makefile
+--- ../rtmpdump-2.4/librtmp/Makefile	2011-07-11 20:24:33.000000000 -0400
++++ ./librtmp/Makefile	2016-09-26 10:26:17.608653918 -0400
+@@ -1,20 +1,14 @@
+ VERSION=v2.4
+ 
+-prefix=/usr/local
+-
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
+ BINDIR=$(DESTDIR)$(bindir)
+ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
+ MANDIR=$(DESTDIR)$(mandir)
+ 
+-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 @@
- VERSION=v2.3
-
+ VERSION=v2.4
+ 
 -prefix=/usr/local
 -
 -CC=$(CROSS_COMPILE)gcc
@@ -12,41 +47,24 @@ index 7470eb4..03dd0e9 100644
 -
  SYS=posix
  #SYS=mingw
-
-@@ -20,8 +15,8 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
-
+ 
+@@ -21,8 +16,8 @@
+ 
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
 -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 -LDFLAGS=-Wall $(XLDFLAGS)
 +CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 +LDFLAGS+=-Wall $(XLDFLAGS)
-
+ 
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
-@@ -35,7 +30,7 @@ LIBS_posix=
- LIBS_mingw=-lws2_32 -lwinmm -lgdi32
- LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
-
+@@ -38,7 +33,7 @@
+ LIB_RTMP=-Llibrtmp -lrtmp
+ LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
+ 
 -THREADLIB_posix=-lpthread
 +THREADLIB_posix=
+ THREADLIB_darwin=-lpthread
  THREADLIB_mingw=
  THREADLIB=$(THREADLIB_$(SYS))
- SLIBS=$(THREADLIB) $(LIBS)
-
-diff --git a/librtmp/Makefile b/librtmp/Makefile
-index 6774db7..6e8d6c9 100644
---- a/librtmp/Makefile
-+++ b/librtmp/Makefile
-@@ -1,11 +1,5 @@
- VERSION=v2.3
-
--prefix=/usr/local
--
--CC=$(CROSS_COMPILE)gcc
--LD=$(CROSS_COMPILE)ld
--AR=$(CROSS_COMPILE)ar
--
- SYS=posix
- CRYPTO=OPENSSL
- #CRYPTO=GNUTLS