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>

5 files changed, 44 insertions, 44 deletions

diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb
index e31017817e..685138702f 100644
--- a/recipes/mplayer/mplayer-maemo_svn.bb
+++ b/recipes/mplayer/mplayer-maemo_svn.bb
@@ -15,17 +15,17 @@ RCONFLICTS_${PN} = "mplayer"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://garage.maemo.org/svn/mplayer/;module=trunk;proto=https \
-           file://Makefile-codec-cfg.patch;apply=yes \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip.patch;apply=yes \
-           file://motion-comp-pld.patch;apply=yes \
-	   file://cfg-common-position.patch;apply=yes "
+           file://Makefile-codec-cfg.patch \
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip.patch \
+           file://motion-comp-pld.patch \
+	   file://cfg-common-position.patch "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
index a5c10da87d..cb6ce51e70 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
@@ -12,28 +12,28 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2;name
            file://vo_w100_fb.h \
            file://vo_pxa.c \
            file://vo_pxa.h \
-           file://Makefile.patch;apply=yes \
-           file://w100-configure.patch;apply=yes \
-           file://w100-Makefile.patch;apply=yes \
-           file://w100-video_out.patch;apply=yes \
-           file://w100-mplayer.patch;apply=yes \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip.patch;apply=yes \
-           ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;apply=yes;name=imageon \
-           file://imageon-video_out.patch;apply=yes \
-	   file://powerpc-is-ppc.diff;apply=yes \
-           file://pxa_configure.patch;apply=yes \
-           file://pxa-video_out.patch;apply=yes \
+           file://Makefile.patch \
+           file://w100-configure.patch \
+           file://w100-Makefile.patch \
+           file://w100-video_out.patch \
+           file://w100-mplayer.patch \
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip.patch \
+           ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;name=imageon \
+           file://imageon-video_out.patch \
+	   file://powerpc-is-ppc.diff \
+           file://pxa_configure.patch \
+           file://pxa-video_out.patch \
           "
 
-SRC_URI_append_avr32 = " file://mplayer-1.0rc1-atmel.2.patch;apply=yes \
+SRC_URI_append_avr32 = " file://mplayer-1.0rc1-atmel.2.patch \
                        "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 PACKAGE_ARCH_mplayer_collie = "collie"
 PACKAGE_ARCH_mencoder_collie = "collie"
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
index cdcbaae15c..876c88bbce 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
@@ -18,24 +18,24 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \
            file://vo_pxa.c \
            file://vo_pxa.h \
 	   file://simple_idct_armv5te.S \
-           file://Makefile-codec-cfg.patch;apply=yes \
-           file://w100-configure-svn.patch;apply=yes \
-           file://w100-video_out.patch;apply=yes \
+           file://Makefile-codec-cfg.patch \
+           file://w100-configure-svn.patch \
+           file://w100-video_out.patch \
            file://w100-mplayer.patch;patch= \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip-rc2.patch;apply=yes \
-           file://mplayer-imageon-svn.patch;apply=yes \
-           file://imageon-video_out.patch;apply=yes \
-           file://pxa_configure.patch;apply=yes \
-           file://pxa-video_out.patch;apply=yes \
-           file://motion-comp-pld.patch;apply=yes \
-	   file://ivtv-fix.patch;apply=yes "
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip-rc2.patch \
+           file://mplayer-imageon-svn.patch \
+           file://imageon-video_out.patch \
+           file://pxa_configure.patch \
+           file://pxa-video_out.patch \
+           file://motion-comp-pld.patch \
+	   file://ivtv-fix.patch "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index 990e14eed4..c08676ab1f 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -8,11 +8,11 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \
-   file://makefile-nostrip-svn.patch;apply=yes \
+   file://makefile-nostrip-svn.patch \
    "
 
 SRC_URI_append_armv7a = " \
-		file://omapfb.patch;apply=yes \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -21,7 +21,7 @@ SRC_URI_append_armv7a = " \
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 SRCREV = "e64bef6a821e12e4a2fabeae15a2dfeef2ab460b"
 
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index f240cb7c3f..ae24cdba49 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -8,18 +8,18 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
-	   file://makefile-nostrip-svn.patch;apply=yes \
-	   file://mplayer-arm-pld.patch;apply=yes \
-	   file://mplayer-lavc-arm.patch;apply=yes \
-       file://fix-exp.diff;apply=yes;maxrev=30291 \
-	   file://fix-addrinfo.patch;apply=yes;maxrev=30302 \
-       file://fix-avconfig.diff;apply=yes;maxrev=30376 \
-	   file://fix-emu_qtx_api.diff;apply=yes;maxrev=30165 \
+	   file://makefile-nostrip-svn.patch \
+	   file://mplayer-arm-pld.patch \
+	   file://mplayer-lavc-arm.patch \
+       file://fix-exp.diff;maxrev=30291 \
+	   file://fix-addrinfo.patch;maxrev=30302 \
+       file://fix-avconfig.diff;maxrev=30376 \
+	   file://fix-emu_qtx_api.diff;maxrev=30165 \
 "
 
 SRCREV = "30165"
 SRC_URI_append_armv7a = " \
-		file://omapfb.patch;apply=yes \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -28,7 +28,7 @@ SRC_URI_append_armv7a = " \
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"