xfree86: Merge vbe into int10

Graphics / X.Org / X.Org Server - Adam Jackson [redhat.com] - 2 October 2019 14:03 EDT

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

b2de577f6 xfree86: Merge vbe into int10
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/{vbe => int10}/vbe.c | 0
hw/xfree86/{vbe => int10}/vbe.h | 0
hw/xfree86/{vbe => int10}/vbeModes.c | 0
hw/xfree86/{vbe => int10}/vbeModes.h | 0
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 --
17 files changed, 17 insertions(+), 84 deletions(-)

Upstream: cgit.freedesktop.org


  • Share