diff options
author | Ross Burton <ross.burton@intel.com> | 2018-06-11 21:38:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-15 17:56:25 +0100 |
commit | b054015357b2b03f308af00a41b29c649cbca171 (patch) | |
tree | f3858a3481ce2509fa98f21668a13842980ad8fe /meta/recipes-multimedia/alsa/alsa-tools/autotools.patch | |
parent | 89cbaca35943228aef60cfbc8ce1d2cb245b11e6 (diff) | |
download | poky-b054015357b2b03f308af00a41b29c649cbca171.tar.gz |
alsa-tools: rewrite packaging
alsa-tools is actually a collection of 20 separate tools, each with their own
configure scripts. The dependencies are varied, old, and estoric (FLTK, GTK+ 1, 2,
and 3, PyGTK 2, Qt3).
Instead of maintaining patches to try and pick a subset that builds, use
PACKAGECONFIG and some magic to build what the user requests.
By default we build all the tools which have no dependencies, and the tools
which need GTK+ 2 or GTK+ 3 if the relevant DISTRO_FEATURES are enabled.
Add a patch to fix the build of ld10k1 with musl.
The ncurses build dependency doesn't seem to be checked for, so remove that.
(From OE-Core rev: 83c9405df5748744ef673ac8757bb89d7050ad8d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-tools/autotools.patch')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/autotools.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch deleted file mode 100644 index c85834a593..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dongxiao Xu <dongxiao.xu@intel.com> | ||
3 | Date: Thu, 14 Jul 2011 15:40:36 +0800 | ||
4 | Subject: [PATCH] alsa-tools: Fix recipe build error. | ||
5 | |||
6 | Add parameters to autoreconf to support cross compile. | ||
7 | Remove some sub-components which needs further recipe support. | ||
8 | |||
9 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | --- | ||
14 | Makefile | 4 ++-- | ||
15 | ld10k1/gitcompile | 2 +- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index c32bf25..1119372 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -1,8 +1,8 @@ | ||
23 | VERSION = 1.1.6 | ||
24 | TOP = . | ||
25 | -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ | ||
26 | +SUBDIRS = as10k1 envy24control \ | ||
27 | mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ | ||
28 | - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ | ||
29 | + us428control usx2yloader vxloader echomixer \ | ||
30 | hwmixvolume hdajackretask hda-verb hdajacksensetest | ||
31 | |||
32 | all: | ||
33 | diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile | ||
34 | index 99429ac..20005d9 100755 | ||
35 | --- a/ld10k1/gitcompile | ||
36 | +++ b/ld10k1/gitcompile | ||
37 | @@ -1,6 +1,6 @@ | ||
38 | #!/bin/bash | ||
39 | |||
40 | -autoreconf -fi || exit 1 | ||
41 | +autoreconf $ACLOCAL_FLAGS -fi || exit 1 | ||
42 | export CFLAGS='-O2 -Wall -pipe -g' | ||
43 | echo "CFLAGS=$CFLAGS" | ||
44 | echo "./configure $@" | ||