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

ffmpeg 4.0, mpv 0.28.2 #26882

Closed
wants to merge 14 commits into from
Closed

ffmpeg 4.0, mpv 0.28.2 #26882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
02976e2
ffmpeg 4.0
ilovezfs Apr 20, 2018
69842fe
ffmpeg2theora: revision for ffmpeg
ilovezfs Apr 21, 2018
50dddce
ffmpegthumbnailer: revision for ffmpeg
ilovezfs Apr 21, 2018
277ff81
ffms2: revision for ffmpeg
ilovezfs Apr 21, 2018
fcf302e
mgba: revision for ffmpeg
ilovezfs Apr 21, 2018
4309e19
minidlna: revision for ffmpeg
ilovezfs Apr 21, 2018
602bc53
mpd: revision for ffmpeg
ilovezfs Apr 21, 2018
43a1151
mpv 0.28.2
ilovezfs Apr 21, 2018
5d312d2
opencv: revision for ffmpeg
ilovezfs Apr 21, 2018
bfe5438
opencv@2: revision for ffmpeg
ilovezfs Apr 21, 2018
4e11147
openimageio: revision for ffmpeg
ilovezfs Apr 21, 2018
8563472
siril: revision for ffmpeg
ilovezfs Apr 21, 2018
5851af9
scrcpy: revision for ffmpeg
ilovezfs Apr 21, 2018
9edbc88
unpaper: revision for ffmpeg
ilovezfs Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Aliases/ffmpeg@3 → Aliases/ffmpeg@4
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions Formula/ffmpeg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Ffmpeg < Formula
desc "Play, record, convert, and stream audio and video"
homepage "https://ffmpeg.org/"
url "https://ffmpeg.org/releases/ffmpeg-3.4.2.tar.bz2"
sha256 "eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a"
url "https://ffmpeg.org/releases/ffmpeg-4.0.tar.xz"
sha256 "ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f"
head "https://github.com/FFmpeg/FFmpeg.git"

bottle do
Expand Down Expand Up @@ -103,7 +103,6 @@ def install
--host-ldflags=#{ENV.ldflags}
]

args << "--disable-jack" if build.stable?
args << "--enable-gpl" if build.with? "gpl"
args << "--disable-indev=qtkit" if build.without? "qtkit"
args << "--disable-securetransport" if build.without? "securetransport"
Expand Down
2 changes: 1 addition & 1 deletion Formula/ffmpeg2theora.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Ffmpeg2theora < Formula
desc "Convert video files to Ogg Theora format"
homepage "https://v2v.cc/~j/ffmpeg2theora/"
revision 1
revision 2

stable do
url "https://v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2"
Expand Down
2 changes: 1 addition & 1 deletion Formula/ffmpegthumbnailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Ffmpegthumbnailer < Formula
homepage "https://github.com/dirkvdb/ffmpegthumbnailer"
url "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2"
sha256 "e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2"
revision 1
revision 2
head "https://github.com/dirkvdb/ffmpegthumbnailer.git"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/ffms2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Ffms2 < Formula
url "https://github.com/FFMS/ffms2/archive/2.23.tar.gz"
mirror "https://mirrors.ocf.berkeley.edu/debian/pool/main/f/ffms2/ffms2_2.23.orig.tar.gz"
sha256 "b09b2aa2b1c6f87f94a0a0dd8284b3c791cbe77f0f3df57af99ddebcd15273ed"
revision 1

bottle do
cellar :any
Expand Down
1 change: 1 addition & 0 deletions Formula/mgba.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class Mgba < Formula
homepage "https://mgba.io/"
url "https://github.com/mgba-emu/mgba/archive/0.6.3.tar.gz"
sha256 "35c8906c01206adae714fee9c2bc39698c514a4adb32c9c4a5a3fa58b2d10f9a"
revision 1
head "https://github.com/mgba-emu/mgba.git"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/minidlna.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class Minidlna < Formula
homepage "https://sourceforge.net/projects/minidlna/"
url "https://downloads.sourceforge.net/project/minidlna/minidlna/1.2.1/minidlna-1.2.1.tar.gz"
sha256 "67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec"
revision 1

bottle do
cellar :any
Expand Down
2 changes: 1 addition & 1 deletion Formula/mpd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Mpd < Formula
desc "Music Player Daemon"
homepage "https://www.musicpd.org/"
revision 1
revision 2

