From 9d9e5bfa85cdd1859a3501993220f30f7faade36 Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev <0x416b617269@gmail.com> Date: Sat, 23 Dec 2017 03:44:44 +0200 Subject: [sdl2] build with libsamplerate support --- src/sdl2-1-fixes.patch | 25 ++++++++++++++++++++++--- src/sdl2.mk | 6 ++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/sdl2-1-fixes.patch b/src/sdl2-1-fixes.patch index e25fcd9..0fae560 100644 --- a/src/sdl2-1-fixes.patch +++ b/src/sdl2-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Robert Norris Date: Sat, 28 Mar 2015 21:47:00 +0100 -Subject: [PATCH 1/3] disable DirectInput because of missing wbemcli.h +Subject: [PATCH 1/4] disable DirectInput because of missing wbemcli.h This patch has been taken from: https://bugzilla.libsdl.org/show_bug.cgi?id=1739 @@ -27,7 +27,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sat, 28 Mar 2015 21:47:32 +0100 -Subject: [PATCH 2/3] fix shared build, libtool +Subject: [PATCH 2/4] fix shared build, libtool This patch is a combination of 2 patches from: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 @@ -81,7 +81,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Charlemagne Lasse Date: Mon, 6 Nov 2017 11:04:46 +0100 -Subject: [PATCH 3/3] Revert "Don't use the system OpenGL headers, ever." +Subject: [PATCH 3/4] Revert "Don't use the system OpenGL headers, ever." Bug-MXE: https://github.com/mxe/mxe/issues/1961 Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=3944 @@ -2279,3 +2279,22 @@ index 1111111..2222222 100644 #endif /* !__IPHONEOS__ */ + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andrei Alexeyev <0x416b617269@gmail.com> +Date: Sat, 23 Dec 2017 03:38:56 +0200 +Subject: [PATCH 4/4] libsamplerate support for windows + + +diff --git a/configure.in b/configure.in +index 1111111..2222222 100644 +--- a/configure.in ++++ b/configure.in +@@ -3453,6 +3453,7 @@ case "$host" in + CheckWINDOWSGLES + CheckVulkan + CheckDIRECTX ++ CheckLibSampleRate + + # Set up the core platform files + SOURCES="$SOURCES $srcdir/src/core/windows/*.c" diff --git a/src/sdl2.mk b/src/sdl2.mk index bf46301..89c3bcb 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4 $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.libsdl.org/release/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libiconv +$(PKG)_DEPS := gcc libiconv libsamplerate define $(PKG)_UPDATE $(WGET) -q -O- 'https://hg.libsdl.org/SDL/tags' | \ @@ -21,7 +21,9 @@ define $(PKG)_BUILD cd '$(1)' && aclocal -I acinclude && autoconf && ./configure \ $(MXE_CONFIGURE_OPTS) \ --enable-threads \ - --enable-directx + --enable-directx \ + --enable-libsamplerate \ + --enable-libsamplerate-shared=$(if $(BUILD_SHARED),yes,no) $(SED) -i 's,defined(__MINGW64_VERSION_MAJOR),defined(__MINGW64_VERSION_MAJOR) \&\& defined(_WIN64),' '$(1)/include/SDL_cpuinfo.h' $(SED) -i 's,-XCClinker,,' '$(1)/sdl2.pc' $(SED) -i 's,-XCClinker,,' '$(1)/sdl2-config' -- cgit v0.12 From 488a8b47a7de2537d21668a7793eab2fa2b38cbc Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev <0x416b617269@gmail.com> Date: Sat, 23 Dec 2017 06:07:04 +0200 Subject: [sdl2_mixer] update to 2.0.2 This version uses the new SDL_AudioStream API for audio conversion, which is necessary to make use of high quality resampling via libsamplerate. The linking patch is no longer needed (fixed upstream) --- src/sdl2_mixer-1-linkfix.patch | 20 -------------------- src/sdl2_mixer.mk | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 src/sdl2_mixer-1-linkfix.patch diff --git a/src/sdl2_mixer-1-linkfix.patch b/src/sdl2_mixer-1-linkfix.patch deleted file mode 100644 index 5be3a0a..0000000 --- a/src/sdl2_mixer-1-linkfix.patch +++ /dev/null @@ -1,20 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Fix link order for the 2 test programs. - -diff -Naur SDL2_mixer-2.0.0/Makefile.in SDL2_mixer-2.0.0.fixed/Makefile.in ---- SDL2_mixer-2.0.0/Makefile.in 2013-08-10 19:39:54.000000000 +0200 -+++ SDL2_mixer-2.0.0.fixed/Makefile.in 2014-10-09 13:27:51.275921178 +0200 -@@ -66,10 +66,10 @@ - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) - - $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(objects)/$(TARGET) $(SDL_LIBS) $(LDFLAGS) - - install: all install-hdrs install-lib #install-bin - install-hdrs: diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk index dc688b5..3ce81bb 100644 --- a/src/sdl2_mixer.mk +++ b/src/sdl2_mixer.mk @@ -4,8 +4,8 @@ PKG := sdl2_mixer $(PKG)_WEBSITE := https://www.libsdl.org/ $(PKG)_DESCR := SDL2_mixer $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.1 -$(PKG)_CHECKSUM := 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f +$(PKG)_VERSION := 2.0.2 +$(PKG)_CHECKSUM := 4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb $(PKG)_SUBDIR := SDL2_mixer-$($(PKG)_VERSION) $(PKG)_FILE := SDL2_mixer-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE) -- cgit v0.12