From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 24 May 2010 13:01:00 -0700 Subject: Make the do_patch apply=yes param implicit if extension is .diff/.patch For .diff/.patch you need to apply manually, you can specify apply=no. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/pulseaudio/libatomics-ops_1.2.bb | 6 +++--- recipes/pulseaudio/libcanberra_0.14.bb | 2 +- recipes/pulseaudio/libcanberra_0.17.bb | 2 +- recipes/pulseaudio/pulseaudio.inc | 4 ++-- recipes/pulseaudio/pulseaudio_0.9.10.bb | 14 +++++++------- recipes/pulseaudio/pulseaudio_0.9.11.bb | 16 ++++++++-------- recipes/pulseaudio/pulseaudio_0.9.15.bb | 22 +++++++++++----------- recipes/pulseaudio/pulseaudio_0.9.19.bb | 12 ++++++------ recipes/pulseaudio/pulseaudio_0.9.21.bb | 8 ++++---- recipes/pulseaudio/pulseaudio_0.9.9.bb | 6 +++--- 10 files changed, 46 insertions(+), 46 deletions(-) (limited to 'recipes/pulseaudio') diff --git a/recipes/pulseaudio/libatomics-ops_1.2.bb b/recipes/pulseaudio/libatomics-ops_1.2.bb index dbbc6603eb..a0e2d8f08e 100644 --- a/recipes/pulseaudio/libatomics-ops_1.2.bb +++ b/recipes/pulseaudio/libatomics-ops_1.2.bb @@ -4,9 +4,9 @@ LICENSE = "MIT" PR = "r3" SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \ - file://fedora/libatomic_ops-1.2-ppclwzfix.patch;apply=yes \ - file://gentoo/libatomic_ops-1.2-mips.patch;apply=yes \ - file://dont.install.header.twice.patch;apply=yes" + file://fedora/libatomic_ops-1.2-ppclwzfix.patch \ + file://gentoo/libatomic_ops-1.2-mips.patch \ + file://dont.install.header.twice.patch" S = "${WORKDIR}/libatomic_ops-${PV}" diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index 3405573c41..58f2b1c08b 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -11,7 +11,7 @@ inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ - file://libcanberra-increase-buffer-size.patch;apply=yes" + file://libcanberra-increase-buffer-size.patch" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index b1bb9b8f99..0e6f06abc8 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -11,7 +11,7 @@ inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ - file://libcanberra-increase-buffer-size.patch;apply=yes" + file://libcanberra-increase-buffer-size.patch" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc index ab3d05aecb..4504656417 100644 --- a/recipes/pulseaudio/pulseaudio.inc +++ b/recipes/pulseaudio/pulseaudio.inc @@ -9,8 +9,8 @@ DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal openssl" INC_PR = "r9" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ - file://gcc4-compile-fix.patch;apply=yes \ - file://configure-ac.patch;apply=yes \ + file://gcc4-compile-fix.patch \ + file://configure-ac.patch \ file://volatiles.04_pulse" inherit autotools pkgconfig diff --git a/recipes/pulseaudio/pulseaudio_0.9.10.bb b/recipes/pulseaudio/pulseaudio_0.9.10.bb index 4650a02f92..458766ec3b 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.10.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.10.bb @@ -3,13 +3,13 @@ require pulseaudio.inc PR = "${INC_PR}.1" SRC_URI += "\ - file://disable-using-glibc-tls.patch;apply=yes \ - file://libpulsedsp-references-libpulsecore.patch;apply=yes \ - file://pa-drop-caps-returns-void.patch;apply=yes \ -# file://libtool2.patch;apply=yes \ - file://2113.diff;apply=yes;striplevel=0 \ - file://2114.diff;apply=yes;striplevel=0 \ - file://libiconv.patch;apply=yes \ + file://disable-using-glibc-tls.patch \ + file://libpulsedsp-references-libpulsecore.patch \ + file://pa-drop-caps-returns-void.patch \ +# file://libtool2.patch \ + file://2113.diff;striplevel=0 \ + file://2114.diff;striplevel=0 \ + file://libiconv.patch \ " do_compile_prepend() { diff --git a/recipes/pulseaudio/pulseaudio_0.9.11.bb b/recipes/pulseaudio/pulseaudio_0.9.11.bb index d903ca9578..4f12b7bc23 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.11.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.11.bb @@ -7,14 +7,14 @@ PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" SRC_URI += "\ - file://disable-using-glibc-tls.patch;apply=yes \ - file://buildfix.patch;apply=yes \ -# file://libpulsedsp-references-libpulsecore.patch;apply=yes \ -# file://pa-drop-caps-returns-void.patch;apply=yes \ -# file://libtool2.patch;apply=yes \ - file://2113.diff;apply=yes;striplevel=0 \ - file://2114.diff;apply=yes;striplevel=0 \ -# file://libiconv.patch;apply=yes \ + file://disable-using-glibc-tls.patch \ + file://buildfix.patch \ +# file://libpulsedsp-references-libpulsecore.patch \ +# file://pa-drop-caps-returns-void.patch \ +# file://libtool2.patch \ + file://2113.diff;striplevel=0 \ + file://2114.diff;striplevel=0 \ +# file://libiconv.patch \ " do_compile_prepend() { diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb index e96a2b6fbc..e95b7d42bf 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.15.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb @@ -6,17 +6,17 @@ PR = "${INC_PR}.6" inherit gettext SRC_URI += "\ - file://buildfix.patch;apply=yes \ - file://alsaerror.patch;apply=yes \ - file://periodfix.patch;apply=yes \ - file://fallback.patch;apply=yes \ - file://autoconf_version.patch;apply=yes \ - file://gettext.patch;apply=yes \ - file://fixbluezbuild.patch;apply=yes \ - file://tls_m4.patch;apply=yes \ - file://sbc-thumb.patch;apply=yes \ - file://CVE-2009-1299.patch;apply=yes \ - file://CVE-2009-1894.patch;apply=yes \ + file://buildfix.patch \ + file://alsaerror.patch \ + file://periodfix.patch \ + file://fallback.patch \ + file://autoconf_version.patch \ + file://gettext.patch \ + file://fixbluezbuild.patch \ + file://tls_m4.patch \ + file://sbc-thumb.patch \ + file://CVE-2009-1299.patch \ + file://CVE-2009-1894.patch \ " do_compile_prepend() { diff --git a/recipes/pulseaudio/pulseaudio_0.9.19.bb b/recipes/pulseaudio/pulseaudio_0.9.19.bb index c6ddc4cd87..a0ba1a04bf 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.19.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.19.bb @@ -11,12 +11,12 @@ PR = "${INC_PR}.0" inherit gettext SRC_URI += "\ - file://buildfix.patch;apply=yes \ - file://autoconf_version.patch;apply=yes \ - file://tls_m4.patch;apply=yes \ - file://configure_silent_rules.patch;apply=yes \ - file://gettext.patch;apply=yes \ - file://fixbluezbuild.patch;apply=yes \ + file://buildfix.patch \ + file://autoconf_version.patch \ + file://tls_m4.patch \ + file://configure_silent_rules.patch \ + file://gettext.patch \ + file://fixbluezbuild.patch \ " do_compile_prepend() { diff --git a/recipes/pulseaudio/pulseaudio_0.9.21.bb b/recipes/pulseaudio/pulseaudio_0.9.21.bb index 5fa6abb825..8be0ea2d0f 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.21.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.21.bb @@ -9,10 +9,10 @@ DEFAULT_PREFERENCE_motorola-ezx = "-1" inherit gettext SRC_URI += "\ - file://buildfix.patch;apply=yes \ - file://autoconf_version.patch;apply=yes \ - file://tls_m4.patch;apply=yes \ - file://configure_silent_rules.patch;apply=yes \ + file://buildfix.patch \ + file://autoconf_version.patch \ + file://tls_m4.patch \ + file://configure_silent_rules.patch \ " do_compile_prepend() { diff --git a/recipes/pulseaudio/pulseaudio_0.9.9.bb b/recipes/pulseaudio/pulseaudio_0.9.9.bb index 00481b1c3f..9babcaeea1 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.9.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.9.bb @@ -4,9 +4,9 @@ PR = "${INC_PR}.1" # this is not correct (see below) SRC_URI += "\ - file://disable-using-glibc-tls.patch;apply=yes \ - file://fix-dbus-without-hal.patch;apply=yes \ - file://fix-shm.patch;apply=yes \ + file://disable-using-glibc-tls.patch \ + file://fix-dbus-without-hal.patch \ + file://fix-shm.patch \ " # problems w/ pulseaudio 0.9.9 atm: -- cgit v1.2.3