From 5cf345ba25b7399e6342046807f1a10f2f52020f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 23 Jun 2004 22:33:29 +0000 Subject: Upgrade alsa-lib, alsa-oss, and alsa-utils to 1.0.5 BKrev: 40da0539xCbdHxkmwIDJq1r6h1yBXg --- alsa-lib/alsa-lib_1.0.4.oe | 2 + alsa-lib/alsa-lib_1.0.5.oe | 0 alsa-oss/alsa-oss-1.0.4/configure.patch | 147 -------------------------------- alsa-oss/alsa-oss-1.0.4/m4.patch | 0 alsa-oss/alsa-oss_1.0.4.oe | 4 +- alsa-oss/alsa-oss_1.0.5.oe | 0 alsa-utils/alsa-utils_1.0.4.oe | 5 +- alsa-utils/alsa-utils_1.0.5.oe | 0 bash/bash-2.05b/configure.patch | 0 bash/bash-2.05b/make.patch | 0 10 files changed, 5 insertions(+), 153 deletions(-) create mode 100644 alsa-lib/alsa-lib_1.0.5.oe delete mode 100644 alsa-oss/alsa-oss-1.0.4/configure.patch delete mode 100644 alsa-oss/alsa-oss-1.0.4/m4.patch create mode 100644 alsa-oss/alsa-oss_1.0.5.oe create mode 100644 alsa-utils/alsa-utils_1.0.5.oe delete mode 100644 bash/bash-2.05b/configure.patch delete mode 100644 bash/bash-2.05b/make.patch diff --git a/alsa-lib/alsa-lib_1.0.4.oe b/alsa-lib/alsa-lib_1.0.4.oe index 446079d227..0e6a717683 100644 --- a/alsa-lib/alsa-lib_1.0.4.oe +++ b/alsa-lib/alsa-lib_1.0.4.oe @@ -14,4 +14,6 @@ do_stage () { install -d ${STAGING_INCDIR}/alsa/sound install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/alsa-lib/alsa-lib_1.0.5.oe b/alsa-lib/alsa-lib_1.0.5.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-oss/alsa-oss-1.0.4/configure.patch b/alsa-oss/alsa-oss-1.0.4/configure.patch deleted file mode 100644 index 05f57be542..0000000000 --- a/alsa-oss/alsa-oss-1.0.4/configure.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- tmp/base/alsa-oss-0.9.8-r0/alsa-oss-0.9.8/acinclude.m4 Wed Dec 31 18:00:00 1969 -+++ alsa-oss-0.9.8/acinclude.m4 Fri Nov 14 11:36:08 2003 -@@ -0,0 +1,144 @@ -+dnl Configure Paths for Alsa -+dnl Some modifications by Richard Boulton -+dnl Christopher Lansdown -+dnl Jaroslav Kysela -+dnl Last modification: alsa.m4,v 1.22 2002/05/27 11:14:20 tiwai Exp -+dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. -+dnl enables arguments --with-alsa-prefix= -+dnl --with-alsa-enc-prefix= -+dnl --disable-alsatest (this has no effect, as yet) -+dnl -+dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, -+dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. -+dnl -+AC_DEFUN(AM_PATH_ALSA, -+[dnl Save the original CFLAGS, LDFLAGS, and LIBS -+alsa_save_CFLAGS="$CFLAGS" -+alsa_save_LDFLAGS="$LDFLAGS" -+alsa_save_LIBS="$LIBS" -+alsa_found=yes -+ -+dnl -+dnl Get the cflags and libraries for alsa -+dnl -+AC_ARG_WITH(alsa-prefix, -+[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], -+[alsa_prefix="$withval"], [alsa_prefix=""]) -+ -+AC_ARG_WITH(alsa-inc-prefix, -+[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], -+[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) -+ -+dnl FIXME: this is not yet implemented -+AC_ARG_ENABLE(alsatest, -+[ --disable-alsatest Do not try to compile and run a test Alsa program], -+[enable_alsatest=no], -+[enable_alsatest=yes]) -+ -+dnl Add any special include directories -+AC_MSG_CHECKING(for ALSA CFLAGS) -+if test "$alsa_inc_prefix" != "" ; then -+ ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" -+ CFLAGS="$CFLAGS -I$alsa_inc_prefix" -+fi -+AC_MSG_RESULT($ALSA_CFLAGS) -+ -+dnl add any special lib dirs -+AC_MSG_CHECKING(for ALSA LDFLAGS) -+if test "$alsa_prefix" != "" ; then -+ ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" -+ LDFLAGS="$LDFLAGS $ALSA_LIBS" -+fi -+ -+dnl add the alsa library -+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -+LIBS=`echo $LIBS | sed 's/-lm//'` -+LIBS=`echo $LIBS | sed 's/-ldl//'` -+LIBS=`echo $LIBS | sed 's/-lpthread//'` -+LIBS=`echo $LIBS | sed 's/ //'` -+LIBS="$ALSA_LIBS $LIBS" -+AC_MSG_RESULT($ALSA_LIBS) -+ -+dnl Check for a working version of libasound that is of the right version. -+min_alsa_version=ifelse([$1], ,0.1.1,$1) -+AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) -+no_alsa="" -+ alsa_min_major_version=`echo $min_alsa_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ alsa_min_minor_version=`echo $min_alsa_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ alsa_min_micro_version=`echo $min_alsa_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+AC_LANG_SAVE -+AC_LANG_C -+AC_TRY_COMPILE([ -+#include -+], [ -+/* ensure backward compatibility */ -+#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -+#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -+#endif -+#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -+#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -+#endif -+#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -+#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -+#endif -+ -+# if(SND_LIB_MAJOR > $alsa_min_major_version) -+ exit(0); -+# else -+# if(SND_LIB_MAJOR < $alsa_min_major_version) -+# error not present -+# endif -+ -+# if(SND_LIB_MINOR > $alsa_min_minor_version) -+ exit(0); -+# else -+# if(SND_LIB_MINOR < $alsa_min_minor_version) -+# error not present -+# endif -+ -+# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -+# error not present -+# endif -+# endif -+# endif -+exit(0); -+], -+ [AC_MSG_RESULT(found.)], -+ [AC_MSG_RESULT(not present.) -+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) -+ alsa_found=no] -+) -+AC_LANG_RESTORE -+ -+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -+AC_CHECK_LIB([asound], [snd_ctl_open],, -+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) -+ alsa_found=no] -+) -+ -+if test "x$alsa_found" = "xyes" ; then -+ ifelse([$2], , :, [$2]) -+ LIBS=`echo $LIBS | sed 's/-lasound//g'` -+ LIBS=`echo $LIBS | sed 's/ //'` -+ LIBS="-lasound $LIBS" -+fi -+if test "x$alsa_found" = "xno" ; then -+ ifelse([$3], , :, [$3]) -+ CFLAGS="$alsa_save_CFLAGS" -+ LDFLAGS="$alsa_save_LDFLAGS" -+ LIBS="$alsa_save_LIBS" -+ ALSA_CFLAGS="" -+ ALSA_LIBS="" -+fi -+ -+dnl That should be it. Now just export out symbols: -+AC_SUBST(ALSA_CFLAGS) -+AC_SUBST(ALSA_LIBS) -+]) -+ -+ diff --git a/alsa-oss/alsa-oss-1.0.4/m4.patch b/alsa-oss/alsa-oss-1.0.4/m4.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe index 7bdacf316f..a026b4d97f 100644 --- a/alsa-oss/alsa-oss_1.0.4.oe +++ b/alsa-oss/alsa-oss_1.0.4.oe @@ -3,9 +3,7 @@ MAINTAINER = "Lorn Potter " LICENSE = "GPL" DEPENDS = "alsa-lib" -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" inherit autotools diff --git a/alsa-oss/alsa-oss_1.0.5.oe b/alsa-oss/alsa-oss_1.0.5.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-utils/alsa-utils_1.0.4.oe b/alsa-utils/alsa-utils_1.0.4.oe index ff1c1d9ce5..82bc0b8939 100644 --- a/alsa-utils/alsa-utils_1.0.4.oe +++ b/alsa-utils/alsa-utils_1.0.4.oe @@ -1,9 +1,8 @@ DESCRIPTION = "Alsa Utilities" MAINTAINER = "Lorn Potter " LICENSE = "GPL" +DEPENDS = "alsa-lib" -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://autotools.patch;patch=1 \ - file://m4.patch;patch=1" +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" inherit autotools diff --git a/alsa-utils/alsa-utils_1.0.5.oe b/alsa-utils/alsa-utils_1.0.5.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bash/bash-2.05b/configure.patch b/bash/bash-2.05b/configure.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bash/bash-2.05b/make.patch b/bash/bash-2.05b/make.patch deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3