diff --git a/libs/SDL2_mixer/CHANGES.txt b/libs/SDL2_mixer/CHANGES.txt
index 7760ddfe33b4abb709da995ab957bece3522850c..1c99deb8ed1f16397e8a03ced510c176d5cd34db 100644
--- a/libs/SDL2_mixer/CHANGES.txt
+++ b/libs/SDL2_mixer/CHANGES.txt
@@ -1,15 +1,3 @@
-2.0.4:
-Ozkan Sezer - Wed, 10 Oct 2018 14:56:10
- * Removed smpeg support for mp3 music, now that it's replaced by libmpg123
-Ozkan Sezer - Sun, 07 Oct 2018 08:50:02
- * Fixed mp3 mad decoder to skip tags, which otherwise would lead to crashes
-Ozkan Sezer - Fri, 15 Jun 2018 05:32:56
- * Added support for Opus music playback using opusfile library
-
-2.0.3:
-Sam Lantinga - Thu, Mar 1, 2018 9:06:58 AM
- * Fixed regression where Mix_Init() would return 0 for available music formats
-
2.0.2:
Sam Lantinga - Fri Oct 20 22:04:50 PDT 2017
* Implemented 24-bit and surround sound support for FLAC audio files
diff --git a/libs/SDL2_mixer/COPYING.txt b/libs/SDL2_mixer/COPYING.txt
index 234a5a5efd51fd6fca18282cabff68d893cda6ab..056d0f35256b07c9f108233e1fa28c187dd9998f 100644
--- a/libs/SDL2_mixer/COPYING.txt
+++ b/libs/SDL2_mixer/COPYING.txt
@@ -1,6 +1,6 @@
/*
SDL_mixer: An audio mixer library based on the SDL library
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/libs/SDL2_mixer/README.txt b/libs/SDL2_mixer/README.txt
index a639c37bc6f09c7ce2ce6ea16376e6ff4a5dfd42..14de6e002567608d39d64f0ac268fe40af44158e 100644
--- a/libs/SDL2_mixer/README.txt
+++ b/libs/SDL2_mixer/README.txt
@@ -14,7 +14,7 @@ for documentation on this mixer library.
The mixer can currently load Microsoft WAVE files and Creative Labs VOC
files as audio samples, it can load FLAC files with libFLAC, it can load
Ogg Vorbis files with Ogg Vorbis or Tremor libraries, it can load MP3 files
-using mpg123 or libmad, and it can load MIDI files with Timidity,
+using mpg123, SMPEG or libmad, and it can load MIDI files with Timidity,
FluidSynth, and natively on Windows, Mac OSX, and Linux, and finally it can
load the following file formats via ModPlug or MikMod: .MOD .S3M .IT .XM.
diff --git a/libs/SDL2_mixer/SRB2NOTE.txt b/libs/SDL2_mixer/SRB2NOTE.txt
deleted file mode 100644
index 7053c44f66de850cde4d6448797dc6a443e29f4b..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/SRB2NOTE.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# SDL Mixer Development Libaries
-
-Download both the VC and MinGW packages and extract them here.
-
-https://www.libsdl.org/projects/SDL_mixer/
-
-## VC Package
-
-* include
-* lib
-
-## MinGW Package
-
-* i686-w64-mingw32
-* x86_64-w64-mingw32
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.FLAC.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.FLAC.txt
index 2e67b77cbb6ed89bd8c78b5d6a7f8e43974bf6f2..94fd3aa692d3d4759fec1b13522d5db404e4508b 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.FLAC.txt
+++ b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.FLAC.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.modplug.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.modplug.txt
index a89532db83cd3b7fa8575b38ce08065e92132856..59fbf826c3b3a602bec0a23e347202be0f618aba 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.modplug.txt
+++ b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.modplug.txt
@@ -1,5 +1 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
ModPlug-XMMS and libmodplug are now in the public domain.
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.mpg123.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.mpg123.txt
index 2111cd79fafac286df4728c833cc0268c960e328..d7bb85fc3be6d8a00bc8e875569d30deb9f0dceb 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.mpg123.txt
+++ b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.mpg123.txt
@@ -1,7 +1,3 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
Main message, to include in "About ..." boxes, etc:
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.ogg-vorbis.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
index 6456dc4ed17fb4de76e4f19318de3c0021b63684..c2cb6d56eb51b788c61183f83133283f22383926 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
+++ b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_image/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (c) 2002-2008 Xiph.org Foundation
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opus.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opus.txt
deleted file mode 100644
index adb56a854b6eff6d2afa846d13d38128e62c40c6..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opus.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
- Jean-Marc Valin, Timothy B. Terriberry,
- CSIRO, Gregory Maxwell, Mark Borgerding,
- Erik de Castro Lopo
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opusfile.txt b/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opusfile.txt
deleted file mode 100644
index dfc9681fcf54ba50bc0ee265bdc1ed9386840846..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/i686-w64-mingw32/bin/LICENSE.opusfile.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.Org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/SDL2_mixer.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/SDL2_mixer.dll
index 96abfa1ab759933e80342a202f1b80928d14858d..54ebbb1d48d0fbc7300678d5368ebb57ad493795 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/SDL2_mixer.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/SDL2_mixer.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libFLAC-8.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libFLAC-8.dll
index b56ea2a8c3d9fea131c88d0d3f6c3419b8e01166..1c55ad4966a52c673e54be638bf97196ad7bf2fa 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libFLAC-8.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libFLAC-8.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libmodplug-1.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libmodplug-1.dll
index d66a317ddfe8d56309ff2e63fe66d62edb68a710..a2cba0d6b5cf20d7fa854a1c698dfc1b2b45d714 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libmodplug-1.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libmodplug-1.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libmpg123-0.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libmpg123-0.dll
index 240298bbfc04835998085ab5054ee5111e83c702..ca7de300d7db8875d19fc379dd36a37504bd70ca 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libmpg123-0.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libmpg123-0.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libogg-0.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libogg-0.dll
index 233c0f42a8379b75b3aeb681436519379079fa8e..3abe6ebfca1a9a96b2b679aa971302dcb5f66743 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libogg-0.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libogg-0.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libopus-0.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libopus-0.dll
deleted file mode 100644
index 94ea541d283adca154b853671e78101ad2625c90..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libopus-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libopusfile-0.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libopusfile-0.dll
deleted file mode 100644
index 260796b6aa5a7da89c729a465141d8ff7036695b..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libopusfile-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbis-0.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbis-0.dll
index 4e4aaa543b55575edb1bda0d6c1c5dd341a7727f..4e44ef0886511997ef9f14a2a3a49b3b5291c336 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbis-0.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbis-0.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbisfile-3.dll b/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbisfile-3.dll
index 5d90a235c988cb15b0f9dc2deb7b065a25b47f2e..e757eb6ded42f8a14b0e3cdb1ad4b76a4fac6f12 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbisfile-3.dll and b/libs/SDL2_mixer/i686-w64-mingw32/bin/libvorbisfile-3.dll differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/include/SDL2/SDL_mixer.h b/libs/SDL2_mixer/i686-w64-mingw32/include/SDL2/SDL_mixer.h
index 009d8a2da6725c58c87a11b09e08ee5bc8e6a2da..cbb8ae6b65ad8325c961f3fc664e6fd8a1bbfd6f 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/include/SDL2/SDL_mixer.h
+++ b/libs/SDL2_mixer/i686-w64-mingw32/include/SDL2/SDL_mixer.h
@@ -1,6 +1,6 @@
/*
SDL_mixer: An audio mixer library based on the SDL library
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -38,7 +38,7 @@ extern "C" {
*/
#define SDL_MIXER_MAJOR_VERSION 2
#define SDL_MIXER_MINOR_VERSION 0
-#define SDL_MIXER_PATCHLEVEL 4
+#define SDL_MIXER_PATCHLEVEL 2
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_mixer library.
@@ -80,8 +80,7 @@ typedef enum
MIX_INIT_MOD = 0x00000002,
MIX_INIT_MP3 = 0x00000008,
MIX_INIT_OGG = 0x00000010,
- MIX_INIT_MID = 0x00000020,
- MIX_INIT_OPUS = 0x00000040
+ MIX_INIT_MID = 0x00000020
} MIX_InitFlags;
/* Loads dynamic libraries and prepares them for use. Flags should be
@@ -135,8 +134,7 @@ typedef enum {
MUS_MP3,
MUS_MP3_MAD_UNUSED,
MUS_FLAC,
- MUS_MODPLUG_UNUSED,
- MUS_OPUS
+ MUS_MODPLUG_UNUSED
} Mix_MusicType;
/* The internal format for a music chunk interpreted via mikmod */
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.a b/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.a
index 5c780be5148ee4805f223a3c96d636098608e65c..9cc3ed19c47a87da0addd390ee03268bb186407d 100644
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.a and b/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.a differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.dll.a b/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.dll.a
index ac90388f2af7c0bc6ff1008b2bc3d210517539fb..6b63de0ee7b7ddfb5f3e716f6340c08546957219 100755
Binary files a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.dll.a and b/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.dll.a differ
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.la b/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.la
deleted file mode 100644
index f8179ea8cd40a65ca0e80c40dd8565a53a7e1af4..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/i686-w64-mingw32/lib/libSDL2_mixer.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libSDL2_mixer.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='../bin/SDL2_mixer.dll'
-
-# Names of this library.
-library_names='libSDL2_mixer.dll.a'
-
-# The name of the static archive.
-old_library='libSDL2_mixer.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/opt/local/i686-w64-mingw32/lib -lmingw32 /opt/local/i686-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libSDL2_mixer.
-current=2
-age=2
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/Users/valve/release/SDL_mixer/SDL2_mixer-2.0.4/i686-w64-mingw32/lib'
diff --git a/libs/SDL2_mixer/i686-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc b/libs/SDL2_mixer/i686-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
index 0b8410993f73f82ff7d6f8f93f1c8e2721e049fb..76ba57fab61143f0ca31ff68d1193522b44239cf 100644
--- a/libs/SDL2_mixer/i686-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
+++ b/libs/SDL2_mixer/i686-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
@@ -1,11 +1,11 @@
-prefix=/opt/local/i686-w64-mingw32
+prefix=/usr/local/i686-w64-mingw32
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: SDL2_mixer
Description: mixer library for Simple DirectMedia Layer
-Version: 2.0.4
+Version: 2.0.2
Requires: sdl2 >= 2.0.7
Libs: -L${libdir} -lSDL2_mixer
Cflags: -I${includedir}/SDL2
diff --git a/libs/SDL2_mixer/include/SDL_mixer.h b/libs/SDL2_mixer/include/SDL_mixer.h
index 009d8a2da6725c58c87a11b09e08ee5bc8e6a2da..cbb8ae6b65ad8325c961f3fc664e6fd8a1bbfd6f 100644
--- a/libs/SDL2_mixer/include/SDL_mixer.h
+++ b/libs/SDL2_mixer/include/SDL_mixer.h
@@ -1,6 +1,6 @@
/*
SDL_mixer: An audio mixer library based on the SDL library
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -38,7 +38,7 @@ extern "C" {
*/
#define SDL_MIXER_MAJOR_VERSION 2
#define SDL_MIXER_MINOR_VERSION 0
-#define SDL_MIXER_PATCHLEVEL 4
+#define SDL_MIXER_PATCHLEVEL 2
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_mixer library.
@@ -80,8 +80,7 @@ typedef enum
MIX_INIT_MOD = 0x00000002,
MIX_INIT_MP3 = 0x00000008,
MIX_INIT_OGG = 0x00000010,
- MIX_INIT_MID = 0x00000020,
- MIX_INIT_OPUS = 0x00000040
+ MIX_INIT_MID = 0x00000020
} MIX_InitFlags;
/* Loads dynamic libraries and prepares them for use. Flags should be
@@ -135,8 +134,7 @@ typedef enum {
MUS_MP3,
MUS_MP3_MAD_UNUSED,
MUS_FLAC,
- MUS_MODPLUG_UNUSED,
- MUS_OPUS
+ MUS_MODPLUG_UNUSED
} Mix_MusicType;
/* The internal format for a music chunk interpreted via mikmod */
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.FLAC.txt b/libs/SDL2_mixer/lib/x64/LICENSE.FLAC.txt
index 2e67b77cbb6ed89bd8c78b5d6a7f8e43974bf6f2..94fd3aa692d3d4759fec1b13522d5db404e4508b 100644
--- a/libs/SDL2_mixer/lib/x64/LICENSE.FLAC.txt
+++ b/libs/SDL2_mixer/lib/x64/LICENSE.FLAC.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.modplug.txt b/libs/SDL2_mixer/lib/x64/LICENSE.modplug.txt
index a89532db83cd3b7fa8575b38ce08065e92132856..59fbf826c3b3a602bec0a23e347202be0f618aba 100644
--- a/libs/SDL2_mixer/lib/x64/LICENSE.modplug.txt
+++ b/libs/SDL2_mixer/lib/x64/LICENSE.modplug.txt
@@ -1,5 +1 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
ModPlug-XMMS and libmodplug are now in the public domain.
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.mpg123.txt b/libs/SDL2_mixer/lib/x64/LICENSE.mpg123.txt
index 2111cd79fafac286df4728c833cc0268c960e328..d7bb85fc3be6d8a00bc8e875569d30deb9f0dceb 100644
--- a/libs/SDL2_mixer/lib/x64/LICENSE.mpg123.txt
+++ b/libs/SDL2_mixer/lib/x64/LICENSE.mpg123.txt
@@ -1,7 +1,3 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
Main message, to include in "About ..." boxes, etc:
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.ogg-vorbis.txt b/libs/SDL2_mixer/lib/x64/LICENSE.ogg-vorbis.txt
index 6456dc4ed17fb4de76e4f19318de3c0021b63684..c2cb6d56eb51b788c61183f83133283f22383926 100644
--- a/libs/SDL2_mixer/lib/x64/LICENSE.ogg-vorbis.txt
+++ b/libs/SDL2_mixer/lib/x64/LICENSE.ogg-vorbis.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_image/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (c) 2002-2008 Xiph.org Foundation
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.opus.txt b/libs/SDL2_mixer/lib/x64/LICENSE.opus.txt
deleted file mode 100644
index adb56a854b6eff6d2afa846d13d38128e62c40c6..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/lib/x64/LICENSE.opus.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
- Jean-Marc Valin, Timothy B. Terriberry,
- CSIRO, Gregory Maxwell, Mark Borgerding,
- Erik de Castro Lopo
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
diff --git a/libs/SDL2_mixer/lib/x64/LICENSE.opusfile.txt b/libs/SDL2_mixer/lib/x64/LICENSE.opusfile.txt
deleted file mode 100644
index dfc9681fcf54ba50bc0ee265bdc1ed9386840846..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/lib/x64/LICENSE.opusfile.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.Org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/SDL2_mixer/lib/x64/SDL2_mixer.dll b/libs/SDL2_mixer/lib/x64/SDL2_mixer.dll
old mode 100644
new mode 100755
index 40bb1c14638d0cd2e0cd3b00ceee416326fcd3ed..116bb1df6f93e2afddac4d97269348f4e1531528
Binary files a/libs/SDL2_mixer/lib/x64/SDL2_mixer.dll and b/libs/SDL2_mixer/lib/x64/SDL2_mixer.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/SDL2_mixer.lib b/libs/SDL2_mixer/lib/x64/SDL2_mixer.lib
old mode 100644
new mode 100755
diff --git a/libs/SDL2_mixer/lib/x64/libFLAC-8.dll b/libs/SDL2_mixer/lib/x64/libFLAC-8.dll
old mode 100644
new mode 100755
index 71f2e19d9cac86400bcfb3bb68a659b9773925ad..b5603902d5ff26bc57d0f0025757b6f0d28a06a4
Binary files a/libs/SDL2_mixer/lib/x64/libFLAC-8.dll and b/libs/SDL2_mixer/lib/x64/libFLAC-8.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/libmodplug-1.dll b/libs/SDL2_mixer/lib/x64/libmodplug-1.dll
old mode 100644
new mode 100755
index 7c0512674e8e43019777928ca42aca50081a8795..31509378b5078d6b24c0b0a435a8d8dba7a94b2c
Binary files a/libs/SDL2_mixer/lib/x64/libmodplug-1.dll and b/libs/SDL2_mixer/lib/x64/libmodplug-1.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/libmpg123-0.dll b/libs/SDL2_mixer/lib/x64/libmpg123-0.dll
old mode 100644
new mode 100755
index c7809b163f5e1d305341bba3e65874efac205792..d222d2dc500d2ab30b18a8dfa139ad71fa3dccfe
Binary files a/libs/SDL2_mixer/lib/x64/libmpg123-0.dll and b/libs/SDL2_mixer/lib/x64/libmpg123-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/libogg-0.dll b/libs/SDL2_mixer/lib/x64/libogg-0.dll
old mode 100644
new mode 100755
index 51334815979b8fe3a74fa39c3cc54eb4cd70c6ce..7b94e60325918c92b4b764cb738dd8f5c0c3379a
Binary files a/libs/SDL2_mixer/lib/x64/libogg-0.dll and b/libs/SDL2_mixer/lib/x64/libogg-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/libopus-0.dll b/libs/SDL2_mixer/lib/x64/libopus-0.dll
deleted file mode 100644
index 9ba6c3860c6daa71ae9646f01b43003dac3798f0..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/lib/x64/libopus-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/lib/x64/libopusfile-0.dll b/libs/SDL2_mixer/lib/x64/libopusfile-0.dll
deleted file mode 100644
index 97a88b6108980d2450acd66cb36193e4cfbaa30a..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/lib/x64/libopusfile-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/lib/x64/libvorbis-0.dll b/libs/SDL2_mixer/lib/x64/libvorbis-0.dll
old mode 100644
new mode 100755
index f5ae1bf754671625ec44f9992efb55e0ad5c2dec..8d8d6537b1fc243e1926ec03a7be842b6a5d6fed
Binary files a/libs/SDL2_mixer/lib/x64/libvorbis-0.dll and b/libs/SDL2_mixer/lib/x64/libvorbis-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x64/libvorbisfile-3.dll b/libs/SDL2_mixer/lib/x64/libvorbisfile-3.dll
old mode 100644
new mode 100755
index d0787368a3e30fd363c1324423c78d7e06add0be..08f8f7aa82ede72a588bb10daef73cd94dad137b
Binary files a/libs/SDL2_mixer/lib/x64/libvorbisfile-3.dll and b/libs/SDL2_mixer/lib/x64/libvorbisfile-3.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.FLAC.txt b/libs/SDL2_mixer/lib/x86/LICENSE.FLAC.txt
index 2e67b77cbb6ed89bd8c78b5d6a7f8e43974bf6f2..94fd3aa692d3d4759fec1b13522d5db404e4508b 100644
--- a/libs/SDL2_mixer/lib/x86/LICENSE.FLAC.txt
+++ b/libs/SDL2_mixer/lib/x86/LICENSE.FLAC.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.modplug.txt b/libs/SDL2_mixer/lib/x86/LICENSE.modplug.txt
index a89532db83cd3b7fa8575b38ce08065e92132856..59fbf826c3b3a602bec0a23e347202be0f618aba 100644
--- a/libs/SDL2_mixer/lib/x86/LICENSE.modplug.txt
+++ b/libs/SDL2_mixer/lib/x86/LICENSE.modplug.txt
@@ -1,5 +1 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
ModPlug-XMMS and libmodplug are now in the public domain.
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.mpg123.txt b/libs/SDL2_mixer/lib/x86/LICENSE.mpg123.txt
index 2111cd79fafac286df4728c833cc0268c960e328..d7bb85fc3be6d8a00bc8e875569d30deb9f0dceb 100644
--- a/libs/SDL2_mixer/lib/x86/LICENSE.mpg123.txt
+++ b/libs/SDL2_mixer/lib/x86/LICENSE.mpg123.txt
@@ -1,7 +1,3 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
Main message, to include in "About ..." boxes, etc:
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.ogg-vorbis.txt b/libs/SDL2_mixer/lib/x86/LICENSE.ogg-vorbis.txt
index 6456dc4ed17fb4de76e4f19318de3c0021b63684..c2cb6d56eb51b788c61183f83133283f22383926 100644
--- a/libs/SDL2_mixer/lib/x86/LICENSE.ogg-vorbis.txt
+++ b/libs/SDL2_mixer/lib/x86/LICENSE.ogg-vorbis.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_image/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (c) 2002-2008 Xiph.org Foundation
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.opus.txt b/libs/SDL2_mixer/lib/x86/LICENSE.opus.txt
deleted file mode 100644
index adb56a854b6eff6d2afa846d13d38128e62c40c6..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/lib/x86/LICENSE.opus.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
- Jean-Marc Valin, Timothy B. Terriberry,
- CSIRO, Gregory Maxwell, Mark Borgerding,
- Erik de Castro Lopo
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
diff --git a/libs/SDL2_mixer/lib/x86/LICENSE.opusfile.txt b/libs/SDL2_mixer/lib/x86/LICENSE.opusfile.txt
deleted file mode 100644
index dfc9681fcf54ba50bc0ee265bdc1ed9386840846..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/lib/x86/LICENSE.opusfile.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.Org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/SDL2_mixer/lib/x86/SDL2_mixer.dll b/libs/SDL2_mixer/lib/x86/SDL2_mixer.dll
old mode 100644
new mode 100755
index 96abfa1ab759933e80342a202f1b80928d14858d..54ebbb1d48d0fbc7300678d5368ebb57ad493795
Binary files a/libs/SDL2_mixer/lib/x86/SDL2_mixer.dll and b/libs/SDL2_mixer/lib/x86/SDL2_mixer.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/SDL2_mixer.lib b/libs/SDL2_mixer/lib/x86/SDL2_mixer.lib
old mode 100644
new mode 100755
diff --git a/libs/SDL2_mixer/lib/x86/libFLAC-8.dll b/libs/SDL2_mixer/lib/x86/libFLAC-8.dll
old mode 100644
new mode 100755
index b56ea2a8c3d9fea131c88d0d3f6c3419b8e01166..1c55ad4966a52c673e54be638bf97196ad7bf2fa
Binary files a/libs/SDL2_mixer/lib/x86/libFLAC-8.dll and b/libs/SDL2_mixer/lib/x86/libFLAC-8.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/libmodplug-1.dll b/libs/SDL2_mixer/lib/x86/libmodplug-1.dll
old mode 100644
new mode 100755
index d66a317ddfe8d56309ff2e63fe66d62edb68a710..a2cba0d6b5cf20d7fa854a1c698dfc1b2b45d714
Binary files a/libs/SDL2_mixer/lib/x86/libmodplug-1.dll and b/libs/SDL2_mixer/lib/x86/libmodplug-1.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/libmpg123-0.dll b/libs/SDL2_mixer/lib/x86/libmpg123-0.dll
old mode 100644
new mode 100755
index 240298bbfc04835998085ab5054ee5111e83c702..ca7de300d7db8875d19fc379dd36a37504bd70ca
Binary files a/libs/SDL2_mixer/lib/x86/libmpg123-0.dll and b/libs/SDL2_mixer/lib/x86/libmpg123-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/libogg-0.dll b/libs/SDL2_mixer/lib/x86/libogg-0.dll
old mode 100644
new mode 100755
index 233c0f42a8379b75b3aeb681436519379079fa8e..3abe6ebfca1a9a96b2b679aa971302dcb5f66743
Binary files a/libs/SDL2_mixer/lib/x86/libogg-0.dll and b/libs/SDL2_mixer/lib/x86/libogg-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/libopus-0.dll b/libs/SDL2_mixer/lib/x86/libopus-0.dll
deleted file mode 100644
index 94ea541d283adca154b853671e78101ad2625c90..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/lib/x86/libopus-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/lib/x86/libopusfile-0.dll b/libs/SDL2_mixer/lib/x86/libopusfile-0.dll
deleted file mode 100644
index 260796b6aa5a7da89c729a465141d8ff7036695b..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/lib/x86/libopusfile-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/lib/x86/libvorbis-0.dll b/libs/SDL2_mixer/lib/x86/libvorbis-0.dll
old mode 100644
new mode 100755
index 4e4aaa543b55575edb1bda0d6c1c5dd341a7727f..4e44ef0886511997ef9f14a2a3a49b3b5291c336
Binary files a/libs/SDL2_mixer/lib/x86/libvorbis-0.dll and b/libs/SDL2_mixer/lib/x86/libvorbis-0.dll differ
diff --git a/libs/SDL2_mixer/lib/x86/libvorbisfile-3.dll b/libs/SDL2_mixer/lib/x86/libvorbisfile-3.dll
old mode 100644
new mode 100755
index 5d90a235c988cb15b0f9dc2deb7b065a25b47f2e..e757eb6ded42f8a14b0e3cdb1ad4b76a4fac6f12
Binary files a/libs/SDL2_mixer/lib/x86/libvorbisfile-3.dll and b/libs/SDL2_mixer/lib/x86/libvorbisfile-3.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.FLAC.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.FLAC.txt
index 2e67b77cbb6ed89bd8c78b5d6a7f8e43974bf6f2..94fd3aa692d3d4759fec1b13522d5db404e4508b 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.FLAC.txt
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.FLAC.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.modplug.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.modplug.txt
index a89532db83cd3b7fa8575b38ce08065e92132856..59fbf826c3b3a602bec0a23e347202be0f618aba 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.modplug.txt
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.modplug.txt
@@ -1,5 +1 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
ModPlug-XMMS and libmodplug are now in the public domain.
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.mpg123.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.mpg123.txt
index 2111cd79fafac286df4728c833cc0268c960e328..d7bb85fc3be6d8a00bc8e875569d30deb9f0dceb 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.mpg123.txt
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.mpg123.txt
@@ -1,7 +1,3 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
Main message, to include in "About ..." boxes, etc:
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.ogg-vorbis.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
index 6456dc4ed17fb4de76e4f19318de3c0021b63684..c2cb6d56eb51b788c61183f83133283f22383926 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.ogg-vorbis.txt
@@ -1,5 +1,5 @@
The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_image/file/default/external
+http://www.libsdl.org/projects/SDL_mixer/libs/
---
Copyright (c) 2002-2008 Xiph.org Foundation
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opus.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opus.txt
deleted file mode 100644
index adb56a854b6eff6d2afa846d13d38128e62c40c6..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opus.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
- Jean-Marc Valin, Timothy B. Terriberry,
- CSIRO, Gregory Maxwell, Mark Borgerding,
- Erik de Castro Lopo
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Opus is subject to the royalty-free patent licenses which are
-specified at:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opusfile.txt b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opusfile.txt
deleted file mode 100644
index dfc9681fcf54ba50bc0ee265bdc1ed9386840846..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/LICENSE.opusfile.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The source code to this library used with SDL_mixer can be found here:
-https://hg.libsdl.org/SDL_mixer/file/default/external
----
-
-Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.Org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/SDL2_mixer.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/SDL2_mixer.dll
index 40bb1c14638d0cd2e0cd3b00ceee416326fcd3ed..116bb1df6f93e2afddac4d97269348f4e1531528 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/SDL2_mixer.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/SDL2_mixer.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libFLAC-8.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libFLAC-8.dll
index 71f2e19d9cac86400bcfb3bb68a659b9773925ad..b5603902d5ff26bc57d0f0025757b6f0d28a06a4 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libFLAC-8.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libFLAC-8.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmodplug-1.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmodplug-1.dll
index 7c0512674e8e43019777928ca42aca50081a8795..31509378b5078d6b24c0b0a435a8d8dba7a94b2c 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmodplug-1.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmodplug-1.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmpg123-0.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmpg123-0.dll
index c7809b163f5e1d305341bba3e65874efac205792..d222d2dc500d2ab30b18a8dfa139ad71fa3dccfe 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmpg123-0.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libmpg123-0.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libogg-0.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libogg-0.dll
index 51334815979b8fe3a74fa39c3cc54eb4cd70c6ce..7b94e60325918c92b4b764cb738dd8f5c0c3379a 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libogg-0.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libogg-0.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopus-0.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopus-0.dll
deleted file mode 100644
index 9ba6c3860c6daa71ae9646f01b43003dac3798f0..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopus-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopusfile-0.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopusfile-0.dll
deleted file mode 100644
index 97a88b6108980d2450acd66cb36193e4cfbaa30a..0000000000000000000000000000000000000000
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libopusfile-0.dll and /dev/null differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbis-0.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbis-0.dll
index f5ae1bf754671625ec44f9992efb55e0ad5c2dec..8d8d6537b1fc243e1926ec03a7be842b6a5d6fed 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbis-0.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbis-0.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbisfile-3.dll b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbisfile-3.dll
index d0787368a3e30fd363c1324423c78d7e06add0be..08f8f7aa82ede72a588bb10daef73cd94dad137b 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbisfile-3.dll and b/libs/SDL2_mixer/x86_64-w64-mingw32/bin/libvorbisfile-3.dll differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2/SDL_mixer.h b/libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2/SDL_mixer.h
index 009d8a2da6725c58c87a11b09e08ee5bc8e6a2da..cbb8ae6b65ad8325c961f3fc664e6fd8a1bbfd6f 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2/SDL_mixer.h
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2/SDL_mixer.h
@@ -1,6 +1,6 @@
/*
SDL_mixer: An audio mixer library based on the SDL library
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -38,7 +38,7 @@ extern "C" {
*/
#define SDL_MIXER_MAJOR_VERSION 2
#define SDL_MIXER_MINOR_VERSION 0
-#define SDL_MIXER_PATCHLEVEL 4
+#define SDL_MIXER_PATCHLEVEL 2
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_mixer library.
@@ -80,8 +80,7 @@ typedef enum
MIX_INIT_MOD = 0x00000002,
MIX_INIT_MP3 = 0x00000008,
MIX_INIT_OGG = 0x00000010,
- MIX_INIT_MID = 0x00000020,
- MIX_INIT_OPUS = 0x00000040
+ MIX_INIT_MID = 0x00000020
} MIX_InitFlags;
/* Loads dynamic libraries and prepares them for use. Flags should be
@@ -135,8 +134,7 @@ typedef enum {
MUS_MP3,
MUS_MP3_MAD_UNUSED,
MUS_FLAC,
- MUS_MODPLUG_UNUSED,
- MUS_OPUS
+ MUS_MODPLUG_UNUSED
} Mix_MusicType;
/* The internal format for a music chunk interpreted via mikmod */
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.a b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.a
index b6483716ebd9dc29a36426d08b618c6f4caa563b..7d39a1f6360a2221f689c06bf4245694d7649031 100644
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.a and b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.a differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.dll.a b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.dll.a
index 82a4bef080902ad394f7bed9b2506c1cf6e3906a..d812f5c85acfe1a72901963c0a030e48f202071b 100755
Binary files a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.dll.a and b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.dll.a differ
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.la b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.la
deleted file mode 100644
index dba212c5a1ce6f6e270904d2d5f62a3914dc903e..0000000000000000000000000000000000000000
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/libSDL2_mixer.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libSDL2_mixer.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='../bin/SDL2_mixer.dll'
-
-# Names of this library.
-library_names='libSDL2_mixer.dll.a'
-
-# The name of the static archive.
-old_library='libSDL2_mixer.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/opt/local/x86_64-w64-mingw32/lib -lmingw32 /opt/local/x86_64-w64-mingw32/lib/libSDL2.la -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -lwinmm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libSDL2_mixer.
-current=2
-age=2
-revision=2
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/Users/valve/release/SDL_mixer/SDL2_mixer-2.0.4/x86_64-w64-mingw32/lib'
diff --git a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
index b7984169ff65c983662c4d618d79227a01740795..56c30ccfe773f6ed0c7ff160a3f59037a3e3f3ba 100644
--- a/libs/SDL2_mixer/x86_64-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
+++ b/libs/SDL2_mixer/x86_64-w64-mingw32/lib/pkgconfig/SDL2_mixer.pc
@@ -1,11 +1,11 @@
-prefix=/opt/local/x86_64-w64-mingw32
+prefix=/usr/local/x86_64-w64-mingw32
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: SDL2_mixer
Description: mixer library for Simple DirectMedia Layer
-Version: 2.0.4
+Version: 2.0.2
Requires: sdl2 >= 2.0.7
Libs: -L${libdir} -lSDL2_mixer
Cflags: -I${includedir}/SDL2