Add support to build Xvnc with meson #1729
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| tigervnc_srcdir = join_paths(meson.source_root(), '../..') | ||
| tigervnc_builddir = tigervnc_srcdir | ||
|
|
||
| cpp = meson.get_compiler('cpp') | ||
|
|
||
| vnccommon_deps = [ | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('rfb', dirs: join_paths(tigervnc_builddir, 'common/rfb'))), | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('rdr', dirs: join_paths(tigervnc_builddir, 'common/rdr'))), | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('os', dirs: join_paths(tigervnc_builddir, 'common/os'))), | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('network', dirs: join_paths(tigervnc_builddir, 'common/network'))), | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('unixcommon', dirs: join_paths(tigervnc_builddir, 'unix/common'))), | ||
| dependency('zlib'), | ||
| dependency('pam'), | ||
| dependency('gnutls'), | ||
| dependency('nettle'), | ||
| dependency('hogweed'), | ||
| dependency('gmp'), | ||
| dependency('libjpeg'), | ||
| ] | ||
|
|
||
| srcs_vnccommon = [ | ||
| 'qnum_to_xorgevdev.c', | ||
| 'qnum_to_xorgkbd.c', | ||
| 'RandrGlue.c', | ||
| 'RFBGlue.cc', | ||
| 'RFBGlue.h', | ||
| 'vncBlockHandler.c', | ||
| 'vncBlockHandler.h', | ||
| 'vncExt.c', | ||
| 'vncExtInit.cc', | ||
| 'vncHooks.c', | ||
| 'vncInput.c', | ||
| 'vncInput.h', | ||
| 'vncInputXKB.c', | ||
| 'vncSelection.c', | ||
| 'vncSelection.h', | ||
| 'xorg-version.h', | ||
| 'XorgGlue.c', | ||
| 'XorgGlue.h', | ||
| 'XserverDesktop.cc', | ||
| 'XserverDesktop.h', | ||
| ] | ||
|
|
||
| vnccommon_inc = include_directories( | ||
| '../../../../common', | ||
| '../../../common', | ||
| '../../../vncconfig', | ||
| ) | ||
|
|
||
| libvnccommon = static_library( | ||
| 'vnccommon', | ||
| srcs_vnccommon, | ||
| include_directories : [inc, vnccommon_inc], | ||
| dependencies: [common_dep, vnccommon_deps], | ||
| install: false, | ||
| ) | ||
|
|
||
| srcs_xvnc = [ | ||
| 'xvnc.c', | ||
| 'buildtime.c', | ||
| '../../fb/fbcmap_mi.c', | ||
| '../../mi/miinitext.c', | ||
| '../../Xi/stubs.c', | ||
| ] | ||
|
|
||
| xvnc_inc = include_directories( | ||
| '../../../../common', | ||
| '../../../common', | ||
| ) | ||
|
|
||
| xvnc = executable( | ||
| 'Xvnc', | ||
| srcs_xvnc, | ||
| include_directories : [inc, xvnc_inc], | ||
| dependencies: common_dep, | ||
| c_args: ['-DTIGERVNC', '-DNO_MODULE_EXTS'], | ||
| link_with: [ | ||
| libxserver, | ||
| libxserver_fb, | ||
| libxserver_main, | ||
| libxserver_glx, | ||
| libglxvnd, | ||
| libxserver_xi_stubs, | ||
| libxserver_xkb_stubs, | ||
| libvnccommon, | ||
| ], | ||
| install: true, | ||
| ) | ||
|
|
||
| libvnc_inc = include_directories( | ||
| '../xfree86/common', | ||
| '../xfree86/os-support', | ||
| '../xfree86/os-support/bus' | ||
| ) | ||
|
|
||
| libvnc = shared_module( | ||
| 'vnc', | ||
| 'vncModule.c', | ||
| include_directories : [inc, xvnc_inc, libvnc_inc], | ||
| dependencies: common_dep, | ||
| link_with: libvnccommon, | ||
| install: true, | ||
| install_dir: join_paths(module_dir, 'extensions') | ||
| ) | ||
|
|
||
| install_man(configure_file( | ||
| input: 'Xvnc.man', | ||
| output: 'Xvnc.1', | ||
| configuration: manpage_config, | ||
| )) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm afraid I'm unfamiliar with meson. Will this still use our
.lafiles? Or do we need to come up with some new glue for meson?It is important that it not only finds the
.afiles, but also includes any dependent libraries. Possibly also cflags, but I'm unsure how well that even works currently.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I don't think meson is capable of handle .la files.
This first attempt manually adds the dependencies, as you can see (e.g.
dependency('zlib')).Now that I see, this only works on my build setup. A workaround could be to do the dynamic library selection to build the common libs at hw/vnc/meson.build.
If the common libs were built with meson too, the library dependencies could be known.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That duplication is not something we'll reasonably be able to maintain.
Moving everything from CMake to meson seems overkill. So we want to add some glue, like we have right now between CMake and libtool.
Please have a look at
CMakeMacroLibtoolFile.cmakeand see how we can do something similar for meson. I.e. automatically generate dependency information in a format meson can consume.