From d3c2bcd7dd7e3d3c0c0ccce1669791ca7915f4dc Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 13 Apr 2011 13:38:25 +0800 Subject: alsa-lib: upgrade to version 1.0.24.1 (From OE-Core rev: b69c77dd3734b1564c60f53d1584ec5bf75b5c48) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- .../alsa-lib-1.0.23/fix-tstamp-declaration.patch | 19 --------- .../alsa/alsa-lib-1.0.23/unbreak_plugindir.patch | 12 ------ .../alsa-lib-1.0.24.1/fix-tstamp-declaration.patch | 21 ++++++++++ .../alsa/alsa-lib-1.0.24.1/unbreak_plugindir.patch | 14 +++++++ meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb | 45 ---------------------- meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb | 45 ++++++++++++++++++++++ 6 files changed, 80 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/fix-tstamp-declaration.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/unbreak_plugindir.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch deleted file mode 100644 index 9016b348de..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch +++ /dev/null @@ -1,19 +0,0 @@ -# Author: Michael Lauer -# Date: Thu Jan 18 00:27:21 2007 +0000 -# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options -# -# Acquired from OpenEmbedded - -Index: alsa-lib-1.0.13/include/global.h -=================================================================== ---- alsa-lib-1.0.13.orig/include/global.h -+++ alsa-lib-1.0.13/include/global.h -@@ -29,6 +29,8 @@ - #define __ALSA_GLOBAL_H_ - - /* for timeval and timespec */ -+#define __need_timeval -+#define __need_timespec - #include - - #ifdef __cplusplus diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch deleted file mode 100644 index 7d13166809..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.24.1/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..32b84b7d7e --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/fix-tstamp-declaration.patch @@ -0,0 +1,21 @@ +# Author: Michael Lauer +# Date: Thu Jan 18 00:27:21 2007 +0000 +# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options +# +# Acquired from OpenEmbedded + +Upstream-Status: Pending + +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include + + #ifdef __cplusplus diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/unbreak_plugindir.patch new file mode 100644 index 0000000000..1f3edd06aa --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.24.1/unbreak_plugindir.patch @@ -0,0 +1,14 @@ +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.23.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb deleted file mode 100644 index 936f299207..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb +++ /dev/null @@ -1,45 +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" - -# 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;patch=1" - -SRC_URI[md5sum] = "f48b50421d8a69d2d806d9c47e534f0d" -SRC_URI[sha256sum] = "b4238ecaba5e4a1383af06180611a57ef29f9bf47bc177136dba1bb5b70ff423" - -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" - -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" -FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" -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.24.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb new file mode 100644 index 0000000000..53f4d29f5f --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb @@ -0,0 +1,45 @@ +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" + +# 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;patch=1" + +SRC_URI[md5sum] = "7cc05f25e1d5b65da8fb3fdcd540f226" +SRC_URI[sha256sum] = "a32f7c21015b6c71f9a80ff70a2b6a50e4ff4d5c77c744ff0793dea7ba7a2517" + +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" + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +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 v1.2.3-54-g00ecf