Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
Date: Sat, 01 Sep 2018 14:25:50
Message-Id: 1535811230.94c9568fe73d41a3edac521bea8bad10d3adb026.chewi@gentoo
1 commit: 94c9568fe73d41a3edac521bea8bad10d3adb026
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 1 14:13:40 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 1 14:13:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c9568f
7
8 media-libs/sdl2-mixer: Patch to fix 2.0.2 smpeg build issue
9
10 Closes: https://bugs.gentoo.org/636014
11 Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13 .../sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch | 21 +++++++++++++++++++++
14 media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild | 4 ++++
15 2 files changed, 25 insertions(+)
16
17 diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
18 new file mode 100644
19 index 00000000000..1377feddb39
20 --- /dev/null
21 +++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
22 @@ -0,0 +1,21 @@
23 +--- SDL2_mixer-2.0.2/music_smpeg-orig.c 2017-12-06 20:47:21.691153833 -0500
24 ++++ SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 20:47:30.032153222 -0500
25 +@@ -138,7 +138,7 @@
26 + SDL_free(music);
27 + return NULL;
28 + }
29 +- smpeg.SMPEG_actualSpec(mp3, &music_spec);
30 ++ smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
31 +
32 + music->freesrc = freesrc;
33 + return music;
34 +--- SDL2_mixer-2.0.2/music_smpeg-orig.c 2017-12-06 21:03:44.907081811 -0500
35 ++++ SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 23:34:36.696418752 -0500
36 +@@ -174,6 +174,7 @@
37 + int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
38 + if (left > 0) {
39 + stream += (len - left);
40 ++ }
41 + return left;
42 + }
43 +
44
45 diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
46 index 53e5155abee..440a2a2ff04 100644
47 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
48 +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
49 @@ -50,6 +50,10 @@ DEPEND="${RDEPEND}"
50
51 S="${WORKDIR}/${MY_P}"
52
53 +PATCHES=(
54 + "${FILESDIR}"/${P}-smpeg.patch
55 +)
56 +
57 multilib_src_configure() {
58 local myeconfargs=(
59 $(use_enable static-libs static)