Re: pkg/48912: audio/alsa-lib 1.0.27.2 DragonFly 3.9 maybe other OSes struct timespec, __u64, versionsort

[David Shao <davshao%gmail.com@localhost>]

The following reply was made to PR pkg/48912; it has been noted by GNATS.

From: David Shao <davshao%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/48912: audio/alsa-lib 1.0.27.2 DragonFly 3.9 maybe other OSes
 struct timespec, __u64, versionsort
Date: Sat, 3 Dec 2016 22:23:36 -0800

 I now use the following to get audio/alsa-lib to build on DragonFly
 4.7-DEVELOPMENT:
 
 diff -Nur audio/alsa-lib/Makefile audio/alsa-lib.new/Makefile
 --- audio/alsa-lib/Makefile    2016-06-03 08:45:43.000000000 -0700
 +++ audio/alsa-lib.new/Makefile    2016-12-03 22:09:38.095823000 -0800
 @@ -27,6 +27,7 @@
  CPPFLAGS.SunOS+=    -D__u32=uint32_t -D__u64=uint64_t
  CPPFLAGS.NetBSD+=    -D__u32=uint32_t -D__u64=uint64_t
  CPPFLAGS.FreeBSD+=    -D__u32=uint32_t -D__u64=uint64_t
 +CPPFLAGS.DragonFly+=    -D__u32=uint32_t -D__u64=uint64_t
 
  LIBS.SunOS+=        -lsocket -lnsl
 
 diff -Nur audio/alsa-lib/distinfo audio/alsa-lib.new/distinfo
 --- audio/alsa-lib/distinfo    2016-06-03 08:45:43.000000000 -0700
 +++ audio/alsa-lib.new/distinfo    2016-12-03 22:08:44.544679000 -0800
 @@ -15,9 +15,10 @@
  SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
  SHA1 (patch-configure.ac) = 1c407e8a9d9ea745ab1b79175f6fc0ec6d475acc
  SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
 -SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
 +SHA1 (patch-include_sound_asound.h) = f8c6370bde21f3f8f973f5cb01ad6f3ea43d92d4
 +SHA1 (patch-src_conf.c) = 77e3a28f6f4ba9b0c2a3085d568742f144582333
  SHA1 (patch-src_control_control__hw.c) =
 07cfe3abe586b32f6b989403cd162599da07e865
  SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
  SHA1 (patch-src_seq_seq__midi__event.c) =
 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
  SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
 -SHA1 (patch-src_ucm_parser.c) = 13dc6b85281d996450c1010cec1bc6e9e87e6b3c
 +SHA1 (patch-src_ucm_parser.c) = 0b48ed576ef666ea8ae3e5f07f5e3c53a0c6b373
 diff -Nur audio/alsa-lib/patches/patch-include_sound_asound.h
 audio/alsa-lib.new/patches/patch-include_sound_asound.h
 --- audio/alsa-lib/patches/patch-include_sound_asound.h    1969-12-31
 16:00:00.000000000 -0800
 +++ audio/alsa-lib.new/patches/patch-include_sound_asound.h
 2016-12-03 21:54:43.192418000 -0800
 @@ -0,0 +1,15 @@
 +$NetBSD$
 +
 +--- include/sound/asound.h.orig    2016-03-31 13:10:39.000000000 +0000
 ++++ include/sound/asound.h
 +@@ -23,6 +23,10 @@
 + #ifndef _UAPI__SOUND_ASOUND_H
 + #define _UAPI__SOUND_ASOUND_H
 +
 ++#ifdef __DragonFly__
 ++#include <sys/time.h>
 ++#endif
 ++
 + #if defined(__KERNEL__) || defined(__linux__)
 + #include <linux/types.h>
 + #else
 diff -Nur audio/alsa-lib/patches/patch-src_conf.c
 audio/alsa-lib.new/patches/patch-src_conf.c
 --- audio/alsa-lib/patches/patch-src_conf.c    2016-04-15
 01:47:50.000000000 -0700
 +++ audio/alsa-lib.new/patches/patch-src_conf.c    2016-12-03
 22:07:00.312452000 -0800
 @@ -1,8 +1,6 @@
 -$NetBSD: patch-src_conf.c,v 1.5 2016/04/15 08:47:50 wiz Exp $
 +$NetBSD$
 
 -* SunOS has no dirent d_type
 -
 ---- src/conf.c.orig    2015-11-09 07:39:18.000000000 +0000
 +--- src/conf.c.orig    2016-03-31 13:10:39.000000000 +0000
  +++ src/conf.c
  @@ -3419,11 +3419,19 @@ static int snd_config_hooks(snd_config_t
 
 @@ -24,3 +22,12 @@
           return 0;
 
       flen = strlen(dirent->d_name);
 +@@ -3549,7 +3557,7 @@ int snd_config_hook_load(snd_config_t *r
 +             int n;
 +
 + #ifndef DOC_HIDDEN
 +-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) &&
 !defined(__FreeBSD__) && !defined(__sun)
 ++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) &&
 !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
 + #define SORTFUNC    versionsort
 + #else
 + #define SORTFUNC    alphasort
 diff -Nur audio/alsa-lib/patches/patch-src_ucm_parser.c
 audio/alsa-lib.new/patches/patch-src_ucm_parser.c
 --- audio/alsa-lib/patches/patch-src_ucm_parser.c    2016-04-15
 01:47:50.000000000 -0700
 +++ audio/alsa-lib.new/patches/patch-src_ucm_parser.c    2016-12-03
 22:07:00.592459000 -0800
 @@ -1,10 +1,8 @@
 -$NetBSD: patch-src_ucm_parser.c,v 1.4 2016/04/15 08:47:50 wiz Exp $
 +$NetBSD$
 
 -* SunOS has no dirent d_type
 -
 ---- src/ucm/parser.c.orig    2013-07-08 12:31:36.000000000 +0000
 +--- src/ucm/parser.c.orig    2016-03-31 13:10:39.000000000 +0000
  +++ src/ucm/parser.c
 -@@ -1224,9 +1224,17 @@ int uc_mgr_import_master_config(snd_use_
 +@@ -1234,9 +1234,17 @@ int uc_mgr_import_master_config(snd_use_
 
   static int filename_filter(const struct dirent *dirent)
   {
 @@ -22,3 +20,12 @@
           if (dirent->d_name[0] == '.') {
               if (dirent->d_name[1] == '\0')
                   return 0;
 +@@ -1264,7 +1272,7 @@ int uc_mgr_scan_master_configs(const cha
 +         "%s", env ? env : ALSA_USE_CASE_DIR);
 +     filename[MAX_FILE-1] = '\0';
 +
 +-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) &&
 !defined(__FreeBSD__) && !defined(__sun)
 ++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) &&
 !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
 + #define SORTFUNC    versionsort
 + #else
 + #define SORTFUNC    alphasort