diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/alsa-lib/Makefile | 3 | ||||
| -rw-r--r-- | audio/alsa-lib/distinfo | 6 | ||||
| -rw-r--r-- | audio/alsa-lib/patches/patch-src_conf.c | 27 | ||||
| -rw-r--r-- | audio/alsa-lib/patches/patch-src_ucm_parser.c | 25 |
4 files changed, 51 insertions, 10 deletions
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index ff364c44889..635e89fc520 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/06/09 12:21:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2014/06/16 14:09:03 jperkin Exp $ # DISTNAME= alsa-lib-1.0.27.2 @@ -24,6 +24,7 @@ CPPFLAGS.SunOS+= -std=c99 -D_POSIX_C_SOURCE=200112L CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0 CPPFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -Du_int64_t=uint64_t +CPPFLAGS.SunOS+= -D__u32=uint32_t -D__u64=uint64_t CPPFLAGS.SunOS+= -Dbswap_64=BSWAP_64 -Dbswap_32=BSWAP_32 -Dbswap_16=BSWAP_16 CPPFLAGS.NetBSD+= -D__u32=uint32_t -D__u64=uint64_t diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo index 6370c1645d6..b9e31c829d3 100644 --- a/audio/alsa-lib/distinfo +++ b/audio/alsa-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2014/06/09 12:21:07 ryoon Exp $ +$NetBSD: distinfo,v 1.15 2014/06/16 14:09:03 jperkin Exp $ SHA1 (alsa-lib-1.0.27.2.tar.bz2) = 9cd50f4b5f07d5e7213dd1277b8673e677804cf8 RMD160 (alsa-lib-1.0.27.2.tar.bz2) = 6794e626affe9b6b6ec5fb64ff31384526b160c2 @@ -44,9 +44,9 @@ SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5 SHA1 (patch-include_sound_asound.h) = 456b8545668294d38a83e98818d76bd2f717df75 SHA1 (patch-src_compat_hsearch__r.c) = 017bf104203233e85e9f3083f43150de6f341ad5 -SHA1 (patch-src_conf.c) = 0ac6556d3a9db8f0535838d35550388ec75d3c2c +SHA1 (patch-src_conf.c) = e047822b6356bf2d62ba156f830ceccd6652d96f 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 -SHA1 (patch-src_ucm_parser.c) = 379b55f0e98444624691fefbb5129d5be92fa1b3 +SHA1 (patch-src_ucm_parser.c) = 63af65cc2f2dcd6037be4dac127e880f4948c58e diff --git a/audio/alsa-lib/patches/patch-src_conf.c b/audio/alsa-lib/patches/patch-src_conf.c index 0d463d548f2..a8b50acd493 100644 --- a/audio/alsa-lib/patches/patch-src_conf.c +++ b/audio/alsa-lib/patches/patch-src_conf.c @@ -1,6 +1,7 @@ -$NetBSD: patch-src_conf.c,v 1.1 2014/06/09 12:21:07 ryoon Exp $ +$NetBSD: patch-src_conf.c,v 1.2 2014/06/16 14:09:03 jperkin Exp $ * NetBSD has no PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +* SunOS has no versionsort or dirent d_type --- src/conf.c.orig 2013-07-08 12:31:36.000000000 +0000 +++ src/conf.c @@ -41,12 +42,32 @@ $NetBSD: patch-src_conf.c,v 1.1 2014/06/09 12:21:07 ryoon Exp $ } #else -@@ -3506,7 +3519,7 @@ int snd_config_hook_load(snd_config_t *r +@@ -3376,11 +3389,19 @@ static int snd_config_hooks(snd_config_t + + static int config_filename_filter(const struct dirent *dirent) + { ++#ifdef __sun ++ struct stat s; ++#endif + size_t flen; + + if (dirent == NULL) + return 0; ++#ifdef __sun ++ stat(dirent->d_name, &s); ++ if (s.st_mode & S_IFDIR) ++#else + if (dirent->d_type == DT_DIR) ++#endif + return 0; + + flen = strlen(dirent->d_name); +@@ -3506,7 +3527,7 @@ int snd_config_hook_load(snd_config_t *r int n; #ifndef DOC_HIDDEN -#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) ++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__sun) #define SORTFUNC versionsort #else #define SORTFUNC alphasort diff --git a/audio/alsa-lib/patches/patch-src_ucm_parser.c b/audio/alsa-lib/patches/patch-src_ucm_parser.c index e445e8e3a6b..fcf8d27eaff 100644 --- a/audio/alsa-lib/patches/patch-src_ucm_parser.c +++ b/audio/alsa-lib/patches/patch-src_ucm_parser.c @@ -1,15 +1,34 @@ -$NetBSD: patch-src_ucm_parser.c,v 1.1 2014/06/09 12:21:07 ryoon Exp $ +$NetBSD: patch-src_ucm_parser.c,v 1.2 2014/06/16 14:09:03 jperkin Exp $ * NetBSD has no versionsort +* SunOS has no versionsort or dirent d_type --- src/ucm/parser.c.orig 2013-07-08 12:31:36.000000000 +0000 +++ src/ucm/parser.c -@@ -1254,7 +1254,7 @@ int uc_mgr_scan_master_configs(const cha +@@ -1224,9 +1224,17 @@ int uc_mgr_import_master_config(snd_use_ + + static int filename_filter(const struct dirent *dirent) + { ++#ifdef __sun ++ struct stat s; ++#endif + if (dirent == NULL) + return 0; ++#ifdef __sun ++ stat(dirent->d_name, &s); ++ if (s.st_mode & S_IFDIR) { ++#else + if (dirent->d_type == DT_DIR) { ++#endif + if (dirent->d_name[0] == '.') { + if (dirent->d_name[1] == '\0') + return 0; +@@ -1254,7 +1262,7 @@ int uc_mgr_scan_master_configs(const cha "%s", env ? env : ALSA_USE_CASE_DIR); filename[MAX_FILE-1] = '\0'; -#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) ++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__sun) #define SORTFUNC versionsort #else #define SORTFUNC alphasort |