From d438c87012a03bf556fe306b178a68ff41d19bc0 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 31 Jul 2013 17:49:18 +0300 Subject: alsa-lib: upgrade to v1.0.27.2 fix-O0-Optimize-unable-inline-function.patch, obsolete_automake_macros.patch patches included in upstream; removed. unbreak_plugindir.patch not used, removed. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../fix-O0-Optimize-unable-inline-function.patch | 63 ---------------------- .../alsa/alsa-lib/obsolete_automake_macros.patch | 15 ------ .../alsa/alsa-lib/unbreak_plugindir.patch | 14 ----- meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb | 52 ------------------ meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | 48 +++++++++++++++++ 5 files changed, 48 insertions(+), 144 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch b/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch deleted file mode 100644 index 1e43c256ad..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch +++ /dev/null @@ -1,63 +0,0 @@ -Change function type from "extern __inline__" to "static __inline__" - -"extern __inline__ function()" is the inlined version that -can be used in this compilation unit, but there will be another -definition of this function somewhere, so compiler will not emit -any code for the function body. This causes problem in -O0, -where functions are never inlined, the function call is preserved, -but linker can't find the symbol, thus the error happens. - -since no packages provide atomic_add and atomic_sub, and -O0 -Optimize is hoped to keep for debug, we can change extern to -static to fix this problem. - -Upstream-Status: Pending - -Signed-off-by: Roy.Li ---- - include/iatomic.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/iatomic.h b/include/iatomic.h -index e92dbfd..364bc5c 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; - * Atomically adds @i to @v. Note that the guaranteed useful range - * of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_add(int i, atomic_t * v) -+static __inline__ void atomic_add(int i, atomic_t * v) - { - unsigned long temp; - -@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) - * Atomically subtracts @i from @v. Note that the guaranteed - * useful range of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_sub(int i, atomic_t * v) -+static __inline__ void atomic_sub(int i, atomic_t * v) - { - unsigned long temp; - -@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) - /* - * Same as above, but return the result value - */ --extern __inline__ int atomic_add_return(int i, atomic_t * v) -+static __inline__ int atomic_add_return(int i, atomic_t * v) - { - unsigned long temp, result; - -@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) - return result; - } - --extern __inline__ int atomic_sub_return(int i, atomic_t * v) -+static __inline__ int atomic_sub_return(int i, atomic_t * v) - { - unsigned long temp, result; - --- -1.7.4.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch deleted file mode 100644 index 95c29dac7c..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [alsa-devel@alsa-project.org] - -Signed-off-by: Marko Lindqvist -diff -Nurd alsa-lib-1.0.25/configure.in alsa-lib-1.0.25/configure.in ---- alsa-lib-1.0.25/configure.in 2012-01-25 09:56:56.000000000 +0200 -+++ alsa-lib-1.0.25/configure.in 2013-01-02 17:00:31.468090167 +0200 -@@ -53,7 +53,7 @@ - - dnl Checks for header files. - AC_HEADER_STDC --AM_CONFIG_HEADER(include/config.h) -+AC_CONFIG_HEADERS(include/config.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch deleted file mode 100644 index 1f3edd06aa..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in ---- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 -+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 -@@ -93,7 +93,7 @@ - esac - plugindir="$dir/$PACKAGE" - fi --AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) -+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) - ALSA_PLUGIN_DIR="$plugindir" - AC_SUBST(ALSA_PLUGIN_DIR) - diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb deleted file mode 100644 index 6f22d06c03..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "Alsa sound library" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" -SECTION = "libs/multimedia" -LICENSE = "LGPLv2.1 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" - -BBCLASSEXTEND = "native nativesdk" - -# configure.in sets -D__arm__ on the command line for any arm system -# (not just those with the ARM instruction set), this should be removed, -# (or replaced by a permitted #define). -#FIXME: remove the following -ARM_INSTRUCTION_SET = "arm" - -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ - file://fix-tstamp-declaration.patch \ - file://obsolete_automake_macros.patch \ - file://fix-O0-Optimize-unable-inline-function.patch \ - file://Check-if-wordexp-function-is-supported.patch \ - " -SRC_URI[md5sum] = "2dfa35d28471d721e592b616beedf965" -SRC_URI[sha256sum] = "8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d" - -inherit autotools pkgconfig - -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" - -EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " - -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" -FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" -FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug" -FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" -FILES_libasound = "${libdir}/libasound.so.*" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}/alsa/" -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" -FILES_alsa-conf-base = "\ -${datadir}/alsa/alsa.conf \ -${datadir}/alsa/cards/aliases.conf \ -${datadir}/alsa/pcm/default.conf \ -${datadir}/alsa/pcm/dmix.conf \ -${datadir}/alsa/pcm/dsnoop.conf" - -RDEPENDS_libasound = "alsa-conf-base" diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb new file mode 100644 index 0000000000..545594466c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "ALSA sound library" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "libs/multimedia" +LICENSE = "LGPLv2.1 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" + +BBCLASSEXTEND = "native nativesdk" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://Check-if-wordexp-function-is-supported.patch \ + file://fix-tstamp-declaration.patch \ + " +SRC_URI[md5sum] = "69129a7c37697f81ac092335e9fa452b" +SRC_URI[sha256sum] = "690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19" + +inherit autotools pkgconfig + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + +EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" +FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug" +FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" -- cgit 1.2.3-korg