CVS commit: pkgsrc/audio/alsa-lib

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 11 15:41:35 UTC 2023

Modified Files:
        pkgsrc/audio/alsa-lib: distinfo
        pkgsrc/audio/alsa-lib/patches: patch-ad
            patch-include_sound_uapi_asound.h

Log Message:
alsa-lib: Build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/alsa-lib/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/alsa-lib/patches/patch-ad
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/alsa-lib/distinfo
diff -u pkgsrc/audio/alsa-lib/distinfo:1.39 pkgsrc/audio/alsa-lib/distinfo:1.40
--- pkgsrc/audio/alsa-lib/distinfo:1.39 Thu Nov 23 16:19:41 2023
+++ pkgsrc/audio/alsa-lib/distinfo      Mon Dec 11 15:41:35 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2023/11/23 16:19:41 wiz Exp $
+$NetBSD: distinfo,v 1.40 2023/12/11 15:41:35 jperkin Exp $
 
 BLAKE2s (alsa-lib-1.2.10.tar.bz2) = 25ee95e555f6dd9f790eefc6da792b0744f123a281327dc70d20cc3cffe5d80b
 SHA512 (alsa-lib-1.2.10.tar.bz2) = 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
 Size (alsa-lib-1.2.10.tar.bz2) = 1107007 bytes
-SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
+SHA1 (patch-ad) = 626bee697949f26cdaff2b0bea43d809f4a3c530
 SHA1 (patch-ae) = e652f7c0230d6a22042fedd0f7c0189f68dc0984
 SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
 SHA1 (patch-ah) = 37079a0b99fba9bd16b2318c9a17359d9c4edb54
@@ -14,7 +14,7 @@ SHA1 (patch-bj) = 59f94d9b54386aa7d1a7ed
 SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5
 SHA1 (patch-include_error.h) = 9e92d4a51badda1d46305d1e5e36b8197788aa89
 SHA1 (patch-include_output.h) = 0a073b53c40293aa7cfa250586c087084002eefe
-SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
+SHA1 (patch-include_sound_uapi_asound.h) = 06170ff7b39112bae60ef7d39b858ed8068347a4
 SHA1 (patch-src_conf.c) = 6f8887c2831de6fb2d58b098e6894278ee145560
 SHA1 (patch-src_conf_alsa.conf) = 1a3d2a0ce15b2f903095bc7103c7765fcd6270c0
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865

Index: pkgsrc/audio/alsa-lib/patches/patch-ad
diff -u pkgsrc/audio/alsa-lib/patches/patch-ad:1.7 pkgsrc/audio/alsa-lib/patches/patch-ad:1.8
--- pkgsrc/audio/alsa-lib/patches/patch-ad:1.7  Fri Apr 15 08:47:50 2016
+++ pkgsrc/audio/alsa-lib/patches/patch-ad      Mon Dec 11 15:41:35 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-ad,v 1.7 2016/04/15 08:47:50 wiz Exp $
+$NetBSD: patch-ad,v 1.8 2023/12/11 15:41:35 jperkin Exp $
 
---- include/global.h.orig      2015-11-09 07:39:18.000000000 +0000
+SunOS needs alloca.h.
+__STRING() is used in more places than just !PIC.
+
+--- include/global.h.orig      2023-09-01 15:35:48.000000000 +0000
 +++ include/global.h
 @@ -30,6 +30,13 @@
  
@@ -16,3 +19,27 @@ $NetBSD: patch-ad,v 1.7 2016/04/15 08:47
  
  #ifdef __cplusplus
  extern "C" {
+@@ -51,6 +58,11 @@ const char *snd_asoundlib_version(void);
+ #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+ #endif
+ 
++#ifndef __STRING
++/** \brief Return 'x' argument as string */
++#define __STRING(x)     #x
++#endif
++
+ #ifdef PIC /* dynamic build */
+ 
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+@@ -71,11 +83,6 @@ struct snd_dlsym_link {
+ 
+ extern struct snd_dlsym_link *snd_dlsym_start;
+ 
+-#ifndef __STRING
+-/** \brief Return 'x' argument as string */
+-#define __STRING(x)     #x
+-#endif
+-
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+ #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
+ /**

Index: pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h
diff -u pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h:1.1 pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h:1.2
--- pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h:1.1 Wed May 12 14:12:13 2021
+++ pkgsrc/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h     Mon Dec 11 15:41:35 2023
@@ -1,8 +1,22 @@
-$NetBSD: patch-include_sound_uapi_asound.h,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+$NetBSD: patch-include_sound_uapi_asound.h,v 1.2 2023/12/11 15:41:35 jperkin Exp $
 
---- include/sound/uapi/asound.h.orig   2020-06-29 10:51:08.000000000 +0000
+SunOS needs sys/byteorder.h
+
+--- include/sound/uapi/asound.h.orig   2023-09-01 15:35:48.000000000 +0000
 +++ include/sound/uapi/asound.h
-@@ -545,12 +545,12 @@ struct __snd_pcm_sync_ptr {
+@@ -28,7 +28,11 @@
+ #include <linux/types.h>
+ #include <asm/byteorder.h>
+ #else
++#ifdef __sun
++#include <sys/byteorder.h>
++#else
+ #include <sys/endian.h>
++#endif
+ #include <sys/ioctl.h>
+ #endif
+ 
+@@ -549,12 +553,12 @@ struct __snd_pcm_sync_ptr {
        } c;
  };