From f2bc4c6a4828903d770f52efcd38750a46df0e2e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 14 Mar 2012 14:54:56 +0000 Subject: alsa-utils: Add rename accidently dropped during patch merge (From OE-Core rev: 96b7e1780c3a25bc19022b66a9d92a9ccf22dc59) Signed-off-by: Richard Purdie --- ...-t-let-systemd-unit-restore-the-volume-wh.patch | 46 ---------------------- .../alsa/alsa-utils-1.0.24.2/ncursesfix.patch | 44 --------------------- .../uclibc-exp10-replacement.patch | 21 ---------- ...-t-let-systemd-unit-restore-the-volume-wh.patch | 46 ++++++++++++++++++++++ .../alsa/alsa-utils-1.0.25/ncursesfix.patch | 44 +++++++++++++++++++++ .../uclibc-exp10-replacement.patch | 21 ++++++++++ 6 files changed, 111 insertions(+), 111 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch deleted file mode 100644 index 1690ca566c..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Sun, 9 Oct 2011 20:06:35 +0200 -Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing - -This avoids an error on bootup - -Signed-off-by: Koen Kooi ---- - -Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 - -Upstream-Status: Pending - - alsactl/Makefile.am | 2 +- - alsactl/alsa-restore.service.in | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am -index 5cfc415..c3768c4 100644 ---- a/alsactl/Makefile.am -+++ b/alsactl/Makefile.am -@@ -34,7 +34,7 @@ install-data-hook: - endif - - edit = \ -- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ -+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ - - alsa-store.service: alsa-store.service.in - $(edit) -diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in -index e97d196..3b76710 100644 ---- a/alsactl/alsa-restore.service.in -+++ b/alsactl/alsa-restore.service.in -@@ -4,6 +4,7 @@ DefaultDependencies=no - After=sysinit.target - Before=shutdown.target - Conflicts=shutdown.target -+ConditionPathExists=@localstatedir@/lib/alsa/asound.state - - [Service] - Type=oneshot --- -1.6.6.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch deleted file mode 100644 index 9936dedf17..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch +++ /dev/null @@ -1,44 +0,0 @@ -Rebase the patch to fit 1.0.24.2 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Dongxiao Xu - -diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in ---- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800 -+++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800 -@@ -127,34 +127,16 @@ - NCURSESLIBSUFFIX="" - CURSES_NLS="no" - if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then -- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -- if test "$ncursesw5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncursesw5-config --libs` -- CURSESLIBDIR=`ncursesw5-config --libdir` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -- curseslib="ncursesw" -- else - AC_CHECK_LIB(ncursesw, initscr, - [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) -- fi - if test -n "$CURSESINC"; then - NCURSESLIBSUFFIX="w" - CURSES_NLS="yes" - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then -- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) -- if test "$ncurses5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncurses5-config --libs` -- CURSESLIBDIR=`ncurses5-config --libdir` -- CURSES_CFLAGS=`ncurses5-config --cflags` -- curseslib="ncurses" -- else - AC_CHECK_LIB(ncurses, initscr, - [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) -- fi - fi - if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then - AC_CHECK_LIB(curses, initscr, diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch deleted file mode 100644 index b2a9a956cc..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch +++ /dev/null @@ -1,21 +0,0 @@ -uclibc does not have exp10 function which is glibc extension. -Bur we can get the same behavior by using pow() - -Upstream-Status: Pending - -Khem Raj - -Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c -=================================================================== ---- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c -+++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c -@@ -36,6 +36,9 @@ - #include - #include - #include "volume_mapping.h" -+#ifdef __UCLIBC__ -+#define exp10(x) (pow(10, (x))) -+#endif /* __UCLIBC__ */ - - #define MAX_LINEAR_DB_SCALE 24 - diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch new file mode 100644 index 0000000000..1690ca566c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -0,0 +1,46 @@ +From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 9 Oct 2011 20:06:35 +0200 +Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing + +This avoids an error on bootup + +Signed-off-by: Koen Kooi +--- + +Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 + +Upstream-Status: Pending + + alsactl/Makefile.am | 2 +- + alsactl/alsa-restore.service.in | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 5cfc415..c3768c4 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -34,7 +34,7 @@ install-data-hook: + endif + + edit = \ +- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ ++ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + + alsa-store.service: alsa-store.service.in + $(edit) +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +index e97d196..3b76710 100644 +--- a/alsactl/alsa-restore.service.in ++++ b/alsactl/alsa-restore.service.in +@@ -4,6 +4,7 @@ DefaultDependencies=no + After=sysinit.target + Before=shutdown.target + Conflicts=shutdown.target ++ConditionPathExists=@localstatedir@/lib/alsa/asound.state + + [Service] + Type=oneshot +-- +1.6.6.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch new file mode 100644 index 0000000000..9936dedf17 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch @@ -0,0 +1,44 @@ +Rebase the patch to fit 1.0.24.2 + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Dongxiao Xu + +diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in +--- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800 ++++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800 +@@ -127,34 +127,16 @@ + NCURSESLIBSUFFIX="" + CURSES_NLS="no" + if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then +- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) +- if test "$ncursesw5_config" = "yes"; then +- CURSESINC="" +- CURSESLIB=`ncursesw5-config --libs` +- CURSESLIBDIR=`ncursesw5-config --libdir` +- CURSES_CFLAGS=`ncursesw5-config --cflags` +- curseslib="ncursesw" +- else + AC_CHECK_LIB(ncursesw, initscr, + [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) +- fi + if test -n "$CURSESINC"; then + NCURSESLIBSUFFIX="w" + CURSES_NLS="yes" + fi + fi + if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then +- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) +- if test "$ncurses5_config" = "yes"; then +- CURSESINC="" +- CURSESLIB=`ncurses5-config --libs` +- CURSESLIBDIR=`ncurses5-config --libdir` +- CURSES_CFLAGS=`ncurses5-config --cflags` +- curseslib="ncurses" +- else + AC_CHECK_LIB(ncurses, initscr, + [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) +- fi + fi + if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then + AC_CHECK_LIB(curses, initscr, diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch new file mode 100644 index 0000000000..b2a9a956cc --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch @@ -0,0 +1,21 @@ +uclibc does not have exp10 function which is glibc extension. +Bur we can get the same behavior by using pow() + +Upstream-Status: Pending + +Khem Raj + +Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c +=================================================================== +--- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c ++++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c +@@ -36,6 +36,9 @@ + #include + #include + #include "volume_mapping.h" ++#ifdef __UCLIBC__ ++#define exp10(x) (pow(10, (x))) ++#endif /* __UCLIBC__ */ + + #define MAX_LINEAR_DB_SCALE 24 + -- cgit v1.2.3-54-g00ecf