summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-tools
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
committerTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
commitc527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch)
treebb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-multimedia/alsa/alsa-tools
downloadpoky-daisy-140929.tar.gz
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-tools')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/autotools.patch32
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch25
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch16
3 files changed, 73 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
new file mode 100644
index 0000000000..5aec84c60d
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
@@ -0,0 +1,32 @@
1Add parameters to autoreconf to support cross compile.
2Remove some sub-components which needs further recipe support.
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6Upstream-Status: Inappropriate [configuration]
7
8diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile
9--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800
10+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800
11@@ -1,6 +1,6 @@
12 #!/bin/bash
13
14-autoreconf -fi || exit 1
15+autoreconf $ACLOCAL_FLAGS -fi || exit 1
16 export CFLAGS='-O2 -Wall -pipe -g'
17 echo "CFLAGS=$CFLAGS"
18 echo "./configure $@"
19diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
20--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
21+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800
22@@ -1,8 +1,8 @@
23 VERSION = 1.0.27
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
31
32 all:
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
new file mode 100644
index 0000000000..26657266a8
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
@@ -0,0 +1,25 @@
1Remove some sub-components which need gtk+.
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
6Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
7
8diff --git a/Makefile b/Makefile
9index 2457a1c..72346d9 100644
10--- a/Makefile
11+++ b/Makefile
12@@ -1,9 +1,9 @@
13 VERSION = 1.0.27
14 TOP = .
15-SUBDIRS = as10k1 envy24control \
16- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
17- us428control usx2yloader vxloader echomixer \
18- hwmixvolume hdajackretask hda-verb
19+SUBDIRS = as10k1 \
20+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \
21+ us428control usx2yloader vxloader \
22+ hwmixvolume hda-verb
23
24 all:
25 @for i in $(SUBDIRS); do \
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
new file mode 100644
index 0000000000..09b10f17e6
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2Signed-off-by: Saul Wold <sgw@linux.intel.com>
3
4Index: alsa-tools-1.0.26.1/hda-verb/hda-verb.c
5===================================================================
6--- alsa-tools-1.0.26.1.orig/hda-verb/hda-verb.c
7+++ alsa-tools-1.0.26.1/hda-verb/hda-verb.c
8@@ -13,7 +13,7 @@
9 #include <ctype.h>
10 #include <unistd.h>
11 #include <sys/ioctl.h>
12-#ifndef __PPC__
13+#if !(__PPC__ || __mips__)
14 #include <sys/io.h>
15 #endif
16 #include <sys/types.h>