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>

42 files changed, 102 insertions, 102 deletions

diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
index a0d9152d6a..486faf033f 100644
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.1.bb
@@ -6,8 +6,8 @@ CFLAGS += "-D_GNU_SOURCE"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
-SRC_URI += "file://X18NCMSstubs.diff;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes \
-	    file://xim.patch;apply=yes \
-	    file://xchar2b.patch;apply=yes"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch \
+	    file://xim.patch \
+	    file://xchar2b.patch"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
index d31c6b8cf6..0d8dbd5a8e 100644
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.2.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
index 40e0519a98..149d543008 100644
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.3.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
index 678226fedf..516ca034f7 100644
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.4.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;apply=yes \
-            file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+SRC_URI += "file://X18NCMSstubs.diff \
+            file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.5.bb b/recipes/xorg-lib/diet-x11_1.1.5.bb
index 59fa0b73d3..4f7e51b99e 100644
--- a/recipes/xorg-lib/diet-x11_1.1.5.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.5.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;apply=yes \
-            file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+SRC_URI += "file://X18NCMSstubs.diff \
+            file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
index 954b9c41c6..fc6e612174 100644
--- a/recipes/xorg-lib/liblbxutil_1.0.1.bb
+++ b/recipes/xorg-lib/liblbxutil_1.0.1.bb
@@ -5,7 +5,7 @@ DEPENDS += " xextproto xproto zlib"
 PROVIDES = "lbxutil"
 PE = "1"
 
-SRC_URI += "file://mkg3states.patch;apply=yes"
+SRC_URI += "file://mkg3states.patch"
 
 export CC_FOR_BUILD = "gcc"
 
diff --git a/recipes/xorg-lib/liblbxutil_1.1.0.bb b/recipes/xorg-lib/liblbxutil_1.1.0.bb
index dd6e3d94a3..a00f15ffe0 100644
--- a/recipes/xorg-lib/liblbxutil_1.1.0.bb
+++ b/recipes/xorg-lib/liblbxutil_1.1.0.bb
@@ -5,7 +5,7 @@ DEPENDS += " xextproto xproto zlib"
 PROVIDES = "lbxutil"
 PE = "1"
 
-SRC_URI += "file://mkg3states-1.1.patch;apply=yes"
+SRC_URI += "file://mkg3states-1.1.patch"
 
 export CC_FOR_BUILD = "gcc"
 
diff --git a/recipes/xorg-lib/libpciaccess_0.10.3.bb b/recipes/xorg-lib/libpciaccess_0.10.3.bb
index df6eff000a..826397101b 100644
--- a/recipes/xorg-lib/libpciaccess_0.10.3.bb
+++ b/recipes/xorg-lib/libpciaccess_0.10.3.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DEPENDS += "xproto virtual/libx11"
 
-SRC_URI += "file://fix-mtrr-check.patch;apply=yes"
+SRC_URI += "file://fix-mtrr-check.patch"
 
 SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
 SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/xorg-lib/libx11-trim_1.1.5.bb b/recipes/xorg-lib/libx11-trim_1.1.5.bb
index 178fe870f3..f7c40e2963 100644
--- a/recipes/xorg-lib/libx11-trim_1.1.5.bb
+++ b/recipes/xorg-lib/libx11-trim_1.1.5.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 protocol and utility library"
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
 
 #FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-#SRC_URI += "file://X18NCMSstubs.diff;apply=yes "
+#SRC_URI += "file://X18NCMSstubs.diff "
 
 PROVIDES = "virtual/libx11"
 
@@ -14,8 +14,8 @@ PR = "r1"
 XORG_PN = "libX11"
 LEAD_SONAME = "libX11.so"
 
-SRC_URI += "file://include_fix.patch;apply=yes \
-            file://makekeys-update.patch;apply=yes"
+SRC_URI += "file://include_fix.patch \
+            file://makekeys-update.patch"
 
 EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 #EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
index 1ffd3dce95..0ecf6cd214 100644
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ b/recipes/xorg-lib/libx11_1.1.1.bb
@@ -11,7 +11,7 @@ XORG_PN = "libX11"
 
 EXTRA_OECONF += "--without-xcb"
 
