diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-09-24 11:10:38 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-09-24 11:10:38 +0000 |
commit | bf322c329d5792f3a05f2229e99e8e5e69a143e6 (patch) | |
tree | adaf07e06afa1a1f9f2c16d0ce20641d87735ddf /audio/alsa-utils | |
parent | 6ba7f23d3dcde541b17b4b9b003eacac92823418 (diff) | |
download | pkgsrc-bf322c329d5792f3a05f2229e99e8e5e69a143e6.tar.gz |
USE_TOOLS+=gsed for -r support, plus various patches to fix SunOS build.
Diffstat (limited to 'audio/alsa-utils')
-rw-r--r-- | audio/alsa-utils/Makefile | 4 | ||||
-rw-r--r-- | audio/alsa-utils/distinfo | 8 | ||||
-rw-r--r-- | audio/alsa-utils/patches/patch-ab | 4 | ||||
-rw-r--r-- | audio/alsa-utils/patches/patch-ac | 4 | ||||
-rw-r--r-- | audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index 2ee384d5480..5b51ee615c3 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/06/11 14:45:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2014/09/24 11:10:38 jperkin Exp $ # DISTNAME= alsa-utils-1.0.27.2 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.alsa-project.org/ COMMENT= Advanced Linux Sound Architecture (ALSA) CLI utilities GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config gmake bash:run +USE_TOOLS+= pkg-config gmake gsed bash:run USE_PKGLOCALEDIR= yes USE_NCURSES= yes LDFLAGS.DragonFly= -lm diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index c5a4df8f040..647f60a0fff 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.7 2014/06/11 14:45:09 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2014/09/24 11:10:38 jperkin Exp $ SHA1 (alsa-utils-1.0.27.2.tar.bz2) = dfec4691dde6b2cee292bbd10f0f368158713e8f RMD160 (alsa-utils-1.0.27.2.tar.bz2) = 05432f3f795a43a42d43e7589235060eb83298f6 Size (alsa-utils-1.0.27.2.tar.bz2) = 1143802 bytes SHA1 (patch-aa) = 78087e7a7fe860e002d592b0c7b83e98b10ea2c3 -SHA1 (patch-ab) = ecc172cd62997d6c645b5e798776cc98a493cd61 -SHA1 (patch-ac) = 5f13043e6f7864bb88b13f0123ce8114995db8be +SHA1 (patch-ab) = 6bbdb3c16e49b6fba05120c243292c9ef51ebca4 +SHA1 (patch-ac) = 19f9570bedfb00068aad244033eb6e6436a6546d SHA1 (patch-ad) = 4da5adfbd3fcc0611c6394bf00f2b684e735dbd2 SHA1 (patch-alsaloop_alsaloop.c) = 469b00a0ffa7ab3bca752bd61e458026100628fe SHA1 (patch-alsaloop_pcmjob.c) = ae340dde8532d3a1253d4ff38782f17fbf2d381e -SHA1 (patch-alsamixer_volume__mapping.c) = 8c2f00a170238653a557387e878524e8d3aceb18 +SHA1 (patch-alsamixer_volume__mapping.c) = a543c74ba4f3f3b3cc7768623fbca760b06a7872 diff --git a/audio/alsa-utils/patches/patch-ab b/audio/alsa-utils/patches/patch-ab index 2f0724c94d1..c62d76bfc30 100644 --- a/audio/alsa-utils/patches/patch-ab +++ b/audio/alsa-utils/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2014/06/09 12:34:26 ryoon Exp $ +$NetBSD: patch-ab,v 1.5 2014/09/24 11:10:38 jperkin Exp $ --- aplay/aplay.c.orig 2013-07-09 15:28:37.000000000 +0000 +++ aplay/aplay.c @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.4 2014/06/09 12:34:26 ryoon Exp $ #include <sys/types.h> +#if defined(__linux__) #include <endian.h> -+#else ++#elif !defined(__sun) +#include <sys/endian.h> +#endif #include "aconfig.h" diff --git a/audio/alsa-utils/patches/patch-ac b/audio/alsa-utils/patches/patch-ac index 4fa2c3e9fcb..8d5dbc2125a 100644 --- a/audio/alsa-utils/patches/patch-ac +++ b/audio/alsa-utils/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2012/02/15 19:46:31 hans Exp $ +$NetBSD: patch-ac,v 1.4 2014/09/24 11:10:38 jperkin Exp $ ---- aplay/formats.h.orig 2008-12-18 22:21:49.000000000 -0500 +--- aplay/formats.h.orig 2013-07-09 15:28:37.000000000 +0000 +++ aplay/formats.h @@ -1,8 +1,20 @@ #ifndef FORMATS_H diff --git a/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c b/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c index 7f4494acab9..caa9e5c208e 100644 --- a/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c +++ b/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c @@ -1,6 +1,6 @@ -$NetBSD: patch-alsamixer_volume__mapping.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $ +$NetBSD: patch-alsamixer_volume__mapping.c,v 1.2 2014/09/24 11:10:38 jperkin Exp $ -* NetBSD has no exp10() +* NetBSD and SunOS have no exp10() --- alsamixer/volume_mapping.c.orig 2013-07-09 15:28:37.000000000 +0000 +++ alsamixer/volume_mapping.c @@ -9,11 +9,11 @@ $NetBSD: patch-alsamixer_volume__mapping.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $ #include "volume_mapping.h" -#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) || defined(__NetBSD__) ++#if defined(__UCLIBC__) || defined(__NetBSD__) || defined(__sun) /* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ #define exp10(x) (exp((x) * log(10))) -#endif /* __UCLIBC__ */ -+#endif /* __UCLIBC__ || __NetBSD__ */ ++#endif /* __UCLIBC__ || __NetBSD__ || __sun */ #define MAX_LINEAR_DB_SCALE 24 |