* add PACKAGECONFIF for python: smixer is build with python only * allow empty alsa-lib package for python disabled * fix EXTRA_OECONF: soft-float was never enabled * alsa-fpu.inc: replace tabs by spaces
Signed-off-by: Andreas Müller <[email protected]> --- meta/recipes-multimedia/alsa/alsa-fpu.inc | 6 ++-- .../alsa-lib/0001-ucm-parser-needs-limits.h.patch | 33 ++++++++++++++++++++ .../0002-use-pkg-config-to-find-python.patch | 36 ++++++++++++++++++++++ .../alsa/{alsa-lib_1.1.2.bb => alsa-lib_1.1.3.bb} | 12 +++++--- 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch rename meta/recipes-multimedia/alsa/{alsa-lib_1.1.2.bb => alsa-lib_1.1.3.bb} (75%) diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc index 1ca31e7..943fae6 100644 --- a/meta/recipes-multimedia/alsa/alsa-fpu.inc +++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc @@ -1,6 +1,6 @@ def get_alsa_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--with-softfloat" - return "" + if d.getVar('TARGET_FPU') in [ 'soft' ]: + return "--with-softfloat" + return "" diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch new file mode 100644 index 0000000..9d464f4 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch @@ -0,0 +1,33 @@ +From 9ed4075f05a4242f32331f7f2c365767970f5003 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <[email protected]> +Date: Wed, 21 Dec 2016 19:46:34 -0300 +Subject: [PATCH] ucm: parser needs limits.h + +It's using PATH_MAX which is defined there, otherwise the build fails on +musl libc. + +Signed-off-by: Gustavo Zacarias <[email protected]> +Signed-off-by: Takashi Iwai <[email protected]> + +Upstream-Status: Backport [1] + +[1] http://git.alsa-project.org/?p=alsa-lib.git;a=commit;h=9ed4075f05a4242f32331f7f2c365767970f5003 +--- + src/ucm/parser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ucm/parser.c b/src/ucm/parser.c +index c98373a..f520abc 100644 +--- a/src/ucm/parser.c ++++ b/src/ucm/parser.c +@@ -32,6 +32,7 @@ + + #include "ucm_local.h" + #include <dirent.h> ++#include <limits.h> + + /** The name of the environment variable containing the UCM directory */ + #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" +-- +2.7.4 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch b/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch new file mode 100644 index 0000000..b7748c3 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch @@ -0,0 +1,36 @@ +From ab5010c7098e7d580189553ac30c6b5d85950fe3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Mon, 23 Jan 2017 14:13:23 +0100 +Subject: [PATCH] use pkg-config to find python +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 83f0ac3..264188d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -388,11 +388,11 @@ if test "$build_python" = "yes"; then + AC_ARG_WITH(pythonlibs, + AS_HELP_STRING([--with-pythonlibs=ldflags], + [specify python libraries (-lpthread -lm -ldl -lpython2.4)]), +- pythonlibs="$withval", pythonlibs=`python-config --libs`) ++ pythonlibs="$withval", pythonlibs=`pkg-config --libs python`) + AC_ARG_WITH(pythonincludes, + AS_HELP_STRING([--with-pythonincludes=Cflags], + [specify python C header files (-I/usr/include/python)]), +- pythonincludes="$withval", pythonincludes=`python-config --includes`) ++ pythonincludes="$withval", pythonincludes=`pkg-config --cflags python`) + if test -z "$pythonlibs"; then + echo "Unable to determine python libraries! Probably python-config is not" + echo "available on this system. Please, use --with-pythonlibs and" +-- +2.7.4 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb similarity index 75% rename from meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb rename to meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb index e313da7..3e0b7e0 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb @@ -11,21 +11,25 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ file://Check-if-wordexp-function-is-supported.patch \ file://avoid-including-sys-poll.h-directly.patch \ + file://0001-ucm-parser-needs-limits.h.patch \ + file://0002-use-pkg-config-to-find-python.patch \ " -SRC_URI[md5sum] = "1946e6438b8262a7b8fdadacd0e06ba7" -SRC_URI[sha256sum] = "d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6" +SRC_URI[md5sum] = "eefe5992567ba00d6110a540657aaf5c" +SRC_URI[sha256sum] = "71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c" inherit autotools pkgconfig require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " +EXTRA_OECONF = "${@get_alsa_fpu_setting(bb, d)}" -EXTRA_OECONF = "--disable-python" +PACKAGECONFIG[python] = "--enable-python,--disable-python,python" EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" +# no python -> smixer is not build +ALLOW_EMPTY_${PN} = "1" FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" FILES_libasound = "${libdir}/libasound.so.*" FILES_alsa-server = "${bindir}/*" -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
