diff --git a/.travis.yml b/.travis.yml index 7d20a6f8e576b..83e76c776e822 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ install: gettext git-core gperf libasound2-dev libass-dev libbz2-dev libcap-dev libcdio-dev libcec4-dev libcrossguid-dev libcurl3 libcurl4-openssl-dev libdbus-1-dev libfmt3-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev libfribidi-dev libgif-dev libiso9660-dev libjpeg-dev liblcms2-dev libltdl-dev liblzo2-dev libmicrohttpd-dev libmysqlclient-dev libnfs-dev - libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev + libpcre3-dev libplist-dev libpng-dev libpulse-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtag1-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip uuid-dev yasm zip zlib1g-dev; diff --git a/docs/README.linux b/docs/README.linux index 5f6c1a2281415..5e311c7b1cfd0 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, libsdl2-dev, + libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-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/docs/README.opensuse b/docs/README.opensuse index 7c8337af8ac67..b90022a017e2a 100644 --- a/docs/README.opensuse +++ b/docs/README.opensuse @@ -68,7 +68,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, libsdl2-dev, + libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpulse-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/docs/README.ubuntu b/docs/README.ubuntu index 2c34056c6745c..7abae0cd848fe 100644 --- a/docs/README.ubuntu +++ b/docs/README.ubuntu @@ -87,7 +87,7 @@ For Ubuntu (all versions >= 7.04): libcurl4-openssl-dev libdbus-1-dev libfontconfig-dev libegl1-mesa-dev libfreetype6-dev \ libfribidi-dev libgif-dev libiso9660-dev libjpeg-dev liblzo2-dev \ libmicrohttpd-dev libmysqlclient-dev libnfs-dev \ - libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev \ + libpcre3-dev libplist-dev libpng-dev libpulse-dev libsmbclient-dev \ libsqlite3-dev libssh-dev libssl-dev libtinyxml-dev libtool libudev-dev libusb-dev \ libva-dev libvdpau-dev libxml2-dev libxmu-dev libxrandr-dev \ libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev \ diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index a47d19bb1f2df..4edbc286df531 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -61,13 +61,11 @@ ifeq ($(NEED_LIBICONV),1) endif ALSA_LIB= -LINUX_SYSTEM_LIBS= ifeq ($(OS),linux) DEPENDS += libuuid #not for raspberry pi ifneq ($(TARGET_PLATFORM),raspberry-pi) - DEPENDS += libsdl2 linux-system-libs - LINUX_SYSTEM_LIBS = linux-system-libs + DEPENDS += linux-system-libs endif DEPENDS += alsa-lib ALSA_LIB = alsa-lib @@ -98,7 +96,6 @@ nettle: gmp pythonmodule-pycryptodome: python27 pythonmodule-setuptools pythonmodule-pil: $(ZLIB) libjpeg-turbo libpng freetype2 python27 pythonmodule-setuptools pythonmodule-setuptools: python27 -libsdl2: $(LINUX_SYSTEM_LIBS) libxslt: libgcrypt libxml2 ffmpeg: $(ICONV) $(ZLIB) bzip2 $(FFMPEG_DEPENDS) platform: p8-platform diff --git a/tools/depends/target/libsdl2/Makefile b/tools/depends/target/libsdl2/Makefile deleted file mode 100644 index 6c6eb5a26a38b..0000000000000 --- a/tools/depends/target/libsdl2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -include ../../Makefile.include -DEPS= ../../Makefile.include Makefile - -# lib name, version -LIBNAME=SDL2 -VERSION=2.0.3 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --disable-video-directfb -ifneq ($(OS),linux) -CONFIGURE += --without-x --disable-video-x11 -endif - -LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a - -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); ./autogen.sh - cd $(PLATFORM); $(CONFIGURE) - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM) - -.installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install - touch $@ - -clean: - $(MAKE) -C $(PLATFORM) clean - rm -f .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM)