Switch linux to packaged SDL2 2.0.2. Fixes #5228.

This commit is contained in:
Paul Chote
2014-05-01 22:37:52 +12:00
parent 39daddfc4c
commit 189f23e442
6 changed files with 12 additions and 23 deletions

View File

@@ -3,7 +3,7 @@ Version: {VERSION}
Architecture: all
Maintainer: Chris Forbes <chrisf@ijw.co.nz>
Installed-Size: {SIZE}
Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri
Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri
Section: games
Priority: extra
Homepage: http://www.open-ra.org/

View File

@@ -7,7 +7,7 @@ arch=('any')
url="http://open-ra.org"
license=('GPL3')
groups=()
depends=('mono' 'openal' 'mesa' 'freetype2' 'sdl')
depends=('mono' 'openal' 'mesa' 'freetype2' 'glibc' 'alsa-lib')
makedepends=('git' 'unzip' 'wget')
optdepends=('gksu: Elevation for installing game packages on Gnome platforms'
'kdesudo: Elevation for installing game packages on KDE platforms')

View File

@@ -14,10 +14,15 @@ Group: Amusements/Games
Packager: Matthias Mailänder <matthias@mailaender.name>
Requires: mono-core
Requires: mono-winforms
Requires: SDL
Requires: openal
Requires: libfreetype.so.6
Requires: libSDL2-2.0.so.0
Requires: libasound.so.2
Requires: libc.so.6
Requires: libdl.so.2
Requires: libm.so.6
Requires: libpthread.so.0
Requires: librt.so.1
Prefix: /usr
Source: %{name}-%{version}.tar.gz
BuildRoot: /tmp/openra

View File

@@ -1,22 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<dllmap dll="SDL2.dll" os="windows" target="SDL2.dll"/>
<dllmap dll="SDL2.dll" os="osx" target="libSDL2.dylib"/>
<dllmap dll="SDL2.dll" os="linux" target="libSDL2-2.0.so.0"/>
<dllmap dll="SDL2_image.dll" os="windows" target="SDL2_image.dll"/>
<dllmap dll="SDL2_image.dll" os="osx" target="libSDL2_image-2.0.0.dylib"/>
<dllmap dll="SDL2_image.dll" os="linux" target="libSDL2_image-2.0.so.0"/>
<dllmap dll="SDL2_mixer.dll" os="windows" target="SDL2_mixer.dll"/>
<dllmap dll="SDL2_mixer.dll" os="osx" target="libSDL2_mixer-2.0.0.dylib"/>
<dllmap dll="SDL2_mixer.dll" os="linux" target="libSDL2_mixer-2.0.so.0"/>
<dllmap dll="SDL2_ttf.dll" os="windows" target="SDL2_ttf.dll"/>
<dllmap dll="SDL2_ttf.dll" os="osx" target="libSDL2_ttf-2.0.0.dylib"/>
<dllmap dll="SDL2_ttf.dll" os="linux" target="libSDL2_ttf-2.0.so.0"/>
<dllmap dll="soft_oal.dll" os="windows" target="soft_oal.dll"/>
<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib"/>
<dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
<dllmap os="linux" dll="SDL2.dll" cpu="x86" target="libSDL232.2.0.2.so" />
<dllmap os="linux" dll="SDL2.dll" cpu="x86-64" target="libSDL264.2.0.2.so" />
</configuration>

BIN
thirdparty/linux/libSDL232.2.0.2.so vendored Executable file

Binary file not shown.

BIN
thirdparty/linux/libSDL264.2.0.2.so vendored Executable file

Binary file not shown.