diff options
author | sbd <sbd> | 2012-03-08 04:04:19 +0000 |
---|---|---|
committer | sbd <sbd> | 2012-03-08 04:04:19 +0000 |
commit | cc3d27dc0138a5fc8bd90ecc223c392ec3b30e12 (patch) | |
tree | eda5da4641bfd2090f26843ca392200fabd9f9dd | |
parent | 658ee2d258be8d23d95652edd37040505cde174e (diff) | |
download | pkgsrc-cc3d27dc0138a5fc8bd90ecc223c392ec3b30e12.tar.gz |
In the blow commit changing the type of snd_pcm_format_silence* in pcm.h
from u_int*_t to uint*_t breaks the build on other OS's (namely Linux),
so wrap the change in an "#ifdef __sun" block.
---
Module Name: pkgsrc
Committed By: hans
Date: Wed Feb 15 19:43:51 UTC 2012
Modified Files:
pkgsrc/audio/alsa-lib: Makefile distinfo
pkgsrc/audio/alsa-lib/patches: patch-ac patch-ad patch-ae patch-af
patch-ai patch-aj patch-ak patch-am patch-ap patch-aq patch-ar
patch-at patch-au patch-aw patch-ax patch-ay patch-az patch-ba
patch-bb patch-bf patch-bg patch-bh patch-include_pcm.h
Added Files:
pkgsrc/audio/alsa-lib/patches: patch-src_control_control__hw.c
Log Message:
Fix build on SunOS.
Inspired by the patches used for the native package in OI.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/alsa-lib/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/alsa-lib/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/alsa-lib/patches/patch-ac \
pkgsrc/audio/alsa-lib/patches/patch-ad \
pkgsrc/audio/alsa-lib/patches/patch-ae \
pkgsrc/audio/alsa-lib/patches/patch-af \
pkgsrc/audio/alsa-lib/patches/patch-ai \
pkgsrc/audio/alsa-lib/patches/patch-aj \
pkgsrc/audio/alsa-lib/patches/patch-ak \
pkgsrc/audio/alsa-lib/patches/patch-am \
pkgsrc/audio/alsa-lib/patches/patch-ar \
pkgsrc/audio/alsa-lib/patches/patch-at \
pkgsrc/audio/alsa-lib/patches/patch-au \
pkgsrc/audio/alsa-lib/patches/patch-ax \
pkgsrc/audio/alsa-lib/patches/patch-ay \
pkgsrc/audio/alsa-lib/patches/patch-az \
pkgsrc/audio/alsa-lib/patches/patch-ba \
pkgsrc/audio/alsa-lib/patches/patch-bb \
pkgsrc/audio/alsa-lib/patches/patch-bf \
pkgsrc/audio/alsa-lib/patches/patch-bh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/alsa-lib/patches/patch-ap \
pkgsrc/audio/alsa-lib/patches/patch-aw
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/audio/alsa-lib/patches/patch-aq \
pkgsrc/audio/alsa-lib/patches/patch-bg
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/alsa-lib/patches/patch-include_pcm.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/alsa-lib/patches/patch-src_control_control__hw.c
-rw-r--r-- | audio/alsa-lib/distinfo | 4 | ||||
-rw-r--r-- | audio/alsa-lib/patches/patch-include_pcm.h | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo index a446158f5e0..a8b98984834 100644 --- a/audio/alsa-lib/distinfo +++ b/audio/alsa-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2012/02/15 19:43:51 hans Exp $ +$NetBSD: distinfo,v 1.11 2012/03/08 04:04:19 sbd Exp $ SHA1 (alsa-lib-1.0.22.tar.bz2) = d3b6c740c23b8d113a8d02da2a9fd61f5d1a8a44 RMD160 (alsa-lib-1.0.22.tar.bz2) = 4dbc3f9550f8ba01535ad3cfd8f0a8140f897e81 @@ -40,5 +40,5 @@ SHA1 (patch-bh) = f207843f4ce2b20b7e680d4b6e9aebb28c55323e SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7 SHA1 (patch-bk) = 7740eea6a0d4a8ce3db3b93b2af5faacdb9424b1 -SHA1 (patch-include_pcm.h) = 2a7a76aebdea61c34040ce8c7621f2ff978266ad +SHA1 (patch-include_pcm.h) = 1c458cd7d078356f4a970b0b3592aad139ac0918 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865 diff --git a/audio/alsa-lib/patches/patch-include_pcm.h b/audio/alsa-lib/patches/patch-include_pcm.h index f66d5f37553..c249a9762b4 100644 --- a/audio/alsa-lib/patches/patch-include_pcm.h +++ b/audio/alsa-lib/patches/patch-include_pcm.h @@ -1,7 +1,7 @@ -$NetBSD: patch-include_pcm.h,v 1.2 2012/02/15 19:43:51 hans Exp $ +$NetBSD: patch-include_pcm.h,v 1.3 2012/03/08 04:04:19 sbd Exp $ ---- include/pcm.h.orig 2009-12-16 16:18:51.000000000 +0100 -+++ include/pcm.h 2012-02-15 14:10:10.589697413 +0100 +--- include/pcm.h.orig 2009-12-16 15:18:51.000000000 +0000 ++++ include/pcm.h @@ -456,7 +456,9 @@ int snd_pcm_wait(snd_pcm_t *pcm, int tim int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2); int snd_pcm_unlink(snd_pcm_t *pcm); @@ -12,18 +12,21 @@ $NetBSD: patch-include_pcm.h,v 1.2 2012/02/15 19:43:51 hans Exp $ /* * application helpers - these functions are implemented on top -@@ -920,10 +922,10 @@ int snd_pcm_format_width(snd_pcm_format_ +@@ -920,10 +922,17 @@ int snd_pcm_format_width(snd_pcm_format_ int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian); ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); --u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); --u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); --u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); --u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); ++#ifdef __sun +uint8_t snd_pcm_format_silence(snd_pcm_format_t format); +uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format); +uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format); +uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format); ++#else + u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); + u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); + u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); + u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); ++#endif int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples); snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes); |