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/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 147aab3f5a..38944b2b3d 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;apply=yes" + file://no-strip.patch" 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 ab72a1d5b5..baf21db408 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;apply=yes \ - file://tremor.patch;apply=yes \ - file://mouse.patch;apply=yes " + file://sword1.patch \ + file://tremor.patch \ + file://mouse.patch " PR="r1" inherit autotools diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb index e0b4bd0075..3c76fea7c4 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;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 += " file://mouse.patch \ + file://gcc-4.x.x-accept.patch \ + file://sh3-linux-new-arch.patch \ + file://tail-obselete-fix.patch \ + file://tremor.patch" SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055" diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb index 17c526a4f9..600e723908 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;apply=yes" +SRC_URI += "file://sh3-arch-0.9.0+.patch" 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 b28530affd..4901de234b 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;apply=yes \ - file://scummvm-targetcheck.patch;apply=yes" +SRC_URI += "file://makefile-nostrip.patch \ + file://scummvm-targetcheck.patch" 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 6e74605424..1c4a251678 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;apply=yes \ + file://no-strip.patch \ " SRC_URI_append_openmoko = " file://openmoko-scummvm " -- cgit 1.2.3-korg