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 <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>

10 files changed, 32 insertions, 32 deletions

diff --git a/recipes/libsdl/libsdl-directfb_1.2.11.bb b/recipes/libsdl/libsdl-directfb_1.2.11.bb
index 4d84ed2017..172e2b11a1 100644
--- a/recipes/libsdl/libsdl-directfb_1.2.11.bb
+++ b/recipes/libsdl/libsdl-directfb_1.2.11.bb
@@ -9,11 +9,11 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://acinclude.m4 \
-  file://configure_tweak.patch;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://kernel-asm-page.patch;apply=yes \
-  file://sdl-cdfix.patch;apply=yes \
-  file://fixmfour.patch;apply=yes \
+  file://configure_tweak.patch \
+  file://pagesize.patch \
+  file://kernel-asm-page.patch \
+  file://sdl-cdfix.patch \
+  file://fixmfour.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl-directfb_1.2.9.bb b/recipes/libsdl/libsdl-directfb_1.2.9.bb
index 01c27d2e8a..d847774f72 100644
--- a/recipes/libsdl/libsdl-directfb_1.2.9.bb
+++ b/recipes/libsdl/libsdl-directfb_1.2.9.bb
@@ -6,9 +6,9 @@ DEFAULT_PREFERENCE = "-1"
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://explicit-extern-C.patch;apply=yes \
+  file://explicit-extern-C.patch \
   file://acinclude.m4 \
-  file://directfb_obsolete_calls.patch;apply=yes \
+  file://directfb_obsolete_calls.patch \
 "
 
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
diff --git a/recipes/libsdl/libsdl-image_1.2.3.bb b/recipes/libsdl/libsdl-image_1.2.3.bb
index e782018520..9f93e1707a 100644
--- a/recipes/libsdl/libsdl-image_1.2.3.bb
+++ b/recipes/libsdl/libsdl-image_1.2.3.bb
@@ -3,7 +3,7 @@ require libsdl-image.inc
 PR = "${INC_PR}.2"
 
 SRC_URI += "\
-  file://autotools.patch;apply=yes \
+  file://autotools.patch \
 "
 
 inherit autotools
diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb
index 9274842168..2217ef2485 100644
--- a/recipes/libsdl/libsdl-mixer_1.2.11.bb
+++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
-           file://fix-flac-madness.diff;apply=yes"
+           file://fix-flac-madness.diff"
 
 S = "${WORKDIR}/SDL_mixer-${PV}"
 
diff --git a/recipes/libsdl/libsdl-native_1.2.11.bb b/recipes/libsdl/libsdl-native_1.2.11.bb
index 73fa1ba8bd..2a3eed23b7 100644
--- a/recipes/libsdl/libsdl-native_1.2.11.bb
+++ b/recipes/libsdl/libsdl-native_1.2.11.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 
 SRC_URI_append = "\
 	   file://acinclude.m4 \
-	   file://kernel-asm-page.patch;apply=yes "
+	   file://kernel-asm-page.patch "
 
 do_configure_prepend() {
 	rm -f ${S}/acinclude.m4
diff --git a/recipes/libsdl/libsdl-net_1.2.7.bb b/recipes/libsdl/libsdl-net_1.2.7.bb
index 443871edcd..d4183deca6 100644
--- a/recipes/libsdl/libsdl-net_1.2.7.bb
+++ b/recipes/libsdl/libsdl-net_1.2.7.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
-	   file://libtool2.patch;apply=yes \
+	   file://libtool2.patch \
 	  "
 
 S = "${WORKDIR}/SDL_net-${PV}"
diff --git a/recipes/libsdl/libsdl-qpe_1.2.9.bb b/recipes/libsdl/libsdl-qpe_1.2.9.bb
index c326ffacf0..a9e3883f6d 100644
--- a/recipes/libsdl/libsdl-qpe_1.2.9.bb
+++ b/recipes/libsdl/libsdl-qpe_1.2.9.bb
@@ -6,17 +6,17 @@ SECTION = "opie/libs"
 DEPENDS = "virtual/libqpe1 libopie2"
 
 SRC_URI += "\
-  file://agawa-piro-mickey-1.2.9.patch;apply=yes \
-  file://pygame-1.2.9.patch;apply=yes \
-  file://mouse-1.2.9.patch;apply=yes \
-  file://kill-stdc++-1.2.9.patch;apply=yes \
-  file://ipaq-1.2.9.patch;apply=yes \
-  file://SDL-Akita-1.2.9.patch;apply=yes \
-  file://fixlibs-1.2.9.patch;apply=yes \
-  file://explicit-extern-C.patch;apply=yes \
-  file://no-PAGE_SIZE.patch;apply=yes \
-  file://fix_Makefile.am.patch;apply=yes \
-  file://fix_configure.in.patch;apply=yes \
+  file://agawa-piro-mickey-1.2.9.patch \
+  file://pygame-1.2.9.patch \
+  file://mouse-1.2.9.patch \
+  file://kill-stdc++-1.2.9.patch \
+  file://ipaq-1.2.9.patch \
+  file://SDL-Akita-1.2.9.patch \
+  file://fixlibs-1.2.9.patch \
+  file://explicit-extern-C.patch \
+  file://no-PAGE_SIZE.patch \
+  file://fix_Makefile.am.patch \
+  file://fix_configure.in.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl-ttf_2.0.3.bb b/recipes/libsdl/libsdl-ttf_2.0.3.bb
index c1934a9b2f..c011f6ab37 100644
--- a/recipes/libsdl/libsdl-ttf_2.0.3.bb
+++ b/recipes/libsdl/libsdl-ttf_2.0.3.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
-           file://new-freetype-includes.patch;apply=yes"
+           file://new-freetype-includes.patch"
 S = "${WORKDIR}/SDL_ttf-${PV}"
 
 inherit autotools
diff --git a/recipes/libsdl/libsdl-x11_1.2.11.bb b/recipes/libsdl/libsdl-x11_1.2.11.bb
index b344442f66..afa9d58ca1 100644
--- a/recipes/libsdl/libsdl-x11_1.2.11.bb
+++ b/recipes/libsdl/libsdl-x11_1.2.11.bb
@@ -8,12 +8,12 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://acinclude.m4 \
-  file://configure_tweak.patch;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://kernel-asm-page.patch;apply=yes \
-  file://sdl-cdfix.patch;apply=yes \
-  file://fixmfour.patch;apply=yes \
-  file://libsdl-1.2.11-pagesize.patch;apply=yes \
+  file://configure_tweak.patch \
+  file://pagesize.patch \
+  file://kernel-asm-page.patch \
+  file://sdl-cdfix.patch \
+  file://fixmfour.patch \
+  file://libsdl-1.2.11-pagesize.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc
index 2849d9618f..9f748e1953 100644
--- a/recipes/libsdl/libsdl.inc
+++ b/recipes/libsdl/libsdl.inc
@@ -10,9 +10,9 @@ INC_PR = "r10"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-  file://extra-keys.patch;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://remove_path.patch;apply=yes \
+  file://extra-keys.patch \
+  file://pagesize.patch \
+  file://remove_path.patch \
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"