Attachment #251890 for bug #280144

View | Details | Raw Unified | Return to bug 280144
Collapse All | Expand All

Lines 1-10 Link Here

(-)b/audio/alsa-plugins/Makefile (-3 / +2 lines)
1	PORTNAME= alsa-plugins	1	PORTNAME= alsa-plugins
2	PORTVERSION= 1.2.7.1	2	PORTVERSION= 1.2.12
3	PORTREVISION= 3
4	CATEGORIES= audio	3	CATEGORIES= audio
5	MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/	4	MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/
6		5
7	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= rodrigo@FreeBSD.org
8	COMMENT= ALSA compatibility library plugins	7	COMMENT= ALSA compatibility library plugins
9	WWW= https://www.alsa-project.org/	8	WWW= https://www.alsa-project.org/
10		9

Lines 1-3 Link Here

(-)b/audio/alsa-plugins/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1695516677	1	TIMESTAMP = 1720213741
2	SHA256 (alsa-plugins-1.2.7.1.tar.bz2) = 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511	2	SHA256 (alsa-plugins-1.2.12.tar.bz2) = 7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2
3	SIZE (alsa-plugins-1.2.7.1.tar.bz2) = 408801	3	SIZE (alsa-plugins-1.2.12.tar.bz2) = 409514




--- arcam-av/arcam_av.c.orig	2024-06-10 09:18:39 UTC
+++ arcam-av/arcam_av.c
@@ -39,6 +39,8 @@
 #include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <string.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -37,6 +38,8 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+
+#define AF_FILE     AF_UNIX
 
+#define AF_FILE     AF_UNIX
+
 #define MIN(a, b)     ((a) < (b) ? (a) : (b))
 #define MAX(a, b)     ((a) > (b) ? (a) : (b))
 




--- configure.orig	2024-06-10 09:22:07 UTC
+++ configure
@@ -743,6 +743,9 @@ AM_V
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V

 am__untar
 am__tar
 AMTAR
@@ -785,7 +788,6 @@ includedir
 docdir
 oldincludedir
 includedir

 localstatedir
 sharedstatedir
 sysconfdir
@@ -909,7 +911,6 @@ localstatedir='${prefix}/var'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'

 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1162,15 +1163,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 

   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1308,7 +1300,7 @@ for ac_var in	exec_prefix prefix bindir sbindir libexe
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1461,7 +1453,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]

   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -2578,12 +2569,7 @@ if test x"${MISSING+set}" != xset; then
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then

 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -2938,7 +2924,21 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${
 
 
 

 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
 # recipes.  So use an aggressive probe to check that the usage we want is
@@ -9015,7 +9015,7 @@ $as_echo_n "checking whether the $compiler linker ($LD
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
   inherit_rpath=no

   module_cmds=
   module_expsym_cmds=
   old_archive_from_new_cmds=
@@ -9314,7 +9314,7 @@ _LT_EOF
 	wlarc=
       else
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'

       fi
       ;;
 
@@ -9333,7 +9333,7 @@ _LT_EOF
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'

       else
 	ld_shlibs=no
       fi
@@ -9362,7 +9362,7 @@ _LT_EOF
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'

 	  else
 	    ld_shlibs=no
 	  fi
@@ -9380,7 +9380,7 @@ _LT_EOF
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'

       else
 	ld_shlibs=no
       fi
@@ -10028,7 +10028,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	hardcode_direct_absolute=yes
 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	  export_dynamic_flag_spec='$wl-E'
 	else
@@ -10877,7 +10877,7 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)

       soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
@@ -11094,9 +11094,6 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 

   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -11105,7 +11102,7 @@ fi
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12012,7 +12009,7 @@ $as_echo_n "checking whether stripping libraries is po
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }

   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -13359,21 +13356,22 @@ fi
 	HAVE_SPEEXDSP="yes"
 fi
 fi

Removed Link Here

