summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-02 13:12:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:37 +0100
commit800f2d7b3be29b12a988ff08a99794146fd440ad (patch)
tree47e0d3bfbce30bee85bf97f8d6b5682b56908e4e
parent0ef7994fd0e41f413a8f3b9e85d4f98ea6107681 (diff)
downloadpoky-800f2d7b3be29b12a988ff08a99794146fd440ad.tar.gz
alsa-lib: move contents of alsa-fpu.inc into alsa-lib recipe
Merge historical .inc file into the only recipe which uses it. (From OE-Core rev: eb1eacefafcbf69e48f906234f5016ae18f0bdce) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-fpu.inc4
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb13
2 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc
deleted file mode 100644
index 355a9dfcd1..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-fpu.inc
+++ /dev/null
@@ -1,4 +0,0 @@
1def get_alsa_fpu_setting(bb, d):
2 if d.getVar('TARGET_FPU') in [ 'soft' ]:
3 return "--with-softfloat"
4 return ""
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
index c5bf107e5e..fb6b4fb501 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
@@ -6,20 +6,19 @@ LICENSE = "LGPLv2.1 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
7 file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" 7 file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545"
8 8
9BBCLASSEXTEND = "native nativesdk"
10
11SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2" 9SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2"
12SRC_URI[md5sum] = "a2b465c3a5265d8a57f3ff39c6c4fc29" 10SRC_URI[md5sum] = "a2b465c3a5265d8a57f3ff39c6c4fc29"
13SRC_URI[sha256sum] = "f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6" 11SRC_URI[sha256sum] = "f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6"
14 12
15inherit autotools pkgconfig 13inherit autotools pkgconfig
16 14
17require alsa-fpu.inc 15EXTRA_OECONF += " \
18EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " 16 ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \
19 17 --disable-python \
20EXTRA_OECONF += "--disable-python" 18"
21 19
22PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" 20PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc"
21
23FILES_libasound = "${libdir}/libasound.so.*" 22FILES_libasound = "${libdir}/libasound.so.*"
24FILES_alsa-server = "${bindir}/*" 23FILES_alsa-server = "${bindir}/*"
25FILES_alsa-conf = "${datadir}/alsa/" 24FILES_alsa-conf = "${datadir}/alsa/"
@@ -38,3 +37,5 @@ RCONFLICTS_${PN}-dev = "alsa-dev"
38RPROVIDES_alsa-conf = "alsa-conf-base" 37RPROVIDES_alsa-conf = "alsa-conf-base"
39RREPLACES_alsa-conf = "alsa-conf-base" 38RREPLACES_alsa-conf = "alsa-conf-base"
40RCONFLICTS_alsa-conf = "alsa-conf-base" 39RCONFLICTS_alsa-conf = "alsa-conf-base"
40
41BBCLASSEXTEND = "native nativesdk"