From 388db2beb50f27ff3488b8a1bef4029bf8a7d058 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 3 Jul 2016 00:03:45 -0700 Subject: Add alsa-utils 1.1.1 --- .gitmodules | 4 ++ media/alsa-utils/.rev | 1 + media/alsa-utils/aconfig.h | 48 +++++++++++++ media/alsa-utils/gen.rc | 21 ++++++ ...0001-Include-poll.h-instead-of-sys-poll.h.patch | 81 ++++++++++++++++++++++ .../0002-amixer.h-Just-include-version.h.patch | 22 ++++++ media/alsa-utils/src | 1 + media/alsa-utils/version.h | 12 ++++ media/gen.rc | 1 + 9 files changed, 191 insertions(+) create mode 100644 media/alsa-utils/.rev create mode 100644 media/alsa-utils/aconfig.h create mode 100644 media/alsa-utils/gen.rc create mode 100644 media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch create mode 100644 media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch create mode 160000 media/alsa-utils/src create mode 100644 media/alsa-utils/version.h diff --git a/.gitmodules b/.gitmodules index c51a2d5e..f9e40b51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -134,6 +134,10 @@ path = media/alsa-lib/src url = git://git.alsa-project.org/alsa-lib.git ignore = all +[submodule "media/alsa-utils/src"] + path = media/alsa-utils/src + url = git://git.alsa-project.org/alsa-utils.git + ignore = all [submodule "media/ffmpeg/src"] path = media/ffmpeg/src url = https://git.ffmpeg.org/ffmpeg.git diff --git a/media/alsa-utils/.rev b/media/alsa-utils/.rev new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/media/alsa-utils/.rev @@ -0,0 +1 @@ +1 diff --git a/media/alsa-utils/aconfig.h b/media/alsa-utils/aconfig.h new file mode 100644 index 00000000..dfa8c5f5 --- /dev/null +++ b/media/alsa-utils/aconfig.h @@ -0,0 +1,48 @@ +#include + +#define DATADIR "/share/alsa" +/* #undef ENABLE_NLS */ +/* #undef ENABLE_NLS_IN_CURSES */ +#define HAVE_ALSA_MIXER_H 1 +#define HAVE_ALSA_PCM_H 1 +#define HAVE_ALSA_RAWMIDI_H 1 +#define HAVE_ALSA_SEQ_H 1 +/* #undef HAVE_ALSA_TOPOLOGY_H */ +#define HAVE_ALSA_USE_CASE_H 1 +/* #undef HAVE_CFLOCALECOPYCURRENT */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ +/* #undef HAVE_CURSES_ESCDELAY */ +/* #undef HAVE_DCGETTEXT */ +/* #undef HAVE_FORM_H */ +/* #undef HAVE_GETTEXT */ +#define HAVE_LIBASOUND 1 +/* #undef HAVE_LIBFFTW3F */ +#define HAVE_LIBM 1 +#define HAVE_LIBPTHREAD 1 +#define HAVE_LIBRT 1 +/* #undef HAVE_LIBTINYALSA */ +/* #undef HAVE_MEMORY_H */ +/* #undef HAVE_MENU_H */ +/* #undef HAVE_PANEL_H */ +/* #undef HAVE_SAMPLERATE_H */ +/* #undef HAVE_SEQ_CLIENT_INFO_GET_CARD */ +/* #undef HAVE_SEQ_CLIENT_INFO_GET_PID */ +#define PACKAGE "alsa-utils" +#define PACKAGE_BUGREPORT "" +#define PACKAGE_NAME "alsa-utils" +#define PACKAGE_STRING "alsa-utils 1.1.1" +#define PACKAGE_TARNAME "alsa-utils" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "1.1.1" +#define SOUNDSDIR "/share/sounds/alsa" +#define TIME_WITH_SYS_TIME 1 +#define VERSION "1.1.1" +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif +/* #undef _FILE_OFFSET_BITS */ +/* #undef _LARGE_FILES */ +/* #undef const */ +#ifndef __cplusplus +/* #undef inline */ +#endif diff --git a/media/alsa-utils/gen.rc b/media/alsa-utils/gen.rc new file mode 100644 index 00000000..837ba2bc --- /dev/null +++ b/media/alsa-utils/gen.rc @@ -0,0 +1,21 @@ +cflags\ + -isystem '$builddir'/media/alsa-lib/include\ + -I include\ + -I '$dir' \ + -I '$srcdir'/include + +libs='$builddir'/media/alsa-lib/libasound.a +deps=phony/media/alsa-lib/headers + +fn x { + name=$1 + shift + exe bin/$name -d $"deps $* $libs + file bin/$name '$outdir'/bin/$name 755 + file share/man/man1/$name.1 '$srcdir'/$name/$name.1 644 +} + +x amixer amixer/amixer.c alsamixer/volume_mapping.c +x aplay aplay/aplay.c + +fetch git diff --git a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch new file mode 100644 index 00000000..cb04c76f --- /dev/null +++ b/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch @@ -0,0 +1,81 @@ +From bf5b040672b67cbf69eadb46b699d7f814adbdd5 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Sat, 2 Jul 2016 23:48:43 -0700 +Subject: [PATCH 1/2] Include poll.h instead of sys/poll.h + +--- + amidi/amidi.c | 2 +- + amixer/amixer.c | 2 +- + aplay/aplay.c | 2 +- + seq/aplaymidi/arecordmidi.c | 2 +- + seq/aseqdump/aseqdump.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/amidi/amidi.c b/amidi/amidi.c +index cedf18c..46f5767 100644 +--- a/amidi/amidi.c ++++ b/amidi/amidi.c +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/amixer/amixer.c b/amixer/amixer.c +index f9b09cb..8241148 100644 +--- a/amixer/amixer.c ++++ b/amixer/amixer.c +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "amixer.h" + #include "../alsamixer/volume_mapping.h" +diff --git a/aplay/aplay.c b/aplay/aplay.c +index 7acaa83..78823d8 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c +index 9628086..1c25fa2 100644 +--- a/seq/aplaymidi/arecordmidi.c ++++ b/seq/aplaymidi/arecordmidi.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "aconfig.h" + #include "version.h" +diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c +index 24c5d21..05892e0 100644 +--- a/seq/aseqdump/aseqdump.c ++++ b/seq/aseqdump/aseqdump.c +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "aconfig.h" + #include "version.h" +-- +2.9.0 + diff --git a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch new file mode 100644 index 00000000..47e151f2 --- /dev/null +++ b/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch @@ -0,0 +1,22 @@ +From 9e890d47655e382702bcaba8cb449fb81f1d1876 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Sun, 3 Jul 2016 00:01:24 -0700 +Subject: [PATCH 2/2] amixer.h: Just include "version.h" + +--- + amixer/amixer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amixer/amixer.h b/amixer/amixer.h +index 3588f04..0daa5b7 100644 +--- a/amixer/amixer.h ++++ b/amixer/amixer.h +@@ -18,4 +18,4 @@ + * + */ + +-#include "../include/version.h" ++#include "version.h" +-- +2.9.0 + diff --git a/media/alsa-utils/src b/media/alsa-utils/src new file mode 160000 index 00000000..96db90e9 --- /dev/null +++ b/media/alsa-utils/src @@ -0,0 +1 @@ +Subproject commit 96db90e98a6040f680f4ebca1880268a2e1ab6cc diff --git a/media/alsa-utils/version.h b/media/alsa-utils/version.h new file mode 100644 index 00000000..d9f7ffff --- /dev/null +++ b/media/alsa-utils/version.h @@ -0,0 +1,12 @@ +/* + * version.h + */ + +#define SND_UTIL_MAJOR 1 +#define SND_UTIL_MINOR 1 +#define SND_UTIL_SUBMINOR 1 +#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\ + (SND_UTIL_MINOR<<8)|\ + SND_UTIL_SUBMINOR) +#define SND_UTIL_VERSION_STR "1.1.1" + diff --git a/media/gen.rc b/media/gen.rc index d4ef5b52..7436dadc 100644 --- a/media/gen.rc +++ b/media/gen.rc @@ -1,3 +1,4 @@ subgen alsa-lib +subgen alsa-utils subgen ffmpeg subgen mpv -- cgit v1.2.3