Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ffmpeg: Add option to build without GPL. #18909

Merged
merged 3 commits into from
Oct 4, 2017
Merged

ffmpeg: Add option to build without GPL. #18909

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f31d8
ffmpeg: Add option to build without GPL.
techdragon Oct 3, 2017
6c63a2e
Update ffmpeg.rb
techdragon Oct 3, 2017
7440b7f
Fix whitespace and capitalisation.
techdragon Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Formula/ffmpeg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class Ffmpeg < Formula
option "without-securetransport", "Disable use of SecureTransport"
option "without-x264", "Disable H.264 encoder"
option "without-xvid", "Disable Xvid MPEG-4 video encoder"
option "without-gpl", "Disable building GPL Licensed parts of FFMPEG"
Copy link
Contributor

Choose a reason for hiding this comment

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

Licensed shouldn't be capitalized.

It's FFmpeg not FFMPEG.


deprecated_option "with-ffplay" => "with-sdl2"
deprecated_option "with-sdl" => "with-sdl2"
Expand Down Expand Up @@ -111,15 +112,15 @@ def install
--prefix=#{prefix}
--enable-shared
--enable-pthreads
--enable-gpl
--enable-version3
--enable-hardcoded-tables
--enable-avresample
--cc=#{ENV.cc}
--host-cflags=#{ENV.cflags}
--host-ldflags=#{ENV.ldflags}
]


args << "--enable-gpl" if not build.without? "gpl"
Copy link
Member

Choose a reason for hiding this comment

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

args << "--enable-gpl" if build.with? "gpl"

Is the preferred syntax.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I was watching the Jenkins log output and saw the style check complaint. I've issued an update to the file.

args << "--disable-indev=qtkit" if build.without? "qtkit"
args << "--disable-securetransport" if build.without? "securetransport"
args << "--enable-chromaprint" if build.with? "chromaprint"
Expand Down