(-)a/audio/alsa-plugins/files/patch-jack_pcm__jack.c (-11 lines)
1	--- jack/pcm_jack.c.orig 2023-11-03 22:31:39 UTC
2	+++ jack/pcm_jack.c
3	@@ -603,7 +603,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const c
4	}
5
6	if (client_name == NULL) {
7	- const char *pname = program_invocation_short_name;
8	+ const char *pname = getprogname();
9	if (!pname[0]) {
10	pname = "alsa-jack";
11	}




--- oss/ctl_oss.c.orig	2024-06-10 09:18:39 UTC
+++ oss/ctl_oss.c
@@ -59,7 +59,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV
 #include <sys/ioctl.h>
 #include <alsa/asoundlib.h>
 #include <alsa/control_external.h>
+#ifdef __linux__
 #include <linux/soundcard.h>
+#else
+#include <sys/soundcard.h>
+#endif
 
 typedef struct snd_ctl_oss {
 	snd_ctl_ext_t ext;
@@ -52,7 +56,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV
 	[SOUND_MIXER_CD] =	"CD Playback Volume",
 	[SOUND_MIXER_IMIX] =	"Monitor Mix Playback Volume",
 	[SOUND_MIXER_ALTPCM] =	"Headphone Playback Volume",

 	[SOUND_MIXER_IGAIN] =	"Capture Volume",
 	[SOUND_MIXER_OGAIN] =	"Playback Volume",
 	[SOUND_MIXER_LINE1] =	"Aux Playback Volume",
@@ -369,7 +369,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
 {
 	snd_config_iterator_t it, next;
 	const char *device = "/dev/mixer";

 	int i, err, val;
 	snd_ctl_oss_t *oss;
 	
@@ -406,19 +408,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
 		goto error;
 	}
 




--- oss/pcm_oss.c.orig	2024-06-10 09:18:39 UTC
+++ oss/pcm_oss.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
 #include <stdio.h>
+#include <stdbool.h>
 #include <sys/ioctl.h>
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_external.h>
@@ -31,16 +32,32 @@
 #include <soundcard.h>
 #endif
+#include <sys/soundcard.h>
+#endif
 
+#ifndef ARRAY_SIZE
+#define	ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))

 } snd_pcm_oss_t;
 
 static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io,
@@ -56,8 +73,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i
 	buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
 	size *= oss->frame_bytes;
 	result = write(oss->fd, buf, size);

 	return result / oss->frame_bytes;
 }
 
@@ -74,37 +104,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io
 	buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
 	size *= oss->frame_bytes;
 	result = read(oss->fd, buf, size);

 	}
 	return 0;
 }
@@ -114,6 +229,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)
 	snd_pcm_oss_t *oss = io->private_data;
 	int tmp = 0;
 

 	ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);
 	return 0;
 }
@@ -122,101 +241,164 @@ static int oss_drain(snd_pcm_ioplug_t *io)
 {
 	snd_pcm_oss_t *oss = io->private_data;
 

 	if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
 		err = -errno;
 		perror("F_GETFL");
@@ -236,16 +418,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
 	return 0;
 }
 

 	unsigned int format[5];
 	unsigned int nchannels;
 	unsigned int channel[6];
@@ -324,6 +638,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)
 		return err;
 
 	return 0;

 }
 
 
@@ -331,6 +646,10 @@ static int oss_close(snd_pcm_ioplug_t *io)
 {
 	snd_pcm_oss_t *oss = io->private_data;
 

 	close(oss->fd);
 	free(oss->device);
 	free(oss);
@@ -346,6 +665,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca
 	.hw_params = oss_hw_params,
 	.prepare = oss_prepare,
 	.drain = oss_drain,

 };
 
 static const snd_pcm_ioplug_callback_t oss_capture_callback = {
@@ -357,6 +677,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal
 	.hw_params = oss_hw_params,
 	.prepare = oss_prepare,
 	.drain = oss_drain,

 };
 
 
@@ -367,6 +688,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)
 	int err;
 	snd_pcm_oss_t *oss;
 	

Lines 1-7 Link Here

