From a0dc330b4abbb31c3c131a4cb1762555e5e109a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 18 Aug 2011 00:17:52 +0000 Subject: recipes: Delete patch=1, its default and replace pnum with striplevel Some place pnum=1 is used which is removed as well since striplevel=1 is default (From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter_git.bb | 4 ++-- .../libmatchbox/libmatchbox_1.9.bb | 6 ++--- .../libmatchbox/libmatchbox_git.bb | 6 ++--- meta/recipes-graphics/libsdl/libsdl_1.2.11.bb | 4 ++-- .../matchbox-wm/matchbox-wm_1.2.bb | 2 +- .../matchbox-wm/matchbox-wm_git.bb | 2 +- meta/recipes-graphics/mesa/mesa-dri_git.bb | 4 ++-- meta/recipes-graphics/mutter/mutter_git.bb | 10 ++++---- meta/recipes-graphics/tslib/tslib_1.0.bb | 4 ++-- meta/recipes-graphics/xcb/libxcb.inc | 2 +- .../xcursor-transparent-theme_0.1.1.bb | 4 ++-- .../xorg-driver/xf86-input-mouse_git.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 6 ++--- meta/recipes-graphics/xorg-lib/libx11_git.inc | 6 ++--- meta/recipes-graphics/xorg-lib/libxfont_1.4.3.bb | 2 +- .../xorg-xserver/xserver-kdrive_1.7.99.2.bb | 28 +++++++++++----------- meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 4 ++-- 17 files changed, 48 insertions(+), 48 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb index 76a26a6313..020453f0c7 100644 --- a/meta/recipes-graphics/clutter/clutter_git.bb +++ b/meta/recipes-graphics/clutter/clutter_git.bb @@ -8,8 +8,8 @@ PV = "1.0.0+git${SRCPV}" PR = "r9" SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \ - file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ - file://enable_tests.patch;patch=1;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 " + file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ + file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 " S = "${WORKDIR}/git" BASE_CONF += "--disable-introspection" diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb index b2cf46dd4d..3b691f70a8 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb @@ -3,10 +3,10 @@ require libmatchbox.inc PR = "r8" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://16bppfixes.patch;patch=1 \ - file://configure_fixes.patch;patch=1 \ + file://16bppfixes.patch \ + file://configure_fixes.patch \ file://check.m4 \ - file://matchbox-start-fix.patch;patch=1" + file://matchbox-start-fix.patch" SRC_URI[md5sum] = "465fa15c43bf0091a3810e7702fe143f" SRC_URI[sha256sum] = "f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea" diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb index 2984177ac3..d9d4535aa6 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb @@ -6,10 +6,10 @@ PR = "r0" DEFAULT_PREFERENCE = "-1" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://configure_fixes.patch;patch=1 \ + file://configure_fixes.patch \ file://check.m4 \ - file://16bppfixes.patch;patch=1 \ - file://matchbox-start-fix.patch;patch=1" + file://16bppfixes.patch \ + file://matchbox-start-fix.patch" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index f08077d8d2..8b0d3c2932 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -17,8 +17,8 @@ PR = "r7" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \ - file://configure_tweak.patch;patch=1 \ - file://kernel-asm-page.patch;patch=1 " + file://configure_tweak.patch \ + file://kernel-asm-page.patch " S = "${WORKDIR}/SDL-${PV}" diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb index f68eb2b4ae..63829ecba8 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb @@ -5,7 +5,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage li PR = "r4" SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ - file://configure_fix.patch;patch=1 \ + file://configure_fix.patch \ file://kbdconfig \ file://gconf-2.m4" diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 9814d67e66..f58529d3fd 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -15,7 +15,7 @@ PV = "1.2+git${SRCPV}" PR = "r0" SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \ - file://configure_fix.patch;patch=1;maxrev=1818 \ + file://configure_fix.patch;maxrev=1818 \ file://kbdconfig" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index 07887f4c10..c4132d7447 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb @@ -1,9 +1,9 @@ include mesa-common.inc SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ - file://cross2.patch;patch=1 \ + file://cross2.patch \ file://matypes.h" -# file://mesa-DRI2Swapbuffer.patch;patch=1 " +# file://mesa-DRI2Swapbuffer.patch " S = "${WORKDIR}/git" PROTO_DEPS = "xf86driproto glproto dri2proto" diff --git a/meta/recipes-graphics/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb index c3ba32efdc..94cb17d336 100644 --- a/meta/recipes-graphics/mutter/mutter_git.bb +++ b/meta/recipes-graphics/mutter/mutter_git.bb @@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" # git://git.gnome.org/mutter.git;protocol=git;branch=master # SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \ - file://nodocs.patch;patch=1 \ - file://nozenity.patch;patch=1 \ - file://crosscompile.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ - file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ - file://fix_pkgconfig.patch;patch=1;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + file://nodocs.patch \ + file://nozenity.patch \ + file://crosscompile.patch;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ + file://fix_pkgconfig.patch;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb index ad9bfa781d..3704572baf 100644 --- a/meta/recipes-graphics/tslib/tslib_1.0.bb +++ b/meta/recipes-graphics/tslib/tslib_1.0.bb @@ -13,13 +13,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" PR = "r18" SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ - file://fix_version.patch;patch=1 \ + file://fix_version.patch \ file://ts.conf \ file://tslib.sh" SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" -SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1" +SRC_URI_append_qemumips += " file://32bitBE-support.patch" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc index 015065e4d7..d3a5044c70 100644 --- a/meta/recipes-graphics/xcb/libxcb.inc +++ b/meta/recipes-graphics/xcb/libxcb.inc @@ -15,7 +15,7 @@ DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native" # DEPENDS += "xsltproc-native gperf-native" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" -# file://xcbincludedir.patch;patch=1" +# file://xcbincludedir.patch" PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ libxcb-randr libxcb-record libxcb-render libxcb-res \ diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb index 0727d0f55b..002cc1569b 100644 --- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb @@ -9,8 +9,8 @@ SECTION = "x11/base" PR="r3" SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ - file://use-relative-symlinks.patch;patch=1 \ - file://fix_watch_cursor.patch;patch=1" + file://use-relative-symlinks.patch \ + file://fix_watch_cursor.patch" SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb index a56ef114c0..b4dd1edfe2 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb @@ -13,6 +13,6 @@ PV = "1.3.0+git${SRCPV}" PR = "r2" SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \ - file://unbreak.patch;patch=1" + file://unbreak.patch" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb index bd82b357a4..dea7faf12a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb @@ -4,9 +4,9 @@ require libx11_git.inc DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ this version." -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" +SRC_URI += "file://X18NCMSstubs.diff \ + file://fix-disable-xlocale.diff \ + file://fix-utf8-wrong-define.patch" DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc index 40d806178f..4de424da0a 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_git.inc +++ b/meta/recipes-graphics/xorg-lib/libx11_git.inc @@ -3,9 +3,9 @@ PV = "1.2.1+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" S = "${WORKDIR}/git" -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1 \ - file://nodolt.patch;patch=1" +SRC_URI += "file://x11_disable_makekeys.patch \ + file://include_fix.patch \ + file://nodolt.patch" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git" FILESPATH = "${FILE_DIRNAME}/libx11-git" diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.4.3.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.4.3.bb index 2f9516c2fc..43a628e23d 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.4.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.4.3.bb @@ -15,7 +15,7 @@ PROVIDES = "xfont" PR = "r0" PE = "1" -#SRC_URI += "file://no-scalable-crash.patch;patch=1" +#SRC_URI += "file://no-scalable-crash.patch" XORG_PN = "libXfont" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb index b7e5520f42..c2067c923e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb @@ -10,20 +10,20 @@ PE = "1" PR = "r26" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ - file://extra-kmodes.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://keyboard-resume-workaround.patch;patch=1 \ - file://enable-xcalibrate.patch;patch=1 \ - file://hide-cursor-and-ppm-root.patch;patch=1 \ - file://fbdev_xrandr_ioctl.patch;patch=1 \ - file://fix-newer-xorg-headers.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://nodolt.patch;patch=1" -# file://kdrive-evdev.patch;patch=1 -# file://kdrive-use-evdev.patch;patch=1 -# file://enable-builtin-fonts.patch;patch=1 -# file://optional-xkb.patch;patch=1 + file://extra-kmodes.patch \ + file://disable-apm.patch \ + file://no-serial-probing.patch \ + file://keyboard-resume-workaround.patch \ + file://enable-xcalibrate.patch \ + file://hide-cursor-and-ppm-root.patch \ + file://fbdev_xrandr_ioctl.patch \ + file://fix-newer-xorg-headers.patch \ + file://crosscompile.patch \ + file://nodolt.patch" +# file://kdrive-evdev.patch +# file://kdrive-use-evdev.patch +# file://enable-builtin-fonts.patch +# file://optional-xkb.patch S = "${WORKDIR}/xorg-server-${PV}" diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb index 75013a26c6..e6ccd047b1 100644 --- a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb @@ -15,8 +15,8 @@ DEPENDS = "virtual/libx11 libxft libxcalibrate" PR = "r13" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://change-cross.patch;patch=1 \ - file://cleanup.patch;patch=1 \ + file://change-cross.patch \ + file://cleanup.patch \ file://dso_linking_change_build_fix.patch \ file://30xTs_Calibrate.sh" -- cgit v1.2.3-54-g00ecf