librtmp: bump to 2.4

xbmc · Jan 30, 2015 · 69eed0b · 69eed0b
1 parent 90f3c35
commit 69eed0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1,918 deletions.
diff --git a/tools/depends/target/librtmp/Makefile b/tools/depends/target/librtmp/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile prefix.patch
 
 # lib name, version
 LIBNAME=rtmpdump
-VERSION=e0056c51cc1710c9a44d2a2c4e2f344fa9cabcf4
+VERSION=a107cef9b392616dff54fabfd37f985ee2190a6f
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 # configuration settings
@@ -27,7 +27,6 @@ $(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); patch -p1 < ../librtmp-60-second-fix.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
@@ -40,8 +39,8 @@ $(LIBDYLIB): $(PLATFORM)
 	$(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.0 $(PREFIX)/lib/librtmp.so
-	$(RPL) -e "librtmp.so.0" "librtmp.so\x00\x00" $(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 $@