diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-03-22 10:34:24 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-03-22 10:34:24 +0000 |
| commit | 8e8bfad331752ef7dc605c9f7c65e8271f96ddeb (patch) | |
| tree | 4380e2475d4008c4601a8ed66b0d423948c1bfbc /user/alsa-lib/type_compat.patch | |
| parent | 98667acf075a3383f3e7a5d1192236630f349ab2 (diff) | |
| parent | 19029ee5ecc515ace99092975081c6e076416d0d (diff) | |
| download | packages-8e8bfad331752ef7dc605c9f7c65e8271f96ddeb.tar.gz packages-8e8bfad331752ef7dc605c9f7c65e8271f96ddeb.tar.bz2 packages-8e8bfad331752ef7dc605c9f7c65e8271f96ddeb.tar.xz packages-8e8bfad331752ef7dc605c9f7c65e8271f96ddeb.zip | |
Merge branch 'sr.2020.03.03' into 'master'
Bumps for Maintainer: Max Rees for 2020.03.03
See merge request adelie/packages!410
Diffstat (limited to 'user/alsa-lib/type_compat.patch')
| -rw-r--r-- | user/alsa-lib/type_compat.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/user/alsa-lib/type_compat.patch b/user/alsa-lib/type_compat.patch new file mode 100644 index 000000000..4236d11d4 --- /dev/null +++ b/user/alsa-lib/type_compat.patch @@ -0,0 +1,23 @@ +Since we force the use of the uapi headers from linux-headers instead of +using the vendored copy, type_compat.h never gets put in the place it +should be for it to be seen in sound/. + +However, the only reason it was included here anyway was to replace a +definition that was never used: + +https://github.com/alsa-project/alsa-lib/commit/ae564665ec261cf104de499b1cdda3564070fc65#diff-5e0b4d8ecf374a31036ffc7b224d5e7fL21 + + -#define __packed __attribute__((__packed__)) + - + +#include <sound/type_compat.h> + +--- alsa-lib-1.2.2/src/topology/tplg_local.h 2020-02-19 03:35:39.000000000 -0600 ++++ alsa-lib-1.2.2/src/topology/tplg_local.h 2020-03-17 01:26:25.159548858 -0500 +@@ -18,7 +18,6 @@ + #include "list.h" + #include "topology.h" + +-#include <sound/type_compat.h> + #include <sound/asound.h> + #include <sound/asoc.h> + #include <sound/tlv.h> |