This commit is contained in:
@@ -1,2 +1,7 @@
|
||||
# From http://lists.x.org/archives/xorg-announce/2011-September/001737.html
|
||||
sha256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 xdm-1.1.11.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2019-March/002959.html
|
||||
md5 47c4c3bf8d59b64b64d134df8b5e5ec5 xdm-1.1.12.tar.bz2
|
||||
sha1 5cc5590e40837949b1a63cb030878f8ceebd4d85 xdm-1.1.12.tar.bz2
|
||||
sha256 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 xdm-1.1.12.tar.bz2
|
||||
sha512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb xdm-1.1.12.tar.bz2
|
||||
# Locally computed
|
||||
sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XAPP_XDM_VERSION = 1.1.11
|
||||
XAPP_XDM_VERSION = 1.1.12
|
||||
XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
|
||||
XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
|
||||
XAPP_XDM_LICENSE = MIT
|
||||
|
||||
@@ -9,7 +9,13 @@ XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
|
||||
XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
|
||||
XAPP_XFD_LICENSE = MIT
|
||||
XAPP_XFD_LICENSE_FILES = COPYING
|
||||
XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
|
||||
XAPP_XFD_DEPENDENCIES = \
|
||||
freetype \
|
||||
fontconfig \
|
||||
xlib_libXaw \
|
||||
xlib_libXft \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
XAPP_XFD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
|
||||
XAPP_XFD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -9,8 +9,9 @@ XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
|
||||
XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
|
||||
XAPP_XLOAD_LICENSE = MIT
|
||||
XAPP_XLOAD_LICENSE_FILES = COPYING
|
||||
XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
|
||||
XAPP_XLOAD_DEPENDENCIES = xlib_libXaw $(TARGET_NLS_DEPENDENCIES)
|
||||
XAPP_XLOAD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
|
||||
XAPP_XLOAD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
|
||||
# musl doesn't have rwhod.h, but xload can replace it with stubs
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
|
||||
bool "xf86-video-amdgpu"
|
||||
depends on BR2_USE_MMU # libdrm
|
||||
depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm
|
||||
select BR2_PACKAGE_LIBDRM
|
||||
@@ -11,5 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
|
||||
AMD GPU video driver
|
||||
|
||||
comment "xf86-video-amdgpu needs egl/opengl support from mesa3d"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
|
||||
!BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://lists.x.org/archives/xorg-announce/2013-September/002324.html
|
||||
sha256 9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b xf86-video-fbdev-0.4.4.tar.bz2
|
||||
sha256 dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 xf86-video-fbdev-0.5.0.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.4
|
||||
XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.5.0
|
||||
XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
|
||||
XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
|
||||
XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# From http://lists.x.org/archives/xorg-announce/2015-March/002554.html
|
||||
sha256 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2 libXdmcp-1.1.2.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2019-March/002974.html
|
||||
md5 115c5c12ecce0e749cd91d999a5fd160 libXdmcp-1.1.3.tar.bz2
|
||||
sha1 0a8f8a274f829331efb1e8e2027c38631b204dd0 libXdmcp-1.1.3.tar.bz2
|
||||
sha256 20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529 libXdmcp-1.1.3.tar.bz2
|
||||
sha512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2
|
||||
# Locally computed
|
||||
sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XLIB_LIBXDMCP_VERSION = 1.1.2
|
||||
XLIB_LIBXDMCP_VERSION = 1.1.3
|
||||
XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
|
||||
XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
|
||||
XLIB_LIBXDMCP_LICENSE = MIT
|
||||
|
||||
@@ -15,9 +15,10 @@ XLIB_LIBXPM_AUTORECONF = YES
|
||||
XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
|
||||
XLIB_LIBXPM_CONF_ENV = ac_cv_search_gettext=no
|
||||
XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -61,7 +61,7 @@ choice
|
||||
bool "X Window System server version"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
|
||||
bool "1.20.3"
|
||||
bool "1.20.4"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT2
|
||||
|
||||
@@ -79,7 +79,7 @@ endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
|
||||
string
|
||||
default "1.20.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
|
||||
default "1.20.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
|
||||
default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x
|
||||
sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
|
||||
sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2018-October/002928.html
|
||||
md5 8ee29e8b24cef6b3cfa747ec01b9155a xorg-server-1.20.3.tar.bz2
|
||||
sha1 a522cd543606b4d0509d821b8061904951171c50 xorg-server-1.20.3.tar.bz2
|
||||
sha256 1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de xorg-server-1.20.3.tar.bz2
|
||||
sha512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2019-February/002957.html
|
||||
md5 c4841cc24b79420205d082fe82e0a650 xorg-server-1.20.4.tar.bz2
|
||||
sha1 1a79da92122124cb782a4eebfd83fd33d5c0d7d4 xorg-server-1.20.4.tar.bz2
|
||||
sha256 fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee xorg-server-1.20.4.tar.bz2
|
||||
sha512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 xorg-server-1.20.4.tar.bz2
|
||||
|
||||
@@ -47,6 +47,7 @@ XSERVER_XORG_SERVER_CONF_OPTS = \
|
||||
--disable-xnest \
|
||||
--disable-xephyr \
|
||||
--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/ \
|
||||
|
||||
Reference in New Issue
Block a user