initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,20 @@
|
||||
Kernel modesettings support also depends on dri2, see
|
||||
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
|
||||
|
||||
Patch sent upstream: https://gitlab.freedesktop.org/xorg/xserver/issues/479
|
||||
|
||||
[rebased for version 1.20.0]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
|
||||
--- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200
|
||||
+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200
|
||||
@@ -1962,7 +1962,7 @@
|
||||
XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
|
||||
fi
|
||||
|
||||
- if test "x$DRM" = xyes; then
|
||||
+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
|
||||
XORG_DRIVER_MODESETTING=yes
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 2e8fca00f5bdb02f2f59aaa428d1e9d808ab0e86 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 16 Jun 2018 19:20:16 +0200
|
||||
Subject: [PATCH] include/misc.h: fix uClibc build
|
||||
|
||||
A similar fix was used for Dovecot:
|
||||
https://www.dovecot.org/list/dovecot/2017-November/110019.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
include/misc.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/misc.h b/include/misc.h
|
||||
index 14920c3c3..390e52b60 100644
|
||||
--- a/include/misc.h
|
||||
+++ b/include/misc.h
|
||||
@@ -185,6 +185,10 @@ typedef struct _xReq *xReqPtr;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#undef bswap_16
|
||||
+#undef bswap_32
|
||||
+#undef bswap_64
|
||||
+
|
||||
/**
|
||||
* Calculate the number of bytes needed to hold bits.
|
||||
* @param bits The minimum number of bits needed.
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 19 Apr 2019 10:19:50 +0200
|
||||
Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
|
||||
|
||||
Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
|
||||
Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
|
||||
In this case, build fails on:
|
||||
|
||||
make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop.
|
||||
make[3]: *** Waiting for unfinished jobs....
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173]
|
||||
---
|
||||
hw/xwayland/Makefile.am | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
|
||||
index bc1cb8506..502879e2a 100644
|
||||
--- a/hw/xwayland/Makefile.am
|
||||
+++ b/hw/xwayland/Makefile.am
|
||||
@@ -21,10 +21,14 @@ Xwayland_SOURCES = \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
+if GLX
|
||||
+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
|
||||
+endif
|
||||
+
|
||||
Xwayland_LDADD = \
|
||||
$(glamor_lib) \
|
||||
$(XWAYLAND_LIBS) \
|
||||
- $(top_builddir)/glx/libglxvnd.la \
|
||||
+ $(GLXVND_LIB) \
|
||||
$(XWAYLAND_SYS_LIBS) \
|
||||
$(top_builddir)/Xext/libXvidmode.la \
|
||||
$(XSERVER_SYS_LIBS)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 27 Dec 2019 23:33:37 +0100
|
||||
Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx
|
||||
|
||||
Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
|
||||
glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
|
||||
|
||||
However, if glx is disabled through --disable-glx and GLX headers are
|
||||
not installed in the build's environment, build fails on:
|
||||
|
||||
In file included from xf86Init.c:81:
|
||||
../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
|
||||
64 | #include <GL/glxproto.h>
|
||||
| ^~~~~~~~~~~~~~~
|
||||
|
||||
Fix this failure by removing this include which does not seem to be
|
||||
needed (an other option would have been to keep it under an ifdef GLXEXT
|
||||
block)
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db]
|
||||
---
|
||||
hw/xfree86/common/xf86Init.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
||||
index 0631c7237..e6fb11398 100644
|
||||
--- a/hw/xfree86/common/xf86Init.c
|
||||
+++ b/hw/xfree86/common/xf86Init.c
|
||||
@@ -78,7 +78,6 @@
|
||||
#include "xf86InPriv.h"
|
||||
#include "picturestr.h"
|
||||
#include "randrstr.h"
|
||||
-#include "glxvndabi.h"
|
||||
#include "xf86Bus.h"
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
#include "xf86VGAarbiter.h"
|
||||
--
|
||||
2.24.1
|
||||
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Anholt <eric@anholt.net>
|
||||
Date: Fri, 26 Oct 2018 17:47:30 -0700
|
||||
Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
|
||||
with PCI.
|
||||
|
||||
Some Broadcom set-top-box boards have PCI busses, but the GPU is still
|
||||
probed through DT. We would dereference a null busid here in that
|
||||
case.
|
||||
|
||||
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
Backported from: e50c85f4ebf559a3bac4817b41074c43d4691779
|
||||
Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
|
||||
---
|
||||
hw/xfree86/common/xf86platformBus.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
|
||||
index cef47da03..dadbac6c8 100644
|
||||
--- a/hw/xfree86/common/xf86platformBus.c
|
||||
+++ b/hw/xfree86/common/xf86platformBus.c
|
||||
@@ -289,7 +289,7 @@ xf86platformProbe(void)
|
||||
for (i = 0; i < xf86_num_platform_devices; i++) {
|
||||
char *busid = xf86_platform_odev_attributes(i)->busid;
|
||||
|
||||
- if (pci && (strncmp(busid, "pci:", 4) == 0)) {
|
||||
+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
|
||||
platform_find_pci_info(&xf86_platform_devices[i], busid);
|
||||
}
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
From de5e24b5036a1a5a877f8f30169e3497d0e296d6 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Cristau <jcristau@debian.org>
|
||||
Date: Wed, 6 Jan 2021 10:20:53 +0100
|
||||
Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The definition relies on IOPortBase, which is only ever set in
|
||||
hw/xfree86/os-support/bsd/arm_video.c
|
||||
|
||||
This caused build failures on linux/mips with GCC 10, due to this
|
||||
change (from https://gcc.gnu.org/gcc-10/changes.html#c):
|
||||
|
||||
"GCC now defaults to -fno-common. As a result, global variable accesses
|
||||
are more efficient on various targets. In C, global variables with
|
||||
multiple tentative definitions now result in linker errors. With
|
||||
-fcommon such definitions are silently merged during linking."
|
||||
|
||||
As a result anything including compiler.h would get its own definition
|
||||
of IOPortBase and the linker would error out.
|
||||
|
||||
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
|
||||
---
|
||||
hw/xfree86/common/compiler.h | 8 ++------
|
||||
hw/xfree86/os-support/bsd/arm_video.c | 3 +++
|
||||
2 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
|
||||
index 2b2008b3f..eb788d3fd 100644
|
||||
--- a/hw/xfree86/common/compiler.h
|
||||
+++ b/hw/xfree86/common/compiler.h
|
||||
@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
|
||||
barrier();
|
||||
}
|
||||
|
||||
-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
|
||||
-#if defined(__arm32__) || defined(__mips64)
|
||||
+#elif defined(__arm32__) && !defined(__linux__)
|
||||
#define PORT_SIZE long
|
||||
-#else
|
||||
-#define PORT_SIZE short
|
||||
-#endif
|
||||
|
||||
-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
|
||||
+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
|
||||
|
||||
static __inline__ void
|
||||
outb(unsigned PORT_SIZE port, unsigned char val)
|
||||
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
|
||||
index dd1020e33..180d70543 100644
|
||||
--- a/hw/xfree86/os-support/bsd/arm_video.c
|
||||
+++ b/hw/xfree86/os-support/bsd/arm_video.c
|
||||
@@ -65,6 +65,7 @@
|
||||
#include "xf86Priv.h"
|
||||
#include "xf86_OSlib.h"
|
||||
#include "xf86OSpriv.h"
|
||||
+#include "compiler.h"
|
||||
|
||||
#if defined(__NetBSD__) && !defined(MAP_FILE)
|
||||
#define MAP_FLAGS MAP_SHARED
|
||||
@@ -162,6 +163,8 @@ xf86DisableIO()
|
||||
|
||||
#if defined(USE_ARC_MMAP) || defined(__arm32__)
|
||||
|
||||
+unsigned int IOPortBase;
|
||||
+
|
||||
Bool
|
||||
xf86EnableIO()
|
||||
{
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
comment "xorg-server needs a glibc or uClibc toolchain"
|
||||
depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
bool "xorg-server"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# xserver uses inb/outb on arm, which aren't available with musl
|
||||
depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL)
|
||||
# We need a SHA1 implementation. If either openssl or
|
||||
# libgcrypt are already part of the build, we'll use one of
|
||||
# them, otherwise, use the small libsha1 library.
|
||||
select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
|
||||
select BR2_PACKAGE_MCOOKIE
|
||||
select BR2_PACKAGE_PIXMAN
|
||||
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_XLIB_LIBXAU
|
||||
select BR2_PACKAGE_XLIB_LIBXCURSOR
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE
|
||||
select BR2_PACKAGE_XLIB_LIBXDMCP
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_XLIB_LIBXFIXES
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT2
|
||||
select BR2_PACKAGE_XLIB_LIBXFT
|
||||
select BR2_PACKAGE_XLIB_LIBXI
|
||||
select BR2_PACKAGE_XLIB_LIBXINERAMA
|
||||
select BR2_PACKAGE_XLIB_LIBXRANDR
|
||||
select BR2_PACKAGE_XLIB_LIBXRENDER
|
||||
select BR2_PACKAGE_XLIB_LIBXRES
|
||||
select BR2_PACKAGE_XLIB_LIBXXF86VM
|
||||
select BR2_PACKAGE_XLIB_LIBXKBFILE
|
||||
select BR2_PACKAGE_XLIB_XTRANS
|
||||
select BR2_PACKAGE_XDATA_XBITMAPS
|
||||
select BR2_PACKAGE_XORGPROTO
|
||||
select BR2_PACKAGE_XUTIL_UTIL_MACROS
|
||||
select BR2_PACKAGE_XKEYBOARD_CONFIG
|
||||
help
|
||||
X.Org X server
|
||||
|
||||
http://xorg.freedesktop.org
|
||||
|
||||
if BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
|
||||
choice
|
||||
prompt "X Window System server type"
|
||||
help
|
||||
Select the X Window System server to use
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
bool "Modular X.org"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_LIBDRM
|
||||
select BR2_PACKAGE_LIBPCIACCESS
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
|
||||
(BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32)
|
||||
help
|
||||
This variant of the X.org server is the full-blown variant,
|
||||
as used by desktop GNU/Linux distributions. The drivers (for
|
||||
input and graphics) are built separately from the X.org
|
||||
server (see the xdriver* packages).
|
||||
|
||||
comment "Modular X.org needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
|
||||
bool "KDrive / TinyX"
|
||||
help
|
||||
This variant of the X.org server is a lightweight version
|
||||
intended for embedded systems. The drivers (for input and
|
||||
graphics) are built into the server. It is generally used
|
||||
directly on top of the Linux framebuffer without DRM or
|
||||
video card specific drivers.
|
||||
|
||||
endchoice
|
||||
|
||||
comment "Optional Servers"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
|
||||
bool "Xvfb server"
|
||||
help
|
||||
Virtual frame buffer X server.
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR
|
||||
bool "Xephyr server"
|
||||
help
|
||||
Xephyr nested X server; successor to Xnest.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,46 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Starts Xorg
|
||||
#
|
||||
|
||||
BIN=/usr/bin/Xorg
|
||||
PIDFILE=/var/run/xorg.pid
|
||||
|
||||
# ":0.0 vt01" makes sure Xorg finds the correct terminal.
|
||||
# -allowMouseOpenFail allows the server to start up even if the mouse device
|
||||
# can't be opened or initialised.
|
||||
# -noreset prevents a server reset when the last client connection is closed.
|
||||
XORG_ARGS=":0.0 vt01 -s 0 -noreset -allowMouseOpenFail"
|
||||
|
||||
start() {
|
||||
printf "Starting Xorg: "
|
||||
start-stop-daemon -S -q -b -m -p $PIDFILE --exec $BIN -- $XORG_ARGS
|
||||
[ $? = 0 ] && sleep 3 && echo "OK" || echo "FAIL"
|
||||
}
|
||||
|
||||
stop() {
|
||||
printf "Stopping Xorg: "
|
||||
start-stop-daemon -K -q -p $PIDFILE
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
sleep 2
|
||||
start
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|reload)
|
||||
restart
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart}"
|
||||
exit 1
|
||||
esac
|
||||
@@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=Xorg server
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/Xorg :0.0 vt01 -s 0 -noreset -allowMouseOpenFail
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
@@ -0,0 +1,6 @@
|
||||
# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html
|
||||
sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz
|
||||
sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING
|
||||
@@ -0,0 +1,199 @@
|
||||
################################################################################
|
||||
#
|
||||
# xserver_xorg-server
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XSERVER_XORG_SERVER_VERSION = 1.20.13
|
||||
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz
|
||||
XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver
|
||||
XSERVER_XORG_SERVER_LICENSE = MIT
|
||||
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
|
||||
XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver
|
||||
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
|
||||
# xfont_font-util is needed only for autoreconf
|
||||
XSERVER_XORG_SERVER_AUTORECONF = YES
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xfont_font-util \
|
||||
xutil_util-macros \
|
||||
xlib_libX11 \
|
||||
xlib_libXau \
|
||||
xlib_libXdmcp \
|
||||
xlib_libXext \
|
||||
xlib_libXfixes \
|
||||
xlib_libXfont2 \
|
||||
xlib_libXi \
|
||||
xlib_libXrender \
|
||||
xlib_libXres \
|
||||
xlib_libXft \
|
||||
xlib_libXcursor \
|
||||
xlib_libXinerama \
|
||||
xlib_libXrandr \
|
||||
xlib_libXdamage \
|
||||
xlib_libXxf86vm \
|
||||
xlib_libxkbfile \
|
||||
xlib_xtrans \
|
||||
xdata_xbitmaps \
|
||||
xorgproto \
|
||||
xkeyboard-config \
|
||||
pixman \
|
||||
mcookie \
|
||||
host-pkgconf
|
||||
|
||||
# We force -O2 regardless of the optimization level chosen by the
|
||||
# user, as the X.org server is known to trigger some compiler bugs at
|
||||
# -Os on several architectures.
|
||||
XSERVER_XORG_SERVER_CONF_OPTS = \
|
||||
--disable-config-hal \
|
||||
--enable-record \
|
||||
--disable-xnest \
|
||||
--disable-dmx \
|
||||
--disable-unit-tests \
|
||||
--with-builder-addr=buildroot@buildroot.org \
|
||||
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \
|
||||
--with-fontrootdir=/usr/share/fonts/X11/ \
|
||||
--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),en,dis)able-xephyr \
|
||||
--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--with-systemd-daemon \
|
||||
--enable-systemd-logind
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += \
|
||||
systemd
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--without-systemd-daemon \
|
||||
--disable-systemd-logind
|
||||
endif
|
||||
|
||||
# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libdrm
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--enable-kdrive \
|
||||
--disable-glx \
|
||||
--disable-dri
|
||||
|
||||
else # modular
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libgl
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
|
||||
endif
|
||||
|
||||
# Optional packages
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += udev
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
|
||||
# udev kms support depends on libdrm and dri2
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libunwind
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-libunwind
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri3 --disable-glamor
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 --disable-dri3 --disable-glamor
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-screensaver
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += openssl
|
||||
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libgcrypt
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
|
||||
endif
|
||||
|
||||
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
|
||||
endef
|
||||
|
||||
# init script conflicts with S90nodm
|
||||
ifneq ($(BR2_PACKAGE_NODM),y)
|
||||
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
|
||||
$(TARGET_DIR)/etc/init.d/S40xorg
|
||||
endef
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user