diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2013-07-31 17:49:19 +0300 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-02 08:01:39 -0700 |
| commit | f74b10cbbecdabcbef695bbdfd26ca4c35c7d369 (patch) | |
| tree | d37307f155e94e66842fad3cba956fd8346f846e /meta/recipes-multimedia/alsa/alsa-utils | |
| parent | d438c87012a03bf556fe306b178a68ff41d19bc0 (diff) | |
| download | openembedded-core-contrib-f74b10cbbecdabcbef695bbdfd26ca4c35c7d369.tar.gz | |
alsa-utils: upgrade to 1.0.27.2
obsolete_automake_macros.patch,
uclibc-exp10-replacement.patch patches removed;
included in upstream.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils')
3 files changed, 17 insertions, 59 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch index 1690ca566c..477cd11b12 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -6,41 +6,35 @@ Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound. This avoids an error on bootup Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- 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: +Index: alsa-utils-1.0.27.2/alsactl/Makefile.am +=================================================================== +--- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am ++++ alsa-utils-1.0.27.2/alsactl/Makefile.am +@@ -36,8 +36,8 @@ install-data-hook: endif edit = \ -- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ -+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ +- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ +- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ ++ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \ ++ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),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 + alsa-state.service: alsa-state.service.in +Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in +=================================================================== +--- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in ++++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in +@@ -10,6 +10,7 @@ DefaultDependencies=no + After=alsa-state.service 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/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch deleted file mode 100644 index 1a20b48fd4..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [alsa-devel@alsa-project.org] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd alsa-utils-1.0.25/configure.in alsa-utils-1.0.25/configure.in ---- alsa-utils-1.0.25/configure.in 2012-01-25 11:43:48.000000000 +0200 -+++ alsa-utils-1.0.25/configure.in 2013-01-12 10:11:51.401498722 +0200 -@@ -269,7 +269,7 @@ - TESTSOUND="$dir/test.wav") - AC_SUBST(TESTSOUND) - --AM_CONFIG_HEADER(include/aconfig.h) -+AC_CONFIG_HEADERS(include/aconfig.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch deleted file mode 100644 index b2a9a956cc..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/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 <raj.khem@gmail.com> - -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 <math.h> - #include <stdbool.h> - #include "volume_mapping.h" -+#ifdef __UCLIBC__ -+#define exp10(x) (pow(10, (x))) -+#endif /* __UCLIBC__ */ - - #define MAX_LINEAR_DB_SCALE 24 - |