alsa-lib: fix build on Solaris

From Claes Nästén in PR 56749

3 files changed, 21 insertions, 7 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index c3af7511608..5d4234e5e1a 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2022/01/24 10:05:37 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2022/03/14 14:08:42 wiz Exp $
 
 DISTNAME=	alsa-lib-1.2.6.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 7e37cd2a18e..1027fb7db39 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2022/01/24 10:05:37 wiz Exp $
+$NetBSD: distinfo,v 1.36 2022/03/14 14:08:42 wiz Exp $
 
 BLAKE2s (alsa-lib-1.2.6.1.tar.bz2) = efef5241c5060a795b451199dd0724b233fed3cdbdee84192c0f65ca1b8b26d2
 SHA512 (alsa-lib-1.2.6.1.tar.bz2) = 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
@@ -15,7 +15,7 @@ SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
 SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5
 SHA1 (patch-include_error.h) = 9e92d4a51badda1d46305d1e5e36b8197788aa89
 SHA1 (patch-include_output.h) = 0a073b53c40293aa7cfa250586c087084002eefe
-SHA1 (patch-include_sound_type__compat.h) = a5dea86a0fd998d35147820269786d2cf8eff5e0
+SHA1 (patch-include_sound_type__compat.h) = 0148823ade8dadc8772a85621a83e4fa41da796a
 SHA1 (patch-include_sound_uapi_asoc.h) = 5f1da418a2ad4ae066b34c75c9106108711b5d3d
 SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
 SHA1 (patch-include_type__compat.h) = 3cb245d8ea171f987859e1b5a89b0908c2037492
diff --git a/audio/alsa-lib/patches/patch-include_sound_type__compat.h b/audio/alsa-lib/patches/patch-include_sound_type__compat.h
index 9dbe4a3a088..23019ab795d 100644
--- a/audio/alsa-lib/patches/patch-include_sound_type__compat.h
+++ b/audio/alsa-lib/patches/patch-include_sound_type__compat.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-include_sound_type__compat.h,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+$NetBSD: patch-include_sound_type__compat.h,v 1.2 2022/03/14 14:08:42 wiz Exp $
+
+NetBSD and Solaris support.
 
 --- include/sound/type_compat.h.orig	2020-06-29 10:51:08.000000000 +0000
 +++ include/sound/type_compat.h
@@ -10,10 +12,13 @@ $NetBSD: patch-include_sound_type__compat.h,v 1.1 2021/05/12 14:12:13 ryoon Exp
  
  #ifndef DOC_HIDDEN
  #include <stdint.h>
-@@ -16,6 +16,20 @@ typedef int32_t __s32;
+@@ -15,7 +15,30 @@ typedef int16_t __s16;
+ typedef int32_t __s32;
  typedef int64_t __s64;
  
++#ifndef __sun
  #include <endian.h>
++#endif
 +#if defined(__NetBSD__)
 +#include <machine/bswap.h>
 +#if BYTE_ORDER == LITTLE_ENDIAN
@@ -28,18 +33,26 @@ $NetBSD: patch-include_sound_type__compat.h,v 1.1 2021/05/12 14:12:13 ryoon Exp
 +#define __cpu_to_be16(x) (x)
 +#endif
 +#else
++#ifdef __sun
++#include <sys/byteorder.h>
++#define __cpu_to_le32(x) LE_32(x)
++#define __cpu_to_be32(x) BE_32(x)
++#define __cpu_to_le16(x) LE_16(x)
++#define __cpu_to_be16(x) BE_16(x)
++#else
  #include <byteswap.h>
  #if __BYTE_ORDER == __LITTLE_ENDIAN
  #define __cpu_to_le32(x) (x)
-@@ -28,6 +42,7 @@ typedef int64_t __s64;
+@@ -28,6 +51,8 @@ typedef int64_t __s64;
  #define __cpu_to_le16(x) bswap_16(x)
  #define __cpu_to_be16(x) (x)
  #endif
 +#endif
++#endif
  
  #define __le32_to_cpu __cpu_to_le32
  #define __be32_to_cpu __cpu_to_be32
-@@ -54,4 +69,4 @@ typedef int64_t __s64;
+@@ -54,4 +79,4 @@ typedef int64_t __s64;
  
  #endif /* DOC_HIDDEN */