diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index cb6e9c0e954a..abd73705f8db 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,67 +1,67 @@ PORTNAME= alsa-utils -PORTVERSION= 1.2.14 +PORTVERSION= 1.2.15.2 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/utils/ MAINTAINER= rodrigo@FreeBSD.org COMMENT= ALSA compatibility utilities WWW= https://www.alsa-project.org/ LICENSE= GPLv2+ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libepoll-shim.so:devel/libepoll-shim \ libfftw3f.so:math/fftw3-float \ libinotify.so:devel/libinotify RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins USES= gettext-tools gmake libtool localbase ncurses pkgconfig \ shebangfix tar:bzip2 SHEBANG_FILES= alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --with-udev-rules-dir="\$${prefix}/lib/udev" -INSTALL_TARGET= install-strip -CFLAGS+= -Dlseek64=lseek -DSCHED_IDLE=SCHED_OTHER \ - -I${LOCALBASE}/include/libepoll-shim -CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files -LDFLAGS+= -linotify -lepoll-shim +CONFIGURE_ARGS= --with-udev-rules-dir="\$${prefix}/lib/udev" +INSTALL_TARGET= install-strip +CFLAGS+= -Dlseek64=lseek -DSCHED_IDLE=SCHED_OTHER \ + -I${LOCALBASE}/include/libepoll-shim +CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files +LDFLAGS+= -linotify -lepoll-shim OPTIONS_DEFINE= BAT MANPAGES NLS SAMPLERATE OPTIONS_DEFAULT= BAT MANPAGES OPTIONS_SUB= yes BAT_DESC= Basic Audio Tester support BAT_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float BAT_CONFIGURE_ENABLE= bat MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto \ rst2man:textproc/py-docutils MANPAGES_CONFIGURE_ENABLE= xmlto MANPAGES_BINARY_ALIAS= xmlto=minixmlto NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_LIBS= -lintl SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENV_OFF= ac_cv_header_samplerate_h=no #${WRKSRC}/speaker-test/samples/sample_map.csv post-patch: @${REINPLACE_CMD} \ 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/alsactl/alsactl_init.xml \ ${WRKSRC}/speaker-test/speaker-test.1 \ ${WRKSRC}/alsaconf/alsaconf.fr.8 \ ${WRKSRC}/alsaconf/alsaconf.8 \ ${WRKSRC}/utils/alsa-utils.spec.in \ ${WRKSRC}/amidi/amidi.1 @${REINPLACE_CMD} \ 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/alsa-info/alsa-info.sh.8 \ ${WRKSRC}/amidi/amidi.1 .include diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index def5c29d1a4e..e9d449ad61fc 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754664140 -SHA256 (alsa-utils-1.2.14.tar.bz2) = 0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741 -SIZE (alsa-utils-1.2.14.tar.bz2) = 1652717 +TIMESTAMP = 1771430653 +SHA256 (alsa-utils-1.2.15.2.tar.bz2) = 7aaaafbfb01942113ec0c31e51f705910e81079205088ca2f8f137a3869e1a3a +SIZE (alsa-utils-1.2.15.2.tar.bz2) = 1668791 diff --git a/audio/alsa-utils/files/patch-alsactl_boot_params.c b/audio/alsa-utils/files/patch-alsactl_boot_params.c new file mode 100644 index 000000000000..83ffda7aa43e --- /dev/null +++ b/audio/alsa-utils/files/patch-alsactl_boot_params.c @@ -0,0 +1,37 @@ +--- alsactl/boot_params.c.orig 2026-02-18 15:46:59 UTC ++++ alsactl/boot_params.c +@@ -629,9 +629,9 @@ + goto out; + } + +- if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts_monotonic) < 0) { ++ if (clock_gettime(CLOCK_MONOTONIC, &ts_monotonic) < 0) { + err = -errno; +- error("Failed to get CLOCK_MONOTONIC_RAW: %s", strerror(errno)); ++ error("Failed to get CLOCK_MONOTONIC: %s", strerror(errno)); + goto out; + } + +@@ -742,8 +742,8 @@ + } + + if (ts_monotonic.tv_sec == 0) { +- if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts_monotonic) < 0) { +- dbg("Failed to get CLOCK_MONOTONIC_RAW: %s", strerror(errno)); ++ if (clock_gettime(CLOCK_MONOTONIC, &ts_monotonic) < 0) { ++ dbg("Failed to get CLOCK_MONOTONIC: %s", strerror(errno)); + return changes; + } + } +@@ -961,9 +961,9 @@ + } + ts_realtime.tv_nsec = 0; + +- if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts_monotonic) < 0) { ++ if (clock_gettime(CLOCK_MONOTONIC, &ts_monotonic) < 0) { + err = -errno; +- error("Failed to get CLOCK_MONOTONIC_RAW: %s", strerror(errno)); ++ error("Failed to get CLOCK_MONOTONIC: %s", strerror(errno)); + goto out; + } + ts_monotonic.tv_nsec = 0; diff --git a/audio/alsa-utils/files/patch-alsactl_wait.c b/audio/alsa-utils/files/patch-alsactl_wait.c new file mode 100644 index 000000000000..c289063e532f --- /dev/null +++ b/audio/alsa-utils/files/patch-alsactl_wait.c @@ -0,0 +1,20 @@ +--- alsactl/wait.c.orig 2026-02-18 15:43:08 UTC ++++ alsactl/wait.c +@@ -112,7 +112,7 @@ + return err; + } + +- clock_gettime(CLOCK_MONOTONIC_RAW, &start_time); ++ clock_gettime(CLOCK_MONOTONIC, &start_time); + + dbg("Waiting for card %d to become ready (timeout=%lld seconds)", cardno, timeout); + +@@ -120,7 +120,7 @@ + long long diff, remaining = 0; + long long sync_time_val = -1; + +- clock_gettime(CLOCK_MONOTONIC_RAW, &now); ++ clock_gettime(CLOCK_MONOTONIC, &now); + + /* Read current Boot control values */ + err = read_boot_params(handle, &boot_time_val, &sync_time_val, &restore_time_val, NULL);