[pkgsrc/trunk]: pkgsrc/audio/alsa-lib Fix build on FreeBSD 9-10:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/alsa-lib Fix build on FreeBSD 9-10:
From: asau <asau%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 15:37:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/de6981ead775
branches:  trunk
changeset: 632348:de6981ead775
user:      asau <asau%pkgsrc.org@localhost>
date:      Tue Mar 25 23:06:07 2014 +0000

description:
Fix build on FreeBSD 9-10:
- malloc.h breaks actively on FreeBSD for a long time, use stdlib.h as suggested;
- treat FreeBSD uniformly with other BSD systems.

diffstat:

 audio/alsa-lib/distinfo                                 |  52 +++++++++-------
 audio/alsa-lib/patches/patch-ab                         |   6 +-
 audio/alsa-lib/patches/patch-ac                         |   4 +-
 audio/alsa-lib/patches/patch-ad                         |   4 +-
 audio/alsa-lib/patches/patch-ae                         |   4 +-
 audio/alsa-lib/patches/patch-af                         |   4 +-
 audio/alsa-lib/patches/patch-ah                         |  15 +++-
 audio/alsa-lib/patches/patch-ai                         |   4 +-
 audio/alsa-lib/patches/patch-aj                         |   4 +-
 audio/alsa-lib/patches/patch-ak                         |   4 +-
 audio/alsa-lib/patches/patch-am                         |   4 +-
 audio/alsa-lib/patches/patch-ap                         |   4 +-
 audio/alsa-lib/patches/patch-ar                         |   4 +-
 audio/alsa-lib/patches/patch-at                         |   4 +-
 audio/alsa-lib/patches/patch-au                         |   4 +-
 audio/alsa-lib/patches/patch-aw                         |   4 +-
 audio/alsa-lib/patches/patch-ax                         |   4 +-
 audio/alsa-lib/patches/patch-ay                         |   4 +-
 audio/alsa-lib/patches/patch-az                         |   4 +-
 audio/alsa-lib/patches/patch-ba                         |   4 +-
 audio/alsa-lib/patches/patch-bb                         |   4 +-
 audio/alsa-lib/patches/patch-bf                         |   4 +-
 audio/alsa-lib/patches/patch-bh                         |   4 +-
 audio/alsa-lib/patches/patch-bk                         |   4 +-
 audio/alsa-lib/patches/patch-src_compat_hsearch__r.c    |  13 ++++
 audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c        |  13 ++++
 audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c |  13 ++++
 audio/alsa-lib/patches/patch-src_shmarea.c              |  13 ++++
 28 files changed, 137 insertions(+), 72 deletions(-)

diffs (truncated from 574 to 300 lines):

diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/distinfo
--- a/audio/alsa-lib/distinfo   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/distinfo   Tue Mar 25 23:06:07 2014 +0000
@@ -1,45 +1,49 @@
-$NetBSD: distinfo,v 1.12 2012/08/02 12:52:33 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2014/03/25 23:06:07 asau Exp $
 
 SHA1 (alsa-lib-1.0.22.tar.bz2) = d3b6c740c23b8d113a8d02da2a9fd61f5d1a8a44
 RMD160 (alsa-lib-1.0.22.tar.bz2) = 4dbc3f9550f8ba01535ad3cfd8f0a8140f897e81
 Size (alsa-lib-1.0.22.tar.bz2) = 808534 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
-SHA1 (patch-ab) = d6082e1291992699de86e6f78bf43f4cb476c0c8
-SHA1 (patch-ac) = 98acc8b37aefedccbfcb4fe11eb7ec5ac6df2f75
-SHA1 (patch-ad) = 29a3515a48f86a482431f8e7835683d9d8572b34
-SHA1 (patch-ae) = 5cc665a10a4835342d9128d295fb81f69caff618
-SHA1 (patch-af) = e4cd89940cd69352ebca13a0834df4e20d1026ce
+SHA1 (patch-ab) = b0a6494760d18079e532ae9b205a73c255000f9a
+SHA1 (patch-ac) = 47f5cad6c436b08161acd726090ec20a9cb50fc8
+SHA1 (patch-ad) = f0ee874e74966e6196996ecfe0637bef47fe1581
+SHA1 (patch-ae) = 498d9e28e5b65d9ae72220752eda22f7866c68c6
+SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
-SHA1 (patch-ah) = 05229389b8bda654e8e979029b2bcd3a8050cf48
-SHA1 (patch-ai) = b0bd940be4d0ee960961beaef48fe6742a3b491e
-SHA1 (patch-aj) = 7eb3d999b876cd8478e28f26983a8af25c210a55
-SHA1 (patch-ak) = 084b8cd20cd5d322cdb0514d8ca140ca31a12984
+SHA1 (patch-ah) = 5b2c0dd3ca8582fef3e00ce256047d3bd345b61e
+SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
+SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
+SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
 SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