stable do
url "https://www.musicpd.org/download/mpd/0.20/mpd-0.20.18.tar.xz"
Expand Down
4 changes: 2 additions & 2 deletions Formula/mpv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Mpv < Formula
desc "Media player based on MPlayer and mplayer2"
homepage "https://mpv.io"
url "https://github.com/mpv-player/mpv/archive/v0.27.2.tar.gz"
sha256 "2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be"
url "https://github.com/mpv-player/mpv/archive/v0.28.2.tar.gz"
sha256 "aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795"
head "https://github.com/mpv-player/mpv.git"

bottle do
Expand Down
2 changes: 1 addition & 1 deletion Formula/opencv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Opencv < Formula
homepage "https://opencv.org/"
url "https://github.com/opencv/opencv/archive/3.4.1.tar.gz"
sha256 "f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852"
revision 2
revision 3

bottle do
sha256 "53b96688ef9738e17b20339b21c46d14abf62983e99e601560f6641a80988d2b" => :high_sierra
Expand Down
8 changes: 8 additions & 0 deletions Formula/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class OpencvAT2 < Formula
homepage "https://opencv.org/"
url "https://github.com/opencv/opencv/archive/2.4.13.6.tar.gz"
sha256 "6ecbeea11f68356b748e35f758f4406067d3a2f6339e4582c63373fa6c3f5a72"
revision 1

bottle do
sha256 "0b6f327f3f5ddd5365d62b44163c9d6957cf912cd04b3e6a8ea6e2d874b30fa2" => :high_sierra
Expand All @@ -27,6 +28,13 @@ class OpencvAT2 < Formula
depends_on "python@2" => :recommended
depends_on "numpy" if build.with? "python@2"

# Backport of https://github.com/opencv/opencv/pull/10011
# Upstream PR from 21 Apr 2018 "Fix build with FFmpeg 4.0"
patch do
url "https://github.com/ilovezfs/opencv/commit/99091a62463.patch?full_index=1"
sha256 "7e33c5c009aea0798cd9bd3edb0f7a2122a9f3b2a962977e53a0fccd55e1db40"
end

def install
jpeg = Formula["jpeg"]

Expand Down
8 changes: 7 additions & 1 deletion Formula/openimageio.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Openimageio < Formula
homepage "http://openimageio.org/"
url "https://github.com/OpenImageIO/oiio/archive/Release-1.8.10.tar.gz"
sha256 "9bc86cbc1df67285134bb4ac0ed7a450d52dfe75423577c469cae809a1154665"
revision 1
revision 2
head "https://github.com/OpenImageIO/oiio.git"

bottle do
Expand Down Expand Up @@ -31,6 +31,12 @@ class Openimageio < Formula
depends_on "webp"

def install
# FFmpeg 4.0 compatibility
# Fix "ffmpeginput.cpp:333:72: error: use of undeclared identifier 'CODEC_CAP_DELAY'"
# Reported 21 Apr 2018 https://github.com/OpenImageIO/oiio/issues/1923
inreplace "src/ffmpeg.imageio/ffmpeginput.cpp", " CODEC_CAP_DELAY",
" AV_CODEC_CAP_DELAY"

# -DUSE_OPENSSL=OFF can be removed in 1.9, see
# https://github.com/Homebrew/homebrew-core/pull/22522#issuecomment-364831533
args = std_cmake_args + %w[
Expand Down
1 change: 1 addition & 0 deletions Formula/scrcpy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class Scrcpy < Formula
homepage "https://github.com/Genymobile/scrcpy"
url "https://github.com/Genymobile/scrcpy/archive/v1.1.tar.gz"
sha256 "1b56caa4aad5add2c49ea436e9f26282b55a413003d0d73b029a1fbf48da0a1c"
revision 1

bottle do
sha256 "cffb7263b7a2571fa00ba7a5d2bb0b0d2a12561c55610c135eefed8018d4e23a" => :high_sierra
Expand Down
2 changes: 1 addition & 1 deletion Formula/siril.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Siril < Formula
homepage "https://free-astro.org/index.php/Siril"
url "https://free-astro.org/download/siril-0.9.8.3.tar.bz2"
sha256 "f6ca57b668441505010673b153f85fa23efdf41fe74ee7ecb5a4926a572acfa3"
revision 1
revision 2
head "https://free-astro.org/svn/siril/", :using => :svn

bottle do
Expand Down
2 changes: 1 addition & 1 deletion Formula/unpaper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Unpaper < Formula
homepage "https://www.flameeyes.eu/projects/unpaper"
url "https://www.flameeyes.eu/files/unpaper-6.1.tar.xz"
sha256 "237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930"
revision 1
revision 2

bottle do
cellar :any
Expand Down