(-)b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c (-4 / +4 lines)
1	based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c	1	based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c
2	--- ./usb_stream/pcm_usb_stream.c.orig 2022-03-17 16:51:58 UTC	2	--- usb_stream/pcm_usb_stream.c.orig 2024-06-10 09:18:39 UTC
3	+++ ./usb_stream/pcm_usb_stream.c	3	+++ usb_stream/pcm_usb_stream.c
4	@@ -78,6 +78,69 @@	4	@@ -77,6 +77,69 @@ static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITI
5	static struct user_usb_stream *uus;	5	static struct user_usb_stream *uus;
6	static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;	6	static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
7		7
Lines 71-77 based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free Link Here
71	static struct user_usb_stream *get_uus(int card)	71	static struct user_usb_stream *get_uus(int card)
72	{	72	{
73	pthread_mutex_lock(&uus_mutex);	73	pthread_mutex_lock(&uus_mutex);
74	@@ -218,7 +281,11 @@	74	@@ -217,7 +280,11 @@ static int snd_pcm_us_prepare(snd_pcm_ioplug_t *io)
75	}	75	}
76		76
77		77

Return to bug 280144

Lines 1-19 Link Here

(-)b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c (-13 / +5 lines)
1	--- arcam-av/arcam_av.c.orig 2016-03-31 13:11:29 UTC	1	--- arcam-av/arcam_av.c.orig 2024-06-10 09:18:39 UTC
2	+++ arcam-av/arcam_av.c	2	+++ arcam-av/arcam_av.c
3	@@ -27,6 +27,7 @@	3	@@ -39,6 +39,8 @@
4	#include <signal.h>
5	#include <stddef.h>
6	#include <stdio.h>
7	+#include <string.h>
8	#include <termios.h>
9	#include <unistd.h>
10
11	@@ -37,6 +38,8 @@
12	#include <sys/stat.h>
13	#include <sys/socket.h>	4	#include <sys/socket.h>
14	#include <sys/un.h>	5	#include <sys/un.h>
15	+
16	+#define AF_FILE AF_UNIX
17		6
		7	+#define AF_FILE AF_UNIX
		8	+
18	#define MIN(a, b) ((a) < (b) ? (a) : (b))	9	#define MIN(a, b) ((a) < (b) ? (a) : (b))
19	#define MAX(a, b) ((a) > (b) ? (a) : (b))	10	#define MAX(a, b) ((a) > (b) ? (a) : (b))
		11

Lines 1-6 Link Here

