summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2021-05-12 14:12:13 +0000
committerryoon <ryoon@pkgsrc.org>2021-05-12 14:12:13 +0000
commitb56c09353b5ae846108036063fa389266e7d5f2d (patch)
tree49191b69004aba912aaccc4e849b3524df85954b /audio
parent1b993d01cbf04af2e44f76ccd9edbe7b396e05ed (diff)
downloadpkgsrc-b56c09353b5ae846108036063fa389266e7d5f2d.tar.gz
alsa-lib: Update to 1.2.4
Changelog: 1.2.4 Core Release v1.2.4 pcm: dmix: make lockless operation optional Control API control: Add documentation for snd_ctl_elem_value_*. control: Improve general control interface documentation. control: Add documentation for snd_ctl_elem_list_*. control: ctlparse - fix enum values in or "" ctl: improve documentation for identifier of control element PCM API pcm: file plugin - implement safe_write pcm: fix the pcm_frames_diff -> pcm_frame_diff typo pcm: dshare - apply the boundary wrap in snd_pcm_dshare_sync_area() pcm: introduce pcm_frame_diff and pcm_frame_diff2 helpers pcm: meter / s16 - add protection for the maximum copied frames dlmisc, pcm: export the old symbols (for -flto) pcm: fix the snd_pcm_plugin_status() avail and delay fields pcm: dmix: fix access to sum-buffer in non-interleaved mixing mode pcm: iec958: set channel status bits according to rate and format pcm: iec958: implement HDMI HBR audio formatting pcm: dmix: Fix semaphore usage with lockless operation pcm: dmix: make lockless operation optional Topology API topology: straight printf and error path fixes topology: save_config - fix the error path handling tplg: fix the unaligned_get32/put32 helpers for big endian topology: improve the printf buffer management topology: fix the unaligned access topology: fix sort_config() topology: fix some gcc10 warnings (labs, signess) topology: return correct value in tplg_save_printf() topology: Make buffer for saving dynamic size topology: decode: Add DAI name printing topology: decode: Print sig_bits field in PCM capabilities section topology: decode: Fix decoding PCM formats and rates topology: decode: Change declaration of enum decoding function topology: decode: Fix printing texts section topology: decode: Add enum control texts as separate element topology: decode: Remove decoding values for enum control topology: decode: Fix infinite loop in decoding enum control topology: decode: Fix channel map memory allocation Use Case Manager API ucm: handle correctly Linked configuration ucm: rename once_list to boot_list ucm: substitute the comment string also in the main configuration file ucm: add a check for the empty configuration ucm: Handle 'Error' keyword in the master file ucm: substitute the merged tree completely ucm: fix parse_get_safe_name() - safe name must be checked after substitution ucm: substitution - remove duplicate allow_empty assignment Configuration conf: quote also strings with '*' and '#' characters in string_print() conf: USB-Audio: Disable IEC958 on Lenovo ThinkStation P620 conf: pcm - USB - Added S/PDIF fix for Asus Xonar SE Documentation README: add patch submission instructions Dynamic Loader helpers dlsym: use the only alsa plugins directory for the internal modules dlmisc, pcm: export the old symbols (for -flto) dlsym: add support for ALSA_PLUGIN_DIR environment variable 1.2.3 Core Release v1.2.3 snd_dlopen: implement the relocatable version for glibc github actions: ubuntu - fix the non-interactive build pcm: dmix: assembly: fix the interface for safety (mmx) configure: add --embed for python3-config (python 3.8) Config API conf: add snd_config_is_array() function Control API tlv: implement nearest rounding in snd_tlv_convert_from_dB() for xdir == 0 control: use more precise rounding in snd_ctl_ascii_value_parse() snd_dlopen: do not use absolute plugin path for snd_dlopen() calls namehint: remember the direction from the upper levels conf: namehint - add omit_noargs to the hint section Mixer API tlv: implement nearest rounding in snd_tlv_convert_from_dB() for xdir == 0 snd_dlopen: do not use absolute plugin path for snd_dlopen() calls PCM API pcm: Fix memory leak at snd_pcm_new when THREAD_SAVE_API is defined pcm: clarify -ENODATA description (recovery, event) pcm: fix spelling in documentation for -EBADFD pcm: add documentation for -ENODATA error code snd_dlopen: do not use absolute plugin path for snd_dlopen() calls pcm: return immediately when the state is SETUP in snd_pcm_drain() pcm: fix snd_pcm_drain() excluding SETUP state from valid states pcm: rate: Fix uninitialized variable warning pcm: rate: Fix compile warning wrt bit ops and comparison pcm: dmix: assembly: give more freedom over the constraints pcm: dmix: assembly: refactor the PIC mode pcm: dmix: assembly: fix the interface for safety (mmx) pcm: dmix: assembly: fix the interface for safety pcm: dmix: assembly: change the token by symbolic names fix infinite draining of the rate plugin in SND_PCM_NONBLOCK mode pcm: rate - fix the remaining size calculation in snd_pcm_rate_drain() pcm: dmix: fix sw_params handling of timestamp types in direct plugins pcm: add chmap option to route plugin Topology API topology: Add missing ATTRIBUTE_UNUSED topology: use snd_config_is_array() function topology: Use bool parser to parse boolean value topology: add back asrc to widget_map in dapm.c Use Case Manager API ucm: fix the wrong return value in uc_mgr_open_ctl() ucm: remove strict: in ${OpenName} substitution ucm: fix the error path in parse_toplevel_path() ucm: fix the wrong uc_mgr_open_ctl() call in if_eval_control_exists() use-case.h: define Linked variable ucm: implement CardIdByName substitution ucm: shuffle code in compound_merge() ucm: substitute arguments in sequences only for syntax 3+ ucm: substitute RenameDevice and DeleteDevice lists ucm: substitute Comment in Transition and Device ucm: substitute verb name and file field ucm: substitute component sequence string ucm: substitute device strings in the device lists ucm: substitute device / modifier names, too ucm: implement the toplevel ucm configuration file parser ucm: substitute ${CardNumber} ucm: substitute ${OpenName} ucm: Define/DefineRegex is supported in Syntax 3 ucm: String condition - implement Empty ucm: handle strict: prefix correctly for the UCM card name ucm: substitute also value strings ucm: allow to specify the toplevel directory using '/' as first character in File path ucm: config - change the in-place include evaluation order ucm: allow syntax version 3 ucm: substitute arguments in sequences ucm: configuration - add DefineRegex ucm: configuration - allow to define the configuration variables ucm: config - substitute File string to allow variables in include ucm: configuration - substitute ${ConfDir} and ${ConfTopDir} ucm: configuration - implement in-place Include ucm: rename _once command to _boot command ucm: rename SectionOnce to BootSequence ucm: fix compilation error in set_defaults_user() ucm: fix SectionOnce comment ucm: initialize mgr->once_list ucm: handle 'set _defaults' command ucm: handle 'set _once' command ucm: execute SectionDefaults lately (when the first verb is set) ucm: parse SectionOnce section in the master UCM configuration file ucm: merge the array items from the condition blocks use-case.h: add USB as allowed device name ucm: fix copy-n-paste typo (RemoveDevice list) ucm: fix the device remove operation usecase: allow indexes also for modifier names ucm: fix uc_mgr_scan_master_configs() ucm: clarify the index syntax for the device names Configuration conf: USB-Audio: Add HP Thunderbolt Dock in the IEC958 blacklist conf: remove debug printf() in snd_config_hook_load() conf: add support for XDG_CONFIG_HOME search path conf: load function (hook) - add OR support conf: USB-Audio.conf - add another card name for Asus Xonar 5 conf: add snd_config_is_array() function conf: use bool type for the join member in the config structure conf: change namehint for pcm.front conf: USB-Audio: Fix S/PDIF output of ASUS Xonar AE pcm: dmix: fix sw_params handling of timestamp types in direct plugins conf: fix namehint for pcm.front and pcm.iec958 conf: USB-Audio: Add C-Media USB Headphone Set to the IEC958 blacklist Change PCM device number of Asus Xonar U5 conf: namehint - add omit_noargs to the hint section conf: changc Loader helpers dlsym: fix the snd_dlopen(), incorrect variable use dlsym: fix again snd_dlpath() dlsym: fix the reference to the origin lib directory snd_dlopen: implement the relocatable version for glibc Kernel Headers header: Fix build error with old kernel headers Simple Abstraction Mixer Modules snd_dlopen: implement the relocatable version for glibc snd_dlopen: do not use absolute plugin path for snd_dlopen() calls Test/Example code test: pcm_min - add snd_pcm_drain() call and indentation fixes 1.2.1.2 Core Release v1.2.1.2 local.h: remove sound/asoundef.h dependency asoundef.h: add CEA861_AUDIO_INFOFRAME defines Control API control: ctlparse - accept enum values in or "" PCM API pcm_file: fix pipe stall when pclose() is called too early Topology API include/sound: sync with the kernel v5.4 Use Case Manager API ucm: add support for ControlEnum in ControlExists condition ucm: conditions - fix the wrong string/substring match use-case: add priority values from pulseaudio use-case: improve comment for mixer elements ucm: rename mixer element identifiers ucm: fix the cdev initialization sequence ucm: remove the new-line for uc_error() calls ucm: use-case.h - add <alsa/asoundlib.h> include ucm: add ${CardDriver} substitution ucm: implement ${sys:sysfs/path} substitution Kernel Headers include/sound/Makefile.am: remove asoundef.h local.h: remove sound/asoundef.h dependency include/sound: sync with the kernel v5.4 Utils alsa.m4: Fix the detection of topology library availability 1.2.1.2 Core Release v1.2.1.2 local.h: remove sound/asoundef.h dependency asoundef.h: add CEA861_AUDIO_INFOFRAME defines Control API control: ctlparse - accept enum values in or "" PCM API pcm_file: fix pipe stall when pclose() is called too early Topology API include/sound: sync with the kernel v5.4 Use Case Manager API ucm: add support for ControlEnum in ControlExists condition ucm: conditions - fix the wrong string/substring match use-case: add priority values from pulseaudio use-case: improve comment for mixer elements ucm: rename mixer element identifiers ucm: fix the cdev initialization sequence ucm: remove the new-line for uc_error() calls ucm: use-case.h - add <alsa/asoundlib.h> include ucm: add ${CardDriver} substitution ucm: implement ${sys:sysfs/path} substitution Kernel Headers include/sound/Makefile.am: remove asoundef.h local.h: remove sound/asoundef.h dependency include/sound: sync with the kernel v5.4 Utils alsa.m4: Fix the detection of topology library availability 1.2.1.1 Core Release v1.2.1.1 PCM API pcm: add braces to condition (coverity) Use Case Manager API ucm: quick fix for the previous commit when ALSA_CONFIG_UCM_VAR is set ucm: fix again the long name configuration filename lookup ucm: parser: Fix snprintf usage ucm: Only look in ucm[1] or ucm2 dir once we've found a config file in one ucm: Fix fallback to card_name (shortname) config for ucm1 profiles ucm: Fix opening of master-configs by the card's longname ucm: fix memory leaks detected by the coverity checker Configuration conf: check for include path duplicates conf: fix the include paths support 1.2.1 Core Release v1.2.1 conf: implement snd_config_add_before() and snd_config_add_after() topology: remove configuration files (moved to alsa-topology-conf repository) create separated libatopology library with the topology routines ucm: remove configuration files (moved to alsa-ucm-conf repository) conf: improve the include paths code Use __func__ instead of __FUNCTION__ rawmidi: use snd_dlobj_cache_get2() in rawmidi open (coverity) ucm: Add UCM profile for CX2072X codec on Baytrail/Cherrytrail profiles Config API conf: implement snd_config_add_before() and snd_config_add_after() ucm: change the If block parsing ucm: add If condition block Control API control_shm: add missing socket close to the error path (coverity) control_shm: remove duplicate code (coverity) Mixer API mixer: simple - add snd_mixer_selem_id_parse() from amixer PCM API pcm: the maximal rate is 768000Hz, fix the remain code pcm: fix the period_size for direct plugins (dmix, dsnoop, dshare) pcm: Fix the wrong PCM object passed for locking/unlocking pcm: chmap: Fix memory leak at snd_pcm_set_chmap() pcm: dshare: allow missing bindings pcm: return -ENOSYS when ops or fast_ops callback is NULL pcm_file: improve error checking in write_wav_header function pcm_file: in case of failed write clear file buffer variables pcm_file: use EIO instead of EPIPE when failing to write output file pcm_file: return errno in case of a failed write operation pcm_file: remove double line pcm_file: report write output file error to api user pcm_file: do not disrupt playback on output file write fail pcm: rate: Avoid pointer arithmetic on `void *` pcm: direct: Remove unused empty struct pcm: Make sure parameter qualifiers match between declaration and definition pcm: hw: Don't return in a void function Use __func__ instead of __FUNCTION__ pcm_file: another locking fix (coverity) pcm_file: coverity fixes (including double locking) pcm_hw: close file descriptor in the error path in snd_pcm_hw_open() (coverity) pcm_file: call pclose() correctly for popen() (coverity) pcm: fix memory leak in _snd_pcm_parse_config_chmaps() (coverity) pcm: file: add infile read support for mmap mode pcm: add mmap_begin callback to snd_pcm_fast_ops_t api pcm: file: add missing unlock on early return pcm: file: use snd_pcm_file_areas_read_infile for readi pcm: file: add support for infile reading in non interleaved mode pcm: dsnoop: Added "hw_ptr_alignment" option in configuration for slave pointer alignment pcm: dshare: Added "hw_ptr_alignment" option in configuration for alignment of slave pointers pcm: direct: Add generic hw_ptr_alignment function for dmix, dshare and dsnoop PCM Plugin API pcm: the maximal rate is 768000Hz, fix the remain code RawMidi API rawmidi_hw: add sanity check for the invalid stream arguments (coverity) rawmidi: use snd_dlobj_cache_get2() in rawmidi open (coverity) Topology API create separated libatopology library with the topology routines topology: Fix variable overflow in split_format topology: add support to parse private data for pcm topology: next round of coverity fixes topology: various coverity fixes Use Case Manager API ucm: add possibility to keep order of childs for If blocks ucm: change the If block parsing ucm: docs: Add MinBufferLevel value ucm: docs: Add EDID File value use-case header file: add more references to correct ASCII ID parsers for CTL/mixer IDs ucm: add snd_use_case_parse_selem_id() ucm: add If.Condition.RegexMatch ucm: add ${CardComponents} substitution to the value string processing ucm: evaluate nested If blocks also in True/False blocks ucm: add If.Condition.String to match strings and substrings ucm: add snd_use_case_parse_ctl_elem_id() ucm: add PlaybackCTL and CaptureCTL default values when they are not set ucm: small cosmetic uc_error change in execute_sequence() ucm: add If condition block ucm: do not cache all control devices in get_card_long_name() ucm: parser - use less memory for integer/real values in parse_value() ucm: save the whole ctl info to the ctl_list structure ucm: add the run-time variable substitution ucm: fix memory leaks for cdev, bin-file and tlv elements ucm: do not report failure when long name configuration does not exist ucm: add support for multiple control devices, more aggresive caching ucm: extend snd_use_case_mgr_open() to address the sound card directly ucm: switch to ucm2 directory and v2 format, keep backward compatibility conf: improve the include paths code ucm: parse_verb_file() - remove folder_name variable and extra logic ucm: fix uc_mgr_scan_master_configs() - skip correctly component directories ucm: cosmetic fix in get_card_long_name() ucm: another coverity fix in uc_mgr_config_load() ucm: coverity fixes /Makefile.am create separated libatopology library with the topology routines /src/Makefile.am create separated libatopology library with the topology routines ALSA Server Use __func__ instead of __FUNCTION__ aserver: fix resource leak coverity Configuration conf: implement snd_config_a_config_add_after() topology: remove configuration files (moved to alsa-topology-conf repository) ucm: remove configuration files (moved to alsa-ucm-conf repository) conf: improve the include paths code conf: List cases in range explicitly config: parse_string() fix the dynamic buffer allocation failure code (coverity) src/conf.c: add missing va_end() call (coverity) ucm: Add UCM profile for CX2072X codec on Baytrail/Cherrytrail profiles Dynamic Loader helpers rawmidi: use snd_dlobj_cache_get2() in rawmidi open (coverity) Utils create separated libatopology library with the topology routines 1.1.9 Core Release v1.1.9 add support for GCC's LTO add snd_strlcpy() and use it everywhere ucm: Add ucm files for DB820c board Control API add support for GCC's LTO Print unsigned ints with %u instead of %i. (snd_ctl_ascii_elem_id_get) add snd_strlcpy() and use it everywhere PCM API add support for GCC's LTO pcm: multi plugin: reset hw/appl pointers in prepare/reset functions pcm: multi plugin: detach the hw_ptr and appl_ptr from master_slave pcm: fix wait condition in snd_pcm_write_areas() to avoid return zero pcm: multi plugin - fix wait_for_avail_min pcm: null: Do not allow a period size of 0 pcm: rate plugin - fix signess in snd_pcm_rate_avail_update() comparison add snd_strlcpy() and use it everywhere pcm: add the missing <strings.h> include pcm: dshare: Fix overflow when slave_hw_ptr rolls over boundary pcm: Preserve period_event in snd_pcm_hw_sw_params() call Sequencer API add snd_strlcpy() and use it everywhere Timer API add support for GCC's LTO Topology API Close topology config file after parsing it. add snd_strlcpy() and use it everywhere Use Case Manager API Android: avoid using versionsort /include/Makefile.am Drop -I$includedir/alsa from alsa.pc ALSA Lisp alisp: add the missing include Configuration Android: avoid using versionsort conf: pcm dmix - add CHANNELS argument ucm: bytcr/PlatformEnableSeq.conf update some comments ucm: Add ucm files for DB820c board Revert "conf/ucm: Add a UCM profile for Dell WD19 Dock USB-audio" conf/ucm: Add a UCM profile for Dell WD19 Dock USB-audio Dynamic Loader helpers add support for GCC's LTO Error handler add snd_strlcpy() and use it everywhere Test/Example code Printf unsigned longs with %lu instead of %ld (playmidi1.c) Printf unsigned ints with %u instead of %i (pcm.c) Printf unsigned long longs with %llu (mixtest.c) Printf unsigned longs with %lu instead of %li (midifile.c) Printf unsigned long with %lu instead of %li (latency.c) test/latency: use frame bytes correctly in writebuf() Utils Drop -I$includedir/alsa from alsa.pc 1.1.8 Core Release v1.1.8 conf: rename snd_conf_load1() to _snd_config_load_with_include() conf/ucm: bytcht-es8316: Add long-name UCM profiles conf/ucm: Add UCM profile for bytcht-es8316 boards Create shared {En,Dis}ableSeq.conf components for rt5645 variants conf/ucm: bytcr-rt5651: Add bytcr-rt5651-stereo-spk-dmic-mic config conf/ucm: kblrt5660: Add ucm setting for Dell Edge IoT platform conf/ucm: chtrt5650: Add UCM config for chtrt5650 ucm: Set default include path conf: Move UCM profile snippets into components subdirectory initial version of .travis.yml file Control API control: fix the assert() in snd_ctl_elem_set_bytes PCM API pcm: ioplug: Fix the regression of pulse plugin drain pcm: extplug: Keep format and channels the same if requested pcm: dshare: Fix segfault when not binding channel 0 pcm: dmix: Add option to allow alignment of slave pointers pcm: interval: Interpret (x x+1] correctly and return x+1 Use Case Manager API conf: rename snd_conf_load1() to _snd_config_load_with_include() ucm: Set default include path conf: Move UCM profile snippets into components subdirectory Configuration conf: rename snd_conf_load1() to _snd_config_load_with_include() conf/ucm: bytcht-es8316: Add long-name UCM profiles conf/ucm: Add UCM profile for bytcht-es8316 boards Create device component for rt5645 Internal Analog Mic UCM Factor out rt5645 variants Headset+Digital Mic UCM shared {en,dis}able sequences Factor out rt5645 variants Speaker+Headphones shared UCM enable sequences Create shared {En,Dis}ableSeq.conf components for rt5645 variants Update chtrt5645 ucm variants to use bytcr/PlatformEnableSeq.conf component conf/ucm: bytcr-rt5651: Document mono speaker wiring conf/ucm: bytcr-rt5651: Add bytcr-rt5651-stereo-spk-dmic-mic config conf/ucm: bytcr-rt5651: Add digital mic support conf/ucm: bytcr-rt5651: Add support for a headset-mic on IN2 conf/ucm: bytcr-rt5651: Enable Stereo? ADC MIXL ADC? switches when enabling inputs conf/ucm: kblrt5660: Add ucm setting for Dell Edge IoT platform conf/ucm: chtrt5650: Add UCM config for chtrt5650 ucm: Set default include path conf: Move UCM profile snippets into components subdirectory conf: USB-Audio: Add Dell WD19 Dock in the IEC958 blacklist conf/ucm/Dell-WD15-Dock: Fix incorrect device names Documentation README.md: add link to www.alsa-project.org initial version of README.md for github External PCM Filter Plugin SDK pcm: extplug: Keep format and channels the same if requested Test/Example code test/audio_time: remove unused variables test: rename code to more approriate mixtest test/code: make it work again test/latecy: fix typo in tstamp compare Utils utils/alsa.m4: conditionally enable libdl in AM_PATH_ALSA m4 macro 1.1.7 Core Release v1.1.7 conf/ucm: bytcr-rt5651: Add bytcr-rt5651-mono-spk-in2-mic-hp-swapped config conf/ucm: bytcr-rt5651: Add long-name UCM profiles conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence, support SSP0 conf/ucm: chtnau8824: Add Cube iWork8 Air and Pipo W2S specific profiles conf/ucm: chtnau8824: Add UCM profile for chtnau8824 boards conf/ucm: bytcr-rt5640: Add long-name UCM profiles conf/ucm: bytcr-rt5640: Add generic bytcr-rt5640 UCM profile configure: Fix forgotten ucm entry conf/ucm: chtrt5645: At config for the Lenovo Ideapad Miix 320 conf/ucm: chtrt5645: At config for the Asus T100HA configure: remove src/conf/alsa.conf.d/Makefile Control API control_hw: Fix issue when applying seccomp policy hcontrol: use position offset macro of TLV data control: use position offset macro of TLV data PCM API pcm: ioplug: Transfer all available data pcm: rate: Add error check for snd_pcm_avail_update() pcm: ioplug: Provide avail helper function for plugins pcm: snd_interval_refine_first/last: exclude value only if also excluded before pcm: Define refine mask bits explicitly (and fix missing DSD support) pcm: dmix: Fix hwptr updates at status call pcm ioplug: fix some coverity issues (switch, missing unlock in snd_pcm_ioplug_drain()) pcm: add missing flags initialization for the fallback control data pcm: softvol: use position offset macro of TLV data pcm: hw: use position offset macro of TLV data pcm: softvol: Allow up to 90 dB of gain PCM Plugin API pcm: Fix header guard in pcm_plugin.h Sequencer API seq: Fix signedness in MIDI encoder/decoder Topology API ASoC: topology: Add alias conf parameter names for hw_configs ASoC: topology: Add definitions for mclk_direction values ASoC: topology: Add missing clock gating parameter when parsing hw_configs ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() Use Case Manager API ucm: adding the folder of card_long_name when finding verb conf file Configuration conf/ucm: bytcr-rt5640: Improve human readable input/output names conf/ucm: bytcr-rt5651: Add bytcr-rt5651-mono-spk-in2-mic-hp-swapped config conf/ucm: bytcr-rt5651: Add long-name UCM profiles conf/ucm: bytcr-rt5651: Add mono speaker output profile conf/ucm: bytcr-rt5651: Split into 1 .conf file per input / output conf/ucm: bytcr-rt5651: Add support for mic input on various pins conf/ucm: bytcr-rt5651: Fix ADC and Mic capture volumes conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence, support SSP0 conf/ucm: bytcr-rt5651: Change Speaker/Headphone en/disable sequences to fix switching conf/ucm: bytcr-rt5651: Start with all outputs and inputs disabled conf/ucm: bytcr-rt5651: Configure all volumes at 0dB conf/ucm: bytcr-rt5651: Do not use both DAC1 and HPVOL inputs for HP conf/ucm: bytcr-rt5645: Use the generic bytcr/PlatformEnableSeq.conf conf/ucm: VEYRON-I2S: Add internal speakers and mic, other fixes conf/ucm: chtnau8824: Add Cube iWork8 Air and Pipo W2S specific profiles conf/ucm: chtnau8824: Add UCM profile for chtnau8824 boards conf/ucm: bytcr-rt5640: Add default DisableSequence conf/ucm: bytcr-rt5640: Add long-name UCM profiles conf/ucm: bytcr-rt5640: Add generic bytcr-rt5640 UCM profile conf: USB-audio: Fix for Xonar U7 SPDIF device conf/ucm: Add a UCM profile for Dell WD15 Dock USB-audio conf/ucm: chtrt5645: At config for the Lenovo Ideapad Miix 320 conf/ucm: chtrt5645: At config for the Asus T100HA conf/ucm: chtrt5645: Fix recording from internal analog microphone conf/ucm: chtrt5645: Microphone recording fixes conf/ucm: chtrt5645: Cleanup and playback fixes conf/ucm: increase the input volume for LineIn ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() conf: remove alsa.conf.d from the datadir alsa.conf: change the location for add-on configs to /etc/alsa/conf.d External PCM I/O Plugin SDK ioplug: Fix comment in struct snd_pcm_ioplug pcm: ioplug: Provide avail helper function for plugins Kernel Headers timer: fix wrong comment to refer to 'SNDRV_TIMER_PSFLG_*' control: add a series of macro for offset of several types of TLV ASoC: topology: Add definitions for mclk_direction values ASoC: topology: Add missing clock gating parameter when parsing hw_configs ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() Test/Example code test: use position offset macro of TLV data 1.1.6 Core Release v1.1.6 a set of fixes to reduce gcc warnings modules: smixer_python - add support for python3 conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration core: Proper reference of internal snd_dlopen() conf/ucm: Add Gigabyte mobo UCM profile with dual HD-audio codecs conf/ucm: Add dual HD-audio codecs config for Lenovo conf/ucm: Rearrange Makefile.am configure.ac: do not enable alisp code by default configure.ac: build extra mixer modules conditionally Change snd_dlopen() function to return the error string Change FSF address (Franklin Street) Control API control ext: fix the default .rawmidi_next_device callback control: Proper reference of internal versioned functions HWDEP API core: Proper reference of internal snd_dlopen() Mixer API core: Proper reference of internal snd_dlopen() PCM API pcm: ioplug: Implement proper drain behavior pcm: Skip avail_min check during draining a set of fixes to reduce gcc warnings pcm: hw: Keep control data from kernel when SND_PCM_APPEND pcm: ioplug: update prepare and draining state correctly pcm: Provide areas_copy function which handles buffer wrap around pcm: ioplug: Provide hw_avail helper function for plugins pcm: Do not access lock_enabled if thread safe API pcm: ioplug: Use boundary for wrap around pcm: another fix for the snd_pcm_area_silence() fast path pcm: fix a bug to copy silent samples aligned to 64 pcm: Fix two bugs in snd_pcm_area_silence() pcm: Return the consistent error code for unexpected PCM states core: Proper reference of internal snd_dlopen() timer: Proper reference of internal versioned symbols pcm: fix wrong comments for some cases of linear interpolation of PCM samples pcm: remove unused macros of NORMS_LABELS/NORMS_END pcm: remove unused macros of GETU_LABELS/GETU_END pcm: remove unused macros of COPY_LABELS/COPY_END pcm: plug: add SND_PCM_FORMAT_{S, U}20 to linear_preferred_formats pcm: linear, route: handle linear formats with 20-bit sample on 4 bytes pcm: add and describe SND_PCM_FORMAT_{S, U}20 pcm: route: Fix use_getput flag computation for 3 byte formats Timer API timer: Proper reference of internal versioned symbols Topology API a set of fixes to reduce gcc warnings topology: Fix parsing config with multiple hw_configs topology: Fix to skip writing of header for compound elements ALSA Lisp control: Proper reference of internal versioned functions Change FSF address (Franklin Street) ALSA Server a set of fixes to reduce gcc warnings Change FSF address (Franklin Street) Compatibility routines Change FSF address (Franklin Street) Configuration conf: USB-Audio: Add second S/PDIF device on Phiree U2SX conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration core: Proper reference of internal snd_dlopen() conf/ucm: Add Gigabyte mobo UCM profile with dual HD-audio codecs conf/ucm: Add dual HD-audio codecs config for Lenovo conf/ucm: Rearrange Makefile.am configure.ac: build extra mixer modules conditionally Change snd_dlopen() function to return the error string Documentation Change FSF address (Franklin Street) Dynamic Loader helpers core: Proper reference of internal snd_dlopen() External PCM I/O Plugin SDK pcm: ioplug: Provide hw_avail helper function for plugins pcm: ioplug: Use boundary for wrap around Kernel Headers asound.h: add SNDRV_PCM_FORMAT_{S, U}20 Simple Abstraction Mixer Modules modules: smixer_python - add support for python3 configure.ac: build extra mixer modules conditionally Change snd_dlopen() function to return the error string Test/Example code test: correct emulation for channel-map TLV 1.1.5 Core Release v1.1.5 conf/ucm: rt5651: Add UCM config for bytcr-rt5651 snd_user_file: avoid use wordexp cleanup: fix poll.h includes Release v1.1.4.1 conf: Check the availability of PTHREAD_MUTEX_RECURSIVE Control API ctl: deprecate APIs of dimensional information ctl: ext: Fail with error code if snd_ctl_ext_callback::read_event() callback is not defined cleanup: fix poll.h includes PCM API pcm: softvol: add support for S24_LE cleanup: Use uint*_t instead of u_int*_t everythwere cleanup: fix poll.h includes pcm: hw: remove superfluous code to call of SNDRV_PCM_IOCTL_SYNC_PTR in snd_pcm_hw_forward() pcm: hw: add a helper function to issue avail_min without side-effects pcm: hw: add a helper function to issue appl_ptr without side-effects pcm: hw: add a helper function to request hwsync without side-effects pcm: hw: add a helper function just to query status data pcm: hw: add a helper function to query status/control data pcm: hw: minor refactoring for initialization of control data pcm: hw: fix to initialize function local variable pcm: hw: Call USER_PVERSION ioctl at open pcm: hw: maintain fallback mode for control data mapping independently pcm: hw: maintain fallback mode for status data mapping pcm: hw: allocate fallback buffer in advance of trials of mapping pcm: hw: deallocate fallback buffer when trials of unmapping finished pcm: hw: add an arrangement for initialization of appl_ptr/avail_min pcm: hw: add helper functions to map/unmap status/control data for runtime of PCM substream pcm: hw: Remove superfluous call of snd_pcm_set_appl_ptr() pcm: minor code cleanup for ioctl call pcm: obsolete 'mmap_emulation' parameter of snd_pcm_hw_open_fd() pcm: dmix: Fix the inconsistent PCM state pcm: dshare: Call snd_pcm_dshare_state() directly pcm: dmix: Workaround for binary incompatibility conf: Check the availability of PTHREAD_MUTEX_RECURSIVE build: Define __USE_UNIX98 for old glibc RawMidi API rawmidi: symbols: use rawmidi_virt only when available Sequencer API seq: fix snd_seq_set_queue_tempo() usage example in the documentation cleanup: fix poll.h includes Topology API alsa-lib: topology: fix DSP_B mode string topology: fix coverity issues topology: fix usage of SND_TPLG_INDEX_ALL when checking routes topology: Fix private data for BEs topology: improve verbose output for block output. topology: Add support for new widget types topology: Add parsing for rates from conf topology: disable alsa-lib topology debug output by default. topology: Add support for missing fields parser. ALSA Server cleanup: fix poll.h includes Compatibility routines cleanup: Use uint*_t instead of u_int*_t everythwere Configuration conf/ucm: rt5651: Mute speakers on boot conf/ucm: rt5651: Add missing cdev conf/ucm: rt5651: Fix HiFi file name conf/ucm: rt5651: Add UCM config for bytcr-rt5651 conf: HdmiLpeAudio: remove the "front" pcm definition conf: HdmiLpeAudio: add support for 3 devices conf/ucm: DB410c-HiFi: add CIC selection conf: USB-Audio: allow custom definitions for "default" devices conf: USB-Audio: fix dsnoop args for Audiophile USB card conf: Check the availability of PTHREAD_MUTEX_RECURSIVE Filename helpers snd_user_file: avoid use wordexp Kernel Headers topology: Add support for new widget types pcm: hw: Call USER_PVERSION ioctl at open SHM helpers cleanup: fix poll.h includes Test/Example code test: obsolete usage of APIs of dimensional information test/seq-decoder: enable timestamping for external subscribers test: apply optimization for v4.14 kernel about changes for TLV data handling on user-defined element set test: add a test for list operation to user-defined element sets 1.1.4.1 Core Release v1.1.4.1 conf: Check the availability of PTHREAD_MUTEX_RECURSIVE PCM API pcm: dmix: Fix the inconsistent PCM state pcm: dshare: Call snd_pcm_dshare_state() directly pcm: dmix: Workaround for binary incompatibility conf: Check the availability of PTHREAD_MUTEX_RECURSIVE build: Define __USE_UNIX98 for old glibc Configuration conf: Check the availability of PTHREAD_MUTEX_RECURSIVE Test/Example code test: add a test for list operation to user-defined element sets
Diffstat (limited to 'audio')
-rw-r--r--audio/alsa-lib/Makefile14
-rw-r--r--audio/alsa-lib/PLIST68
-rw-r--r--audio/alsa-lib/distinfo28
-rw-r--r--audio/alsa-lib/patches/patch-aq16
-rw-r--r--audio/alsa-lib/patches/patch-configure.ac10
-rw-r--r--audio/alsa-lib/patches/patch-include_sound_asound.h16
-rw-r--r--audio/alsa-lib/patches/patch-include_sound_type__compat.h47
-rw-r--r--audio/alsa-lib/patches/patch-include_sound_uapi_asoc.h14
-rw-r--r--audio/alsa-lib/patches/patch-include_sound_uapi_asound.h19
-rw-r--r--audio/alsa-lib/patches/patch-src_dlmisc.c36
-rw-r--r--audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c6
-rw-r--r--audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c6
-rw-r--r--audio/alsa-lib/patches/patch-src_shmarea.c6
-rw-r--r--audio/alsa-lib/patches/patch-src_ucm_parser.c17
14 files changed, 193 insertions, 110 deletions
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 61f42e3799c..86d6182fca1 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2017/06/19 20:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2021/05/12 14:12:13 ryoon Exp $
-DISTNAME= alsa-lib-1.1.4.1
+DISTNAME= alsa-lib-1.2.4
CATEGORIES= audio
MASTER_SITES= ftp://ftp.alsa-project.org/pub/lib/
EXTRACT_SUFX= .tar.bz2
@@ -21,12 +21,12 @@ CONFIGURE_ARGS+= --disable-python
CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0
CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600
-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+= -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.NetBSD+= -D__u32=uint32_t -D__u64=uint64_t
-CPPFLAGS.FreeBSD+= -D__u32=uint32_t -D__u64=uint64_t
+#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
LIBS.SunOS+= -lsocket -lnsl
diff --git a/audio/alsa-lib/PLIST b/audio/alsa-lib/PLIST
index 2ad9baf9d90..b4bb29b8ca6 100644
--- a/audio/alsa-lib/PLIST
+++ b/audio/alsa-lib/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2017/05/29 12:42:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/05/12 14:12:13 ryoon Exp $
bin/aserver
-include/alsa/alisp.h
include/alsa/asoundef.h
include/alsa/asoundlib.h
include/alsa/conf.h
@@ -34,16 +33,26 @@ include/alsa/sound/sb16_csp.h
include/alsa/sound/sscape_ioctl.h
include/alsa/sound/tlv.h
include/alsa/sound/type_compat.h
+include/alsa/sound/uapi/asoc.h
+include/alsa/sound/uapi/asound_fm.h
+include/alsa/sound/uapi/emu10k1.h
+include/alsa/sound/uapi/hdsp.h
+include/alsa/sound/uapi/hdspm.h
+include/alsa/sound/uapi/sb16_csp.h
+include/alsa/sound/uapi/sscape_ioctl.h
+include/alsa/sound/uapi/tlv.h
include/alsa/timer.h
include/alsa/topology.h
include/alsa/use-case.h
include/alsa/version.h
+include/asoundlib.h
include/sys/asoundlib.h
lib/libasound.la
+lib/libatopology.la
+lib/pkgconfig/alsa-topology.pc
lib/pkgconfig/alsa.pc
share/aclocal/alsa.m4
share/alsa/alsa.conf
-share/alsa/alsa.conf.d/README
share/alsa/cards/AACI.conf
share/alsa/cards/ATIIXP-MODEM.conf
share/alsa/cards/ATIIXP-SPDMA.conf
@@ -90,8 +99,6 @@ share/alsa/cards/RME9636.conf
share/alsa/cards/RME9652.conf
share/alsa/cards/SB-XFi.conf
share/alsa/cards/SI7018.conf
-share/alsa/cards/SI7018/sndoc-mixer.alisp
-share/alsa/cards/SI7018/sndop-mixer.alisp
share/alsa/cards/TRID4DWAVENX.conf
share/alsa/cards/USB-Audio.conf
share/alsa/cards/VIA686A.conf
@@ -102,7 +109,6 @@ share/alsa/cards/VX222.conf
share/alsa/cards/VXPocket.conf
share/alsa/cards/VXPocket440.conf
share/alsa/cards/YMF744.conf
-share/alsa/cards/aliases.alisp
share/alsa/cards/aliases.conf
share/alsa/cards/pistachio-card.conf
share/alsa/cards/vc4-hdmi.conf
@@ -123,53 +129,3 @@ share/alsa/pcm/surround41.conf
share/alsa/pcm/surround50.conf
share/alsa/pcm/surround51.conf
share/alsa/pcm/surround71.conf
-share/alsa/sndo-mixer.alisp
-share/alsa/topology/broadwell/broadwell.conf
-share/alsa/topology/bxtrt298/bxt_i2s.conf
-share/alsa/topology/sklrt286/skl_i2s.conf
-share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
-share/alsa/ucm/DAISY-I2S/HiFi.conf
-share/alsa/ucm/DB410c/DB410c.conf
-share/alsa/ucm/DB410c/HDMI
-share/alsa/ucm/DB410c/HiFi
-share/alsa/ucm/GoogleNyan/GoogleNyan.conf
-share/alsa/ucm/GoogleNyan/HiFi.conf
-share/alsa/ucm/PAZ00/HiFi.conf
-share/alsa/ucm/PAZ00/PAZ00.conf
-share/alsa/ucm/PAZ00/Record.conf
-share/alsa/ucm/PandaBoard/FMAnalog
-share/alsa/ucm/PandaBoard/PandaBoard.conf
-share/alsa/ucm/PandaBoard/hifi
-share/alsa/ucm/PandaBoard/hifiLP
-share/alsa/ucm/PandaBoard/record
-share/alsa/ucm/PandaBoard/voice
-share/alsa/ucm/PandaBoard/voiceCall
-share/alsa/ucm/PandaBoardES/FMAnalog
-share/alsa/ucm/PandaBoardES/PandaBoardES.conf
-share/alsa/ucm/PandaBoardES/hifi
-share/alsa/ucm/PandaBoardES/hifiLP
-share/alsa/ucm/PandaBoardES/record
-share/alsa/ucm/PandaBoardES/voice
-share/alsa/ucm/PandaBoardES/voiceCall
-share/alsa/ucm/SDP4430/FMAnalog
-share/alsa/ucm/SDP4430/SDP4430.conf
-share/alsa/ucm/SDP4430/hifi
-share/alsa/ucm/SDP4430/hifiLP
-share/alsa/ucm/SDP4430/record
-share/alsa/ucm/SDP4430/voice
-share/alsa/ucm/SDP4430/voiceCall
-share/alsa/ucm/VEYRON-I2S/HiFi.conf
-share/alsa/ucm/VEYRON-I2S/VEYRON-I2S.conf
-share/alsa/ucm/broadwell-rt286/HiFi
-share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
-share/alsa/ucm/broxton-rt298/Hdmi1
-share/alsa/ucm/broxton-rt298/Hdmi2
-share/alsa/ucm/broxton-rt298/HiFi
-share/alsa/ucm/broxton-rt298/broxton-rt298.conf
-share/alsa/ucm/chtrt5645/HiFi.conf
-share/alsa/ucm/chtrt5645/chtrt5645.conf
-share/alsa/ucm/skylake-rt286/Hdmi1
-share/alsa/ucm/skylake-rt286/Hdmi2
-share/alsa/ucm/skylake-rt286/HiFi
-share/alsa/ucm/skylake-rt286/skylake-rt286.conf
-share/alsa/ucm/tegraalc5632/tegraalc5632.conf
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index a451a4c57be..1758533228d 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,24 +1,28 @@
-$NetBSD: distinfo,v 1.28 2017/06/27 15:51:39 jperkin Exp $
+$NetBSD: distinfo,v 1.29 2021/05/12 14:12:13 ryoon Exp $
-SHA1 (alsa-lib-1.1.4.1.tar.bz2) = 628634afbdc19054fca26d714aa6c2f1e41e465d
-RMD160 (alsa-lib-1.1.4.1.tar.bz2) = 703e99f22a6b399fe32419a2ccc95b9b6292db10
-SHA512 (alsa-lib-1.1.4.1.tar.bz2) = 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b
-Size (alsa-lib-1.1.4.1.tar.bz2) = 974584 bytes
+SHA1 (alsa-lib-1.2.4.tar.bz2) = 5404393a44906f92ba87189b6fd7fa0c031a037e
+RMD160 (alsa-lib-1.2.4.tar.bz2) = d59abf8ef810f000df484b4e6cd33db54d8f0b45
+SHA512 (alsa-lib-1.2.4.tar.bz2) = 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
+Size (alsa-lib-1.2.4.tar.bz2) = 1044405 bytes
SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
SHA1 (patch-ae) = 7ad3a3c3ee4be2c80fa6b0a2ea28563efd399a60
SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
-SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
+SHA1 (patch-aq) = 29fc896b2acad44e5fa9619aca1df5dddd76fa5e
SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
SHA1 (patch-bi) = 7e74ebe53cc2ab273f5235775e391a6ef28d1006
SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
-SHA1 (patch-configure.ac) = 897ae894de00857ed58553808ba40e24c0666b15
-SHA1 (patch-include_sound_asound.h) = 04e80f66542473b3b858427972046f2de320f871
+SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5
+SHA1 (patch-include_sound_asound.h) = 5d85d804fec62250d2a3e5d269397641e13bc957
+SHA1 (patch-include_sound_type__compat.h) = a5dea86a0fd998d35147820269786d2cf8eff5e0
+SHA1 (patch-include_sound_uapi_asoc.h) = 5f1da418a2ad4ae066b34c75c9106108711b5d3d
+SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
SHA1 (patch-include_type__compat.h) = 3cb245d8ea171f987859e1b5a89b0908c2037492
SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
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) = 6682d702c5180ecddd1c6c8ecffe6064986ed8b1
+SHA1 (patch-src_dlmisc.c) = 65eff0df7e182992868b75784ee07c797b3fbb4d
+SHA1 (patch-src_pcm_pcm__mmap.c) = 6d2325ebbc029e0b964f3a2de0516705ca8263e2
+SHA1 (patch-src_seq_seq__midi__event.c) = cf4ff866cf2cff3e78dc589b43840e16a1cf40b1
+SHA1 (patch-src_shmarea.c) = 44e21f48c4cb5d8b82888ea92b7f55b73fcee21a
+SHA1 (patch-src_ucm_parser.c) = 57a99eb617eb8e8f290ddd821fe8a4c99506d536
diff --git a/audio/alsa-lib/patches/patch-aq b/audio/alsa-lib/patches/patch-aq
index 0df1df07a4d..17969badef8 100644
--- a/audio/alsa-lib/patches/patch-aq
+++ b/audio/alsa-lib/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.4 2016/04/15 08:47:50 wiz Exp $
+$NetBSD: patch-aq,v 1.5 2021/05/12 14:12:13 ryoon Exp $
---- src/pcm/pcm_hw.c.orig 2013-07-08 12:31:36.000000000 +0000
+--- src/pcm/pcm_hw.c.orig 2020-06-29 10:51:08.000000000 +0000
+++ src/pcm/pcm_hw.c
-@@ -220,10 +224,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
+@@ -278,10 +278,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
static int snd_pcm_hw_async(snd_pcm_t *pcm, int sig, pid_t pid)
{
@@ -15,7 +15,7 @@ $NetBSD: patch-aq,v 1.4 2016/04/15 08:47:50 wiz Exp $
if ((flags = fcntl(fd, F_GETFL)) < 0) {
err = -errno;
SYSMSG("F_GETFL failed (%i)", err);
-@@ -238,13 +243,16 @@ static int snd_pcm_hw_async(snd_pcm_t *p
+@@ -296,13 +297,16 @@ static int snd_pcm_hw_async(snd_pcm_t *p
SYSMSG("F_SETFL for O_ASYNC failed (%i)", err);
return err;
}
@@ -32,7 +32,7 @@ $NetBSD: patch-aq,v 1.4 2016/04/15 08:47:50 wiz Exp $
if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
err = -errno;
SYSMSG("F_SETOWN failed (%i)", err);
-@@ -1407,8 +1415,10 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp,
+@@ -1555,8 +1559,10 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp,
mode = 0;
if (fmode & O_NONBLOCK)
mode |= SND_PCM_NONBLOCK;
@@ -40,10 +40,10 @@ $NetBSD: patch-aq,v 1.4 2016/04/15 08:47:50 wiz Exp $
if (fmode & O_ASYNC)
mode |= SND_PCM_ASYNC;
+#endif
+ if (fmode & O_APPEND)
+ mode |= SND_PCM_APPEND;
- if (ioctl(fd, SNDRV_PCM_IOCTL_PVERSION, &ver) < 0) {
- ret = -errno;
-@@ -1547,8 +1557,10 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, co
+@@ -1705,8 +1711,10 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, co
fmode = O_RDWR;
if (mode & SND_PCM_NONBLOCK)
fmode |= O_NONBLOCK;
diff --git a/audio/alsa-lib/patches/patch-configure.ac b/audio/alsa-lib/patches/patch-configure.ac
index 7dfe9d5870c..c76401633d7 100644
--- a/audio/alsa-lib/patches/patch-configure.ac
+++ b/audio/alsa-lib/patches/patch-configure.ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.2 2017/05/29 12:42:25 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.3 2021/05/12 14:12:13 ryoon Exp $
---- configure.ac.orig 2017-05-12 08:01:45.000000000 +0000
+--- configure.ac.orig 2020-06-29 10:51:08.000000000 +0000
+++ configure.ac
-@@ -687,6 +687,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
- src/conf/ucm/broxton-rt298/Makefile \
- utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
+@@ -732,6 +732,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
+ test/Makefile test/lsb/Makefile \
+ utils/Makefile utils/alsa-lib.spec utils/alsa.pc utils/alsa-topology.pc)
+case $host_os in
+ netbsd*|freebsd*|dragonfly*)
diff --git a/audio/alsa-lib/patches/patch-include_sound_asound.h b/audio/alsa-lib/patches/patch-include_sound_asound.h
index 85e3395e206..18697ec2d00 100644
--- a/audio/alsa-lib/patches/patch-include_sound_asound.h
+++ b/audio/alsa-lib/patches/patch-include_sound_asound.h
@@ -1,14 +1,10 @@
-$NetBSD: patch-include_sound_asound.h,v 1.5 2017/02/22 14:48:09 wiz Exp $
+$NetBSD: patch-include_sound_asound.h,v 1.6 2021/05/12 14:12:13 ryoon Exp $
-Include sys/time.h for struct timespec.
-
---- include/sound/asound.h.orig 2016-12-20 14:43:20.000000000 +0000
+--- include/sound/asound.h.orig 2020-06-29 10:51:08.000000000 +0000
+++ include/sound/asound.h
-@@ -27,6 +27,7 @@
- #include <linux/types.h>
- #else
- #include <sys/ioctl.h>
-+#include <sys/time.h>
+@@ -8,4 +8,5 @@
+ #define __kernel_long_t long
#endif
- #ifndef __KERNEL__
++#include <alsa/sound/type_compat.h>
+ #include <alsa/sound/uapi/asound.h>
diff --git a/audio/alsa-lib/patches/patch-include_sound_type__compat.h b/audio/alsa-lib/patches/patch-include_sound_type__compat.h
new file mode 100644
index 00000000000..9dbe4a3a088
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-include_sound_type__compat.h
@@ -0,0 +1,47 @@
+$NetBSD: patch-include_sound_type__compat.h,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+
+--- include/sound/type_compat.h.orig 2020-06-29 10:51:08.000000000 +0000
++++ include/sound/type_compat.h
+@@ -1,5 +1,5 @@
+-#ifndef __TYPE_COMPAT_H
+-#define __TYPE_COMPAT_H
++#ifndef __SOUND_TYPE_COMPAT_H
++#define __SOUND_TYPE_COMPAT_H
+
+ #ifndef DOC_HIDDEN
+ #include <stdint.h>
+@@ -16,6 +16,20 @@ typedef int32_t __s32;
+ typedef int64_t __s64;
+
+ #include <endian.h>
++#if defined(__NetBSD__)
++#include <machine/bswap.h>
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define __cpu_to_le32(x) (x)
++#define __cpu_to_be32(x) bswap32(x)
++#define __cpu_to_le16(x) (x)
++#define __cpu_to_be16(x) bswap16(x)
++#else
++#define __cpu_to_le32(x) bswap32(x)
++#define __cpu_to_be32(x) (x)
++#define __cpu_to_le16(x) bswap16(x)
++#define __cpu_to_be16(x) (x)
++#endif
++#else
+ #include <byteswap.h>
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define __cpu_to_le32(x) (x)
+@@ -28,6 +42,7 @@ typedef int64_t __s64;
+ #define __cpu_to_le16(x) bswap_16(x)
+ #define __cpu_to_be16(x) (x)
+ #endif
++#endif
+
+ #define __le32_to_cpu __cpu_to_le32
+ #define __be32_to_cpu __cpu_to_be32
+@@ -54,4 +69,4 @@ typedef int64_t __s64;
+
+ #endif /* DOC_HIDDEN */
+
+-#endif /* __TYPE_COMPAT_H */
++#endif /* __SOUND_TYPE_COMPAT_H */
diff --git a/audio/alsa-lib/patches/patch-include_sound_uapi_asoc.h b/audio/alsa-lib/patches/patch-include_sound_uapi_asoc.h
new file mode 100644
index 00000000000..d45478083d3
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-include_sound_uapi_asoc.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_sound_uapi_asoc.h,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+
+--- include/sound/uapi/asoc.h.orig 2020-06-29 10:51:08.000000000 +0000
++++ include/sound/uapi/asoc.h
+@@ -16,7 +16,9 @@
+ #ifndef __LINUX_UAPI_SND_ASOC_H
+ #define __LINUX_UAPI_SND_ASOC_H
+
++#if defined(__linux__)
+ #include <linux/types.h>
++#endif
+
+ /*
+ * Maximum number of channels topology kcontrol can represent.
diff --git a/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h b/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h
new file mode 100644
index 00000000000..cad31c0669e
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-include_sound_uapi_asound.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_sound_uapi_asound.h,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+
+--- include/sound/uapi/asound.h.orig 2020-06-29 10:51:08.000000000 +0000
++++ include/sound/uapi/asound.h
+@@ -545,12 +545,12 @@ struct __snd_pcm_sync_ptr {
+ } c;
+ };
+
+-#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
++#if (defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)) || (defined(BYTE_ORDER) ? BYTE_ORDER == BIG_ENDIAN : defined(BIG_ENDIAN))
+ typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+ typedef char __pad_after_uframe[0];
+ #endif
+
+-#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
++#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) || defined(BYTE_ORDER) ? BYTE_ORDER == LITTLE_ENDIAN : defined(LITTLE_ENDIAN)
+ typedef char __pad_before_uframe[0];
+ typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+ #endif
diff --git a/audio/alsa-lib/patches/patch-src_dlmisc.c b/audio/alsa-lib/patches/patch-src_dlmisc.c
new file mode 100644
index 00000000000..cd16f705281
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-src_dlmisc.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_dlmisc.c,v 1.1 2021/05/12 14:12:13 ryoon Exp $
+
+* Fix !DL_ORIGIN_AVAILABLE case.
+ https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
+ https://github.com/alsa-project/alsa-lib/commit/1d993b37ab4e0b9b6e6b795d7be84ce97b29e20b
+
+--- src/dlmisc.c.orig 2020-10-19 09:45:13.000000000 +0000
++++ src/dlmisc.c
+@@ -42,13 +42,11 @@
+ #ifndef PIC
+ struct snd_dlsym_link *snd_dlsym_start = NULL;
+ #endif
+-#ifdef DL_ORIGIN_AVAILABLE
+ static int snd_plugin_dir_set = 0;
+ static char *snd_plugin_dir = NULL;
+ #endif
+-#endif
+
+-#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
++#ifdef HAVE_LIBPTHREAD
+ static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+ static inline void snd_dlpath_lock(void)
+@@ -442,12 +440,10 @@ void snd_dlobj_cache_cleanup(void)
+ free(c);
+ }
+ snd_dlobj_unlock();
+-#ifdef DL_ORIGIN_AVAILABLE
+ snd_dlpath_lock();
+ snd_plugin_dir_set = 0;
+ free(snd_plugin_dir);
+ snd_plugin_dir = NULL;
+ snd_dlpath_unlock();
+-#endif
+ }
+ #endif
diff --git a/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c b/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
index 95af12a6bc0..cb99303def2 100644
--- a/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
+++ b/audio/alsa-lib/patches/patch-src_pcm_pcm__mmap.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_pcm_pcm__mmap.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: patch-src_pcm_pcm__mmap.c,v 1.3 2021/05/12 14:12:13 ryoon Exp $
---- src/pcm/pcm_mmap.c.orig 2015-11-09 07:39:18.000000000 +0000
+--- src/pcm/pcm_mmap.c.orig 2020-06-29 10:51:08.000000000 +0000
+++ src/pcm/pcm_mmap.c
@@ -20,7 +20,7 @@
@@ -9,5 +9,5 @@ $NetBSD: patch-src_pcm_pcm__mmap.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
- #include <sys/poll.h>
+ #include <poll.h>
#include <sys/mman.h>
diff --git a/audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c b/audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c
index e11b42b9385..a44eff79a7d 100644
--- a/audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c
+++ b/audio/alsa-lib/patches/patch-src_seq_seq__midi__event.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_seq_seq__midi__event.c,v 1.1 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-src_seq_seq__midi__event.c,v 1.2 2021/05/12 14:12:13 ryoon Exp $
---- src/seq/seq_midi_event.c.orig 2009-12-16 15:18:51.000000000 +0000
+--- src/seq/seq_midi_event.c.orig 2020-06-29 10:51:08.000000000 +0000
+++ src/seq/seq_midi_event.c
@@ -28,7 +28,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <malloc.h>
diff --git a/audio/alsa-lib/patches/patch-src_shmarea.c b/audio/alsa-lib/patches/patch-src_shmarea.c
index 85479990461..d50e225fa28 100644
--- a/audio/alsa-lib/patches/patch-src_shmarea.c
+++ b/audio/alsa-lib/patches/patch-src_shmarea.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_shmarea.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: patch-src_shmarea.c,v 1.3 2021/05/12 14:12:13 ryoon Exp $
---- src/shmarea.c.orig 2015-11-09 07:39:18.000000000 +0000
+--- src/shmarea.c.orig 2020-06-29 10:51:08.000000000 +0000
+++ src/shmarea.c
@@ -24,7 +24,7 @@
#ifdef HAVE_SYS_SHM_H
@@ -10,4 +10,4 @@ $NetBSD: patch-src_shmarea.c,v 1.2 2016/02/18 15:15:57 wiz Exp $
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
- #include <sys/poll.h>
+ #include <poll.h>
diff --git a/audio/alsa-lib/patches/patch-src_ucm_parser.c b/audio/alsa-lib/patches/patch-src_ucm_parser.c
index d15e7446e9a..bbe71458385 100644
--- a/audio/alsa-lib/patches/patch-src_ucm_parser.c
+++ b/audio/alsa-lib/patches/patch-src_ucm_parser.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_ucm_parser.c,v 1.7 2017/06/27 15:51:39 jperkin Exp $
+$NetBSD: patch-src_ucm_parser.c,v 1.8 2021/05/12 14:12:13 ryoon Exp $
* SunOS has no dirent d_type
---- src/ucm/parser.c.orig 2017-06-01 06:27:36.000000000 +0000
+--- src/ucm/parser.c.orig 2020-06-29 10:51:08.000000000 +0000
+++ src/ucm/parser.c
-@@ -1476,7 +1476,13 @@ static int filename_filter(const struct
+@@ -2220,7 +2220,13 @@ static int filename_filter(const struct
{
if (dirent == NULL)
return 0;
@@ -18,3 +18,14 @@ $NetBSD: patch-src_ucm_parser.c,v 1.7 2017/06/27 15:51:39 jperkin Exp $
if (dirent->d_name[0] == '.') {
if (dirent->d_name[1] == '\0')
return 0;
+@@ -2316,8 +2322,10 @@ int uc_mgr_scan_master_configs(const cha
+
+ snprintf(fn, sizeof(fn), "%s.conf", d_name);
+ ucm_filename(filename, sizeof(filename), 2, d_name, fn);
++#if defined(__linux__)
+ if (eaccess(filename, R_OK))
+ continue;
++#endif
+
+ err = uc_mgr_config_load(2, filename, &cfg);
+ if (err < 0)