Skip to content

x264 fixes#1592

Merged
doutriaux1 merged 6 commits intomasterfrom
x264_fixes
Oct 7, 2015
Merged

x264 fixes#1592
doutriaux1 merged 6 commits intomasterfrom
x264_fixes

Conversation

@chaosphere2112
Copy link
Copy Markdown
Contributor

Fixes a few bugs...
#1586

@doutriaux1's issue with expanding x264 on a newer CMake
@dnadeau4's issue with building x264 on his VM

Comment thread CMake/cdat_modules/x264_pkg.cmake Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

no new md5?

@doutriaux1
Copy link
Copy Markdown
Contributor

@chaosphere2112 yep that's what I was suspecting you probably need to update the md5

@chaosphere2112
Copy link
Copy Markdown
Contributor Author

@doutriaux1 @dnadeau4 Sorry about that, just wanted to push the PR out before I went home for the day. Fixed both of those issues.

Comment thread CMake/cdat_modules/x264_deps.cmake Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

So X264_deps just depends on pkgconfig? Are there any other system specific libraries we need to document?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nope; in fact, it technically doesn't even depend on pkgconfig. It has a soft dependency on yasm, but that's already sort of a dependency for us (as part of the original x264 PR I did some stuff to make our build handle not having yasm installed).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The reason it's "dependent" on pkgconfig is because it fixes a weird parallelism issue that @dnadeau4 was having (where the linker got confused as libx264 and pkgconfig built at the same time).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks @chaosphere2112.care to add a note in the deps file so that someone know it next time?

@aashish24
Copy link
Copy Markdown
Contributor

No problem @chaosphere2112 thanks for addressing our suggestions. Once cdash is happy, I will give it +2

@chaosphere2112
Copy link
Copy Markdown
Contributor Author

@doutriaux1 Those have been stuck in queue an awfully long time... any idea on the status?

@doutriaux1
Copy link
Copy Markdown
Contributor

I killed the server, I need to restart it.

doutriaux1 added a commit that referenced this pull request Oct 7, 2015
@doutriaux1 doutriaux1 merged commit b5f07e8 into master Oct 7, 2015
@doutriaux1 doutriaux1 deleted the x264_fixes branch October 7, 2015 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants