From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Sun, 23 May 2010 20:23:53 -0700
Subject: Rename url params patch=<ignored>/pnum=<n> to
 apply={yes,no}/striplevel=<n>

I think this makes the behavior rather more clear.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/scummvm/scummvm_0.12.0.bb |  2 +-
 recipes/scummvm/scummvm_0.6.0.bb  |  6 +++---
 recipes/scummvm/scummvm_0.6.1b.bb | 10 +++++-----
 recipes/scummvm/scummvm_0.9.0.bb  |  2 +-
 recipes/scummvm/scummvm_0.9.1.bb  |  4 ++--
 recipes/scummvm/scummvm_1.0.0.bb  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'recipes/scummvm')

diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
index 7e3edf2ca4..147aab3f5a 100644
--- a/recipes/scummvm/scummvm_0.12.0.bb
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += " file://scummvm.desktop \
-	file://no-strip.patch;patch=1"
+	file://no-strip.patch;apply=yes"
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
 SRC_URI_append_shr = " file://openmoko-scummvm "
diff --git a/recipes/scummvm/scummvm_0.6.0.bb b/recipes/scummvm/scummvm_0.6.0.bb
index 6525d2b3be..ab72a1d5b5 100644
--- a/recipes/scummvm/scummvm_0.6.0.bb
+++ b/recipes/scummvm/scummvm_0.6.0.bb
@@ -6,9 +6,9 @@ DEPENDS = "libsdl-qpe tremor libogg zlib \
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
-			file://sword1.patch;patch=1 \
-			file://tremor.patch;patch=1 \
-			file://mouse.patch;patch=1 "
+			file://sword1.patch;apply=yes \
+			file://tremor.patch;apply=yes \
+			file://mouse.patch;apply=yes "
 PR="r1"
 
 inherit autotools
diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb
index 5e22ac7259..e0b4bd0075 100644
--- a/recipes/scummvm/scummvm_0.6.1b.bb
+++ b/recipes/scummvm/scummvm_0.6.1b.bb
@@ -1,11 +1,11 @@
 require scummvm.inc
 DEPENDS = "virtual/libsdl tremor libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
-SRC_URI += " file://mouse.patch;patch=1 \
-             file://gcc-4.x.x-accept.patch;patch=1 \
-	     file://sh3-linux-new-arch.patch;patch=1 \
-	     file://tail-obselete-fix.patch;patch=1 \
-	     file://tremor.patch;patch=1"
+SRC_URI += " file://mouse.patch;apply=yes \
+             file://gcc-4.x.x-accept.patch;apply=yes \
+	     file://sh3-linux-new-arch.patch;apply=yes \
+	     file://tail-obselete-fix.patch;apply=yes \
+	     file://tremor.patch;apply=yes"
 
 
 SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055"
diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb
index c9d858ac0b..17c526a4f9 100644
--- a/recipes/scummvm/scummvm_0.9.0.bb
+++ b/recipes/scummvm/scummvm_0.9.0.bb
@@ -1,7 +1,7 @@
 require scummvm.inc
 DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
-SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
+SRC_URI += "file://sh3-arch-0.9.0+.patch;apply=yes"
 
 EXTRA_OECONF += "--enable-lure \
 		 --enable-agi \
diff --git a/recipes/scummvm/scummvm_0.9.1.bb b/recipes/scummvm/scummvm_0.9.1.bb
index becc13170f..b28530affd 100644
--- a/recipes/scummvm/scummvm_0.9.1.bb
+++ b/recipes/scummvm/scummvm_0.9.1.bb
@@ -3,8 +3,8 @@ require scummvm.inc
 DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
-SRC_URI += "file://makefile-nostrip.patch;patch=1 \
-            file://scummvm-targetcheck.patch;patch=1"
+SRC_URI += "file://makefile-nostrip.patch;apply=yes \
+            file://scummvm-targetcheck.patch;apply=yes"
 SRC_URI_append_openmoko = " file://openmoko-scummvm \
                            file://scummvm.desktop"
 
diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
index 20c06273a6..6e74605424 100644
--- a/recipes/scummvm/scummvm_1.0.0.bb
+++ b/recipes/scummvm/scummvm_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += " file://scummvm.desktop \
-             file://no-strip.patch;patch=1 \
+             file://no-strip.patch;apply=yes \
            "
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
-- 
cgit 1.2.3-korg