Skip to content

Conversation

@collinsr
Copy link
Member

This patch updates the _XOPEN_SOURCE macro to 600 so GDAL's libjson
finds strdup(). Via https://bugs.launchpad.net/libvterm/+bug/1638205

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@kwcvrobot
Copy link
Collaborator

@dstoup
Copy link
Collaborator

dstoup commented Jan 26, 2021

It looks like the Mac build is getting bit by the change in Qt download. That is fixed in master now. Would be worth bringing this PR up to date with master so we can test again.

I can't explain or understand the Linux failure but I don't believe it's related to this change. Digging in to that one now.

@dstoup
Copy link
Collaborator

dstoup commented Feb 10, 2021

If possible, I would love to get this PR sorted out and landed before we make the patch release. I think that means we should switch the destination branch to 'release' if that doesn't cause too much pain.

@dstoup dstoup added the patch release Include this PR in the next patch release label Feb 10, 2021
Copy link
Member

@mleotta mleotta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Though I'm not sure if @dstoup wanted to get #634 redirected to release and merged before cutting this release. The comments indicated that was the plan.

@mleotta
Copy link
Member

mleotta commented Feb 25, 2021

Can we address this one way or the other so that we don't hold up the patch release.

@collinsr collinsr changed the base branch from master to release February 25, 2021 03:29
@collinsr
Copy link
Member Author

Sorry this slipped past my radar on email-- it looks like this needs two things:

  1. Restructure so that the patch is constructed correctly (original file first, then diff)

  2. Redirect to release rather than master

I believe I just redirected the base to release for (2) -- I assume there was an implied "Roddy, as the submitter, should be the one do this"; if not, my apologies.

If (1) is still a blocker, let me know-- if so, maybe it would be better to abandon this branch and start over?

@mleotta
Copy link
Member

mleotta commented Mar 2, 2021

@collinsr it looks like this branch needs be rebased onto release. Simply redirecting the merge target to release is pulling in all the other changes on master.

The KWIVER patch release has been made now. It would be good to get this in soon so we can make the Fletch patch release as well.

@mleotta
Copy link
Member

mleotta commented Mar 4, 2021

ping @collinsr

Can you rebase this on release?

@collinsr collinsr force-pushed the dev/patch-gdal-for-mac branch from b90af1a to ee3c075 Compare March 4, 2021 04:57
@collinsr
Copy link
Member Author

collinsr commented Mar 4, 2021

@mleotta -- I think I did this correctly? My first rebase --onto ...

@mleotta
Copy link
Member

mleotta commented Mar 4, 2021

@collinsr rebase looks good to me.

It's not obvious to me why the Windows build is failing. Maybe @dstoup or @Cookt2 or @johnwparent can take a look.

@johnwparent
Copy link
Member

@mleotta This failure looks like it's coming from an issue @dstoup and I had talked about with Sprokit and multiconfig generators, where the Sprokit tests. both python and c++ are not provided a configuration, and so, can't be run.

@dstoup
Copy link
Collaborator

dstoup commented Mar 4, 2021

It looks like the Windows failure is expected (though frustrating and disappointing).

When the Fletch PR CI runs the kwiver check to make sure we didn't break anything two tests almost always fail to 'build'. But in this case, it looks like only one of them, test-ffmpeg-video_input_ffmpeg ... there was an ocv test that always failed previously but that seems to have worked today.

I would say this is good to merge.

@dstoup dstoup merged commit 102206d into Kitware:release Mar 4, 2021
johnwparent added a commit to johnwparent/fletch that referenced this pull request Mar 4, 2021
dstoup added a commit that referenced this pull request Mar 10, 2021
* release:
  Update release notes for #634
  Update release versioning in relevant files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

patch release Include this PR in the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants