From 51afc5431064e457e8be40c03c6aee7e62247576 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 8 Feb 2015 16:22:34 +0000 Subject: Update to 0.19.9: ver 0.19.9 (2015/02/06) * decoder - dsdiff, dsf: raise ID3 tag limit to 1 MB * playlist: fix loading duplicate tag types from state file * despotify: remove defunct plugin * fix clock integer overflow on OS X * fix gcc 5.0 warnings * fix build failure with uClibc * fix build failure on non-POSIX operating systems * fix dependency issue on parallel Android build * fix database/state file saving on Windows --- audio/musicpd/Makefile | 5 ++- audio/musicpd/distinfo | 11 +++--- audio/musicpd/patches/patch-src_system_Clock.cxx | 46 ------------------------ audio/musicpd/patches/patch-src_util_Alloc.cxx | 30 ---------------- audio/musicpd/patches/patch-src_util_Alloc.hxx | 25 ------------- 5 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 audio/musicpd/patches/patch-src_system_Clock.cxx delete mode 100644 audio/musicpd/patches/patch-src_util_Alloc.cxx delete mode 100644 audio/musicpd/patches/patch-src_util_Alloc.hxx (limited to 'audio') diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 81e2d0bc6f3..528745649f5 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2015/01/26 08:46:53 pho Exp $ +# $NetBSD: Makefile,v 1.103 2015/02/08 16:22:34 wiz Exp $ -DISTNAME= mpd-0.19.8 -PKGREVISION= 1 +DISTNAME= mpd-0.19.9 PKGNAME= ${DISTNAME:S/mpd/musicpd/} CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/mpd/0.19/ diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 5030fb633d5..85a7f67815e 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.61 2015/01/26 08:22:25 pho Exp $ +$NetBSD: distinfo,v 1.62 2015/02/08 16:22:34 wiz Exp $ -SHA1 (mpd-0.19.8.tar.xz) = e5e325b666474bddec6c07502fa2dcf3710a42e3 -RMD160 (mpd-0.19.8.tar.xz) = eec522d7a2ba4b91c0d7e2ca44bce3a14313a69d -Size (mpd-0.19.8.tar.xz) = 705108 bytes +SHA1 (mpd-0.19.9.tar.xz) = 6683bee5f132eda318c5a61ec14b2df8d9164d60 +RMD160 (mpd-0.19.9.tar.xz) = 1860665c1b75a372b46892df4307ed0346419bbb +Size (mpd-0.19.9.tar.xz) = 701480 bytes SHA1 (patch-src_output_plugins_httpd_HttpdOutputPlugin.cxx) = b47d79cc49a27d732a7531e23d666bf9df748bec -SHA1 (patch-src_system_Clock.cxx) = fb8aa263c78a15ab942324a987d6429c0b7b41fb -SHA1 (patch-src_util_Alloc.cxx) = fcd14700adc0c2f8c792de1ffda7021866fce894 -SHA1 (patch-src_util_Alloc.hxx) = 3dca83980d15b3fd6b3e2af75f3a10e48900b9cf diff --git a/audio/musicpd/patches/patch-src_system_Clock.cxx b/audio/musicpd/patches/patch-src_system_Clock.cxx deleted file mode 100644 index 38870e21f73..00000000000 --- a/audio/musicpd/patches/patch-src_system_Clock.cxx +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-src_system_Clock.cxx,v 1.1 2015/01/26 07:26:55 pho Exp $ - -Avoid integer overflow in MonotonicClock{S,MS,US} - -This is Darwin specific: the original implementation was causing an -integer overflow when base.numer was very large. On PPC Darwin, the -timebase is 1000000000/33330116 and this is too large for integer -arithmetic. - -http://bugs.musicpd.org/view.php?id=4292 - ---- src/system/Clock.cxx.orig 2015-01-26 06:16:36.000000000 +0000 -+++ src/system/Clock.cxx -@@ -40,8 +40,8 @@ MonotonicClockS(void) - if (base.denom == 0) - (void)mach_timebase_info(&base); - -- return (unsigned)((mach_absolute_time() * base.numer / 1000) -- / (1000000 * base.denom)); -+ return (unsigned)(((double)mach_absolute_time() * base.numer / 1000) -+ / base.denom / 1000000); - #elif defined(CLOCK_MONOTONIC) - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); -@@ -62,8 +62,8 @@ MonotonicClockMS(void) - if (base.denom == 0) - (void)mach_timebase_info(&base); - -- return (unsigned)((mach_absolute_time() * base.numer) -- / (1000000 * base.denom)); -+ return (unsigned)(((double)mach_absolute_time() * base.numer) -+ / base.denom / 1000000); - #elif defined(CLOCK_MONOTONIC) - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); -@@ -104,8 +104,8 @@ MonotonicClockUS(void) - if (base.denom == 0) - (void)mach_timebase_info(&base); - -- return ((uint64_t)mach_absolute_time() * (uint64_t)base.numer) -- / (1000 * (uint64_t)base.denom); -+ return (uint64_t)(((double)mach_absolute_time() * base.numer) -+ / base.denom / 1000); - #elif defined(CLOCK_MONOTONIC) - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/audio/musicpd/patches/patch-src_util_Alloc.cxx b/audio/musicpd/patches/patch-src_util_Alloc.cxx deleted file mode 100644 index 0c62afebf58..00000000000 --- a/audio/musicpd/patches/patch-src_util_Alloc.cxx +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-src_util_Alloc.cxx,v 1.4 2015/01/26 08:22:25 pho Exp $ - -Some platforms (e.g. Darwin 9) don't have strndup(3), but the function -xstrndup() isn't used in the first place. - -http://bugs.musicpd.org/view.php?id=4289 (rejected) -http://bugs.musicpd.org/view.php?id=4291 (revised; rejected too) - ---- src/util/Alloc.cxx.orig 2014-10-24 22:28:53.000000000 +0000 -+++ src/util/Alloc.cxx -@@ -58,19 +58,3 @@ xstrdup(const char *s) - - return p; - } -- --char * --xstrndup(const char *s, size_t n) --{ --#ifdef WIN32 -- char *p = (char *)xalloc(n + 1); -- memcpy(p, s, n); -- p[n] = 0; --#else -- char *p = strndup(s, n); -- if (gcc_unlikely(p == nullptr)) -- oom(); --#endif -- -- return p; --} diff --git a/audio/musicpd/patches/patch-src_util_Alloc.hxx b/audio/musicpd/patches/patch-src_util_Alloc.hxx deleted file mode 100644 index d89e784ceb1..00000000000 --- a/audio/musicpd/patches/patch-src_util_Alloc.hxx +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-src_util_Alloc.hxx,v 1.4 2015/01/26 08:22:25 pho Exp $ - -Some platforms (e.g. Darwin 9) don't have strndup(3), but the function -xstrndup() isn't used in the first place. - -http://bugs.musicpd.org/view.php?id=4289 (rejected) -http://bugs.musicpd.org/view.php?id=4291 (revised; rejected too) - ---- src/util/Alloc.hxx.orig 2014-10-24 22:28:53.000000000 +0000 -+++ src/util/Alloc.hxx -@@ -54,14 +54,4 @@ gcc_malloc gcc_nonnull_all - char * - xstrdup(const char *s); - --/** -- * Duplicate a string. Use free() to free it. -- * -- * This function never fails; in out-of-memory situations, it aborts -- * the process. -- */ --gcc_malloc gcc_nonnull_all --char * --xstrndup(const char *s, size_t n); -- - #endif -- cgit v1.2.3