xserver: Branch 'master' - 3 commits

[Jeremy Sequoia]

I reverted and created a pull request to track getting this in once the pipelines are updated:

    https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913

Also, a plug for the PR I just put up to get Xorg and Xnest building again on darwin:

    https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/912

Thanks, and sorry for the noise.

> On Jun 20, 2022, at 17:41, Jeremy Sequoia <jeremyhu at apple.com> wrote:
> 
> Shoot, sorry about that.  Do you want me to revert it?  I figured the warning meant the build wouldn't even work with older meson :/
> 
> Sent from my iPhone...
> 
>> On Jun 20, 2022, at 02:09, Michel Dänzer <michel.daenzer at mailbox.org> wrote:
>> 
>> 
>> Hi Jeremy,
>> 
>> 
>> good to see you working on Xquartz again!
>> 
>> 
>> We are generally not pushing xserver changes directly to the main repository anymore, but using GitLab merge requests instead. While you are mostly free to ignore this for changes which affect Xquartz only[0], bumping the minimum meson version requirement does not affect only Xquartz. This change broke the GitLab CI pipeline on master & server-22.1-branch:
>> 
>> https://gitlab.freedesktop.org/xorg/xserver/-/pipelines/616828
>> https://gitlab.freedesktop.org/xorg/xserver/-/pipelines/616834 (Looks like another commit broke make dist as well)
>> 
>> Until this is resolved, it won't be possible to merge any GitLab MRs (which don't resolve the issue) to these branches.
>> 
>> 
>> [0] That said, if the Xquartz build could be tested as part of the GitLab CI pipeline, that could be useful for you as well.
> 
> Could you point me at documentation for setting that up?
> 
>>> On 2022-06-20 07:21, GitLab Mirror wrote:
>>> 
>>> commit 0a27f96d1d0e474b308be982fa7069d3ae0d9892
>>> Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>>> Date:   Sun Jun 19 22:18:16 2022 -0700
>>> 
>>>   meson: Bump requirement to meson-0.50.0
>>> 
>>>   WARNING: Project specifies a minimum meson_version '>= 0.47.0' but uses features which were added in newer versions:
>>>    * 0.50.0: {'install arg in configure_file'}
>>> 
>>>   Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>>> 
>>> diff --git a/meson.build b/meson.build
>>> index db1d63f3e..7f9330107 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -4,7 +4,7 @@ project('xserver', 'c',
>>>            'c_std=gnu99',
>>>        ],
>>>        version: '21.1.99.1',
>>> -        meson_version: '>= 0.47.0',
>>> +        meson_version: '>= 0.50.0',
>>> )
>>> release_date = '2021-07-05'
>>> 
>> 
>> 
>> -- 
>> Earthling Michel Dänzer            |                  https://redhat.com
>> Libre software enthusiast          |         Mesa and Xwayland developer

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.x.org/archives/xorg-devel/attachments/20220620/06a3800c/attachment.htm>