-SRC_URI += " file://ruutf8.patch;apply=yes"
+SRC_URI += " file://ruutf8.patch"
 
 do_compile() {
         (
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
index ad1e6daa52..a02fb0ef9b 100644
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ b/recipes/xorg-lib/libx11_1.1.2.bb
@@ -9,7 +9,7 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://include_fix.patch;apply=yes" 
+SRC_URI += "file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
index 2507ba8af9..8100baa9e8 100644
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ b/recipes/xorg-lib/libx11_1.1.3.bb
@@ -9,7 +9,7 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://include_fix.patch;apply=yes" 
+SRC_URI += "file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
index 1b3c0d956d..6949a3f2fa 100644
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ b/recipes/xorg-lib/libx11_1.1.4.bb
@@ -9,8 +9,8 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;apply=yes \
-            file://include_fix.patch;apply=yes" 
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index bffa18a15c..fa33157ff0 100644
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -9,8 +9,8 @@ PR = "r4"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
index 2a6730fd6f..b496563301 100644
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ b/recipes/xorg-lib/libx11_1.2.bb
@@ -8,8 +8,8 @@ PE = "1"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index 2d1c123d69..855dfa2f83 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -9,9 +9,9 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.1.6.3.patch;apply=yes \
-            file://dolt-fix.patch;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+SRC_URI += "file://x11_disable_makekeys.1.6.3.patch \
+            file://dolt-fix.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index f20d7be809..37ef559011 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -9,9 +9,9 @@ PR = "r7"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;apply=yes \
-            file://dolt-fix.patch;apply=yes \
-            ${@['file://keysymdef_include.patch;apply=yes', ''][(bb.data.inherits_class('native', d))]} \
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://dolt-fix.patch \
+            ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \
 "
 
 # --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
diff --git a/recipes/xorg-lib/libxcomposite_0.3.1.bb b/recipes/xorg-lib/libxcomposite_0.3.1.bb
index c686f27480..928e805e5e 100644
--- a/recipes/xorg-lib/libxcomposite_0.3.1.bb
+++ b/recipes/xorg-lib/libxcomposite_0.3.1.bb
@@ -9,7 +9,7 @@ PROVIDES = "xcomposite"
 
 XORG_PN = "libXcomposite"
 
-SRC_URI += " file://change-include-order.patch;apply=yes"
+SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
 SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.0.bb b/recipes/xorg-lib/libxcomposite_0.4.0.bb
index fab4d8743e..e6feafdf9c 100644
--- a/recipes/xorg-lib/libxcomposite_0.4.0.bb
+++ b/recipes/xorg-lib/libxcomposite_0.4.0.bb
@@ -8,7 +8,7 @@ PE = "1"
 
 XORG_PN = "libXcomposite"
 
-SRC_URI += " file://change-include-order.patch;apply=yes"
+SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
 SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
diff --git a/recipes/xorg-lib/libxfont_1.2.7.bb b/recipes/xorg-lib/libxfont_1.2.7.bb
index 8edded8075..c6cbff8a3d 100644
--- a/recipes/xorg-lib/libxfont_1.2.7.bb
+++ b/recipes/xorg-lib/libxfont_1.2.7.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
 
-SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+SRC_URI += "file://no-scalable-crash.patch"
 
 DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
diff --git a/recipes/xorg-lib/libxfont_1.2.8.bb b/recipes/xorg-lib/libxfont_1.2.8.bb
index a721c866a1..9d9847980e 100644
--- a/recipes/xorg-lib/libxfont_1.2.8.bb
+++ b/recipes/xorg-lib/libxfont_1.2.8.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
 
-SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+SRC_URI += "file://no-scalable-crash.patch"
 
 DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.0.bb b/recipes/xorg-lib/libxfont_1.3.0.bb
index 647cbe4614..6f63f7b5f1 100644
--- a/recipes/xorg-lib/libxfont_1.3.0.bb
+++ b/recipes/xorg-lib/libxfont_1.3.0.bb
@@ -7,8 +7,8 @@ PROVIDES = "xfont"
 PR = "r2"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;apply=yes \
-            file://builtinreaddirectory-no-side-effect.patch;apply=yes"
+SRC_URI += "file://no-scalable-crash.patch \
+            file://builtinreaddirectory-no-side-effect.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.1.bb b/recipes/xorg-lib/libxfont_1.3.1.bb
index 476ccef6eb..a6be89f338 100644
--- a/recipes/xorg-lib/libxfont_1.3.1.bb
+++ b/recipes/xorg-lib/libxfont_1.3.1.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.2.bb b/recipes/xorg-lib/libxfont_1.3.2.bb
index 69d42f55a5..5c9f08b051 100644
--- a/recipes/xorg-lib/libxfont_1.3.2.bb
+++ b/recipes/xorg-lib/libxfont_1.3.2.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.3.bb b/recipes/xorg-lib/libxfont_1.3.3.bb
index c6c9052d84..17cf158eed 100644
--- a/recipes/xorg-lib/libxfont_1.3.3.bb
+++ b/recipes/xorg-lib/libxfont_1.3.3.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-#SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+#SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.4.1.bb b/recipes/xorg-lib/libxfont_1.4.1.bb
index 7467420574..4ec9e23794 100644
--- a/recipes/xorg-lib/libxfont_1.4.1.bb
+++ b/recipes/xorg-lib/libxfont_1.4.1.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-#SRC_URI += "file://no-scalable-crash.patch;apply=yes"
+#SRC_URI += "file://no-scalable-crash.patch"
 
 # disable docs
 EXTRA_OECONF += " --disable-devel-docs "
diff --git a/recipes/xorg-lib/libxft_2.1.14.bb b/recipes/xorg-lib/libxft_2.1.14.bb
index a6df0279b3..bb8be59245 100644
--- a/recipes/xorg-lib/libxft_2.1.14.bb
+++ b/recipes/xorg-lib/libxft_2.1.14.bb
@@ -6,7 +6,7 @@ PROVIDES = "xft"
 PR = "r1"
 PE = "1"
 
-SRC_URI += "file://autotools.patch;apply=yes"
+SRC_URI += "file://autotools.patch"
 
 XORG_PN = "libXft"
 
diff --git a/recipes/xorg-lib/libxt_1.0.4.bb b/recipes/xorg-lib/libxt_1.0.4.bb
index 0d2668e140..4038a171e2 100644
--- a/recipes/xorg-lib/libxt_1.0.4.bb
+++ b/recipes/xorg-lib/libxt_1.0.4.bb
@@ -9,7 +9,7 @@ PROVIDES = "xt"
 
 XORG_PN = "libXt"
 
-SRC_URI += "file://pr10970-header-fix.patch;apply=yes"
+SRC_URI += "file://pr10970-header-fix.patch"
 
 PR = "r1"
 
diff --git a/recipes/xorg-lib/libxt_1.0.5.bb b/recipes/xorg-lib/libxt_1.0.5.bb
index 68e716057d..f002b73edd 100644
--- a/recipes/xorg-lib/libxt_1.0.5.bb
+++ b/recipes/xorg-lib/libxt_1.0.5.bb
@@ -8,7 +8,7 @@ PE = "1"
 
 XORG_PN = "libXt"
 
-SRC_URI += "file://pr10970-header-fix.patch;apply=yes"
+SRC_URI += "file://pr10970-header-fix.patch"
 
 EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
diff --git a/recipes/xorg-lib/pixman_0.11.8.bb b/recipes/xorg-lib/pixman_0.11.8.bb
index 4879773b62..1a507aedb5 100644
--- a/recipes/xorg-lib/pixman_0.11.8.bb
+++ b/recipes/xorg-lib/pixman_0.11.8.bb
@@ -2,8 +2,8 @@ require pixman.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += " \
-           file://pixman-arm.patch;apply=yes \
-	   file://pixman-x888-565.patch;apply=yes \
+           file://pixman-arm.patch \
+	   file://pixman-x888-565.patch \
 	  "
 
 SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
diff --git a/recipes/xorg-lib/pixman_0.12.0.bb b/recipes/xorg-lib/pixman_0.12.0.bb
index 939da91609..cb9bfc2e27 100644
--- a/recipes/xorg-lib/pixman_0.12.0.bb
+++ b/recipes/xorg-lib/pixman_0.12.0.bb
@@ -2,8 +2,8 @@ require pixman.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += " \
-           file://pixman-arm.patch;apply=yes \
-	   file://pixman-x888-565.patch;apply=yes \
+           file://pixman-arm.patch \
+	   file://pixman-x888-565.patch \
 	  "
 
 SRC_URI[archive.md5sum] = "09357cc74975b01714e00c5899ea1881"
diff --git a/recipes/xorg-lib/pixman_0.13.2.bb b/recipes/xorg-lib/pixman_0.13.2.bb
index 78e50dbcd4..a35b452327 100644
--- a/recipes/xorg-lib/pixman_0.13.2.bb
+++ b/recipes/xorg-lib/pixman_0.13.2.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += " \
-            file://pixman-0.13.2-neon1.patch;apply=yes \
+            file://pixman-0.13.2-neon1.patch \
 	   "
 
 # We have NEON
diff --git a/recipes/xorg-lib/pixman_0.17.12.bb b/recipes/xorg-lib/pixman_0.17.12.bb
index e39659dd19..cad36e6d2e 100644
--- a/recipes/xorg-lib/pixman_0.17.12.bb
+++ b/recipes/xorg-lib/pixman_0.17.12.bb
@@ -6,14 +6,14 @@ DEFAULT_PREFERENCE_angstrom = "2"
 DEFAULT_PREFERENCE_shr = "2"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;apply=yes \ 
-           file://over-n-8-0565.patch;apply=yes \
-           file://src-8888-0565.patch;apply=yes \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \ 
+           file://over-n-8-0565.patch \
+           file://src-8888-0565.patch \
 "
 
 SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
diff --git a/recipes/xorg-lib/pixman_0.17.8.bb b/recipes/xorg-lib/pixman_0.17.8.bb
index 4e1e1fd36d..8613e991da 100644
--- a/recipes/xorg-lib/pixman_0.17.8.bb
+++ b/recipes/xorg-lib/pixman_0.17.8.bb
@@ -6,13 +6,13 @@ DEFAULT_PREFERENCE_angstrom = "2"
 DEFAULT_PREFERENCE_shr = "2"
 
 SRC_URI += " \
-           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://1-composite.patch;apply=yes \
-           file://2-composite.patch;apply=yes \          
-           file://3-composite.patch;apply=yes \          
+           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://1-composite.patch \
+           file://2-composite.patch \          
+           file://3-composite.patch \          
           "
 
 SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
diff --git a/recipes/xorg-lib/pixman_0.18.0.bb b/recipes/xorg-lib/pixman_0.18.0.bb
index 2140609ada..ce44da4aac 100644
--- a/recipes/xorg-lib/pixman_0.18.0.bb
+++ b/recipes/xorg-lib/pixman_0.18.0.bb
@@ -5,15 +5,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "2"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://calloc.patch;apply=yes \
-           file://tls.patch;apply=yes \
-           file://565-scanline.patch;apply=yes \
-           file://missing-cache-preload.diff;apply=yes \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://calloc.patch \
+           file://tls.patch \
+           file://565-scanline.patch \
+           file://missing-cache-preload.diff \
 "
 
 SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
diff --git a/recipes/xorg-lib/pixman_0.18.2.bb b/recipes/xorg-lib/pixman_0.18.2.bb
index 067c7b3f57..d07084015e 100644
--- a/recipes/xorg-lib/pixman_0.18.2.bb
+++ b/recipes/xorg-lib/pixman_0.18.2.bb
@@ -8,13 +8,13 @@ SRC_URI[archive.md5sum] = "5d1378fa61610dd5d3c7e0111b2c5253"
 SRC_URI[archive.sha256sum] = "80aee833b429d105d2c7593ef96993da04441b3b747084f1f3bfd7be594e1c45"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes\
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes\
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes\
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes\
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes\
-           file://0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch;apply=yes\
-           file://0007-ARM-added-missing-cache-preload.patch;apply=yes\
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch\
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch\
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch\
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch\
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch\
+           file://0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch\
+           file://0007-ARM-added-missing-cache-preload.patch\
 "
 
 NEON = " --disable-arm-neon "
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
index 122d9d78fc..e538113877 100644
--- a/recipes/xorg-lib/pixman_0.9.5.bb
+++ b/recipes/xorg-lib/pixman_0.9.5.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "Library for lowlevel pixel operations"
 DEPENDS = "virtual/libx11"
 
-SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch;apply=yes"
+SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
 
 SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
 SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
index a34a8d6487..160819a910 100644
--- a/recipes/xorg-lib/pixman_git.bb
+++ b/recipes/xorg-lib/pixman_git.bb
@@ -8,16 +8,16 @@ SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
 DEFAULT_PREFERENCE = "-1"
  
 SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;apply=yes \ 
-           file://over-n-8-0565.patch;apply=yes \
-           file://src-8888-0565.patch;apply=yes \
-           file://calloc.patch;apply=yes \
-           file://tls.patch;apply=yes \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \ 
+           file://over-n-8-0565.patch \
+           file://src-8888-0565.patch \
+           file://calloc.patch \
+           file://tls.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xorg-lib/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
index bb4c0bd540..30c3d03ba1 100644
--- a/recipes/xorg-lib/xtrans_1.0.3.bb
+++ b/recipes/xorg-lib/xtrans_1.0.3.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;apply=yes"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
 SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
diff --git a/recipes/xorg-lib/xtrans_1.0.4.bb b/recipes/xorg-lib/xtrans_1.0.4.bb
index eb2ea7aa8d..de826bb9ba 100644
--- a/recipes/xorg-lib/xtrans_1.0.4.bb
+++ b/recipes/xorg-lib/xtrans_1.0.4.bb
@@ -8,7 +8,7 @@ ALLOW_EMPTY = "1"
 
 XORG_PN = "xtrans"
 
-SRC_URI += "file://fix-missing-includepath.patch;apply=yes"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
 SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
diff --git a/recipes/xorg-lib/xtrans_1.1.bb b/recipes/xorg-lib/xtrans_1.1.bb
index da105431df..0ec225f7d7 100644
--- a/recipes/xorg-lib/xtrans_1.1.bb
+++ b/recipes/xorg-lib/xtrans_1.1.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;apply=yes"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
 SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
diff --git a/recipes/xorg-lib/xtrans_1.2.bb b/recipes/xorg-lib/xtrans_1.2.bb
index 14c547f821..b5d56ac9f6 100644
--- a/recipes/xorg-lib/xtrans_1.2.bb
+++ b/recipes/xorg-lib/xtrans_1.2.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;apply=yes"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
 SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"