-SHA1 (patch-am) = d5b4044c4fa9a459a3bf6952c33a0dd793d5c663
+SHA1 (patch-am) = 6bad62786ede14c5910d9c1c9fc99b4807976c9d
 SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
 SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
-SHA1 (patch-ap) = cad0c9f1627a38111bbbee3bd82d048db2eb4ca8
+SHA1 (patch-ap) = deaa53fcf3fc23c7683388b5e37b3d6593776121
 SHA1 (patch-aq) = 17faa322f2272b3c926a0c3610079e9686707248
-SHA1 (patch-ar) = aa1f637c1239332e49366097504a239dba06e0b4
+SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
 SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
-SHA1 (patch-at) = bb0f45f180db0e1a06252b374086ac883a16d790
-SHA1 (patch-au) = 7e4b233c160b2cda8e6cbf581a690e17efeb7667
+SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
+SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
 SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
-SHA1 (patch-aw) = 2cc44907d4af446832e1d34cbe4bd704d89f66cb
-SHA1 (patch-ax) = cc68d0f358433afdfaac3dfe47d1bf7c985e6427
-SHA1 (patch-ay) = 45ee3c0bca143c70f21079fd79320ed0f28416d9
-SHA1 (patch-az) = 10bcd3364fa4854099075cba065647cd75011369
-SHA1 (patch-ba) = e7280eb04ee7c39a576fea3bc5ca4dc1567310f6
-SHA1 (patch-bb) = 3c3121219846eec100bb6d1c144f03d46f2450ec
+SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
+SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
+SHA1 (patch-ay) = 3c5dc895c88354b03df4d9ca516465ce3fdc3465
+SHA1 (patch-az) = 6664cb045360c770c80e8d0a7e8e7192d8267487
+SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
+SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
 SHA1 (patch-bc) = 0b034b98d536c4ab7f785420d0d51c3d0763d960
 SHA1 (patch-bd) = 63a102186f4df59da93bedaac772530e166a9fde
 SHA1 (patch-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
-SHA1 (patch-bf) = 0c75869d99473349b0470b8ae5ae7b62c76d4593
+SHA1 (patch-bf) = 10588dd9f8faac208b8f314676558c2c7da12063
 SHA1 (patch-bg) = 29c0fb6c1fb6a11e7f42778bdd965b9d25ddfd0c
-SHA1 (patch-bh) = f207843f4ce2b20b7e680d4b6e9aebb28c55323e
+SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
 SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
-SHA1 (patch-bk) = 7740eea6a0d4a8ce3db3b93b2af5faacdb9424b1
+SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
 SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d
 SHA1 (patch-include_pcm.h) = 1c458cd7d078356f4a970b0b3592aad139ac0918
+SHA1 (patch-src_compat_hsearch__r.c) = 017bf104203233e85e9f3083f43150de6f341ad5
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
+SHA1 (patch-src_pcm_pcm__mmap.c) = 8ce33dae5215ee441196414e0c1ba02e4757e32d
+SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
+SHA1 (patch-src_shmarea.c) = e6da001119f4e164b606e19a4c12df9aa05caa6a
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ab
--- a/audio/alsa-lib/patches/patch-ab   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ab   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2008/12/30 14:40:29 hasso Exp $
+$NetBSD: patch-ab,v 1.5 2014/03/25 23:06:07 asau Exp $
 
 --- configure.orig     2008-10-29 08:46:35.000000000 -0400
 +++ configure  2008-12-19 00:09:49.000000000 -0500
@@ -7,7 +7,7 @@
  fi
  
 +case $host_os in
-+  netbsd*|dragonfly*)
++  netbsd*|freebsd*|dragonfly*)
 +    HAVE_LIBDL=yes
 +cat >>confdefs.h <<\_ACEOF
 +#define HAVE_LIBDL 1
@@ -22,7 +22,7 @@
  
  DEFS=-DHAVE_CONFIG_H
 +case $host_os in
