New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x264 fixes #1592

Merged
merged 6 commits into from Oct 7, 2015

Conversation

Projects
None yet
4 participants
@chaosphere2112
Contributor

chaosphere2112 commented Oct 6, 2015

Fixes a few bugs...
#1586

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

set(X264_TIME 2245)
set(X264_ADDENDUM "-stable")
set(X264_ADDENDUM "")
set(X264_URL ${LLNL_URL})
set(X264_GZ x264-snapshot-${X264_DATE}-${X264_TIME}${X264_ADDENDUM}.tar.gz)
set(X264_MD5 43095e5d2ca331eec7f0fbed856e5bab)

This comment has been minimized.

@doutriaux1

doutriaux1 Oct 7, 2015

Member

no new md5?

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Oct 7, 2015

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

@dnadeau4

This comment has been minimized.

Contributor

dnadeau4 commented on b1b9f90 Oct 7, 2015

I think that _DEPS needs to be lowercase _deps.

chaosphere2112 added some commits Oct 7, 2015

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Oct 7, 2015

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

@@ -1 +1 @@
set(X264_DEPS "")
set(X264_deps ${pkgconfig_pkg})

This comment has been minimized.

@aashish24

aashish24 Oct 7, 2015

Contributor

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

This comment has been minimized.

@chaosphere2112

chaosphere2112 Oct 7, 2015

Contributor

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).

This comment has been minimized.

@chaosphere2112

chaosphere2112 Oct 7, 2015

Contributor

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).

This comment has been minimized.

@aashish24

aashish24 Oct 7, 2015

Contributor

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

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 7, 2015

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

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Oct 7, 2015

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

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Oct 7, 2015

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

3 of 9 checks passed

cont-int/LLNL/Darwin-Mac1 10.10.5 (NOGUI) running 'ctest -j4 -D Experimental' (Wed Oct 7 16:03:50 2015)
Details
cont-int/LLNL/Linux-annie Ubuntu 15.04 (FULL/MESA) running 'ctest -j15 -D Experimental' (Wed Oct 7 15:16:17 2015)
Details
cont-int/LLNL/Linux-crunchy RH6 (FULL) running 'ctest -j12 -D Experimental' (Wed Oct 7 15:02:42 2015)
Details
cont-int/LLNL/Linux-oceanonly RH6 (MESA/NOGUI) running 'ctest -j12 -D Experimental' (Wed Oct 7 14:50:40 2015)
Details
continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
cont-int/LLNL/Darwin-Mac2 10.10.5 (FULL) running 'rm -rf /Users/doutriaux1/bot/build' (Wed Oct 7 16:50:00 2015)
Details
cont-int/LLNL/Darwin-Mac 10.10.5 (LEAN) running 'ctest -j4 -D Experimental' (Wed Oct 7 14:35:03 2015)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@doutriaux1 doutriaux1 deleted the x264_fixes branch Oct 7, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment