summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-09-26 08:12:46 +0000
committerKoen Kooi <koen@openembedded.org>2008-09-26 08:12:46 +0000
commit867a2fc881350840de1f1637764ee6fe0dab25cc (patch)
treea783ba15db96637a4a3c0ec491dd59361d778206 /packages/xorg-xserver
parentb3a5025c455067becc065fa17a4d73de74b5cd3f (diff)
xserver-xorg : RRECOMMEND xkeyboard-config
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xorg-xserver-common.inc4
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.2.0.bb2
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.3.0.0.bb2
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.4.2.bb2
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.4.bb2
-rw-r--r--packages/xorg-xserver/xserver-xorg_cvs.bb2
6 files changed, 7 insertions, 7 deletions
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 0b06425857..666946b71a 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
-RDEPENDS_${PN} = "hal rgb xorg-minimal-fonts"
+RDEPENDS_${PN} = "hal"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
@@ -25,7 +25,7 @@ inherit autotools pkgconfig
PACKAGES =+ "xserver-security-policy"
FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb"
PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index f63f19ce0b..e4a0a22db0 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
require xorg-xserver-common.inc
PE = "1"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index 572c434fa9..d6633f1f88 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
require xorg-xserver-common.inc
PE = "1"
-PR = "r5"
+PR = "r6"
SRC_URI += "file://drmfix.patch;patch=1 \
file://glyphstr.patch;patch=1"
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 716c432428..b6685d43a1 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman"
PE = "1"
-PR = "r5"
+PR = "r6"
SRC_URI += "file://drmfix.patch;patch=1 \
file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 716c432428..b6685d43a1 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman"
PE = "1"
-PR = "r5"
+PR = "r6"
SRC_URI += "file://drmfix.patch;patch=1 \
file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index cc027fdd02..abbfb3fcab 100644
--- a/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
@@ -1,7 +1,7 @@
SECTION = "x11/base"
LICENSE = "Xorg"
PROVIDES = "virtual/xserver"
-PR = "r4"
+PR = "r5"
PV = "6.8.1+cvs${SRCDATE}"
DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"