diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,7 +1,6 @@ PORTNAME= alsa-utils -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.9 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= GH @@ -58,7 +57,6 @@ '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 \ diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo --- 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 = 1688177936 +SHA256 (alsa-project-alsa-utils-v1.2.9_GH0.tar.gz) = fde581549326489e9acb2b2d9ddcb146ee85a1698b817f7f4891f49c9f6fc11f +SIZE (alsa-project-alsa-utils-v1.2.9_GH0.tar.gz) = 1383357 diff --git a/audio/alsa-utils/files/patch-aplay_formats.h b/audio/alsa-utils/files/patch-aplay_formats.h --- a/audio/alsa-utils/files/patch-aplay_formats.h +++ b/audio/alsa-utils/files/patch-aplay_formats.h @@ -1,10 +1,10 @@ ---- aplay/formats.h.orig 2016-03-31 14:37:02 UTC -+++ aplay/formats.h -@@ -1,7 +1,6 @@ +--- aplay/formats.h.orig 2023-06-30 22:21:37.349255000 -0400 ++++ aplay/formats.h 2023-06-30 22:22:09.223640000 -0400 +@@ -1,6 +1,7 @@ #ifndef FORMATS_H #define FORMATS_H 1 --#include - #include ++#include + #include "bswap.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 --- 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/files/patch-speaker-test_speaker-test.1 b/audio/alsa-utils/files/patch-speaker-test_speaker-test.1 deleted file mode 100644 --- a/audio/alsa-utils/files/patch-speaker-test_speaker-test.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- speaker-test/speaker-test.1.orig 2020-02-19 12:02:10 UTC -+++ speaker-test/speaker-test.1 -@@ -129,7 +129,7 @@ Use the given WAV file for the playback instead of pre - .TP - \fB\-W\fP | \fB\-\-wavdir\fP \fIDIRECTORY\fP - Specify the directory containing WAV files for playback. --The default path is \fI/usr/share/sounds/alsa\fP. -+The default path is \fI%%PREFIX%%/share/sounds/alsa\fP. - - .TP - \fB\-m\fP | \fB\-\-chmap\fP \fIMAP\fP diff --git a/audio/alsa-utils/pkg-plist b/audio/alsa-utils/pkg-plist --- a/audio/alsa-utils/pkg-plist +++ b/audio/alsa-utils/pkg-plist @@ -15,7 +15,6 @@ bin/axfer bin/iecset bin/speaker-test -lib/udev/89-alsa-ucm.rules lib/udev/90-alsa-restore.rules %%MANPAGES%%man/fr/man8/alsaconf.8.gz %%MANPAGES%%man/man1/aconnect.1.gz @@ -52,7 +51,6 @@ 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/fr/LC_MESSAGES/alsa-utils.mo %%NLS%%share/locale/ja/LC_MESSAGES/alsa-utils.mo