Patchwork [5/8] alsa-utils: update to 1.0.25

login
register
mail settings
Submitter Kang Kai
Date March 14, 2012, 9:03 a.m.
Message ID <8e34c071af55fbd1bf52da1c78337ee9ea23e9e5.1331713107.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/23279/
State New
Headers show

Comments

Kang Kai - March 14, 2012, 9:03 a.m.
Update to version 1.0.25, and update patch
0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
because rejected when apply it.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 ...-t-let-systemd-unit-restore-the-volume-wh.patch |    4 ++--
 .../ncursesfix.patch                               |    0
 .../uclibc-exp10-replacement.patch                 |    0
 ...alsa-utils_1.0.24.2.bb => alsa-utils_1.0.25.bb} |    8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-utils-1.0.24.2 => alsa-utils-1.0.25}/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch (87%)
 rename meta/recipes-multimedia/alsa/{alsa-utils-1.0.24.2 => alsa-utils-1.0.25}/ncursesfix.patch (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils-1.0.24.2 => alsa-utils-1.0.25}/uclibc-exp10-replacement.patch (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.0.24.2.bb => alsa-utils_1.0.25.bb} (93%)
Shane Wang - March 16, 2012, 7:25 a.m.
Kang Kai wrote onĀ 2012-03-14:

> Update to version 1.0.25, and update patch
> 0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch because
> rejected when apply it.
> 
> Signed-off-by: Kang Kai <kai.kang@windriver.com>


Kai, why did you drop the patch? You can port it to alsa-utils v1.0.25 code base, as I did.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=shane/m4upgrade&id=924cdfe1a0069ff53526afe67b11cbd9405472de

--
Shane
Kang Kai - March 19, 2012, 2:05 a.m.
On 2012?03?16? 15:25, Wang, Shane wrote:
> Kang Kai wrote on 2012-03-14:
>
>> Update to version 1.0.25, and update patch
>> 0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch because
>> rejected when apply it.
>>
>> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>
> Kai, why did you drop the patch? You can port it to alsa-utils v1.0.25 code base, as I did.
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=shane/m4upgrade&id=924cdfe1a0069ff53526afe67b11cbd9405472de

Hi Shane,

Yes, I just update the patch and don't drop it.
Maybe the comments is not clear, that I mean the patch is jejected by 
bitbake when run do_patch.

Regards,
Kai


>
> --
> Shane
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

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.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
similarity index 87%
rename from meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
rename to meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index 55e180a..1690ca5 100644
--- 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.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -24,8 +24,8 @@  index 5cfc415..c3768c4 100644
  endif
  
  edit = \
--	sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
-+	sed $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
+-	$(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/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch
rename to meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch
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.25/uclibc-exp10-replacement.patch
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch
rename to meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
similarity index 93%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
index e62a0f3..e8ebef1 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
@@ -3,10 +3,10 @@  HOMEPAGE = "http://www.alsa-project.org"
 BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
 SECTION = "console/utils"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r5"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \
@@ -14,8 +14,8 @@  SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
           "
 
-SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2"
-SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2"
+SRC_URI[md5sum] = "f81f9dcb9a014fd32cb3a70066a5b9a9"
+SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c"
 
 # lazy hack. needs proper fixing in gettext.m4, see
 # http://bugs.openembedded.org/show_bug.cgi?id=2348