* [PATCH 1/2] libcanberra: upgrade to ver. 0.29
@ 2012-07-20 10:07 Cristian Iorga
2012-07-20 10:07 ` [PATCH 2/2] pulseaudio: upgrade to ver. 2.0 Cristian Iorga
2012-07-21 0:21 ` [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Saul Wold
0 siblings, 2 replies; 4+ messages in thread
From: Cristian Iorga @ 2012-07-20 10:07 UTC (permalink / raw)
To: openembedded-core
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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pulseaudio: upgrade to ver. 2.0
2012-07-20 10:07 [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Cristian Iorga
@ 2012-07-20 10:07 ` Cristian Iorga
2012-07-21 0:21 ` [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Saul Wold
1 sibling, 0 replies; 4+ messages in thread
From: Cristian Iorga @ 2012-07-20 10:07 UTC (permalink / raw)
To: openembedded-core
Changed the license file.
Project's file structure changed.
License is the same.
X32 patch is no longer necessary.
Fixes already included in package.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
.../pulseaudio/pulseaudio_fix_for_x32.patch | 238 --------------------
.../{pulseaudio_1.1.bb => pulseaudio_2.0.bb} | 7 +-
3 files changed, 4 insertions(+), 243 deletions(-)
delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch
rename meta/recipes-multimedia/pulseaudio/{pulseaudio_1.1.bb => pulseaudio_2.0.bb} (64%)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index ca8b71e..e8ebf56 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+ & LGPLv2.1"
LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
- file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
+ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
# optional
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch
deleted file mode 100644
index b68ac5b..0000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Upstream-Status: Pending
-
-This patch makes assembly syntax compatible to the x32 toolchain.
-
-This fixes these kinds of compilations errors with x32 gcc.
-| pulsecore/svolume_mmx.c: Assembler messages:
-| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid base/index expression
-| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a valid base/index expression
-| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1
-
-Orignally these assembly lines are written for x86_64 ABI, now they are also compatible with
-X32 ABI.
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/03
-Index: pulseaudio-1.1/src/pulsecore/svolume_mmx.c
-===================================================================
---- pulseaudio-1.1.orig/src/pulsecore/svolume_mmx.c
-+++ pulseaudio-1.1/src/pulsecore/svolume_mmx.c
-@@ -107,7 +107,7 @@ static void pa_volume_s16ne_mmx(int16_t
- " test $1, %2 \n\t" /* check for odd samples */
- " je 2f \n\t"
-
-- " movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
-+ " movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
- " movw (%0), %w4 \n\t" /* .. | p0 | */
- " movd %4, %%mm1 \n\t"
- VOLUME_32x16 (%%mm1, %%mm0)
-@@ -122,7 +122,7 @@ static void pa_volume_s16ne_mmx(int16_t
- " je 4f \n\t"
-
- "3: \n\t" /* do samples in groups of 2 */
-- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
- " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
- VOLUME_32x16 (%%mm1, %%mm0)
- " movd %%mm0, (%0) \n\t" /* .. | p1*v1 | p0*v0 | */
-@@ -135,8 +135,8 @@ static void pa_volume_s16ne_mmx(int16_t
- " je 6f \n\t"
-
- "5: \n\t" /* do samples in groups of 4 */
-- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-- " movq 8(%1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
-+ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq 8(%q1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
- " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
- " movd 4(%0), %%mm3 \n\t" /* .. | p3 | p2 | */
- VOLUME_32x16 (%%mm1, %%mm0)
-@@ -180,7 +180,7 @@ static void pa_volume_s16re_mmx(int16_t
- " test $1, %2 \n\t" /* check for odd samples */
- " je 2f \n\t"
-
-- " movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
-+ " movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
- " movw (%0), %w4 \n\t" /* .. | p0 | */
- " rorw $8, %w4 \n\t"
- " movd %4, %%mm1 \n\t"
-@@ -197,7 +197,7 @@ static void pa_volume_s16re_mmx(int16_t
- " je 4f \n\t"
-
- "3: \n\t" /* do samples in groups of 2 */
-- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
- " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
- SWAP_16 (%%mm1)
- VOLUME_32x16 (%%mm1, %%mm0)
-@@ -212,8 +212,8 @@ static void pa_volume_s16re_mmx(int16_t
- " je 6f \n\t"
-
- "5: \n\t" /* do samples in groups of 4 */
-- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-- " movq 8(%1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
-+ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq 8(%q1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
- " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
- " movd 4(%0), %%mm3 \n\t" /* .. | p3 | p2 | */
- SWAP_16_2 (%%mm1, %%mm3)
-Index: pulseaudio-1.1/src/pulsecore/svolume_sse.c
-===================================================================
---- pulseaudio-1.1.orig/src/pulsecore/svolume_sse.c
-+++ pulseaudio-1.1/src/pulsecore/svolume_sse.c
-@@ -92,7 +92,7 @@ static void pa_volume_s16ne_sse2(int16_t
- " test $1, %2 \n\t" /* check for odd samples */
- " je 2f \n\t"
-
-- " movd (%1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
-+ " movd (%q1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
- " movw (%0), %w4 \n\t" /* .. | p0 | */
- " movd %4, %%xmm1 \n\t"
- VOLUME_32x16 (%%xmm1, %%xmm0)
-@@ -107,7 +107,7 @@ static void pa_volume_s16ne_sse2(int16_t
- " je 4f \n\t"
-
- "3: \n\t" /* do samples in groups of 2 */
-- " movq (%1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq (%q1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
- " movd (%0), %%xmm1 \n\t" /* .. | p1 | p0 | */
- VOLUME_32x16 (%%xmm1, %%xmm0)
- " movd %%xmm0, (%0) \n\t" /* .. | p1*v1 | p0*v0 | */
-@@ -123,7 +123,7 @@ static void pa_volume_s16ne_sse2(int16_t
- * that the array is 16 bytes aligned, we probably have to do the odd values
- * after this then. */
- "5: \n\t" /* do samples in groups of 4 */
-- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-+ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
- " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
- VOLUME_32x16 (%%xmm1, %%xmm0)
- " movq %%xmm0, (%0) \n\t" /* .. | p3*v3 .. p0*v0 | */
-@@ -136,8 +136,8 @@ static void pa_volume_s16ne_sse2(int16_t
- " je 8f \n\t"
-
- "7: \n\t" /* do samples in groups of 8 */
-- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-- " movdqu 16(%1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
-+ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-+ " movdqu 16(%q1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
- " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
- " movq 8(%0), %%xmm3 \n\t" /* .. | p7 .. p4 | */
- VOLUME_32x16 (%%xmm1, %%xmm0)
-@@ -176,7 +176,7 @@ static void pa_volume_s16re_sse2(int16_t
- " test $1, %2 \n\t" /* check for odd samples */
- " je 2f \n\t"
-
-- " movd (%1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
-+ " movd (%q1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
- " movw (%0), %w4 \n\t" /* .. | p0 | */
- " rorw $8, %w4 \n\t"
- " movd %4, %%xmm1 \n\t"
-@@ -193,7 +193,7 @@ static void pa_volume_s16re_sse2(int16_t
- " je 4f \n\t"
-
- "3: \n\t" /* do samples in groups of 2 */
-- " movq (%1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
-+ " movq (%q1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
- " movd (%0), %%xmm1 \n\t" /* .. | p1 | p0 | */
- SWAP_16 (%%xmm1)
- VOLUME_32x16 (%%xmm1, %%xmm0)
-@@ -211,7 +211,7 @@ static void pa_volume_s16re_sse2(int16_t
- * that the array is 16 bytes aligned, we probably have to do the odd values
- * after this then. */
- "5: \n\t" /* do samples in groups of 4 */
-- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-+ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
- " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
- SWAP_16 (%%xmm1)
- VOLUME_32x16 (%%xmm1, %%xmm0)
-@@ -226,8 +226,8 @@ static void pa_volume_s16re_sse2(int16_t
- " je 8f \n\t"
-
- "7: \n\t" /* do samples in groups of 8 */
-- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-- " movdqu 16(%1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
-+ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
-+ " movdqu 16(%q1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
- " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
- " movq 8(%0), %%xmm3 \n\t" /* .. | p7 .. p4 | */
- SWAP_16_2 (%%xmm1, %%xmm3)
-Index: pulseaudio-1.1/src/pulsecore/sconv_sse.c
-===================================================================
---- pulseaudio-1.1.orig/src/pulsecore/sconv_sse.c
-+++ pulseaudio-1.1/src/pulsecore/sconv_sse.c
-@@ -54,8 +54,8 @@ static void pa_sconv_s16le_from_f32ne_ss
- " je 2f \n\t"
-
- "1: \n\t"
-- " movups (%2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
-- " movups 16(%2, %0, 2), %%xmm2 \n\t"
-+ " movups (%q2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
-+ " movups 16(%q2, %0, 2), %%xmm2 \n\t"
- " minps %%xmm5, %%xmm0 \n\t" /* clamp to 1.0 */
- " minps %%xmm5, %%xmm2 \n\t"
- " maxps %%xmm6, %%xmm0 \n\t" /* clamp to -1.0 */
-@@ -72,8 +72,8 @@ static void pa_sconv_s16le_from_f32ne_ss
-
- " packssdw %%mm1, %%mm0 \n\t" /* pack parts */
- " packssdw %%mm3, %%mm2 \n\t"
-- " movq %%mm0, (%3, %0) \n\t"
-- " movq %%mm2, 8(%3, %0) \n\t"
-+ " movq %%mm0, (%q3, %0) \n\t"
-+ " movq %%mm2, 8(%q3, %0) \n\t"
-
- " add $16, %0 \n\t"
- " dec %1 \n\t"
-@@ -85,12 +85,12 @@ static void pa_sconv_s16le_from_f32ne_ss
- " je 4f \n\t"
-
- "3: \n\t"
-- " movss (%2, %0, 2), %%xmm0 \n\t"
-+ " movss (%q2, %0, 2), %%xmm0 \n\t"
- " minss %%xmm5, %%xmm0 \n\t"
- " maxss %%xmm6, %%xmm0 \n\t"
- " mulss %%xmm7, %%xmm0 \n\t"
- " cvtss2si %%xmm0, %4 \n\t"
-- " movw %w4, (%3, %0) \n\t"
-+ " movw %w4, (%q3, %0) \n\t"
- " add $2, %0 \n\t"
- " dec %1 \n\t"
- " jne 3b \n\t"
-@@ -119,8 +119,8 @@ static void pa_sconv_s16le_from_f32ne_ss
- " je 2f \n\t"
-
- "1: \n\t"
-- " movups (%2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
-- " movups 16(%2, %0, 2), %%xmm2 \n\t"
-+ " movups (%q2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
-+ " movups 16(%q2, %0, 2), %%xmm2 \n\t"
- " minps %%xmm5, %%xmm0 \n\t" /* clamp to 1.0 */
- " minps %%xmm5, %%xmm2 \n\t"
- " maxps %%xmm6, %%xmm0 \n\t" /* clamp to -1.0 */
-@@ -132,7 +132,7 @@ static void pa_sconv_s16le_from_f32ne_ss
- " cvtps2dq %%xmm2, %%xmm2 \n\t"
-
- " packssdw %%xmm2, %%xmm0 \n\t"
-- " movdqu %%xmm0, (%3, %0) \n\t"
-+ " movdqu %%xmm0, (%q3, %0) \n\t"
-
- " add $16, %0 \n\t"
- " dec %1 \n\t"
-@@ -144,12 +144,12 @@ static void pa_sconv_s16le_from_f32ne_ss
- " je 4f \n\t"
-
- "3: \n\t"
-- " movss (%2, %0, 2), %%xmm0 \n\t"
-+ " movss (%q2, %0, 2), %%xmm0 \n\t"
- " minss %%xmm5, %%xmm0 \n\t"
- " maxss %%xmm6, %%xmm0 \n\t"
- " mulss %%xmm7, %%xmm0 \n\t"
- " cvtss2si %%xmm0, %4 \n\t"
-- " movw %w4, (%3, %0) \n\t"
-+ " movw %w4, (%q3, %0) \n\t"
- " add $2, %0 \n\t"
- " dec %1 \n\t"
- " jne 3b \n\t"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
similarity index 64%
rename from meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
rename to meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
index e88a3a5..7e57e5e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r10"
+PR = "r0"
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
@@ -8,11 +8,10 @@ inherit gettext perlnative
SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
file://volatiles.04_pulse \
- file://pulseaudio_fix_for_x32.patch \
"
-SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a"
-SRC_URI[sha256sum] = "6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee"
+SRC_URI[md5sum] = "9bbde657c353fe675c3b693054175a8e"
+SRC_URI[sha256sum] = "28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061"
do_compile_prepend() {
cd ${S}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] libcanberra: upgrade to ver. 0.29
2012-07-20 10:07 [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Cristian Iorga
2012-07-20 10:07 ` [PATCH 2/2] pulseaudio: upgrade to ver. 2.0 Cristian Iorga
@ 2012-07-21 0:21 ` Saul Wold
2012-07-23 10:23 ` Iorga, Cristian
1 sibling, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-07-21 0:21 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] libcanberra: upgrade to ver. 0.29
2012-07-21 0:21 ` [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Saul Wold
@ 2012-07-23 10:23 ` Iorga, Cristian
0 siblings, 0 replies; 4+ messages in thread
From: Iorga, Cristian @ 2012-07-23 10:23 UTC (permalink / raw)
To: Saul Wold, Patches and discussions about the oe-core layer
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-23 10:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-20 10:07 [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Cristian Iorga
2012-07-20 10:07 ` [PATCH 2/2] pulseaudio: upgrade to ver. 2.0 Cristian Iorga
2012-07-21 0:21 ` [PATCH 1/2] libcanberra: upgrade to ver. 0.29 Saul Wold
2012-07-23 10:23 ` Iorga, Cristian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox