xserver-kdrive: Build against xextproto-70-includes:

* Ancient xservers are incompatible with xextproto >= 7.1.
* Nobody would want to port working ancient code.
* For more see http://lists.linuxtogo.org/pipermail/angstrom-distro-users/2010-January/003011.html
* Introduced INC_PR.

diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index b00893da6d00ac697a62a3bfcb416ea7858c4e5e..fd4b2f60454f153ac794fc764034a1101ad9ddb1 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive-common.inc
+++ b/recipes/xorg-xserver/xserver-kdrive-common.inc
@@ -1,6 +1,7 @@
 LICENSE = "MIT"
 DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \
-       libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans"
+       libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans xextproto-70-includes"
+INC_PR = "r28"
 
 PKGN ?= "xserver-kdrive"
 
@@ -94,6 +95,8 @@ inherit autotools pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
 
+CFLAGS_prepend = "-I${STAGING_INCDIR}/xextproto-70 "
+
 EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --disable-dga --disable-dri --disable-xinerama \
                 --disable-xf86misc --disable-xf86vidmode \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 1b052e7926517187cf813e26563ad97fc51a91c0..34b5c0d05e0368f6a6168bf6a1df3a43cec53f9c 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r27"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index b6322769ab34b733ad55f1dccc0dc1b7e2bae343..25715a82a8ca06b565258ef844725ac3bfad8965 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
index e6e791ad4f71fbe35ac447c40a9d5c727e5a10c2..d0b7ac17e02f88d0e829d21f52d3fad1f7a5b5df 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 161390179d4643a2bcafd3fd8c853255e83c87dc..187de439967f17a043f1878ba7e52566799c7c0e 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -6,7 +6,7 @@ RDEPENDS += "hal"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r4"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
index e792c84ce077029c29559f4be2cc011b32fde9aa..43a07f9a3f48d00900ae0cbf0000addf7d9d7d0b 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index 686826eca3ef7aba2673c8346dc534fbdf367123..ab7c594c87720ecdc242966e6d6161beae7f03fe 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -6,7 +6,7 @@ RDEPENDS += "hal"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb
index 2e1da5c97767f70478c8fddd118ef99e9efb77ef..4de73e8fc1ea02e7dfc6e4f68013b856ddb60375 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_git.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_git.bb
@@ -6,7 +6,7 @@ PV = "1.4+git${SRCDATE}"
 DEPENDS += "libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \