[osx/ios] bump librtmp to 2.4

2 files changed, 8 insertions, 88 deletions

diff --git a/tools/darwin/depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch b/tools/darwin/depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
deleted file mode 100644
index 358a0ff6f7..0000000000
--- a/tools/darwin/depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -uNr rtmpdump-2.3/Makefile rtmpdump-2.3-org/Makefile
---- rtmpdump-2.3/Makefile	2010-06-30 15:58:35.000000000 -0400
-+++ rtmpdump-2.3-org/Makefile	2011-01-23 13:50:03.000000000 -0500
-@@ -2,8 +2,8 @@
- 
- prefix=/usr/local
- 
--CC=$(CROSS_COMPILE)gcc
--LD=$(CROSS_COMPILE)ld
-+#CC=$(CROSS_COMPILE)gcc
-+#LD=$(CROSS_COMPILE)ld
- 
- SYS=posix
- #SYS=mingw
-@@ -33,10 +33,12 @@
- 
- LIBS_posix=
- LIBS_mingw=-lws2_32 -lwinmm -lgdi32
-+LIBS_darwin=
- LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
- 
- THREADLIB_posix=-lpthread
- THREADLIB_mingw=
-+THREADLIB_darwin=-lpthread
- THREADLIB=$(THREADLIB_$(SYS))
- SLIBS=$(THREADLIB) $(LIBS)
- 
-@@ -45,6 +47,7 @@
- 
- EXT_posix=
- EXT_mingw=.exe
-+EXT_darwin=
- EXT=$(EXT_$(SYS))
- 
- all:	$(LIBRTMP) progs
-diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile
---- rtmpdump-2.3/librtmp/Makefile	2010-06-30 16:01:28.000000000 -0400
-+++ rtmpdump-2.3-org/librtmp/Makefile	2011-01-23 13:56:46.000000000 -0500
-@@ -2,9 +2,9 @@
- 
- prefix=/usr/local
- 
--CC=$(CROSS_COMPILE)gcc
--LD=$(CROSS_COMPILE)ld
--AR=$(CROSS_COMPILE)ar
-+#CC=$(CROSS_COMPILE)gcc
-+#LD=$(CROSS_COMPILE)ld
-+#AR=$(CROSS_COMPILE)ar
- 
- SYS=posix
- CRYPTO=OPENSSL
-@@ -27,8 +27,14 @@
- 
- SO_posix=so.0
- SO_mingw=dll
-+SO_darwin=0.dylib
- SO_EXT=$(SO_$(SYS))
- 
-+SO_LDFLAGS_posix=-shared -Wl,-soname,$@
-+SO_LDFLAGS_mingw=
-+SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace $(XLDFLAGS)
-+SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
-+
- SHARED=yes
- SODEF_yes=-fPIC
- SOLIB_yes=librtmp.$(SO_EXT)
-@@ -61,7 +67,7 @@
- 	$(AR) rs $@ $?
- 
- librtmp.$(SO_EXT): $(OBJS)
--	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
-+	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
- 	ln -sf $@ librtmp.so
- 
- log.o: log.c log.h Makefile
-@@ -87,5 +93,9 @@
- 	cp librtmp.so.0 $(LIBDIR)
- 	cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so
- 
-+install_0.dylib:	librtmp.0.dylib
-+	cp librtmp.0.dylib $(LIBDIR)
-+	cd $(LIBDIR); ln -sf librtmp.0.dylib librtmp.dylib
-+
- install_dll:	librtmp.dll
-	cp librtmp.dll $(BINDIR)
diff --git a/tools/darwin/depends/librtmp/Makefile b/tools/darwin/depends/librtmp/Makefile
index 4439a94575..5589b44fd1 100644
--- a/tools/darwin/depends/librtmp/Makefile
+++ b/tools/darwin/depends/librtmp/Makefile
@@ -3,9 +3,9 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=rtmpdump
-VERSION=2.3
+VERSION=2.4
 SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tgz
+ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
 
@@ -20,7 +20,12 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	rm -rf $(SOURCE)
 	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); patch -p1 < ../01-make_shared_lib_for_darwin-tag2.3.patch
+	sed -i -e 's|CC=|#CC=|' $(SOURCE)/Makefile
+	sed -i -e 's|LD=|#LD=|' $(SOURCE)/Makefile
+	sed -i -e 's|CC=|#CC=|' $(SOURCE)/librtmp/Makefile
+	sed -i -e 's|LD=|#LD=|' $(SOURCE)/librtmp/Makefile
+	sed -i -e 's|AR=|#AR=|' $(SOURCE)/librtmp/Makefile
+	sed -i -e 's|headerpad_max_install_names|headerpad_max_install_names -install_name \$$(libdir)/\$$@|' $(SOURCE)/librtmp/Makefile
 
 $(LIBDYLIB): $(SOURCE)
 	make SYS=darwin prefix=$(PREFIX) XCFLAGS="$(CFLAGS)" XLDFLAGS="$(LDFLAGS)" -j $(MAKE_JOBS) -C $(SOURCE)/librtmp