CVS commit: pkgsrc/audio/alsa-lib

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Aug 10 20:39:51 UTC 2021

Modified Files:
        pkgsrc/audio/alsa-lib: Makefile distinfo
Added Files:
        pkgsrc/audio/alsa-lib/patches: patch-include_error.h
            patch-include_output.h

Log Message:
alsa-lib: Fix building of audio/alsa-utils

pkgsrc changes:
---------------
  * Add patches to explicitly include stdarg.h in header files that use
    va_list. They could be removed if the following pull request is
    accepted:
    https://github.com/alsa-project/alsa-lib/pull/169
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/alsa-lib/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/alsa-lib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/alsa-lib/patches/patch-include_error.h \
    pkgsrc/audio/alsa-lib/patches/patch-include_output.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/Makefile
diff -u pkgsrc/audio/alsa-lib/Makefile:1.24 pkgsrc/audio/alsa-lib/Makefile:1.25
--- pkgsrc/audio/alsa-lib/Makefile:1.24 Mon Jun 28 10:10:50 2021
+++ pkgsrc/audio/alsa-lib/Makefile      Tue Aug 10 20:39:51 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2021/06/28 10:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/08/10 20:39:51 triaxx Exp $
 
 DISTNAME=      alsa-lib-1.2.5.1
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/audio/alsa-lib/distinfo
diff -u pkgsrc/audio/alsa-lib/distinfo:1.30 pkgsrc/audio/alsa-lib/distinfo:1.31
--- pkgsrc/audio/alsa-lib/distinfo:1.30 Mon Jun 28 10:10:50 2021
+++ pkgsrc/audio/alsa-lib/distinfo      Tue Aug 10 20:39:51 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2021/06/28 10:10:50 wiz Exp $
+$NetBSD: distinfo,v 1.31 2021/08/10 20:39:51 triaxx Exp $
 
 SHA1 (alsa-lib-1.2.5.1.tar.bz2) = 842612c57e47c36b6f0f9f08de8255f6ba7ba065
 RMD160 (alsa-lib-1.2.5.1.tar.bz2) = bdffee4ce2f51f643a7264d475c1ec1c475ebc8e
@@ -14,6 +14,8 @@ SHA1 (patch-bi) = 7e74ebe53cc2ab273f5235
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 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_asound.h) = 5d85d804fec62250d2a3e5d269397641e13bc957
 SHA1 (patch-include_sound_type__compat.h) = a5dea86a0fd998d35147820269786d2cf8eff5e0
 SHA1 (patch-include_sound_uapi_asoc.h) = 5f1da418a2ad4ae066b34c75c9106108711b5d3d

Added files:

Index: pkgsrc/audio/alsa-lib/patches/patch-include_error.h
diff -u /dev/null pkgsrc/audio/alsa-lib/patches/patch-include_error.h:1.1
--- /dev/null   Tue Aug 10 20:39:51 2021
+++ pkgsrc/audio/alsa-lib/patches/patch-include_error.h Tue Aug 10 20:39:51 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_error.h,v 1.1 2021/08/10 20:39:51 triaxx Exp $
+
+Fix building of audio/alsa-utils.
+To be removed if the following pull request is accepted:
+https://github.com/alsa-project/alsa-lib/pull/169
+
+--- include/error.h.orig       2021-06-14 10:28:44.000000000 +0000
++++ include/error.h
+@@ -32,6 +32,8 @@
+ extern "C" {
+ #endif
+ 
++#include <stdarg.h>
++
+ /**
+  *  \defgroup Error Error handling
+  *  Error handling macros and functions.
Index: pkgsrc/audio/alsa-lib/patches/patch-include_output.h
diff -u /dev/null pkgsrc/audio/alsa-lib/patches/patch-include_output.h:1.1
--- /dev/null   Tue Aug 10 20:39:51 2021
+++ pkgsrc/audio/alsa-lib/patches/patch-include_output.h        Tue Aug 10 20:39:51 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_output.h,v 1.1 2021/08/10 20:39:51 triaxx Exp $
+
+Fix building of audio/alsa-utils.
+To be removed if the following pull request is accepted:
+https://github.com/alsa-project/alsa-lib/pull/169
+
+--- include/output.h.orig      2021-06-14 10:28:44.000000000 +0000
++++ include/output.h
+@@ -32,6 +32,8 @@
+ extern "C" {
+ #endif
+ 
++#include <stdarg.h>
++
+ /**
+  *  \defgroup Output Output Interface
+  *