(-)b/audio/alsa-plugins/files/patch-configure (-20 / +20 lines)
1	--- configure.orig 2022-03-17 16:36:30 UTC	1	--- configure.orig 2024-06-10 09:22:07 UTC
2	+++ configure	2	+++ configure
3	@@ -743,6 +743,9 @@	3	@@ -743,6 +743,9 @@ AM_V
4	AM_DEFAULT_VERBOSITY	4	AM_DEFAULT_VERBOSITY
5	AM_DEFAULT_V	5	AM_DEFAULT_V
6	AM_V	6	AM_V
Lines 10-16 Link Here
10	am__untar	10	am__untar
11	am__tar	11	am__tar
12	AMTAR	12	AMTAR
13	@@ -785,7 +788,6 @@	13	@@ -785,7 +788,6 @@ includedir
14	docdir	14	docdir
15	oldincludedir	15	oldincludedir
16	includedir	16	includedir
Lines 18-24 Link Here
18	localstatedir	18	localstatedir
19	sharedstatedir	19	sharedstatedir
20	sysconfdir	20	sysconfdir
21	@@ -909,7 +911,6 @@	21	@@ -909,7 +911,6 @@ localstatedir='${prefix}/var'
22	sysconfdir='${prefix}/etc'	22	sysconfdir='${prefix}/etc'
23	sharedstatedir='${prefix}/com'	23	sharedstatedir='${prefix}/com'
24	localstatedir='${prefix}/var'	24	localstatedir='${prefix}/var'
Lines 26-32 Link Here
26	includedir='${prefix}/include'	26	includedir='${prefix}/include'
27	oldincludedir='/usr/include'	27	oldincludedir='/usr/include'
28	docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'	28	docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
29	@@ -1162,15 +1163,6 @@	29	@@ -1162,15 +1163,6 @@ do
30	\| -silent \| --silent \| --silen \| --sile \| --sil)	30	\| -silent \| --silent \| --silen \| --sile \| --sil)
31	silent=yes ;;	31	silent=yes ;;
32		32
Lines 42-48 Link Here
42	-sbindir \| --sbindir \| --sbindi \| --sbind \| --sbin \| --sbi \| --sb)	42	-sbindir \| --sbindir \| --sbindi \| --sbind \| --sbin \| --sbi \| --sb)
43	ac_prev=sbindir ;;	43	ac_prev=sbindir ;;
44	-sbindir=* \| --sbindir=* \| --sbindi=* \| --sbind=* \| --sbin=* \	44	-sbindir=* \| --sbindir=* \| --sbindi=* \| --sbind=* \| --sbin=* \
45	@@ -1308,7 +1300,7 @@	45	@@ -1308,7 +1300,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexe
46	for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \	46	for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
47	datadir sysconfdir sharedstatedir localstatedir includedir \	47	datadir sysconfdir sharedstatedir localstatedir includedir \
48	oldincludedir docdir infodir htmldir dvidir pdfdir psdir \	48	oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
Lines 51-57 Link Here
51	do	51	do
52	eval ac_val=\$$ac_var	52	eval ac_val=\$$ac_var
53	# Remove trailing slashes.	53	# Remove trailing slashes.
54	@@ -1461,7 +1453,6 @@	54	@@ -1461,7 +1453,6 @@ Fine tuning of the installation directories:
55	--sysconfdir=DIR read-only single-machine data [PREFIX/etc]	55	--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
56	--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]	56	--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
57	--localstatedir=DIR modifiable single-machine data [PREFIX/var]	57	--localstatedir=DIR modifiable single-machine data [PREFIX/var]
Lines 59-65 Link Here
59	--libdir=DIR object code libraries [EPREFIX/lib]	59	--libdir=DIR object code libraries [EPREFIX/lib]
60	--includedir=DIR C header files [PREFIX/include]	60	--includedir=DIR C header files [PREFIX/include]
61	--oldincludedir=DIR C header files for non-gcc [/usr/include]	61	--oldincludedir=DIR C header files for non-gcc [/usr/include]
62	@@ -2578,12 +2569,7 @@	62	@@ -2578,12 +2569,7 @@ if test x"${MISSING+set}" != xset; then
63	am_aux_dir=`cd "$ac_aux_dir" && pwd`	63	am_aux_dir=`cd "$ac_aux_dir" && pwd`
64		64
65	if test x"${MISSING+set}" != xset; then	65	if test x"${MISSING+set}" != xset; then
Lines 73-79 Link Here
73	fi	73	fi
74	# Use eval to expand $SHELL	74	# Use eval to expand $SHELL
75	if eval "$MISSING --is-lightweight"; then	75	if eval "$MISSING --is-lightweight"; then
76	@@ -2938,7 +2924,21 @@	76	@@ -2938,7 +2924,21 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${
77		77
78		78
79		79
Lines 95-101 Link Here
95	# POSIX will say in a future version that running "rm -f" with no argument	95	# POSIX will say in a future version that running "rm -f" with no argument
96	# is OK; and we want to be able to make that assumption in our Makefile	96	# is OK; and we want to be able to make that assumption in our Makefile
97	# recipes. So use an aggressive probe to check that the usage we want is	97	# recipes. So use an aggressive probe to check that the usage we want is
98	@@ -9015,7 +9015,7 @@	98	@@ -9015,7 +9015,7 @@ $as_echo_n "checking whether the $compiler linker ($LD
99	hardcode_minus_L=no	99	hardcode_minus_L=no
100	hardcode_shlibpath_var=unsupported	100	hardcode_shlibpath_var=unsupported
101	inherit_rpath=no	101	inherit_rpath=no
Lines 104-110 Link Here
104	module_cmds=	104	module_cmds=
105	module_expsym_cmds=	105	module_expsym_cmds=
106	old_archive_from_new_cmds=	106	old_archive_from_new_cmds=
107	@@ -9314,7 +9314,7 @@	107	@@ -9314,7 +9314,7 @@ _LT_EOF
108	wlarc=	108	wlarc=
109	else	109	else
110	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'	110	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
Lines 113-119 Link Here
113	fi	113	fi
114	;;	114	;;
115		115
116	@@ -9333,7 +9333,7 @@	116	@@ -9333,7 +9333,7 @@ _LT_EOF
117	_LT_EOF	117	_LT_EOF
118	elif $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then	118	elif $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
119	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'	119	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
Lines 122-128 Link Here
122	else	122	else
123	ld_shlibs=no	123	ld_shlibs=no
124	fi	124	fi
125	@@ -9362,7 +9362,7 @@	125	@@ -9362,7 +9362,7 @@ _LT_EOF
126	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then	126	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
127	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'	127	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
128	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'	128	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
Lines 131-137 Link Here
131	else	131	else
132	ld_shlibs=no	132	ld_shlibs=no
133	fi	133	fi
134	@@ -9380,7 +9380,7 @@	134	@@ -9380,7 +9380,7 @@ _LT_EOF
135	*)	135	*)
136	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then	136	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
137	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'	137	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
Lines 140-146 Link Here
140	else	140	else
141	ld_shlibs=no	141	ld_shlibs=no
142	fi	142	fi
143	@@ -10028,7 +10028,7 @@	143	@@ -10028,7 +10028,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
144	hardcode_direct_absolute=yes	144	hardcode_direct_absolute=yes
145	if test -z "`echo __ELF__ \| $CC -E - \| $GREP __ELF__`"; then	145	if test -z "`echo __ELF__ \| $CC -E - \| $GREP __ELF__`"; then
146	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'	146	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
Lines 149-155 Link Here
149	hardcode_libdir_flag_spec='$wl-rpath,$libdir'	149	hardcode_libdir_flag_spec='$wl-rpath,$libdir'
150	export_dynamic_flag_spec='$wl-E'	150	export_dynamic_flag_spec='$wl-E'
151	else	151	else
152	@@ -10877,7 +10877,7 @@	152	@@ -10877,7 +10877,7 @@ freebsd* \| dragonfly*)
153	version_type=freebsd-$objformat	153	version_type=freebsd-$objformat
154	case $version_type in	154	case $version_type in
155	freebsd-elf*)	155	freebsd-elf*)
Lines 158-164 Link Here
158	soname_spec='$libname$release$shared_ext$major'	158	soname_spec='$libname$release$shared_ext$major'
159	need_version=no	159	need_version=no
160	need_lib_prefix=no	160	need_lib_prefix=no
161	@@ -11094,9 +11094,6 @@	161	@@ -11094,9 +11094,6 @@ fi
162	# before this can be enabled.	162	# before this can be enabled.
163	hardcode_into_libs=yes	163	hardcode_into_libs=yes
164		164
Lines 168-174 Link Here
168	# Ideally, we could use ldconfig to report all directores which are	168	# Ideally, we could use ldconfig to report all directores which are
169	# searched for libraries, however this is still not possible. Aside from not	169	# searched for libraries, however this is still not possible. Aside from not
170	# being certain /sbin/ldconfig is available, command	170	# being certain /sbin/ldconfig is available, command
171	@@ -11105,7 +11102,7 @@	171	@@ -11105,7 +11102,7 @@ fi
172	# appending ld.so.conf contents (and includes) to the search path.	172	# appending ld.so.conf contents (and includes) to the search path.
173	if test -f /etc/ld.so.conf; then	173	if test -f /etc/ld.so.conf; then
174	lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf \| $SED -e 's/#.//;/^[ ]hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]$//;s/=[^= ] / /g;s/"//g;/^$/d' \| tr '\n' ' '`	174	lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf \| $SED -e 's/#.//;/^[ ]hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]$//;s/=[^= ] / /g;s/"//g;/^$/d' \| tr '\n' ' '`
Lines 177-183 Link Here
177	fi	177	fi
178		178
179	# We used to test for /lib/ld.so.1 and disable shared libraries on	179	# We used to test for /lib/ld.so.1 and disable shared libraries on
180	@@ -12012,7 +12009,7 @@	180	@@ -12012,7 +12009,7 @@ $as_echo_n "checking whether stripping libraries is po
181	old_striplib=	181	old_striplib=
182	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5	182	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
183	$as_echo_n "checking whether stripping libraries is possible... " >&6; }	183	$as_echo_n "checking whether stripping libraries is possible... " >&6; }
Lines 186-192 Link Here
186	test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"	186	test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
187	test -z "$striplib" && striplib="$STRIP --strip-unneeded"	187	test -z "$striplib" && striplib="$STRIP --strip-unneeded"
188	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5	188	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
189	@@ -13293,21 +13290,22 @@	189	@@ -13359,21 +13356,22 @@ fi
190	HAVE_SPEEXDSP="yes"	190	HAVE_SPEEXDSP="yes"
191	fi	191	fi
192	fi	192	fi

