[pygame-sdl2] 08/09: Revert "Drop sdl2-mixer.patch. Applied upstream."

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository pygame-sdl2.

commit 329cb5c22c1ea80fe948983755b728b2eacc1e1a
Author: Markus Koschany <apo at debian.org>
Date:   Mon Jan 15 18:19:21 2018 +0100

    Revert "Drop sdl2-mixer.patch. Applied upstream."
    
    This reverts commit 9ddcb17594f54c7234e3584cb4481ba7976f6916.
---
 debian/patches/sdl2-mixer.patch | 43 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/sdl2-mixer.patch b/debian/patches/sdl2-mixer.patch
new file mode 100644
index 0000000..8d737ee
--- /dev/null
+++ b/debian/patches/sdl2-mixer.patch
@@ -0,0 +1,43 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 11 Nov 2017 22:38:53 +0100
+Subject: sdl2 mixer
+
+Fix FTBFS with libsdl2-mixer version 2.0.2.
+
+Forwarded: https://github.com/renpy/pygame_sdl2/pull/82/files
+---
+ include/sdl2_mixer.pxd    | 3 +--
+ src/pygame_sdl2/mixer.pyx | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd
+index 0cea395..4bb0187 100644
+--- a/include/sdl2_mixer.pxd
++++ b/include/sdl2_mixer.pxd
+@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil:
+     ctypedef enum MIX_InitFlags:
+         MIX_INIT_FLAC
+         MIX_INIT_MOD
+-        MIX_INIT_MODPLUG
+         MIX_INIT_MP3
+         MIX_INIT_OGG
+-        MIX_INIT_FLUIDSYNTH
++        MIX_INIT_MID
+ 
+     int Mix_Init(int flags)
+     void Mix_Quit()
+diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx
+index 3c5e185..bea5cbf 100644
+--- a/src/pygame_sdl2/mixer.pyx
++++ b/src/pygame_sdl2/mixer.pyx
+@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096):
+     if get_init() is not None:
+         return
+ 
+-    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG,
+-                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH):
++    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD,
++                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID):
+ 
+         if Mix_Init(flag) != flag:
+             errors.append("{}\n".format(SDL_GetError()))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..442b439
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sdl2-mixer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pygame-sdl2.git