Meson support for Xvnc for xserver master branch with a patch #2064
+163
−4
There are no files selected for viewing
This file contains hidden or 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,117 @@ | ||
| tigervnc_builddir = get_option('tigervnc_builddir') | ||
| cpp = meson.get_compiler('cpp') | ||
|
|
||
| vnccommon_deps = [ | ||
| declare_dependency( | ||
| dependencies: cpp.find_library('core', dirs: join_paths(tigervnc_builddir, 'common/core'))), | ||
| 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('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 = [ | ||
| 'vncPresent.c', | ||
| 'xvnc.c', | ||
| 'vncDRI3.c', | ||
| 'vncDRI3Draw.c', | ||
|
Comment on lines
+27
to
+28
Member
There was a problem hiding this comment. Aren't these conditional, like for autoconf? |
||
| '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', | ||
|
Comment on lines
+52
to
+54
Member
There was a problem hiding this comment. We should probably have a |
||
| ) | ||
|
|
||
| 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 hidden or 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 hidden or 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,40 @@ | ||
| diff --git a/hw/meson.build b/hw/meson.build | ||
| index f9605a5b7..359b622dd 100644 | ||
| --- a/hw/meson.build | ||
| +++ b/hw/meson.build | ||
| @@ -1,3 +1,7 @@ | ||
| +if get_option('tigervnc_builddir') != '' | ||
| + subdir('vnc') | ||
| +endif | ||
| + | ||
| if build_xephyr | ||
| subdir('kdrive') | ||
| endif | ||
| diff --git a/meson.build b/meson.build | ||
| index 1556491eb..680d23e51 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -1,4 +1,4 @@ | ||
| -project('xserver', 'c', | ||
| +project('xserver', ['c', 'cpp'], | ||
| default_options: [ | ||
| 'buildtype=debugoptimized', | ||
| 'c_std=gnu99', | ||
| @@ -8,7 +8,7 @@ project('xserver', 'c', | ||
| ) | ||
| release_date = '2021-07-05' | ||
|
|
||
| -add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) | ||
| +add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc', 'cpp']) | ||
| cc = meson.get_compiler('c') | ||
|
|
||
| add_project_arguments('-fno-strict-aliasing', language : 'c') | ||
| diff --git a/meson_options.txt b/meson_options.txt | ||
| index 94698f218..616686299 100644 | ||
| --- a/meson_options.txt | ||
| +++ b/meson_options.txt | ||
| @@ -1,3 +1,4 @@ | ||
| +option('tigervnc_builddir', type: 'string', description: 'tigervncbuild dir', value: '') | ||
| option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', | ||
| description: 'Enable Xorg X Server') | ||
| option('xephyr', type: 'boolean', value: false, |
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.
As mentioned in the original PR, this is duplication we want to avoid. So we'd like some clever way of providing this information to Meson based on what's in our CMake files.