Parse XPM without SDL_image
We encounter some problems with SDL2_image on MSYS2 (Windows), so implement our own XPM parsing which does not depend on SDL_image. The input XPM is considered safe (it's in our source repo), so do not check XPM format errors. This implies that read_xpm() is not safe to call on any unsafe input. Although less straightforward, use SDL_CreateRGBSurfaceFrom() instead of SDL_CreateRGBSurfaceWithFormatFrom() because it is available with SDL versions older than 2.0.5.
This commit is contained in:
@@ -7,13 +7,13 @@ This project displays screens of Android devices plugged on USB in live.
|
||||
|
||||
### Runtime requirements
|
||||
|
||||
This projects requires _FFmpeg_, _LibSDL2_, _LibSDL2-image_ and _LibSDL2-net_.
|
||||
This projects requires _FFmpeg_, _LibSDL2_ and _LibSDL2-net_.
|
||||
|
||||
#### Linux
|
||||
|
||||
Install the packages from your package manager. For example, on Debian:
|
||||
|
||||
sudo apt install ffmpeg libsdl2-2.0.0 libsdl2-image-2.0.0 libsdl2-net-2.0.0
|
||||
sudo apt install ffmpeg libsdl2-2.0.0 libsdl2-net-2.0.0
|
||||
|
||||
|
||||
#### Windows
|
||||
@@ -21,7 +21,6 @@ Install the packages from your package manager. For example, on Debian:
|
||||
From [MSYS2]:
|
||||
|
||||
pacman -S mingw-w64-x86_64-SDL2
|
||||
pacman -S mingw-w64-x86_64-SDL2_image
|
||||
pacman -S mingw-w64-x86_64-SDL2_net
|
||||
pacman -S mingw-w64-x86_64-ffmpeg
|
||||
|
||||
@@ -65,7 +64,7 @@ described below.
|
||||
|
||||
sudo apt install make gcc openjdk-8-jdk pkg-config meson zip \
|
||||
libavcodec-dev libavformat-dev libavutil-dev \
|
||||
libsdl2-dev libsdl2-image-dev libsdl2-net-dev
|
||||
libsdl2-dev libsdl2-net-dev
|
||||
|
||||
|
||||
#### Windows
|
||||
|
||||
Reference in New Issue
Block a user