Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg-server dmx disabled is ready fixed

Browse Source
This commit is contained in:
Ertuğrul Erata
2015-07-15 01:25:03 +03:00
parent 27b4c9a2a6
commit 7ae8ee2a6a
3 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/server/xorg-server/actions.py
+2 -3
View File
@@ -10,9 +10,8 @@ from pisi.actionsapi import get
def setup():
# shelltools.chmod("hw/vnc/symlink-vnc.sh")
autotools.autoreconf("-fi")
autotools.configure("--enable-install-libxf86config \
--disable-systemd-logind \
--enable-aiglx \
@@ -28,7 +27,7 @@ def setup():
--disable-config-hal \
--enable-xfree86-utils \
--enable-xorg \
--enable-dmx \
--disable-dmx \
--enable-xvfb \
--enable-xnest \
--enable-kdrive \
x11/server/xorg-server/files/0001-configure.ac-error-while-checking-for-XDMXCONFIG_DE.patch
+44
View File
@@ -0,0 +1,44 @@
From cd1962b7f9c14bc67e22c07cb9a9cd3a4a119506 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize-XzQKRVe1yT0V+D8aMU/kSg@public.gmane.org>
Date: Sat, 28 Nov 2009 21:32:47 -0500
Subject: [PATCH] configure.ac: error while checking for XDMXCONFIG_DEP
Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
was not quoted.
Signed-off-by: Gaetan Nadon <memsize-XzQKRVe1yT0V+D8aMU/kSg@public.gmane.org>
Reviewed-by: Dan Nicholson <dbn.lists-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Tested-by: Julien Cristau <jcristau at debian.org>
---
configure.ac | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8500db4..1038734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1808,11 +1808,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
dnl DMX DDX
-PKG_CHECK_MODULES([DMXMODULES],
- [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
- PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes],
- [have_dmx=no]),
- [have_dmx=no])
+PKG_CHECK_MODULES(
+ [DMXMODULES],
+ [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
+ [PKG_CHECK_MODULES(
+ [XDMXCONFIG_DEP],
+ [xaw7 xmu xt xpm x11],
+ [have_dmx=yes],
+ [have_dmx=no])],
+ [have_dmx=no])
AC_MSG_CHECKING([whether to build Xdmx DDX])
if test "x$DMX" = xauto; then
DMX="$have_dmx"
--
1.6.0.4
x11/server/xorg-server/pspec.xml
+17
View File
@@ -47,6 +47,8 @@
<Dependency>xtrans</Dependency>
<Dependency>eudev-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>libunwind-devel</Dependency>
<Dependency>libXau-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch</Patch>
@@ -91,6 +93,9 @@
</Replaces>
<IsA>app:console</IsA>
<RuntimeDependencies>
<Dependency>libXau</Dependency>
<Dependency>eudev</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>mesa</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>pixman</Dependency>
@@ -156,6 +161,9 @@
<IsA>app:console</IsA>
<Summary>Run X clients under wayland</Summary>
<RuntimeDependencies>
<Dependency>libXau</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>libunwind</Dependency>
<Dependency>mesa</Dependency>
<Dependency>pixman</Dependency>
<Dependency>libdrm</Dependency>
@@ -175,6 +183,10 @@
<IsA>app:console</IsA>
<Summary>Nested X Server</Summary>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXau</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>xorg-server-common</Dependency>
<Dependency>mesa</Dependency>
<Dependency>xcb-util</Dependency>
@@ -202,6 +214,8 @@
<IsA>app:console</IsA>
<Summary>Virtual Framebuffer X Server</Summary>
<RuntimeDependencies>
<Dependency>libXau</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>xorg-server-common</Dependency>
<Dependency>libXfont</Dependency>
<Dependency>pixman</Dependency>
@@ -222,6 +236,9 @@
<Name>xorg-server-xnest</Name>
<Summary>A nested X server that runs as an X application</Summary>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXau</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>libXfont</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libunwind</Dependency>