Lines 1-18 Link Here

(-)b/audio/alsa-plugins/files/patch-oss_ctl__oss.c (-16 / +4 lines)
1	--- oss/ctl_oss.c.orig 2022-01-29 13:06:39 UTC	1	--- oss/ctl_oss.c.orig 2024-06-10 09:18:39 UTC
2	+++ oss/ctl_oss.c	2	+++ oss/ctl_oss.c
3	@@ -26,7 +26,11 @@	3	@@ -59,7 +59,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV
4	#include <sys/ioctl.h>
5	#include <alsa/asoundlib.h>
6	#include <alsa/control_external.h>
7	+#ifdef __linux__
8	#include <linux/soundcard.h>
9	+#else
10	+#include <sys/soundcard.h>
11	+#endif
12
13	typedef struct snd_ctl_oss {
14	snd_ctl_ext_t ext;
15	@@ -52,7 +56,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV
16	[SOUND_MIXER_CD] = "CD Playback Volume",	4	[SOUND_MIXER_CD] = "CD Playback Volume",
17	[SOUND_MIXER_IMIX] = "Monitor Mix Playback Volume",	5	[SOUND_MIXER_IMIX] = "Monitor Mix Playback Volume",
18	[SOUND_MIXER_ALTPCM] = "Headphone Playback Volume",	6	[SOUND_MIXER_ALTPCM] = "Headphone Playback Volume",
Lines 21-27 Link Here
21	[SOUND_MIXER_IGAIN] = "Capture Volume",	9	[SOUND_MIXER_IGAIN] = "Capture Volume",
22	[SOUND_MIXER_OGAIN] = "Playback Volume",	10	[SOUND_MIXER_OGAIN] = "Playback Volume",
23	[SOUND_MIXER_LINE1] = "Aux Playback Volume",	11	[SOUND_MIXER_LINE1] = "Aux Playback Volume",
24	@@ -362,7 +366,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)	12	@@ -369,7 +369,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
25	{	13	{
26	snd_config_iterator_t it, next;	14	snd_config_iterator_t it, next;
27	const char *device = "/dev/mixer";	15	const char *device = "/dev/mixer";
Lines 31-37 Link Here
31	int i, err, val;	19	int i, err, val;
32	snd_ctl_oss_t *oss;	20	snd_ctl_oss_t *oss;
33		21
34	@@ -399,19 +405,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)	22	@@ -406,19 +408,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
35	goto error;	23	goto error;
36	}	24	}
37		25

