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/opencv/artoolkit_2.72.1.bb | 4 ++-- recipes/opencv/opencv_1.0.0.bb | 36 +++++++++++++++++----------------- recipes/opencv/openscenegraph_2.9.6.bb | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'recipes/opencv') diff --git a/recipes/opencv/artoolkit_2.72.1.bb b/recipes/opencv/artoolkit_2.72.1.bb index 629a4a217c..fad502603e 100644 --- a/recipes/opencv/artoolkit_2.72.1.bb +++ b/recipes/opencv/artoolkit_2.72.1.bb @@ -6,8 +6,8 @@ DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \ - file://configure.diff;apply=yes \ - file://paddle.diff;apply=yes " + file://configure.diff \ + file://paddle.diff " S = "${WORKDIR}/ARToolKit" diff --git a/recipes/opencv/opencv_1.0.0.bb b/recipes/opencv/opencv_1.0.0.bb index b696323214..32ca2d079e 100644 --- a/recipes/opencv/opencv_1.0.0.bb +++ b/recipes/opencv/opencv_1.0.0.bb @@ -10,24 +10,24 @@ DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0" #RDEPENDS = "python jpeg zlib libpng tiff glib-2.0" SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-${PV}.tar.gz \ - file://debian/010_enable_static.diff;apply=yes \ - file://debian/010_ffmpeg_linking.diff;apply=yes \ - file://debian/010_fix_optimisations.diff;apply=yes \ - file://debian/010_m4_syntax.diff;apply=yes \ - file://debian/010_makefile_syntax.diff;apply=yes \ - file://debian/010_python_cspec.diff;apply=yes \ - file://debian/020_python_linking.diff;apply=yes \ - file://debian/030_install_hook.diff;apply=yes \ - file://debian/050_rebootstrap.diff;apply=yes \ - file://debian/100_amd64.diff;apply=yes \ - file://debian/100_static_inline.diff;apply=yes \ - file://debian/100_ffmpeg_updates.diff;apply=yes \ - file://debian/110_dc1394.diff;apply=yes \ - file://debian/120_header_warnings.diff;apply=yes \ - file://debian/200_documentation.diff;apply=yes \ - file://debian/200_examples_makefile.diff;apply=yes \ - file://debian/210_openmp_compilation.diff;apply=yes \ - file://debian/300_fix_segfault_in_window_gtk.diff;apply=yes \ + file://debian/010_enable_static.diff \ + file://debian/010_ffmpeg_linking.diff \ + file://debian/010_fix_optimisations.diff \ + file://debian/010_m4_syntax.diff \ + file://debian/010_makefile_syntax.diff \ + file://debian/010_python_cspec.diff \ + file://debian/020_python_linking.diff \ + file://debian/030_install_hook.diff \ + file://debian/050_rebootstrap.diff \ + file://debian/100_amd64.diff \ + file://debian/100_static_inline.diff \ + file://debian/100_ffmpeg_updates.diff \ + file://debian/110_dc1394.diff \ + file://debian/120_header_warnings.diff \ + file://debian/200_documentation.diff \ + file://debian/200_examples_makefile.diff \ + file://debian/210_openmp_compilation.diff \ + file://debian/300_fix_segfault_in_window_gtk.diff \ " inherit distutils-base autotools pkgconfig diff --git a/recipes/opencv/openscenegraph_2.9.6.bb b/recipes/opencv/openscenegraph_2.9.6.bb index 572f6d8ca8..0118a460be 100644 --- a/recipes/opencv/openscenegraph_2.9.6.bb +++ b/recipes/opencv/openscenegraph_2.9.6.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+ ffmpeg poppler libxrandr" inherit cmake SRC_URI = "http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-2.9.6.zip;name=osg \ - file://gles.diff;apply=yes " + file://gles.diff " SRC_URI[osg.md5sum] = "f27a69499f3eadf1d8ad2ee22f6d5e85" SRC_URI[osg.sha256sum] = "9aa8ce2a581d42f8c9bac14dff5069c66633ddf73370a1e7412873048d643e9a" -- cgit 1.2.3-korg