[depends] remove rtmp as it's included through ffmpeg or as binary addon

6 files changed, 2 insertions, 79 deletions

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 5bb7fe30ff..b34fa6c282 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -1,7 +1,6 @@
 include ../../depends/Makefile.include
 
 OBJS = libcurl.so \
-  librtmp.so \
   libplist.so libshairplay.so \
   libnfs.so libass.so \
   libbluray.so libsmbclient.so
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 82b378dfa1..f0f0bf4f26 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -9,7 +9,7 @@ DEPENDS = \
 	libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
 	openssl gmp nettle gnutls curl \
 	libjpeg-turbo libpng fribidi libass \
-	librtmp libxml2 yajl libmicrohttpd mysql libffi \
+	libxml2 yajl libmicrohttpd mysql libffi \
 	python27 libshairplay \
 	libplist libcec libbluray tinyxml dummy-libxbmc \
 	libamplayer libssh taglib libusb libnfs \
@@ -83,7 +83,6 @@ libgcrypt: libgpg-error
 fontconfig: freetype2 expat $(ICONV)
 curl: openssl
 libass: fontconfig libpng freetype2 expat $(ICONV)
-librtmp: openssl
 libmicrohttpd: gnutls libgcrypt libgpg-error
 python27: expat gettext libxml2 sqlite3 openssl libffi
 libcdio: $(ICONV)
diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile
index 023949f96c..df604507fd 100644
--- a/tools/depends/target/curl/Makefile
+++ b/tools/depends/target/curl/Makefile
@@ -13,7 +13,7 @@ ARCHIVE=$(SOURCE).tar.bz2
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) \
-          --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp
+          --without-libssh2 --disable-ntlm-wb --enable-ipv6
 
 LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
 
diff --git a/tools/depends/target/librtmp/Makefile b/tools/depends/target/librtmp/Makefile
deleted file mode 100644
index e78d375b12..0000000000
--- a/tools/depends/target/librtmp/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile prefix.patch
-
-# lib name, version
-LIBNAME=rtmpdump
-VERSION=fa8646daeb19dfd12c181f7d19de708d623704c0
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-# configuration settings
-LIBDYLIB=$(PLATFORM)/librtmp/librtmp.a
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-SYS=posix
-ifeq ($(OS),ios)
-  SYS=darwin
-endif
-ifeq ($(OS),osx)
-  SYS=darwin
-endif
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p0 < ../prefix.patch
-	cd $(PLATFORM)/librtmp; patch -p0 < ../../libm.patch
-	sed -i -e 's|CC=|#CC=|' $(PLATFORM)/librtmp/Makefile
-	sed -i -e 's|LD=|#LD=|' $(PLATFORM)/librtmp/Makefile
-	sed -i -e 's|AR=|#AR=|' $(PLATFORM)/librtmp/Makefile
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE)  PREFIX=$(PREFIX) SYS=$(SYS) CC="$(CC)" LD="$(LD)" AR="$(AR)" XCFLAGS="$(CFLAGS)" XLDFLAGS="$(LDFLAGS)" -C $(PLATFORM)/librtmp
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) SYS=$(SYS) prefix=$(PREFIX) -C $(PLATFORM)/librtmp install
-ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/librtmp.la $(PREFIX)/lib/librtmp.so
-	mv -f $(PREFIX)/lib/librtmp.so.1 $(PREFIX)/lib/librtmp.so
-	$(RPL) -e "librtmp.so.1" "librtmp.so\x00\x00" $(PREFIX)/lib/librtmp.so
-	-$(READELF) --dynamic $(PREFIX)/lib/librtmp.so | grep ibrary
-endif
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
diff --git a/tools/depends/target/librtmp/libm.patch b/tools/depends/target/librtmp/libm.patch
deleted file mode 100644
index d86485b584..0000000000
--- a/tools/depends/target/librtmp/libm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2013-06-04 17:35:58.000000000 +0200
-+++ Makefile	2013-06-04 17:36:13.000000000 +0200
-@@ -25,7 +25,7 @@
- REQ_GNUTLS=gnutls
- REQ_OPENSSL=libssl,libcrypto
- LIBZ=-lz
--LIBS_posix=
-+LIBS_posix=-lm
- LIBS_darwin=
- LIBS_mingw=-lws2_32 -lwinmm -lgdi32
- LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
diff --git a/tools/depends/target/librtmp/prefix.patch b/tools/depends/target/librtmp/prefix.patch
deleted file mode 100644
index 381797217e..0000000000
--- a/tools/depends/target/librtmp/prefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- librtmp/Makefile     2010-06-30 15:58:35.000000000 -0400
-+++ librtmp/Makefile.2   2011-03-31 16:19:52.813884882 -0400
-@@ -1,6 +1,6 @@
- VERSION=v2.4
-
--prefix=/usr/local
-+prefix=$(PREFIX)
-
- CC=$(CROSS_COMPILE)gcc
- LD=$(CROSS_COMPILE)ld