xserver-kdrive: move some patches out of -common inc, preparation for 1.4

diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc
index e46abe3..f294a9c 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -92,11 +92,8 @@ KDRIVE_COMMON_PATCHES = " \
        file://kmode.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://fbdev-not-fix.patch;patch=1  \
        file://enable-builtin-fonts.patch;patch=1 \
-       file://disable-xf86-dga-xorgcfg.patch;patch=1 \
        file://optional-xkb.patch;patch=1 \
        file://enable-epson.patch;patch=1 \
        file://enable-tslib.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index beb7b0f..8ed6502 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -12,6 +12,9 @@ PR = "r2"
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
+       file://kdrive-evdev.patch;patch=1  \
+       file://kdrive-use-evdev.patch;patch=1  \
+       file://disable-xf86-dga-xorgcfg.patch;patch=1 \
        file://enable-xcalibrate.patch;patch=1 \
         file://fbcompositesrc8888revnpx0565.patch;patch=1 \
         file://kdrive-vidmemarea.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index 5af854c..052e9e4 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -7,6 +7,9 @@ PR = "r9"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
+       file://kdrive-evdev.patch;patch=1  \
+       file://kdrive-use-evdev.patch;patch=1  \
+       file://disable-xf86-dga-xorgcfg.patch;patch=1 \
        file://enable-xcalibrate.patch;patch=1 \
         file://w100.patch;patch=1 \
         file://w100-fix-offscreen-bmp.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 9adc638..44c9f00 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -7,6 +7,9 @@ PR = "r16"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
+       file://kdrive-evdev.patch;patch=1  \
+       file://kdrive-use-evdev.patch;patch=1  \
+       file://disable-xf86-dga-xorgcfg.patch;patch=1 \
         file://fix_default_mode.patch;patch=1 \
        file://enable-xcalibrate.patch;patch=1 \
        file://hide-cursor-and-ppm-root.patch;patch=1 \