diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index 93109dd0cc58..4ac36a682521 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,68 +1,67 @@ PORTNAME= alsa-utils -PORTVERSION= 1.2.10 -PORTREVISION= 3 +PORTVERSION= 1.2.11 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_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 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.1 \ ${WRKSRC}/amidi/amidi.1 .include diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index 6771e3b285b1..efd8cdd7fd1c 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695515854 -SHA256 (alsa-utils-1.2.10.tar.bz2) = 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a -SIZE (alsa-utils-1.2.10.tar.bz2) = 1625707 +TIMESTAMP = 1713015078 +SHA256 (alsa-utils-1.2.11.tar.bz2) = 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 +SIZE (alsa-utils-1.2.11.tar.bz2) = 1627148 diff --git a/audio/alsa-utils/files/patch-aplay_aplay.c b/audio/alsa-utils/files/patch-aplay_aplay.c deleted file mode 100644 index 61a9046313b2..000000000000 --- a/audio/alsa-utils/files/patch-aplay_aplay.c +++ /dev/null @@ -1,23 +0,0 @@ ---- aplay/aplay.c.orig 2020-02-19 12:02:10 UTC -+++ aplay/aplay.c -@@ -49,7 +49,6 @@ - #include - #include - #include --#include - #include "gettext.h" - #include "formats.h" - #include "version.h" -@@ -70,6 +69,12 @@ - #define be16toh(x) __be16_to_cpu(x) - #define le32toh(x) __le32_to_cpu(x) - #define be32toh(x) __be32_to_cpu(x) -+#endif -+ -+#ifndef _LARGEFILE64_SOURCE -+/* assume modern system */ -+typedef off_t off64_t; -+#define lseek64 lseek - #endif - - #define DEFAULT_FORMAT SND_PCM_FORMAT_U8 diff --git a/audio/alsa-utils/files/patch-seq_aplaymidi_aplaymidi.c b/audio/alsa-utils/files/patch-seq_aplaymidi_aplaymidi.c deleted file mode 100644 index 03c821703455..000000000000 --- a/audio/alsa-utils/files/patch-seq_aplaymidi_aplaymidi.c +++ /dev/null @@ -1,11 +0,0 @@ ---- seq/aplaymidi/aplaymidi.c.orig 2023-09-01 15:36:26 UTC -+++ seq/aplaymidi/aplaymidi.c -@@ -819,6 +819,8 @@ static void play_midi(void) - ev.time.tick = event->tick; - ev.dest = ports[event->port]; - if (event->type == SND_SEQ_EVENT_TEMPO) { -+ snd_seq_ev_set_fixed(&ev); -+ ev.type = event->type; - ev.dest.client = SND_SEQ_CLIENT_SYSTEM; - ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER; - ev.data.queue.queue = queue;