Lines 1-18 Link Here

(-)b/audio/alsa-plugins/files/patch-oss_pcm__oss.c (-18 / +16 lines)
1	--- oss/pcm_oss.c.orig 2020-02-19 09:35:42 UTC	1	--- oss/pcm_oss.c.orig 2024-06-10 09:18:39 UTC
2	+++ oss/pcm_oss.c	2	+++ oss/pcm_oss.c
3	@@ -19,21 +19,42 @@	3	@@ -20,6 +20,7 @@
4	*/
5		4
		5	#include "config.h"
6	#include <stdio.h>	6	#include <stdio.h>
7	+#include <stdbool.h>	7	+#include <stdbool.h>
8	#include <sys/ioctl.h>	8	#include <sys/ioctl.h>
9	#include <alsa/asoundlib.h>	9	#include <alsa/asoundlib.h>
10	#include <alsa/pcm_external.h>	10	#include <alsa/pcm_external.h>
11	+#ifdef __linux__	11	@@ -31,16 +32,32 @@
12	#include <linux/soundcard.h>	12	#include <soundcard.h>
13	+#else	13	#endif
14	+#include <sys/soundcard.h>
15	+#endif
16		14
17	+#ifndef ARRAY_SIZE	15	+#ifndef ARRAY_SIZE
18	+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))	16	+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
Lines 48-54 Link Here
48	} snd_pcm_oss_t;	46	} snd_pcm_oss_t;
49		47
50	static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io,	48	static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io,
51	@@ -49,8 +70,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i	49	@@ -56,8 +73,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i
52	buf = (char )areas->addr + (areas->first + areas->step offset) / 8;	50	buf = (char )areas->addr + (areas->first + areas->step offset) / 8;
53	size *= oss->frame_bytes;	51	size *= oss->frame_bytes;
54	result = write(oss->fd, buf, size);	52	result = write(oss->fd, buf, size);
Lines 72-78 Link Here
72	return result / oss->frame_bytes;	70	return result / oss->frame_bytes;
73	}	71	}
74		72
75	@@ -67,37 +101,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io	73	@@ -74,37 +104,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io
76	buf = (char )areas->addr + (areas->first + areas->step offset) / 8;	74	buf = (char )areas->addr + (areas->first + areas->step offset) / 8;
77	size *= oss->frame_bytes;	75	size *= oss->frame_bytes;
78	result = read(oss->fd, buf, size);	76	result = read(oss->fd, buf, size);
Lines 204-210 Link Here
204	}	202	}
205	return 0;	203	return 0;
206	}	204	}
207	@@ -107,6 +226,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)	205	@@ -114,6 +229,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)
208	snd_pcm_oss_t *oss = io->private_data;	206	snd_pcm_oss_t *oss = io->private_data;
209	int tmp = 0;	207	int tmp = 0;
210		208
Lines 215-221 Link Here
215	ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);	213	ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);
216	return 0;	214	return 0;
217	}	215	}
218	@@ -115,101 +238,164 @@ static int oss_drain(snd_pcm_ioplug_t *io)	216	@@ -122,101 +241,164 @@ static int oss_drain(snd_pcm_ioplug_t *io)
219	{	217	{
220	snd_pcm_oss_t *oss = io->private_data;	218	snd_pcm_oss_t *oss = io->private_data;
221		219
Lines 445-451 Link Here
445	if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {	443	if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
446	err = -errno;	444	err = -errno;
447	perror("F_GETFL");	445	perror("F_GETFL");
448	@@ -229,16 +415,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,	446	@@ -236,16 +418,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
449	return 0;	447	return 0;
450	}	448	}
451		449
Lines 596-602 Link Here
596	unsigned int format[5];	594	unsigned int format[5];
597	unsigned int nchannels;	595	unsigned int nchannels;
598	unsigned int channel[6];	596	unsigned int channel[6];
599	@@ -317,6 +635,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)	597	@@ -324,6 +638,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)
600	return err;	598	return err;
601		599
602	return 0;	600	return 0;
Lines 604-610 Link Here
604	}	602	}
605		603
606		604
607	@@ -324,6 +643,10 @@ static int oss_close(snd_pcm_ioplug_t *io)	605	@@ -331,6 +646,10 @@ static int oss_close(snd_pcm_ioplug_t *io)
608	{	606	{
609	snd_pcm_oss_t *oss = io->private_data;	607	snd_pcm_oss_t *oss = io->private_data;
610		608
Lines 615-621 Link Here
615	close(oss->fd);	613	close(oss->fd);
616	free(oss->device);	614	free(oss->device);
617	free(oss);	615	free(oss);
618	@@ -339,6 +662,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca	616	@@ -346,6 +665,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca
619	.hw_params = oss_hw_params,	617	.hw_params = oss_hw_params,
620	.prepare = oss_prepare,	618	.prepare = oss_prepare,
621	.drain = oss_drain,	619	.drain = oss_drain,
Lines 623-629 Link Here
623	};	621	};
624		622
625	static const snd_pcm_ioplug_callback_t oss_capture_callback = {	623	static const snd_pcm_ioplug_callback_t oss_capture_callback = {
626	@@ -350,6 +674,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal	624	@@ -357,6 +677,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal
627	.hw_params = oss_hw_params,	625	.hw_params = oss_hw_params,
628	.prepare = oss_prepare,	626	.prepare = oss_prepare,
629	.drain = oss_drain,	627	.drain = oss_drain,
Lines 631-637 Link Here
631	};	629	};
632		630
633		631
634	@@ -360,6 +685,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)	632	@@ -367,6 +688,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)
635	int err;	633	int err;
636	snd_pcm_oss_t *oss;	634	snd_pcm_oss_t *oss;
637		635