From 14d9c8ae05c38eb3cbf2ee3be5e2027632a3e010 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 20 Nov 2020 16:41:36 +0900 Subject: [PATCH 1/4] hwdep: fix metadata and documentation for the type of interface The scanner of g-i and gtk-doc can't handle macro lines in enumeration lines expectedly. This commit fixes to generate valid metadata and documentation. Fixes: 843c9fe68228 ("hwdep: conditional build for Linux kernel 4.12 or later") Fixes: 45f650bf29e8 ("hwdep: conditional build for Linux kernel v4.9 or later") Signed-off-by: Takashi Sakamoto --- src/hwdep/alsahwdep-enum-types.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/hwdep/alsahwdep-enum-types.h b/src/hwdep/alsahwdep-enum-types.h index 97278f76..b5116669 100644 --- a/src/hwdep/alsahwdep-enum-types.h +++ b/src/hwdep/alsahwdep-enum-types.h @@ -5,6 +5,19 @@ #include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0) +#ifndef __GTK_DOC_IGNORE__ +#define SNDRV_HWDEP_IFACE_LINE6 (SNDRV_HWDEP_IFACE_FW_TASCAM + 1) +#endif +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0) +#ifndef __GTK_DOC_IGNORE__ +#define SNDRV_HWDEP_IFACE_FW_MOTU (SNDRV_HWDEP_IFACE_LINE6 + 1) +#define SNDRV_HWDEP_IFACE_FW_FIREFACE (SNDRV_HWDEP_IFACE_FW_MOTU + 1) +#endif +#endif + /** *ALSAHwdepIfaceType: * @ALSAHWDEP_IFACE_TYPE_OPL2: For OPL2 sound chip. @@ -62,18 +75,9 @@ typedef enum { ALSAHWDEP_IFACE_TYPE_FW_OXFW = SNDRV_HWDEP_IFACE_FW_OXFW, ALSAHWDEP_IFACE_TYPE_FW_DIGI00X = SNDRV_HWDEP_IFACE_FW_DIGI00X, ALSAHWDEP_IFACE_TYPE_FW_TASCAM = SNDRV_HWDEP_IFACE_FW_TASCAM, -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ALSAHWDEP_IFACE_TYPE_LINE6 = SNDRV_HWDEP_IFACE_LINE6, -#else - ALSAHWDEP_IFACE_TYPE_LINE6, -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) ALSAHWDEP_IFACE_TYPE_FW_MOTU = SNDRV_HWDEP_IFACE_FW_MOTU, ALSAHWDEP_IFACE_TYPE_FW_FIREFACE = SNDRV_HWDEP_IFACE_FW_FIREFACE, -#else - ALSAHWDEP_IFACE_TYPE_FW_MOTU, - ALSAHWDEP_IFACE_TYPE_FW_FIREFACE, -#endif } ALSAHwdepIfaceType; #endif From b8c1df92480d06d1bdbf7f97a30102ad7d5e7fc4 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 20 Nov 2020 16:41:36 +0900 Subject: [PATCH 2/4] upgrade CI operationg system to Ubuntu 20.04 LTS amd64 Signed-off-by: Takashi Sakamoto --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index babf7fc9..cf9453a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: sudo lxd init --auto - name: Launch container run: | - sudo lxc launch ubuntu:19.10/amd64 builder + sudo lxc launch ubuntu:20.04/amd64 builder sudo lxc exec builder -- bash -c 'while [ "$(systemctl is-system-running 2>/dev/null)" != "running" ] && [ "$(systemctl is-system-running 2>/dev/null)" != "degraded" ]; do :; done' - name: Prepare build environment. run: | From 754f455cdf5ad0f96644191db2b92097283afd42 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 20 Nov 2020 16:41:36 +0900 Subject: [PATCH 3/4] upgrade CI operationg system to Fedora 33 Signed-off-by: Takashi Sakamoto --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf9453a1..4358f6e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: build_in_fedora_for_amd64_on_docker: runs-on: ubuntu-latest container: - image: fedora:32 + image: fedora:33 steps: - name: Checkout repository. uses: actions/checkout@v2 From 4685f94d74bea91cd136da13e74fa4979c95e31e Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 20 Nov 2020 16:41:36 +0900 Subject: [PATCH 4/4] bump version up to 0.2.0 to release Signed-off-by: Takashi Sakamoto --- README.rst | 7 ++++--- meson.build | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index ae7b777c..1355d8ec 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ The alsa-gobject project ======================== -2020/06/21 +2020/11/20 Takashi Sakamoto Introduction @@ -60,7 +60,7 @@ Dependencies * GLib * GObject introspection -* UAPI of Linux kernel for sound subsystem +* UAPI of Linux kernel version 4.5 or later for sound subsystem * libudev1 * Meson * (optional) PyGObject to execute tests @@ -104,7 +104,8 @@ Design note =========== * These libraries are independent of alsa-lib, to focus on interaction to - kernel land directly by system calls without alsa-lib's configuration space. + kernel land directly by system calls without alsa-lib's configuration space + and plugin framework. * The way to enumerate any device is based on sysfs, programmed with libudev1. * GObject object is used for structures in UAPI of Linux sound subsystem with reserved space. diff --git a/meson.build b/meson.build index 2068db63..58e6a9a2 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('alsa-gobject', 'c', - version: '0.1.0', + version: '0.2.0', license: 'LGPL-3', )