From 3373a35044d2fe13e1c7586ecb5de26cfed364bf Mon Sep 17 00:00:00 2001 From: Martijn Kaijser Date: Sun, 11 Dec 2016 15:13:57 +0100 Subject: [PATCH] [depends] remove rtmp as it's included through ffmpeg or as binary addon --- .gitignore | 1 - docs/README.linux | 2 +- project/cmake/cpack/deb/copyright | 18 ------- project/cmake/cpack/deb/packages/kodi.txt.in | 2 +- project/cmake/scripts/android/Install.cmake | 1 - tools/android/packaging/Makefile.in | 1 - tools/depends/target/Makefile | 3 +- tools/depends/target/curl/Makefile | 2 +- tools/depends/target/librtmp/Makefile | 54 -------------------- tools/depends/target/librtmp/libm.patch | 11 ---- tools/depends/target/librtmp/prefix.patch | 10 ---- 11 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 tools/depends/target/librtmp/Makefile delete mode 100644 tools/depends/target/librtmp/libm.patch delete mode 100644 tools/depends/target/librtmp/prefix.patch diff --git a/.gitignore b/.gitignore index 44ef5abaa2941..9c8dc28595100 100644 --- a/.gitignore +++ b/.gitignore @@ -274,7 +274,6 @@ lib/cpluff/stamp-h1 /system/EasyHook32.dll /system/libcurl.dll /system/libeay32.dll -/system/librtmp.dll /system/libexif.dll /system/ssh.dll /system/sqlite3.dll diff --git a/docs/README.linux b/docs/README.linux index 3b903c2bf2098..036d0577344ac 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -52,7 +52,7 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl, libfribidi-dev, libgif-dev (>= 4.1.6), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libiso9660-dev, libjpeg-dev, libltdl-dev, liblzo2-dev, libmicrohttpd-dev, libmpcdec-dev, libmysqlclient-dev, libnfs-dev, - libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev, librtmp-dev,libsdl2-dev, + libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-dev, libsdl2-dev, libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, libssl-dev, libswscale-dev, libtag1-dev (>= 1.8), libtinyxml-dev (>= 2.6.2), libtool, libudev-dev, libusb-dev, libva-dev, libvdpau-dev, libxml2-dev, diff --git a/project/cmake/cpack/deb/copyright b/project/cmake/cpack/deb/copyright index e0c15e8de855e..a79cf54f63bff 100644 --- a/project/cmake/cpack/deb/copyright +++ b/project/cmake/cpack/deb/copyright @@ -2330,24 +2330,6 @@ libnfs - NFS client library You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . -librtmp - toolkit for RTMP streams - - Copyright (C) 2009 Andrej Stepanchuk - Copyright (C) 2009-2010 Howard Chu - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - libsquish - Open source DXT compression library Copyright (C) 2006 Simon Brown diff --git a/project/cmake/cpack/deb/packages/kodi.txt.in b/project/cmake/cpack/deb/packages/kodi.txt.in index 4a8c520243fe2..4ca417b70036e 100644 --- a/project/cmake/cpack/deb/packages/kodi.txt.in +++ b/project/cmake/cpack/deb/packages/kodi.txt.in @@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE all PACKAGE_SECTION video PACKAGE_PRIORITY optional PACKAGE_SHLIBDEPS -PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python-bluez | python-lightblue, python-imaging, python-simplejson, libass5 | libass4, libgif5 | libgif7, libssh-4 | libssh2-1, libnfs8 | libnfs4 | libnfs1, libbluray1, libshairplay0, libvorbisfile3, libaacs0, libcec4, librtmp1 | librtmp0, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1, libyajl2 +PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python-bluez | python-lightblue, python-imaging, python-simplejson, libass5 | libass4, libgif5 | libgif7, libssh-4 | libssh2-1, libnfs8 | libnfs4 | libnfs1, libbluray1, libshairplay0, libvorbisfile3, libaacs0, libcec4, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1, libyajl2 PACKAGE_RECOMMENDS libvdpau1, libva-intel-vaapi-driver, libva1 PACKAGE_SUGGESTS @APP_NAME_LC@-pvr-mythtv, @APP_NAME_LC@-pvr-vuplus, @APP_NAME_LC@-pvr-vdr-vnsi, @APP_NAME_LC@-pvr-njoy, @APP_NAME_LC@-pvr-nextpvr, @APP_NAME_LC@-pvr-mediaportal-tvserver, @APP_NAME_LC@-pvr-tvheadend-hts, @APP_NAME_LC@-pvr-dvbviewer, @APP_NAME_LC@-pvr-argustv, @APP_NAME_LC@-pvr-iptvsimple, @APP_NAME_LC@-audioencoder-vorbis, @APP_NAME_LC@-audioencoder-flac, @APP_NAME_LC@-audioencoder-lame PACKAGE_BREAKS xbmc (<< 2:14.0~git20141019), xbmc-data, xbmc-standalone diff --git a/project/cmake/scripts/android/Install.cmake b/project/cmake/scripts/android/Install.cmake index 5c66f4136b6c7..025f194cb569b 100644 --- a/project/cmake/scripts/android/Install.cmake +++ b/project/cmake/scripts/android/Install.cmake @@ -91,7 +91,6 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay) endif() endforeach() add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "") -add_bundle_file(${DEPENDS_PATH}/lib/librtmp.so ${libdir} "") # Main targets from Makefile.in if(CPU MATCHES i686) diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 5bb7fe30ffe27..b34fa6c2822b0 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 82b378dfa17b7..f0f0bf4f26484 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 023949f96c00d..df604507fdf92 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 e78d375b12849..0000000000000 --- 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 d86485b584920..0000000000000 --- 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 381797217e262..0000000000000 --- 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