aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt3
-rw-r--r--cmake/modules/FindSdl.cmake25
-rw-r--r--cmake/scripts/android/ArchSetup.cmake1
-rw-r--r--docs/README.armel2
-rw-r--r--docs/README.linux2
-rw-r--r--docs/README.opensuse4
-rw-r--r--docs/README.ubuntu2
-rw-r--r--tools/depends/target/Makefile5
-rw-r--r--tools/depends/target/libsdl2/Makefile41
-rw-r--r--tools/depends/target/libsdl_image/Makefile40
-rw-r--r--xbmc/Application.cpp4
-rw-r--r--xbmc/video/Teletext.cpp6
-rw-r--r--xbmc/windowing/WinEventsSDL.h4
14 files changed, 12 insertions, 129 deletions
diff --git a/.travis.yml b/.travis.yml
index 7d20a6f8e5..83e76c776e 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/CMakeLists.txt b/CMakeLists.txt
index cee8b9a1b4..86d8772e30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,6 @@ if(UNIX)
option(FFMPEG_PATH "Path to external ffmpeg?" "")
option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON)
option(ENABLE_OPENSSL "Enable OpenSSL?" ON)
- option(ENABLE_SDL "Enable SDL?" OFF)
option(ENABLE_MIR "Enable MIR?" OFF)
if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
option(ENABLE_X11 "Enable X11 support?" ON)
@@ -217,8 +216,6 @@ endif()
if(CORE_SYSTEM_NAME STREQUAL osx)
core_require_dep(Sdl)
-else()
- core_optional_dep(Sdl)
endif()
if(NOT WIN32)
diff --git a/cmake/modules/FindSdl.cmake b/cmake/modules/FindSdl.cmake
index 91bcac5bf7..81c179377b 100644
--- a/cmake/modules/FindSdl.cmake
+++ b/cmake/modules/FindSdl.cmake
@@ -11,36 +11,19 @@
# SDL_DEFINITIONS - the SDL compile definitions
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_SDL2 sdl2 QUIET)
- if(PC_SDL2_FOUND)
- set(SDL_VERSION ${PC_SDL2_VERSION})
- else()
- pkg_check_modules(PC_SDL1 sdl QUIET)
- if(PC_SDL1_FOUND)
- set(SDL_VERSION ${PC_SDL1_VERSION})
- endif()
- endif()
+ pkg_check_modules(PC_SDL sdl QUIET)
endif()
-find_path(SDL_INCLUDE_DIR SDL/SDL.h
- PATHS ${PC_SDL2_INCLUDE_DIR} ${PC_SDL1_INCLUDE_DIR})
-find_library(SDL_LIBRARY NAMES SDL2 SDL
- PATHS ${PC_SDL2_LIBDIR} ${PC_SDL1_LIBDIR})
+find_path(SDL_INCLUDE_DIR SDL/SDL.h PATHS ${PC_SDL_INCLUDE_DIR})
+find_library(SDL_LIBRARY NAMES SDL PATHS ${PC_SDL_LIBDIR})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sdl REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR
- VERSION_VAR SDL_VERSION)
+find_package_handle_standard_args(Sdl REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR)
if(SDL_FOUND)
set(SDL_LIBRARIES ${SDL_LIBRARY})
set(SDL_INCLUDE_DIRS ${SDL_INCLUDE_DIR})
set(SDL_DEFINITIONS -DHAVE_SDL=1)
-
- if(SDL_VERSION VERSION_GREATER 2)
- list(APPEND SDL_DEFINITIONS -DHAVE_SDL_VERSION=2)
- elseif(SDL_VERSION VERSION_GREATER 1)
- list(APPEND SDL_DEFINITIONS -DHAVE_SDL_VERSION=1)
- endif()
endif()
mark_as_advanced(SDL_LIBRARY SDL_INCLUDE_DIR)
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index a252519b35..d7d07574e1 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -25,7 +25,6 @@ else()
endif()
endif()
-set(ENABLE_SDL OFF CACHE BOOL "" FORCE)
set(ENABLE_X11 OFF CACHE BOOL "" FORCE)
set(ENABLE_AML OFF CACHE BOOL "" FORCE)
set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
diff --git a/docs/README.armel b/docs/README.armel
index 1174a48070..dce9216b09 100644
--- a/docs/README.armel
+++ b/docs/README.armel
@@ -217,7 +217,7 @@ These are python and liblzo2
For Angstrom:
$ opkg update
- $ opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-image-1.2-dev libsdl-gfx-dev libsdl-mixer-1.2-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev
+ $ opkg install subversion make g++ gcc gawk pmount libtool automake gperf unzip bison libsdl-1.2-dev libsdl-gfx-dev libfribidi-dev liblzo-dev libfreetype-dev libsqlite3-dev libasound2 python-sqlite3 libcurl4 libxrandr-dev libxrender-dev libmysqlclient-dev libpcre-dev libdbus-glib-1-dev hal-dev libfontconfig-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev
Unfortunately this will only install the packages that are available through opkg. There will be further packages that need to be installed.
Either use the method mentioned below, or selectively find and install packages, mentioned at the bottom of this README.
diff --git a/docs/README.linux b/docs/README.linux
index 5f6c1a2281..5e311c7b1c 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 39bceffb2e..b90022a017 100644
--- a/docs/README.opensuse
+++ b/docs/README.opensuse
@@ -51,7 +51,7 @@ Full build dependency list is:
make cmake autoconf automake gcc gcc-c++ libtool gettext-devel patch boost-devel glew-devel
libmysqlclient-devel libass-devel libmpeg2-devel libmad-devel libjpeg-devel libsamplerate-devel libogg-devel
libvorbis-devel libmodplug-devel libcurl-devel flac-devel libbz2-devel libtiff-devel lzo-devel libyajl-devel
-fribidi-devel sqlite3-devel libpng12-devel pcre-devel libcdio-devel libjasper-devel libSDL_mixer-devel libSDL_image-devel
+fribidi-devel sqlite3-devel libpng12-devel pcre-devel libcdio-devel libjasper-devel
libmicrohttpd-devel libsmbclient-devel python-devel gperf zip nasm tinyxml-devel libtag-devel libbluray-devel
libnfs-devel shairplay-devel swig libvdpau-devel libavahi-devel libcec-devel libdvdread-devel libva-devel libplist-devel
libxst-devel alsa-devel libpulse-devel libXrandr-devel libXrender-devel randrproto-devel renderproto-devel libssh-devel
@@ -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 2c34056c67..7abae0cd84 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 7a330cc1d7..ebbe097a93 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 6c6eb5a26a..0000000000
--- 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)
diff --git a/tools/depends/target/libsdl_image/Makefile b/tools/depends/target/libsdl_image/Makefile
deleted file mode 100644
index 41062476a1..0000000000
--- a/tools/depends/target/libsdl_image/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-NATIVE_BUILD=1
-include ../../Makefile.include
-DEPS=Makefile
-
-# lib name, version
-LIBNAME=SDL_image
-VERSION=1.2.7
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) \
- --disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-sdltest
-
-LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME).so
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- echo $(PLATFORM) > .gitignore
- 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)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 1885812dcc..fc781d65b1 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -99,10 +99,8 @@
#include "input/KeyboardLayoutManager.h"
-#if HAVE_SDL_VERSION == 1
+#ifdef HAS_SDL
#include <SDL/SDL.h>
-#elif HAVE_SDL_VERSION == 2
-#include <SDL2/SDL.h>
#endif
#ifdef HAS_UPNP
diff --git a/xbmc/video/Teletext.cpp b/xbmc/video/Teletext.cpp
index b679d58a17..0f8be9a3dd 100644
--- a/xbmc/video/Teletext.cpp
+++ b/xbmc/video/Teletext.cpp
@@ -32,11 +32,6 @@
#include "filesystem/SpecialProtocol.h"
#include "guilib/GraphicContext.h"
-#if HAVE_SDL_VERSION == 1
-#include <SDL/SDL_stdinc.h>
-#elif HAVE_SDL_VERSION == 2
-#include <SDL2/SDL_stdinc.h>
-#else
#define SDL_memset4(dst, val, len) \
do { \
uint32_t _count = (len); \
@@ -53,7 +48,6 @@ do { \
} \
} while(0)
#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len) << 2)
-#endif
static const char *TeletextFont = "special://xbmc/media/Fonts/teletext.ttf";
diff --git a/xbmc/windowing/WinEventsSDL.h b/xbmc/windowing/WinEventsSDL.h
index 6a23658e5a..930db45326 100644
--- a/xbmc/windowing/WinEventsSDL.h
+++ b/xbmc/windowing/WinEventsSDL.h
@@ -25,11 +25,7 @@
#include "system.h"
#ifdef HAS_SDL
-#if HAVE_SDL_VERSION == 1
#include <SDL/SDL_events.h>
-#elif HAVE_SDL_VERSION == 2
-#include <SDL/SDL_events.h>
-#endif
#include "WinEvents.h"
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-06 17:21:59 +0000