diff options
Diffstat (limited to 'audio/alsa-utils')
| -rw-r--r-- | audio/alsa-utils/Makefile | 34 | ||||
| -rw-r--r-- | audio/alsa-utils/distinfo | 6 | ||||
| -rw-r--r-- | audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.8 (renamed from audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.1) | 4 | ||||
| -rw-r--r-- | audio/alsa-utils/files/patch-aplay_aplay.c | 23 | ||||
| -rw-r--r-- | audio/alsa-utils/files/patch-aplay_formats.h | 10 | ||||
| -rw-r--r-- | audio/alsa-utils/files/patch-speaker-test_samples_sample__map.csv | 7 | ||||
| -rw-r--r-- | audio/alsa-utils/pkg-plist | 64 |
7 files changed, 58 insertions, 90 deletions
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index d6bf786963c2..cb6e9c0e954a 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,11 +1,9 @@ PORTNAME= alsa-utils -PORTVERSION= 1.2.2 -DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTVERSION= 1.2.14 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/ @@ -17,20 +15,18 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ 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 +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 @@ -53,19 +49,19 @@ 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}/alsa-info/alsa-info.sh.8 \ ${WRKSRC}/amidi/amidi.1 .include <bsd.port.mk> diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index 7af3684defc2..def5c29d1a4e 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 = 1754664140 +SHA256 (alsa-utils-1.2.14.tar.bz2) = 0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741 +SIZE (alsa-utils-1.2.14.tar.bz2) = 1652717 diff --git a/audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.1 b/audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.8 index 7c87d358dd5b..13cdbe6ef419 100644 --- a/audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.1 +++ b/audio/alsa-utils/files/patch-alsa-info_alsa-info.sh.8 @@ -1,5 +1,5 @@ ---- alsa-info/alsa-info.sh.1.orig 2020-02-19 12:02:10 UTC -+++ alsa-info/alsa-info.sh.1 +--- alsa-info/alsa-info.sh.8.orig 2020-02-19 12:02:10 UTC ++++ alsa-info/alsa-info.sh.8 @@ -37,7 +37,7 @@ Includes output from \fIamixer\fP. Includes output from \fIalsactl\fP. .TP 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 <sys/time.h> - #include <sys/stat.h> - #include <sys/types.h> --#include <endian.h> - #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-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 <endian.h> - #include <byteswap.h> - - /* 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..51af0d3ec5f0 100644 --- a/audio/alsa-utils/pkg-plist +++ b/audio/alsa-utils/pkg-plist @@ -8,39 +8,47 @@ bin/amidi bin/amixer bin/aplay bin/aplaymidi +bin/aplaymidi2 bin/arecord bin/arecordmidi +bin/arecordmidi2 bin/aseqdump +bin/aseqsend 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/speaker-test.1.gz -%%MANPAGES%%man/man7/alsactl_init.7.gz -%%MANPAGES%%man/man8/alsaconf.8.gz +%%MANPAGES%%share/man/fr/man8/alsaconf.8.gz +%%MANPAGES%%share/man/man1/aconnect.1.gz +%%MANPAGES%%%%BAT%%share/man/man1/alsabat.1.gz +%%MANPAGES%%share/man/man1/alsactl.1.gz +%%MANPAGES%%share/man/man1/alsaloop.1.gz +%%MANPAGES%%share/man/man1/alsamixer.1.gz +%%MANPAGES%%share/man/man1/alsatplg.1.gz +%%MANPAGES%%share/man/man1/alsaucm.1.gz +%%MANPAGES%%share/man/man1/amidi.1.gz +%%MANPAGES%%share/man/man1/amixer.1.gz +%%MANPAGES%%share/man/man1/aplay.1.gz +%%MANPAGES%%share/man/man1/aplaymidi.1.gz +%%MANPAGES%%share/man/man1/aplaymidi2.1.gz +%%MANPAGES%%share/man/man1/arecord.1.gz +%%MANPAGES%%share/man/man1/arecordmidi.1.gz +%%MANPAGES%%share/man/man1/arecordmidi2.1.gz +%%MANPAGES%%share/man/man1/aseqdump.1.gz +%%MANPAGES%%share/man/man1/aseqsend.1.gz +%%MANPAGES%%share/man/man1/aseqnet.1.gz +%%MANPAGES%%share/man/man1/axfer-list.1.gz +%%MANPAGES%%share/man/man1/axfer-transfer.1.gz +%%MANPAGES%%share/man/man1/axfer.1.gz +%%MANPAGES%%share/man/man1/iecset.1.gz +%%MANPAGES%%share/man/man1/nhlt-dmic-info.1.gz +%%MANPAGES%%share/man/man1/speaker-test.1.gz +%%MANPAGES%%share/man/man7/alsactl_init.7.gz +%%MANPAGES%%share/man/man8/alsa-info.sh.8.gz +%%MANPAGES%%share/man/man8/alsaconf.8.gz sbin/alsa-info.sh %%BAT%%sbin/alsabat-test.sh sbin/alsaconf @@ -52,12 +60,16 @@ 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 |