From be9262233975911e404f6fcdb3c81ba916d28e32 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 22 Feb 2011 21:38:09 +0000 Subject: Remove all comments from multiline expressions (as mentioned in bug #704) Signed-off-by: Richard Purdie --- .../recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb | 9 +++++---- .../xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb | 4 ++-- .../xorg-xserver/xserver-xf86-dri-lite_git.bb | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'meta/recipes-graphics/xorg-xserver') 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 f6a0d83cc..b7e5520f4 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 @@ -13,10 +13,6 @@ 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://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://keyboard-resume-workaround.patch;patch=1 \ file://enable-xcalibrate.patch;patch=1 \ file://hide-cursor-and-ppm-root.patch;patch=1 \ @@ -24,5 +20,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 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 + S = "${WORKDIR}/xorg-server-${PV}" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb index 9ff85de6c..faa4f6415 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb @@ -10,8 +10,8 @@ PR = "r0" SRC_URI += "file://nodolt.patch \ file://crosscompile.patch" -# file://libdri-xinerama-symbol.patch;patch=1 \ -# file://xserver-boottime.patch;patch=1" +# file://libdri-xinerama-symbol.patch;patch=1 +# file://xserver-boottime.patch;patch=1 # Misc build failure for master HEAD SRC_URI += "file://fix_open_max_preprocessor_error.patch" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb index 4789f28f5..99804a21b 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb @@ -10,18 +10,18 @@ DEPENDS += "font-util" RDEPENDS_${PN} += "xkeyboard-config" -# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \ -# file://xserver-1.5.0-bg-none-root.patch;patch=1 \ -# file://xserver-no-root-2.patch;patch=1 \ -# file://xserver-boottime.patch;patch=1" -# file://xserver-DRI2Swapbuffer.patch;patch=1" +# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 +# file://xserver-1.5.0-bg-none-root.patch;patch=1 +# file://xserver-no-root-2.patch;patch=1 +# file://xserver-boottime.patch;patch=1 +# file://xserver-DRI2Swapbuffer.patch;patch=1 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \ file://nodolt.patch;patch=1 \ file://crosscompile.patch;patch=1 \ file://fix_macros1.patch;patch=1" -# file://libdri-xinerama-symbol.patch;patch=1" +# file://libdri-xinerama-symbol.patch;patch=1 # Misc build failure for master HEAD SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" -- cgit v1.2.3