Update VXL and ITK by mattdawkins · Pull Request #479 · Kitware/fletch

mattdawkins · 2018-12-28T20:04:34Z

VXL update was required for the ITK version

Conflicts: CMake/fletch-tarballs.cmake

kwcvrobot · 2018-12-28T20:05:59Z

Can one of the admins verify this patch?

mattdawkins · 2018-12-28T22:08:21Z

You can... talk?

Conflicts: CMake/External_VXL.cmake

Conflicts: Patches/VXL/FindFFMPEG.cmake

dstoup · 2019-01-02T15:10:36Z

If this patch fixes the upstream VXL's ffmpeg issue then please push it there instead of making a fletch patch. I can approve and merge VXL branches so I would prefer not patching locally.

dstoup · 2019-04-11T15:13:11Z

jenkins test this please

dstoup · 2019-04-11T15:15:51Z

@@ -0,0 +1,606 @@
+// This is core/vidl/vidl_ffmpeg_ostream_v56.hxx


Is this a new file or patched from VXL source? If it's patched, it would be ideal to add in 2 commits so we can see the actual diff

dstoup · 2019-04-11T15:24:09Z

Having looked at the diff in the VXL patch, is there a good reason we don't push this into that repo? Also, why don't we go closer to master? Is something else broken?

kwcvrobot · 2019-04-11T16:18:25Z

KwiverCheckCentosPR experienced failing tests.

kwcvrobot · 2019-04-11T17:20:56Z

KWIVER against Fletch Linux build succeeded.

kwcvrobot · 2019-04-11T17:20:58Z

KWIVER against Fletch LinuxGPU build succeeded.

kwcvrobot · 2019-04-11T17:22:24Z

KWIVER against Fletch Mac build succeeded.

kwcvrobot · 2019-04-11T18:41:26Z

KWJenkins-FletchWindowsPR-479 experienced errors.

mattdawkins · 2019-07-12T20:57:44Z

Something else was broken on latest VXL in the time period of this branch though that's fairly old now so maybe it was fixed, haven't had a chance to look at this in more detail and this branch is still broken on Windows due to a bug in VXL's build sys

dstoup · 2019-07-16T16:39:28Z

Jenkins test this please

kwcvrobot · 2019-07-16T17:32:18Z

KWJenkins-FletchLinuxPR-479 experienced errors.

kwcvrobot · 2019-07-17T02:54:06Z

KWIVER against Fletch Centos build succeeded.

kwcvrobot · 2019-07-17T02:54:10Z

KWIVER against Fletch Linux build succeeded.

kwcvrobot · 2019-07-17T03:01:07Z

KWIVER against Fletch LinuxGPU build succeeded.

kwcvrobot · 2019-07-17T04:39:43Z

KWIVER against Fletch Mac build succeeded.

This reverts commit 2d5bd16.

This reverts commit d5bbf06.

This reverts commit 814e90a.

This reverts commit 14007ca.

This reverts commit 13fc389.

Conflicts: CMake/fletch-tarballs.cmake

dstoup · 2019-07-23T17:53:26Z

I have been testing recently and currently master fails on VS with link errors.

mattdawkins added 4 commits December 28, 2018 15:02

Update ITK minor version
c7baf3f
Conflicts: CMake/fletch-tarballs.cmake

Update path
3a8f940

Update vxl version
345ea8a
Conflicts: CMake/fletch-tarballs.cmake

Enable modules
72b34f6

mattdawkins added 4 commits December 28, 2018 18:39

Adjust flags for latest VXL changes
d265038
Conflicts: CMake/External_VXL.cmake

Patch ffmpeg issue
13fc389
Conflicts: CMake/External_VXL.cmake

Cleanup patch
14007ca

Modify patch
814e90a
Conflicts: Patches/VXL/FindFFMPEG.cmake

mattdawkinsand others added 4 commits April 10, 2019 11:52

Update hash
3fd0d00

Disable OXL
f1806c1

Add link to opencv if enabled
7bbea9b

Fix OpenCV ITK depends
167a711

dstoup reviewed Apr 11, 2019
View reviewed changes

mattdawkins added 2 commits April 18, 2019 16:30

Add patch for windows linking issues
d5bbf06

Update patch
2d5bd16

mattdawkins added 2 commits July 12, 2019 17:22

Update ITK hash
ceb5260

Update hash
de998cc

mattdawkinsand others added 6 commits July 22, 2019 16:02

Revert "Update patch"
ac4e6a6
This reverts commit 2d5bd16.

Revert "Add patch for windows linking issues"
ed3ef1a
This reverts commit d5bbf06.

Revert "Modify patch"
a411b4e
This reverts commit 814e90a.

Revert "Cleanup patch"
b6c35bc
This reverts commit 14007ca.

Revert "Patch ffmpeg issue"
31df308
This reverts commit 13fc389.

Peg the vxl hash to today's master
ebe73e0
Conflicts: CMake/fletch-tarballs.cmake

		@@ -0,0 +1,606 @@
		// This is core/vidl/vidl_ffmpeg_ostream_v56.hxx

Uh oh!

Conversation

mattdawkins commented Dec 28, 2018

Uh oh!

kwcvrobot commented Dec 28, 2018

Uh oh!

mattdawkins commented Dec 28, 2018

Uh oh!

dstoup commented Jan 2, 2019

Uh oh!

dstoup commented Apr 11, 2019

Uh oh!

dstoupApr 11, 2019

Choose a reason for hiding this comment

Uh oh!

dstoup commented Apr 11, 2019

Uh oh!

kwcvrobot commented Apr 11, 2019

Uh oh!

kwcvrobot commented Apr 11, 2019

Uh oh!

kwcvrobot commented Apr 11, 2019

Uh oh!

kwcvrobot commented Apr 11, 2019

Uh oh!

kwcvrobot commented Apr 11, 2019

Uh oh!

mattdawkins commented Jul 12, 2019

Uh oh!

dstoup commented Jul 16, 2019

Uh oh!

kwcvrobot commented Jul 16, 2019

Uh oh!

kwcvrobot commented Jul 17, 2019

Uh oh!

kwcvrobot commented Jul 17, 2019

Uh oh!

kwcvrobot commented Jul 17, 2019

Uh oh!

kwcvrobot commented Jul 17, 2019

Uh oh!

dstoup commented Jul 23, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants