diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index d6bf786963c2..16ea4c0b46ba 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,71 +1,66 @@ PORTNAME= alsa-utils -PORTVERSION= 1.2.2 -DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTVERSION= 1.2.10 CATEGORIES= audio -MASTER_SITES= GH +MASTER_SITES= https://www.alsa-project.org/files/pub/utils/ -MAINTAINER= ports@FreeBSD.org +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= autoreconf gettext-tools gmake libtool localbase ncurses shebangfix \ - tar:bzip2 pkgconfig -USE_GITHUB= yes -GH_ACCOUNT= alsa-project -GH_PROJECT= ${PORTNAME} +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 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}/speaker-test/samples/sample_map.csv \ ${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 7af3684defc2..6771e3b285b1 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634081670 -SHA256 (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 9da1ce4f12a4dd56d55cd5a8f6ae7d56ac91397c3d37fdfcd737adeeb34fce1c -SIZE (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 1252639 +TIMESTAMP = 1695515854 +SHA256 (alsa-utils-1.2.10.tar.bz2) = 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a +SIZE (alsa-utils-1.2.10.tar.bz2) = 1625707 diff --git a/audio/alsa-utils/files/patch-aplay_formats.h b/audio/alsa-utils/files/patch-aplay_formats.h deleted file mode 100644 index fa232b58bf42..000000000000 --- a/audio/alsa-utils/files/patch-aplay_formats.h +++ /dev/null @@ -1,10 +0,0 @@ ---- aplay/formats.h.orig 2016-03-31 14:37:02 UTC -+++ aplay/formats.h -@@ -1,7 +1,6 @@ - #ifndef FORMATS_H - #define FORMATS_H 1 - --#include - #include - - /* Definitions for .VOC files */ diff --git a/audio/alsa-utils/files/patch-speaker-test_samples_sample__map.csv b/audio/alsa-utils/files/patch-speaker-test_samples_sample__map.csv deleted file mode 100644 index a37d824c6b84..000000000000 --- a/audio/alsa-utils/files/patch-speaker-test_samples_sample__map.csv +++ /dev/null @@ -1,7 +0,0 @@ ---- speaker-test/samples/sample_map.csv.orig 2020-02-19 12:02:10 UTC -+++ speaker-test/samples/sample_map.csv -@@ -1,2 +1,2 @@ --0, "Front Left", "/usr/share/alsa/samples/Front_Left.wav" --1, "Front Right", "/usr/share/alsa/samples/Front_Right.wav" -+0, "Front Left", "%%PREFIX%%/share/alsa/samples/Front_Left.wav" -+1, "Front Right", "%%PREFIX%%/share/alsa/samples/Front_Right.wav" diff --git a/audio/alsa-utils/pkg-plist b/audio/alsa-utils/pkg-plist index 8a0a7d38bd96..f9e3fd028cab 100644 --- a/audio/alsa-utils/pkg-plist +++ b/audio/alsa-utils/pkg-plist @@ -1,71 +1,77 @@ bin/aconnect %%BAT%%bin/alsabat bin/alsaloop bin/alsamixer bin/alsatplg bin/alsaucm bin/amidi bin/amixer bin/aplay bin/aplaymidi bin/arecord bin/arecordmidi bin/aseqdump bin/aseqnet bin/axfer bin/iecset +bin/nhlt-dmic-info bin/speaker-test -lib/udev/89-alsa-ucm.rules +lib/alsa-topology/libalsatplg_module_nhlt.so lib/udev/90-alsa-restore.rules %%MANPAGES%%man/fr/man8/alsaconf.8.gz %%MANPAGES%%man/man1/aconnect.1.gz %%MANPAGES%%man/man1/alsa-info.sh.1.gz %%MANPAGES%%%%BAT%%man/man1/alsabat.1.gz %%MANPAGES%%man/man1/alsactl.1.gz %%MANPAGES%%man/man1/alsaloop.1.gz %%MANPAGES%%man/man1/alsamixer.1.gz %%MANPAGES%%man/man1/alsatplg.1.gz %%MANPAGES%%man/man1/alsaucm.1.gz %%MANPAGES%%man/man1/amidi.1.gz %%MANPAGES%%man/man1/amixer.1.gz %%MANPAGES%%man/man1/aplay.1.gz %%MANPAGES%%man/man1/aplaymidi.1.gz %%MANPAGES%%man/man1/arecord.1.gz %%MANPAGES%%man/man1/arecordmidi.1.gz %%MANPAGES%%man/man1/aseqdump.1.gz %%MANPAGES%%man/man1/aseqnet.1.gz %%MANPAGES%%man/man1/axfer-list.1.gz %%MANPAGES%%man/man1/axfer-transfer.1.gz %%MANPAGES%%man/man1/axfer.1.gz %%MANPAGES%%man/man1/iecset.1.gz +%%MANPAGES%%man/man1/nhlt-dmic-info.1.gz %%MANPAGES%%man/man1/speaker-test.1.gz %%MANPAGES%%man/man7/alsactl_init.7.gz %%MANPAGES%%man/man8/alsaconf.8.gz sbin/alsa-info.sh %%BAT%%sbin/alsabat-test.sh sbin/alsaconf sbin/alsactl share/alsa/init/00main share/alsa/init/ca0106 share/alsa/init/default share/alsa/init/hda share/alsa/init/help share/alsa/init/info share/alsa/init/test -share/alsa/speaker-test/sample_map.csv %%NLS%%share/locale/de/LC_MESSAGES/alsa-utils.mo +%%NLS%%share/locale/eu/LC_MESSAGES/alsa-utils.mo %%NLS%%share/locale/fr/LC_MESSAGES/alsa-utils.mo %%NLS%%share/locale/ja/LC_MESSAGES/alsa-utils.mo %%NLS%%share/locale/ja/LC_MESSAGES/alsaconf.mo +%%NLS%%share/locale/ka/LC_MESSAGES/alsa-utils.mo +%%NLS%%share/locale/ka/LC_MESSAGES/alsaconf.mo +%%NLS%%share/locale/ko/LC_MESSAGES/alsa-utils.mo %%NLS%%share/locale/ru/LC_MESSAGES/alsaconf.mo +%%NLS%%share/locale/sk/LC_MESSAGES/alsa-utils.mo share/sounds/alsa/Front_Center.wav share/sounds/alsa/Front_Left.wav share/sounds/alsa/Front_Right.wav share/sounds/alsa/Noise.wav share/sounds/alsa/Rear_Center.wav share/sounds/alsa/Rear_Left.wav share/sounds/alsa/Rear_Right.wav share/sounds/alsa/Side_Left.wav share/sounds/alsa/Side_Right.wav @dir /var/lib/alsa @dir /var/lib