-+  netbsd*|dragonfly*)
++  netbsd*|freebsd*|dragonfly*)
 +    DEFS="$DEFS -Dbswap_32=bswap32 -Dbswap_16=bswap16 -Dbswap_64=bswap64"
 +    ;;
 +esac
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ac
--- a/audio/alsa-lib/patches/patch-ac   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ac   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ac,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- include/asoundlib-head.h.orig      2008-12-18 22:01:21.000000000 -0500
 +++ include/asoundlib-head.h
@@ -6,7 +6,7 @@
  #include <string.h>
  #include <fcntl.h>
  #include <assert.h>
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#elif defined(__sun)
 +#include <sys/byteorder.h>
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ad
--- a/audio/alsa-lib/patches/patch-ad   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ad   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ad,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- include/global.h.orig      2008-10-29 08:42:10.000000000 -0400
 +++ include/global.h
@@ -18,7 +18,7 @@
  int snd_user_file(const char *file, char **result);
  
 -#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  struct timeval {
        time_t          tv_sec;         /* seconds */
        long            tv_usec;        /* microseconds */
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ae
--- a/audio/alsa-lib/patches/patch-ae   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ae   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ae,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- include/local.h.orig       2008-10-29 08:42:10.000000000 -0400
 +++ include/local.h
@@ -6,7 +6,7 @@
  #include <string.h>
  #include <fcntl.h>
  #include <assert.h>
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#elif defined(__sun)
 +#include <sys/byteorder.h>
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-af
--- a/audio/alsa-lib/patches/patch-af   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-af   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-af,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- include/search.h.orig      2008-10-29 08:42:10.000000000 -0400
 +++ include/search.h
@@ -6,7 +6,7 @@
  #ifndef _SEARCH_H
  #define       _SEARCH_H 1
  
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <features.h>
 +#else
 +#ifdef __sun
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ah
--- a/audio/alsa-lib/patches/patch-ah   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ah   Tue Mar 25 23:06:07 2014 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ah,v 1.2 2014/03/25 23:06:07 asau Exp $
 
---- src/pcm/pcm.c.orig 2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm.c.orig 2009-12-16 15:18:51.000000000 +0000
 +++ src/pcm/pcm.c
-@@ -635,6 +635,10 @@ playback devices.
+@@ -630,7 +630,7 @@ playback devices.
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <signal.h>
+ #include <sys/poll.h>
+@@ -639,6 +639,10 @@ playback devices.
  #include <limits.h>
  #include "pcm_local.h"
  
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ai
--- a/audio/alsa-lib/patches/patch-ai   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ai   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ai,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_adpcm.c.orig   2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_adpcm.c
@@ -6,7 +6,7 @@
    come across a good description of XA yet.
   */
  
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-aj
--- a/audio/alsa-lib/patches/patch-aj   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-aj   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-aj,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_alaw.c.orig    2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_alaw.c
@@ -6,7 +6,7 @@
   *
   */
    
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ak
--- a/audio/alsa-lib/patches/patch-ak   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ak   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ak,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_copy.c.orig    2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_copy.c
@@ -6,7 +6,7 @@
   *
   */
    
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-am
--- a/audio/alsa-lib/patches/patch-am   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-am   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-am,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_dmix_generic.c.orig    2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_dmix_generic.c
@@ -6,7 +6,7 @@
         (1ULL << SND_PCM_FORMAT_S24_3LE) | \
         (1ULL << SND_PCM_FORMAT_U8))
  
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <byteswap.h>
 +#endif
  
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ap
--- a/audio/alsa-lib/patches/patch-ap   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ap   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ap,v 1.5 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_file.c.orig    2009-05-06 07:07:23.000000000 +0000
 +++ src/pcm/pcm_file.c
@@ -6,7 +6,7 @@
   *
   */
    
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <endian.h>
  #include <byteswap.h>
 +#endif
diff -r 8cf2910fff8f -r de6981ead775 audio/alsa-lib/patches/patch-ar
--- a/audio/alsa-lib/patches/patch-ar   Tue Mar 25 22:56:56 2014 +0000
+++ b/audio/alsa-lib/patches/patch-ar   Tue Mar 25 23:06:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.3 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-ar,v 1.4 2014/03/25 23:06:07 asau Exp $
 
 --- src/pcm/pcm_iec958.c.orig  2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_iec958.c
@@ -6,7 +6,7 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/print Sync tex-hyphen-greek{,-doc} with TeX Live 2013
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of misc/rubygems package to 2.4.5.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/print Sync tex-hyphen-greek{,-doc} with TeX Live 2013
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of misc/rubygems package to 2.4.5.
Indexes:
Home | Main Index | Thread Index | Old Index