xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Oct 2 14:11:11 UTC 2019
Makefile.am | 1 -
configure.ac | 5 -----
hw/xfree86/Makefile.am | 8 ++------
hw/xfree86/int10/Makefile.am | 7 +++++--
hw/xfree86/int10/meson.build | 4 ++++
hw/xfree86/loader/loadmod.c | 4 ++++
hw/xfree86/meson.build | 4 ----
hw/xfree86/sdksyms.sh | 9 ++-------
hw/xfree86/vbe/Makefile.am | 14 --------------
hw/xfree86/vbe/meson.build | 10 ----------
hw/xfree86/vbe/vbe_module.c | 22 ----------------------
meson.build | 11 -----------
meson_options.txt | 2 --
13 files changed, 17 insertions(+), 84 deletions(-)
New commits:
commit b2de577f6388c6dd7a463e5cebb8b1366bb45d1f
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Jul 23 14:33:45 2019 -0400
xfree86: Merge vbe into int10
There's not really a good reason to keep these separate, the vbe code
requires int10 and is not very large. This change eliminates the
build-time options for vbe; if you build int10, you get vbe.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
diff --git a/Makefile.am b/Makefile.am
index 89e6006f3..575296509 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,7 +180,6 @@ EXTRA_DIST += \
hw/xfree86/parser/meson.build \
hw/xfree86/ramdac/meson.build \
hw/xfree86/shadowfb/meson.build \
- hw/xfree86/vbe/meson.build \
hw/xfree86/vgahw/meson.build \
hw/xfree86/x86emu/meson.build \
hw/xfree86/xkb/meson.build \
diff --git a/configure.ac b/configure.ac
index 4b71f8559..03c2e367c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -571,7 +571,6 @@ AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL
AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
-AC_ARG_ENABLE(vbe, AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
AC_ARG_ENABLE(int10-module, AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
AC_ARG_ENABLE(windowsdri, AS_HELP_STRING([--enable-windowsdri], [Build XWin with WindowsDRI extension (default: auto)]), [WINDOWSDRI=$enableval], [WINDOWSDRI=auto])
AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
@@ -662,7 +661,6 @@ case $host_os in
INT10MODULE=no
PCI=no
VGAHW=no
- VBE=no
XF86UTILS=no
XF86VIDMODE=no
XSELINUX=no
@@ -672,7 +670,6 @@ case $host_os in
PCI=no
INT10MODULE=no
VGAHW=no
- VBE=no
DRM=no
DRI2=no
DRI3=no
@@ -1348,7 +1345,6 @@ XI_INC='-I$(top_srcdir)/Xi'
AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
-AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
@@ -2473,7 +2469,6 @@ hw/xfree86/os-support/stub/Makefile
hw/xfree86/parser/Makefile
hw/xfree86/ramdac/Makefile
hw/xfree86/shadowfb/Makefile
-hw/xfree86/vbe/Makefile
hw/xfree86/vgahw/Makefile
hw/xfree86/x86emu/Makefile
hw/xfree86/xkb/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 1d494cd0f..baf380d4d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -30,22 +30,18 @@ if VGAHW
VGAHW_SUBDIR = vgahw
endif
-if VBE
-VBE_SUBDIR = vbe
-endif
-
if INT10MODULE
INT10_SUBDIR = int10
endif
SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \
+ $(DRI2_SUBDIR) . i2c dixmods xkb \
fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
$(GLAMOR_EGL_SUBDIR) drivers
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
- parser ramdac shadowfb vbe vgahw \
+ parser ramdac shadowfb vgahw \
loader dixmods xkb dri dri2 exa modes \
utils doc man glamor_egl drivers
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 66cb14d46..0248dc781 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -1,6 +1,6 @@
module_LTLIBRARIES = libint10.la
-sdk_HEADERS = xf86int10.h
+sdk_HEADERS = xf86int10.h vbe.h vbeModes.h
EXTRA_CFLAGS =
@@ -8,6 +8,8 @@ libint10_la_LDFLAGS = -avoid-version
libint10_la_LIBADD = $(PCIACCESS_LIBS)
COMMON_SOURCES = \
+ vbe.c \
+ vbeModes.c \
helper_exec.c \
helper_mem.c \
xf86int10.c \
@@ -17,7 +19,8 @@ if I386_VIDEO
I386_VIDEO_CFLAGS = -D_PC
endif
-AM_CPPFLAGS = $(XORG_INCS)
+AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../modes -I$(srcdir)/../i2c \
+ -I$(srcdir)/../parser
if INT10_VM86
AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
diff --git a/hw/xfree86/int10/meson.build b/hw/xfree86/int10/meson.build
index b1ead9c4c..a309e9b53 100644
--- a/hw/xfree86/int10/meson.build
+++ b/hw/xfree86/int10/meson.build
@@ -1,4 +1,6 @@
srcs_xorg_int10 = [
+ 'vbe.c',
+ 'vbeModes.c',
'helper_exec.c',
'helper_mem.c',
'xf86int10.c',
@@ -58,3 +60,5 @@ xorg_int10 = shared_module('int10',
)
install_data('xf86int10.h', install_dir: xorgsdkdir)
+install_data('vbe.h', install_dir: xorgsdkdir)
+install_data('vbeModes.h', install_dir: xorgsdkdir)
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/int10/vbe.c
similarity index 100%
rename from hw/xfree86/vbe/vbe.c
rename to hw/xfree86/int10/vbe.c
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/int10/vbe.h
similarity index 100%
rename from hw/xfree86/vbe/vbe.h
rename to hw/xfree86/int10/vbe.h
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/int10/vbeModes.c
similarity index 100%
rename from hw/xfree86/vbe/vbeModes.c
rename to hw/xfree86/int10/vbeModes.c
diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/int10/vbeModes.h
similarity index 100%
rename from hw/xfree86/vbe/vbeModes.h
rename to hw/xfree86/int10/vbeModes.h
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index f0983b2f8..a93a76aa9 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -697,6 +697,10 @@ LoadModule(const char *module, void *options, const XF86ModReqInfo *modreq,
m = (char *) module;
}
+ /* Backward compatibility, vbe and int10 are merged into int10 now */
+ if (!strcmp(m, "vbe"))
+ m = name = "int10";
+
for (cim = compiled_in_modules; *cim; cim++)
if (!strcmp(m, *cim)) {
LogMessageVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 8b657acf0..cf1f1ba78 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -10,7 +10,6 @@ xorg_inc = include_directories(
'os-support/bus',
'parser',
'ramdac',
- 'vbe',
'vgahw',
)
@@ -128,9 +127,6 @@ if int10 != 'false'
subdir('int10')
endif
subdir('shadowfb')
-if build_vbe
- subdir('vbe')
-endif
if build_vgahw
subdir('vgahw')
endif
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index bdf47a71a..e41089297 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -71,6 +71,8 @@ cat > sdksyms.c << EOF
/* hw/xfree86/int10/Makefile.am -- module */
/*
#include "xf86int10.h"
+#include "vbe.h"
+#include "vbeModes.h"
*/
@@ -181,13 +183,6 @@ cat > sdksyms.c << EOF
#include "xf86Optrec.h"
-/* hw/xfree86/vbe/Makefile.am -- module */
-/*
-#include "vbe.h"
-#include "vbeModes.h"
- */
-
-
/* hw/xfree86/dri/Makefile.am -- module */
#ifdef XF86DRI
# include "dri.h"
diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
deleted file mode 100644
index 041b47a9f..000000000
--- a/hw/xfree86/vbe/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-module_LTLIBRARIES = libvbe.la
-libvbe_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
-libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
-if NO_UNDEFINED
-libvbe_la_LIBADD = ../int10/libint10.la
-endif
-
-sdk_HEADERS = vbe.h vbeModes.h
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
- -I$(srcdir)/../modes -I$(srcdir)/../parser \
- -I$(srcdir)/../int10
diff --git a/hw/xfree86/vbe/meson.build b/hw/xfree86/vbe/meson.build
deleted file mode 100644
index d13991e94..000000000
--- a/hw/xfree86/vbe/meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
-shared_module('vbe',
- [ 'vbe.c', 'vbeModes.c', 'vbe_module.c' ],
- include_directories: [ inc, xorg_inc ],
- dependencies: common_dep,
- c_args: xorg_c_args,
- install: true,
- install_dir: module_dir,
-)
-
-install_data(['vbe.h', 'vbeModes.h'], install_dir: xorgsdkdir)
diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c
deleted file mode 100644
index 3fb86956e..000000000
--- a/hw/xfree86/vbe/vbe_module.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86.h"
-#include "xf86str.h"
-#include "vbe.h"
-
-static XF86ModuleVersionInfo vbeVersRec = {
- "vbe",
- MODULEVENDORSTRING,
- MODINFOSTRING1,
- MODINFOSTRING2,
- XORG_VERSION_CURRENT,
- 1, 1, 0,
- ABI_CLASS_VIDEODRV, /* needs the video driver ABI */
- ABI_VIDEODRV_VERSION,
- MOD_CLASS_NONE,
- {0, 0, 0, 0}
-};
-
-_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, NULL, NULL };
diff --git a/meson.build b/meson.build
index acd77234e..2eca5c295 100644
--- a/meson.build
+++ b/meson.build
@@ -394,17 +394,6 @@ endif
build_modesetting = libdrm_dep.found()
-build_vbe = false
-if get_option('vbe') == 'auto'
- if (host_machine.system() != 'darwin' and
- host_machine.system() != 'windows' and
- host_machine.system() != 'cygwin')
- build_vbe = true
- endif
-else
- build_vbe = get_option('vbe') == 'true'
-endif
-
build_vgahw = false
if get_option('vgahw') == 'auto'
if (host_machine.system() != 'darwin' and
diff --git a/meson_options.txt b/meson_options.txt
index 94a782a92..209587cd0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -72,8 +72,6 @@ option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable HAL integration')
option('systemd_logind', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable systemd-logind integration')
-option('vbe', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
- description: 'Xorg VBE module')
option('vgahw', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Xorg VGA access module')
option('dpms', type: 'boolean', value: true,
More information about the xorg-commit
mailing list