summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-07-23 14:33:45 -0400
committerAdam Jackson <ajax@redhat.com>2019-10-02 10:03:26 -0400
commitb2de577f6388c6dd7a463e5cebb8b1366bb45d1f (patch)
tree17045289d20a4fe028d56eaf7ac69f5d8c931ce0 /hw/xfree86
parente7b5af451c101608d8cc003e8dd0ff83ded17146 (diff)
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@collabora.com>
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/Makefile.am8
-rw-r--r--hw/xfree86/int10/Makefile.am7
-rw-r--r--hw/xfree86/int10/meson.build4
-rw-r--r--hw/xfree86/int10/vbe.c (renamed from hw/xfree86/vbe/vbe.c)0
-rw-r--r--hw/xfree86/int10/vbe.h (renamed from hw/xfree86/vbe/vbe.h)0
-rw-r--r--hw/xfree86/int10/vbeModes.c (renamed from hw/xfree86/vbe/vbeModes.c)0
-rw-r--r--hw/xfree86/int10/vbeModes.h (renamed from hw/xfree86/vbe/vbeModes.h)0
-rw-r--r--hw/xfree86/loader/loadmod.c4
-rw-r--r--hw/xfree86/meson.build4
-rwxr-xr-xhw/xfree86/sdksyms.sh9
-rw-r--r--hw/xfree86/vbe/Makefile.am14
-rw-r--r--hw/xfree86/vbe/meson.build10
-rw-r--r--hw/xfree86/vbe/vbe_module.c22
13 files changed, 17 insertions, 65 deletions
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
index a37975ddf..a37975ddf 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/int10/vbe.c
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/int10/vbe.h
index c8fb4e48f..c8fb4e48f 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/int10/vbe.h
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/int10/vbeModes.c
index 50ac50d2c..50ac50d2c 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/int10/vbeModes.c
diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/int10/vbeModes.h
index ee0257c15..ee0257c15 100644
--- a/hw/xfree86/vbe/vbeModes.h
+++ b/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 };