summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2010-01-10 13:02:36 +0000
committerutx@penguin.cz <utx@penguin.cz>2010-01-10 13:06:14 +0000
commitfaf1793d478bc800a5ef994e98962c4dd8717d40 (patch)
treeea6e3026006cb51c48462dff5350d90686a9310f
parentf3aefd497f216d9fe0240625305f7a9a28da16c7 (diff)
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.
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-common.inc5
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.4.2.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.4.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.5.3.bb2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_git.bb2
8 files changed, 11 insertions, 8 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index b00893da6d..fd4b2f6045 100644
--- 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 1b052e7926..34b5c0d05e 100644
--- 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 b6322769ab..25715a82a8 100644
--- 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 e6e791ad4f..d0b7ac17e0 100644
--- 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 161390179d..187de43996 100644
--- 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 e792c84ce0..43a07f9a3f 100644
--- 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 686826eca3..ab7c594c87 100644
--- 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 2e1da5c977..4de73e8fc1 100644
--- 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 \