Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDL_Sound: update version #2267

Merged
merged 1 commit into from
Dec 18, 2023
Merged

SDL_Sound: update version #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMake/FetchSDL_Sound.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FetchContent_Declare(
sdlsound_content
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
URL https://github.com/icculus/SDL_sound/archive/1507be95c3605e4fd6a48ea4c527e4aa711a1566.tar.gz
URL_HASH MD5=f945a7330089d1c3490404b4f18fdffd
URL https://github.com/icculus/SDL_sound/archive/c5639414c1bb24fb4eef5861c13adb42a4aab950.tar.gz
URL_HASH MD5=d1037daa0e444efa8a09defaa1a6321f
)

FetchContent_GetProperties(sdlsound_content)
Expand Down
2 changes: 1 addition & 1 deletion Windows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ and SDL2.dll to run.
Official page for SDL_Sound library is https://www.icculus.org/SDL_sound/, but downloads are hosted on github: https://github.com/icculus/SDL_sound/releases.
Any latest 2.0.X release should be good.

For the reference, at the time of writing our build server is using revision 1507be95c3: https://github.com/icculus/SDL_sound/archive/1507be95c3605e4fd6a48ea4c527e4aa711a1566.tar.gz
For the reference, at the time of writing our build server is using revision c5639414c1: https://github.com/icculus/SDL_sound/archive/c5639414c1bb24fb4eef5861c13adb42a4aab950.tar.gz

After you downloaded the source this way or another, you should use CMake to generate MSVS solution from their provided CMakeList.txt.
Note that when doing this you may have to direct CMake to the SDL2's cmake config files. First go to the SDL2's sources location and find "cmake" directory inside. It should contain the file called "sdl2-config.cmake". If the file is not present, this means something is wrong with the SDL2's package, or maybe you've downloaded a way too old version of SDL2.
Expand Down
2 changes: 1 addition & 1 deletion ci/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ RUN curl -fLsS "https://github.com/xiph/theora/archive/refs/tags/v${LIBTHEORA_VE
rm /tmp/libtheora-${LIBTHEORA_VERSION}.tar.gz

# Build and install SDL_sound
ARG SDL2_SOUND_VERSION=1507be95c3605e4fd6a48ea4c527e4aa711a1566
ARG SDL2_SOUND_VERSION=c5639414c1bb24fb4eef5861c13adb42a4aab950
RUN cd /tmp && \
curl -fLsS "https://github.com/icculus/SDL_sound/archive/$SDL2_SOUND_VERSION.tar.gz" --output SDL_sound.tar.gz && \
tar -xvzf SDL_sound.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion ci/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN mkdir Lib\SDL2 && \
echo endif ^(^) >> "Lib\SDL2\sdl2-config.cmake" && \
echo string^(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES^) >> "Lib\SDL2\sdl2-config.cmake"

ARG SDL_SOUND_VERSION=1507be95c3605e4fd6a48ea4c527e4aa711a1566
ARG SDL_SOUND_VERSION=c5639414c1bb24fb4eef5861c13adb42a4aab950
RUN mkdir Lib\SDL_sound && \
echo "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 ^&^& pushd Lib\SDL_sound\build_x86 ^&^& msbuild SDL_sound.sln /p:PlatformToolset=v140 /p:Configuration=Release /p:Platform=Win32 /maxcpucount /nologo ^&^& popd > sdlsoundvcbuild_x86.bat && \
echo "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 ^&^& pushd Lib\SDL_sound\build_x64 ^&^& msbuild SDL_sound.sln /p:PlatformToolset=v140 /p:Configuration=Release /p:Platform=x64 /maxcpucount /nologo ^&^& popd > sdlsoundvcbuild_x64.bat && \
Expand Down
2 changes: 1 addition & 1 deletion debian/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ At the time of writing SDL_Sound `2.*` has just been released, but almost no lin
Until that is resolved, we recommend to clone their repository from https://github.com/icculus/SDL_sound.
Or download particular revision archive using following url:

https://github.com/icculus/SDL_sound/archive/1507be95c3605e4fd6a48ea4c527e4aa711a1566.tar.gz
https://github.com/icculus/SDL_sound/archive/c5639414c1bb24fb4eef5861c13adb42a4aab950.tar.gz

then build and install using CMake (see instructions in the SDL_Sound's docs).

Expand Down
2 changes: 1 addition & 1 deletion libsrc/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ get https://github.com/xiph/vorbis/archive/${LIBVORBIS_VERSION}.tar.gz vorbis.ta
LIBTHEORA_VERSION=7180717276af1ebc7da15c83162d6c5d6203aabf
get https://github.com/xiph/theora/archive/${LIBTHEORA_VERSION}.tar.gz theora.tar.gz

SDLSOUND_VERSION=1507be95c3605e4fd6a48ea4c527e4aa711a1566
SDLSOUND_VERSION=c5639414c1bb24fb4eef5861c13adb42a4aab950
get https://github.com/icculus/SDL_sound/archive/${SDLSOUND_VERSION}.tar.gz SDL_sound.tar.gz

SDL_VERSION=2.28.2
Expand Down
2 changes: 1 addition & 1 deletion libsrc/sha1sums
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
16c7c4844d8b5e8027dfb134d2971746bb1382c3 SDL.tar.gz
d7374080bcb6d346f628c1a59f1492c674558507 SDL_sound.tar.gz
2e9ab24fd861f61349b9386fd66c9851e9f03a60 SDL_sound.tar.gz
8085a94164c1eb6cfab245c5b4306c2d3ec847cd ogg.tar.gz
beaeae25bc7ace77007f42c33e0b0fa74acf4992 theora.tar.gz
76f06629562d52a9539818f3b78722fbc9e19ddb vorbis.tar.gz
Expand Down