| Submitter | Cristian Iorga |
|---|---|
| Date | July 20, 2012, 10:07 a.m. |
| Message ID | <1342778862-503-1-git-send-email-cristian.iorga@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/32713/ |
| State | New |
| Headers | show |
Comments
On 07/20/2012 03:07 AM, Cristian Iorga wrote: > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > --- > .../{libcanberra_0.28.bb => libcanberra_0.29.bb} | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > rename meta/recipes-multimedia/pulseaudio/{libcanberra_0.28.bb => libcanberra_0.29.bb} (76%) > > diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > similarity index 76% > rename from meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb > rename to meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > index e69c89d..27020c5 100644 > --- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb > +++ b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > @@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ > file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" > > DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis" > -PR = "r1" > +PR = "r0" > > inherit gconf autotools > > -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" > +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz" > > -SRC_URI[md5sum] = "c198b4811598c4c161ff505e4531b02c" > -SRC_URI[sha256sum] = "eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c" > +SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8" > +SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" > > EXTRA_OECONF = " --disable-oss --disable-ltdl-install" > > @@ -25,8 +25,8 @@ PACKAGES += "${PN}-gnome" > FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" > FILES_${PN}-gnome += "${datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \ > ${libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop" > -FILES_${PN}-dev += "${libdir}/libcanberra-0.28/libcanberra-*.so \ > - ${libdir}/libcanberra-0.28/libcanberra-*.la \ > +FILES_${PN}-dev += "${libdir}/libcanberra-${PV}/libcanberra-*.so \ > + ${libdir}/libcanberra-${PV}/libcanberra-*.la \ > ${datadir}/vala/vapi" > -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.28/.debug" > +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-${PV}/.debug" > > Richard merged earlier verions of both these patches, please verify if you need to rebase and make any additional changes and re-submit. Sorry about the confusion Thanks Sau!
Hi Saul, I think everything is ok now. Thanks. It is already merged, with the right versions. /Cristian -----Original Message----- From: Saul Wold [mailto:sgw@linux.intel.com] Sent: Saturday, July 21, 2012 3:21 AM To: Patches and discussions about the oe-core layer Cc: Iorga, Cristian Subject: Re: [OE-core] [PATCH 1/2] libcanberra: upgrade to ver. 0.29 On 07/20/2012 03:07 AM, Cristian Iorga wrote: > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > --- > .../{libcanberra_0.28.bb => libcanberra_0.29.bb} | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > rename meta/recipes-multimedia/pulseaudio/{libcanberra_0.28.bb => > libcanberra_0.29.bb} (76%) > > diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb > b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > similarity index 76% > rename from meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb > rename to meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > index e69c89d..27020c5 100644 > --- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb > +++ b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb > @@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ > file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" > > DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis" > -PR = "r1" > +PR = "r0" > > inherit gconf autotools > > -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" > +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz" > > -SRC_URI[md5sum] = "c198b4811598c4c161ff505e4531b02c" > -SRC_URI[sha256sum] = "eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c" > +SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8" > +SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" > > EXTRA_OECONF = " --disable-oss --disable-ltdl-install" > > @@ -25,8 +25,8 @@ PACKAGES += "${PN}-gnome" > FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" > FILES_${PN}-gnome += "${datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \ > ${libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop" > -FILES_${PN}-dev += "${libdir}/libcanberra-0.28/libcanberra-*.so \ > - ${libdir}/libcanberra-0.28/libcanberra-*.la \ > +FILES_${PN}-dev += "${libdir}/libcanberra-${PV}/libcanberra-*.so \ > + ${libdir}/libcanberra-${PV}/libcanberra-*.la \ > ${datadir}/vala/vapi" > -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.28/.debug" > +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-${PV}/.debug" > > Richard merged earlier verions of both these patches, please verify if you need to rebase and make any additional changes and re-submit. Sorry about the confusion Thanks Sau!
Patch
diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb similarity index 76% rename from meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb rename to meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb index e69c89d..27020c5 100644 --- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb +++ b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb @@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis" -PR = "r1" +PR = "r0" inherit gconf autotools -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz" -SRC_URI[md5sum] = "c198b4811598c4c161ff505e4531b02c" -SRC_URI[sha256sum] = "eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c" +SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8" +SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" EXTRA_OECONF = " --disable-oss --disable-ltdl-install" @@ -25,8 +25,8 @@ PACKAGES += "${PN}-gnome" FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" FILES_${PN}-gnome += "${datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \ ${libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop" -FILES_${PN}-dev += "${libdir}/libcanberra-0.28/libcanberra-*.so \ - ${libdir}/libcanberra-0.28/libcanberra-*.la \ +FILES_${PN}-dev += "${libdir}/libcanberra-${PV}/libcanberra-*.so \ + ${libdir}/libcanberra-${PV}/libcanberra-*.la \ ${datadir}/vala/vapi" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.28/.debug" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-${PV}/.debug"
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- .../{libcanberra_0.28.bb => libcanberra_0.29.bb} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename meta/recipes-multimedia/pulseaudio/{libcanberra_0.28.bb => libcanberra_0.29.bb} (76%)