[pygame-sdl2] 03/04: Drop sdl2-mixer.patch. Fixed upstream.

Markus Koschany apo at moszumanska.debian.org
Sun Apr 8 19:39:33 UTC 2018


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

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

commit 9a527f8fddc24dedc25200bfd3e391d4ebdd3e99
Author: Markus Koschany <apo at debian.org>
Date:   Sun Apr 8 21:32:55 2018 +0200

    Drop sdl2-mixer.patch. Fixed upstream.
---
 debian/patches/sdl2-mixer.patch | 43 -----------------------------------------
 debian/patches/series           |  1 -
 2 files changed, 44 deletions(-)

diff --git a/debian/patches/sdl2-mixer.patch b/debian/patches/sdl2-mixer.patch
deleted file mode 100644
index 8d737ee..0000000
--- a/debian/patches/sdl2-mixer.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 442b439..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-sdl2-mixer.patch

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



More information about the Pkg-games-commits mailing list