pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/sidplay2 Don't launder const. Should fix Linux b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4de05c9fc46
branches:  trunk
changeset: 604090:d4de05c9fc46
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed May 23 04:28:29 2012 +0000

description:
Don't launder const. Should fix Linux build.

diffstat:

 audio/sidplay2/distinfo                   |   3 ++-
 audio/sidplay2/patches/patch-src_args_cpp |  23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r d124152e65c0 -r d4de05c9fc46 audio/sidplay2/distinfo
--- a/audio/sidplay2/distinfo   Wed May 23 04:11:38 2012 +0000
+++ b/audio/sidplay2/distinfo   Wed May 23 04:28:29 2012 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/11/27 19:33:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/05/23 04:28:29 dholland Exp $
 
 SHA1 (sidplay-2.0.9.tar.gz) = 2e4589cc59b3d2d37f38b98d7a0a0ba37b82da7a
 RMD160 (sidplay-2.0.9.tar.gz) = 9d7d2cbcb472ab413093e85827de2c7099782e47
 Size (sidplay-2.0.9.tar.gz) = 362140 bytes
 SHA1 (patch-aa) = 12e236e42f2cbf311e5d9ed7b25c262089f57a27
+SHA1 (patch-src_args_cpp) = 85898b44fd5ece2a327b76a6ad29032ead088a47
 SHA1 (patch-src_audio_wav_WavFile.cpp) = a7ef72b68eb3a86bf01537e9da4fba7d44dd280e
diff -r d124152e65c0 -r d4de05c9fc46 audio/sidplay2/patches/patch-src_args_cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sidplay2/patches/patch-src_args_cpp Wed May 23 04:28:29 2012 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_args_cpp,v 1.1 2012/05/23 04:28:29 dholland Exp $]
+
+Don't launder const. Fixes build with recent glibc.
+
+--- src/args.cpp~      2004-05-05 23:49:20.000000000 +0000
++++ src/args.cpp
+@@ -110,8 +110,14 @@ bool ConsolePlayer::parseTime (const cha
+     else
+     {   // Read in MM:SS format
+         int val;
+-        *sep = '\0';
+-        val  = atoi (str);
++      char *tmp;
++      size_t len;
++      len = sep - str;
++      tmp = new char[len + 1];
++      memcpy(tmp, str, len);
++      tmp[len] = 0;
++        val  = atoi (tmp);
++      delete []tmp;
+         if (val < 0 || val > 99)
+             return false;
+         _time = (uint_least32_t) val * 60;



Home | Main Index | Thread Index | Old Index