xserver: Branch 'master' - 9 commits
Adam Jackson
ajax at kemper.freedesktop.org
Thu Apr 27 19:20:57 UTC 2017
fb/meson.build | 11 +++++++++++
glx/meson.build | 5 +++++
hw/dmx/config/meson.build | 1 +
hw/xfree86/dixmods/meson.build | 27 +++++++++++++++++++++++++++
hw/xfree86/fbdevhw/meson.build | 16 ++++++++++++++++
hw/xfree86/meson.build | 8 ++++++++
hw/xfree86/shadowfb/meson.build | 10 ++++++++++
hw/xfree86/vbe/meson.build | 10 ++++++++++
hw/xfree86/vgahw/meson.build | 10 ++++++++++
meson.build | 8 +++++---
os/meson.build | 24 +++++++++++++++++-------
11 files changed, 120 insertions(+), 10 deletions(-)
New commits:
commit 59554eaa6c4d3d3c170a4be4fc385a86d05c5558
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 13:23:56 2017 -0400
meson: Build libvbe.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 0599706c5..22de2fdd6 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -51,6 +51,9 @@ subdir('os-support')
subdir('parser')
subdir('ramdac')
subdir('shadowfb')
+if build_vbe
+ subdir('vbe')
+endif
if build_vgahw
subdir('vgahw')
endif
diff --git a/hw/xfree86/vbe/meson.build b/hw/xfree86/vbe/meson.build
new file mode 100644
index 000000000..d13991e94
--- /dev/null
+++ b/hw/xfree86/vbe/meson.build
@@ -0,0 +1,10 @@
+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/meson.build b/meson.build
index 6da21f489..2b2b43092 100644
--- a/meson.build
+++ b/meson.build
@@ -226,6 +226,7 @@ build_dpms = true
build_mitshm = true
build_res = true
build_screensaver = true
+build_vbe = true
build_vgahw = true
build_xace = true
build_xsecurity = true
commit 2f1a1be46c3366a47657fe7550bc59fb99acf91c
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 13:19:11 2017 -0400
meson: Build libshadowfb.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index a8f51da6a..0599706c5 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -50,6 +50,7 @@ subdir('modes')
subdir('os-support')
subdir('parser')
subdir('ramdac')
+subdir('shadowfb')
if build_vgahw
subdir('vgahw')
endif
diff --git a/hw/xfree86/shadowfb/meson.build b/hw/xfree86/shadowfb/meson.build
new file mode 100644
index 000000000..0470ecbb5
--- /dev/null
+++ b/hw/xfree86/shadowfb/meson.build
@@ -0,0 +1,10 @@
+shared_module('shadowfb',
+ [ 'shadowfb.c', 'sfbmodule.c'],
+ include_directories: [ inc, xorg_inc ],
+ dependencies: common_dep,
+ c_args: xorg_c_args,
+ install: true,
+ install_dir: module_dir,
+)
+
+install_data('shadowfb.h', install_dir: xorgsdkdir)
commit bdce17959cd17fa6d46a1df361b53b5855ff62e8
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 13:15:55 2017 -0400
meson: Build libvgahw.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index a09e8210c..a8f51da6a 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -50,6 +50,9 @@ subdir('modes')
subdir('os-support')
subdir('parser')
subdir('ramdac')
+if build_vgahw
+ subdir('vgahw')
+endif
subdir('drivers/modesetting')
srcs_xorg = [
diff --git a/hw/xfree86/vgahw/meson.build b/hw/xfree86/vgahw/meson.build
new file mode 100644
index 000000000..762a90f06
--- /dev/null
+++ b/hw/xfree86/vgahw/meson.build
@@ -0,0 +1,10 @@
+shared_module('vgahw',
+ [ 'vgaHW.c', 'vgaHWmodule.c'],
+ include_directories: [ inc, xorg_inc ],
+ dependencies: common_dep,
+ c_args: xorg_c_args,
+ install: true,
+ install_dir: module_dir,
+)
+
+install_data('vgaHW.h', install_dir: xorgsdkdir)
diff --git a/meson.build b/meson.build
index 3952b82b6..6da21f489 100644
--- a/meson.build
+++ b/meson.build
@@ -226,6 +226,7 @@ build_dpms = true
build_mitshm = true
build_res = true
build_screensaver = true
+build_vgahw = true
build_xace = true
build_xsecurity = true
build_xf86bigfont = true
commit 5c7d92362b25670856091663e70d3e0dc2350efb
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 13:10:33 2017 -0400
meson: Build libfbdevhw.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/fbdevhw/meson.build b/hw/xfree86/fbdevhw/meson.build
new file mode 100644
index 000000000..3cb841179
--- /dev/null
+++ b/hw/xfree86/fbdevhw/meson.build
@@ -0,0 +1,16 @@
+if host_machine.system() == 'linux'
+ srcs_fbdevhw = 'fbdevhw.c'
+else
+ srcs_fbdevhw = 'fbdevhwstubs.c'
+endif
+
+shared_module('fbdevhw',
+ srcs_fbdevhw,
+ include_directories: [ inc, xorg_inc ],
+ dependencies: common_dep,
+ c_args: xorg_c_args,
+ install: true,
+ install_dir: module_dir,
+)
+
+install_data('fbdevhw.h', install_dir: xorgsdkdir)
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index a9bb84af2..a09e8210c 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -27,6 +27,7 @@ subdir('common')
subdir('ddc')
subdir('dixmods')
subdir('exa')
+subdir('fbdevhw')
if gbm_dep.found()
subdir('glamor_egl')
endif
commit 6413a87bcd3bfb91ac1536b41c37af0c6e47a9b6
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 12:58:54 2017 -0400
meson: Build libwfb.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/fb/meson.build b/fb/meson.build
index ef8e68ca2..bf85141f9 100644
--- a/fb/meson.build
+++ b/fb/meson.build
@@ -34,3 +34,14 @@ libxserver_fb = static_library('libxserver_fb',
dependencies: common_dep,
pic: true,
)
+
+wfb_args = '-DFB_ACCESS_WRAPPER'
+
+libxserver_wfb = static_library('libxserver_wfb',
+ srcs_fb,
+ c_args: wfb_args,
+ include_directories: inc,
+ dependencies: common_dep,
+ pic: true,
+ build_by_default: false,
+)
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index e2c91265d..36027f045 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -25,6 +25,18 @@ shared_module(
)
shared_module(
+ 'wfb',
+ 'fbmodule.c',
+
+ include_directories: [inc, xorg_inc],
+ c_args: [ xorg_c_args, wfb_args ],
+ dependencies: common_dep,
+ objects: libxserver_wfb.extract_all_objects(),
+
+ install: true,
+ install_dir: module_dir,
+)
+shared_module(
'shadow',
'shmodule.c',
commit 1597297067fd14d479a2279ad1ab20082317271a
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 12:50:13 2017 -0400
meson: Build libglx.so
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/glx/meson.build b/glx/meson.build
index a29e53cfa..c5f5ecc8f 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -48,3 +48,8 @@ if build_glx
]
)
endif
+
+srcs_glxdri2 = ''
+if build_dri2 or build_dri3
+ srcs_glxdri2 = files('glxdri2.c')
+endif
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 2b8fe1349..e2c91265d 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -36,3 +36,18 @@ shared_module(
install: true,
install_dir: module_dir,
)
+
+if build_glx
+ shared_module(
+ 'glx',
+ [ 'glxmodule.c', srcs_glxdri2 ],
+
+ include_directories: [ inc, xorg_inc, glx_inc ],
+ c_args: [ xorg_c_args, glx_align64 ],
+ dependencies: [ common_dep, dl_dep ],
+ objects: libxserver_glx.extract_all_objects(),
+
+ install: true,
+ install_dir: join_paths(module_dir, 'extensions')
+ )
+endif
diff --git a/meson.build b/meson.build
index d4443c9d7..3952b82b6 100644
--- a/meson.build
+++ b/meson.build
@@ -294,6 +294,8 @@ inc = include_directories(
'xfixes',
)
+glx_inc = include_directories('glx')
+
serverconfigdir = join_paths(get_option('libdir'), '/xorg')
# Include must come first, as it sets up dix-config.h
commit 47f047462dcb492203ff569a2b1528bff8cd3ff3
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 11:49:11 2017 -0400
meson: Fix linking the dmx utilities
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/dmx/config/meson.build b/hw/dmx/config/meson.build
index c77cd0b44..39b41c2cb 100644
--- a/hw/dmx/config/meson.build
+++ b/hw/dmx/config/meson.build
@@ -38,6 +38,7 @@ dmx_config = static_library('dmx_config',
srcs_dmx_config,
include_directories: dmx_inc,
dependencies: common_dep,
+ link_with: libxlibc,
c_args: dmx_c_args,
)
commit 5d785693a8843d18be806ea9f8caecc2dcbf1007
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 11:47:11 2017 -0400
meson: Factor out the AC_REPLACE_FUNCS stuff to its own library
This is all just stuff we wish we had in libc, and some of this gets
used in eg. the dmx utilities build, so split it to its own library to
avoid pulling in xserver stuff.
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/os/meson.build b/os/meson.build
index e26778a43..e1741bb50 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -20,26 +20,27 @@ srcs_os = [
]
# Wrapper code for missing C library functions
+srcs_libc = []
if not cc.has_function('reallocarray')
- srcs_os += 'reallocarray.c'
+ srcs_libc += 'reallocarray.c'
endif
if not cc.has_function('strcasecmp')
- srcs_os += 'strcasecmp.c'
+ srcs_libc += 'strcasecmp.c'
endif
if not cc.has_function('strcasestr')
- srcs_os += 'strcasestr.c'
+ srcs_libc += 'strcasestr.c'
endif
if not cc.has_function('strlcat')
- srcs_os += 'strlcat.c'
+ srcs_libc += 'strlcat.c'
endif
if not cc.has_function('strlcpy')
- srcs_os += 'strlcpy.c'
+ srcs_libc += 'strlcpy.c'
endif
if not cc.has_function('strndup')
- srcs_os += 'strndup.c'
+ srcs_libc += 'strndup.c'
endif
if not cc.has_function('timingsafe_memcmp')
- srcs_os += 'timingsafe_memcmp.c'
+ srcs_libc += 'timingsafe_memcmp.c'
endif
if cc.has_function('poll')
@@ -53,6 +54,14 @@ if get_option('xdmcp')
srcs_os += 'xdmcp.c'
endif
+libxlibc = []
+if srcs_libc.length() > 0
+ libxlibc = static_library('libxlibc',
+ srcs_libc,
+ include_directories: inc,
+ )
+endif
+
libxserver_os = static_library('libxserver_os',
srcs_os,
include_directories: inc,
@@ -62,4 +71,5 @@ libxserver_os = static_library('libxserver_os',
sha1_dep,
dependency('xau')
],
+ link_with: libxlibc,
)
commit 8659aac2ccc6649477f601908e1a4062fad8635e
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Apr 27 12:52:29 2017 -0400
meson: Fix a typo
"bulid" isn't valid anything, and build_xwayland was already defined
above.
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/meson.build b/meson.build
index 3431fe9a6..d4443c9d7 100644
--- a/meson.build
+++ b/meson.build
@@ -192,10 +192,8 @@ if module_dir == ''
module_dir = join_paths(get_option('libdir'), 'xorg/modules')
endif
-bulid_wayland = false
-
if glamor_option == 'auto'
- build_glamor = build_xorg or build_wayland
+ build_glamor = build_xorg or build_xwayland
else
build_glamor = get_option('glamor') == 'yes'
endif
More information about the xorg-commit
mailing list