summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb1
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb5
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb2
3 files changed, 6 insertions, 2 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index a7c92dcb83..cfb1294c09 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -39,6 +39,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
--disable-dga --disable-dri --disable-xinerama \
--disable-xf86misc --disable-xf86vidmode \
--disable-xorg --disable-xorgcfg \
+ --disable-dmx \
--disable-xkb --disable-xnest --disable-xvfb \
--disable-xevie --disable-xprint --disable-xtrap \
--with-default-font-path=built-ins \
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index e667e36f2c..491e486b3d 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -1,4 +1,4 @@
-PV = "0.0+git"
+PV = "1.1.0+git${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
@@ -26,7 +26,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
file://fbdev-not-fix.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
file://optional-xkb.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://enable-tslib.patch;patch=1"
SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
@@ -43,5 +43,6 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
--disable-xorg --disable-xorgcfg \
--disable-xkb --disable-xnest --disable-xvfb \
--disable-xevie --disable-xprint --disable-xtrap \
+ --disable-dmx \
--with-default-font-path=built-ins \
ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
index 674f1e5e64..42b5bb918d 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -2,6 +2,8 @@ include xorg-xserver-common.inc
SRC_URI += "file://drmfix.patch;patch=1"
+EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+
#DESCRIPTION = ""
#DEPENDS += " "