public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/
Date: Sat,  1 Sep 2018 14:25:45 +0000 (UTC)	[thread overview]
Message-ID: <1535811230.94c9568fe73d41a3edac521bea8bad10d3adb026.chewi@gentoo> (raw)

commit:     94c9568fe73d41a3edac521bea8bad10d3adb026
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 14:13:40 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 14:13:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c9568f

media-libs/sdl2-mixer: Patch to fix 2.0.2 smpeg build issue

Closes: https://bugs.gentoo.org/636014
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch   | 21 +++++++++++++++++++++
 media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild       |  4 ++++
 2 files changed, 25 insertions(+)

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
new file mode 100644
index 00000000000..1377feddb39
--- /dev/null
+++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
@@ -0,0 +1,21 @@
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 20:47:21.691153833 -0500
++++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 20:47:30.032153222 -0500
+@@ -138,7 +138,7 @@
+         SDL_free(music);
+         return NULL;
+     }
+-    smpeg.SMPEG_actualSpec(mp3, &music_spec);
++    smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
+ 
+     music->freesrc = freesrc;
+     return music;
+--- SDL2_mixer-2.0.2/music_smpeg-orig.c	2017-12-06 21:03:44.907081811 -0500
++++ SDL2_mixer-2.0.2/music_smpeg.c	2017-12-06 23:34:36.696418752 -0500
+@@ -174,6 +174,7 @@
+     int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
+     if (left > 0) {
+         stream += (len - left);
++    }
+     return left;
+ }
+ 

diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
index 53e5155abee..440a2a2ff04 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-smpeg.patch
+)
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)


             reply	other threads:[~2018-09-01 14:25 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-01 14:25 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-09-23 18:06 [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/, media-libs/sdl2-mixer/files/ James Le Cuirot
2021-09-05 17:09 James Le Cuirot
2021-03-25 13:25 Sam James
2018-09-16 18:55 Andreas Sturmlechner
2016-02-16  1:38 Michael Sterrett
2016-01-05 22:38 Michael Sterrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1535811230.94c9568fe73d41a3edac521bea8bad10d3adb026.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox