From 02976e21571d4fb435a7820d422beb0ab35cb3aa Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Fri, 20 Apr 2018 08:56:42 -0700 Subject: [PATCH 01/14] ffmpeg 4.0 --- Aliases/{ffmpeg@3 => ffmpeg@4} | 0 Formula/ffmpeg.rb | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename Aliases/{ffmpeg@3 => ffmpeg@4} (100%) diff --git a/Aliases/ffmpeg@3 b/Aliases/ffmpeg@4 similarity index 100% rename from Aliases/ffmpeg@3 rename to Aliases/ffmpeg@4 diff --git a/Formula/ffmpeg.rb b/Formula/ffmpeg.rb index caab3dec16443..3ff3e9201843c 100644 --- a/Formula/ffmpeg.rb +++ b/Formula/ffmpeg.rb @@ -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 @@ -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" From 69842fe356c09bb8d13c760305f24241793703d8 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:17 -0700 Subject: [PATCH 02/14] ffmpeg2theora: revision for ffmpeg --- Formula/ffmpeg2theora.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ffmpeg2theora.rb b/Formula/ffmpeg2theora.rb index 4ab83d79b7466..08f65d792db66 100644 --- a/Formula/ffmpeg2theora.rb +++ b/Formula/ffmpeg2theora.rb @@ -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" From 50dddce6cbd79ef8ab324588e7b09ce663e92bb8 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:24 -0700 Subject: [PATCH 03/14] ffmpegthumbnailer: revision for ffmpeg --- Formula/ffmpegthumbnailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ffmpegthumbnailer.rb b/Formula/ffmpegthumbnailer.rb index 172a54b3856be..def9fffe1380c 100644 --- a/Formula/ffmpegthumbnailer.rb +++ b/Formula/ffmpegthumbnailer.rb @@ -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 From 277ff817660bac5871e00651d66f0130af15dcd4 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:27 -0700 Subject: [PATCH 04/14] ffms2: revision for ffmpeg --- Formula/ffms2.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/ffms2.rb b/Formula/ffms2.rb index 5f01f7b3e0547..a6d3ffdc1bf2c 100644 --- a/Formula/ffms2.rb +++ b/Formula/ffms2.rb @@ -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 From fcf302e389f774a2bab78055d742ca557b47236c Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:32 -0700 Subject: [PATCH 05/14] mgba: revision for ffmpeg --- Formula/mgba.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/mgba.rb b/Formula/mgba.rb index 8528bd90c3bf3..ee49be500d411 100644 --- a/Formula/mgba.rb +++ b/Formula/mgba.rb @@ -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 From 4309e193a8fad548bfa69078a2a3c8a383918c6b Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:36 -0700 Subject: [PATCH 06/14] minidlna: revision for ffmpeg --- Formula/minidlna.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/minidlna.rb b/Formula/minidlna.rb index 20c99d1e93650..9218a0aedb936 100644 --- a/Formula/minidlna.rb +++ b/Formula/minidlna.rb @@ -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 From 602bc53d84889feed8003a995f0146f80b6366b1 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:39 -0700 Subject: [PATCH 07/14] mpd: revision for ffmpeg --- Formula/mpd.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/mpd.rb b/Formula/mpd.rb index 5a8343da80899..39146c8d2ec34 100644 --- a/Formula/mpd.rb +++ b/Formula/mpd.rb @@ -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" From 43a11516c945ead3fdfe0bd8380e01ebb4f003a3 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:43 -0700 Subject: [PATCH 08/14] mpv 0.28.2 also serves as revision for ffmpeg --- Formula/mpv.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/mpv.rb b/Formula/mpv.rb index 4066c94118fc4..93270b805af97 100644 --- a/Formula/mpv.rb +++ b/Formula/mpv.rb @@ -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 From 5d312d2c2e203727b9a4f731e5643d29ca261e87 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:46 -0700 Subject: [PATCH 09/14] opencv: revision for ffmpeg --- Formula/opencv.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/opencv.rb b/Formula/opencv.rb index 8be24f7efaf29..48f01501733f1 100644 --- a/Formula/opencv.rb +++ b/Formula/opencv.rb @@ -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 From bfe5438777e377505e66141e94ac6ef721505703 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:49 -0700 Subject: [PATCH 10/14] opencv@2: revision for ffmpeg patch for FFmpeg 4.0 compatibility --- Formula/opencv@2.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Formula/opencv@2.rb b/Formula/opencv@2.rb index bd40d60659354..79dd904c34e0d 100644 --- a/Formula/opencv@2.rb +++ b/Formula/opencv@2.rb @@ -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 @@ -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"] From 4e11147a25c6d3be8d8e4c345d279cc716ed4fbf Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:52 -0700 Subject: [PATCH 11/14] openimageio: revision for ffmpeg fix for FFmpeg 4.0 compatibility --- Formula/openimageio.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Formula/openimageio.rb b/Formula/openimageio.rb index ad6312dc3801b..0c9f5e8ad7e84 100644 --- a/Formula/openimageio.rb +++ b/Formula/openimageio.rb @@ -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 @@ -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[ From 8563472e3668c7e0940f6d00b08c04a6a1f8f95c Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:55 -0700 Subject: [PATCH 12/14] siril: revision for ffmpeg --- Formula/siril.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/siril.rb b/Formula/siril.rb index ba462d1de3212..3f8585e973d28 100644 --- a/Formula/siril.rb +++ b/Formula/siril.rb @@ -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 From 5851af95335103d8c9ca41b14ed9911a7ff27736 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:36:59 -0700 Subject: [PATCH 13/14] scrcpy: revision for ffmpeg --- Formula/scrcpy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/scrcpy.rb b/Formula/scrcpy.rb index ae951f79d34c0..5e95860c9805f 100644 --- a/Formula/scrcpy.rb +++ b/Formula/scrcpy.rb @@ -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 From 9edbc88e8e40458384eb62634ad8fff604236409 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 21 Apr 2018 09:37:03 -0700 Subject: [PATCH 14/14] unpaper: revision for ffmpeg --- Formula/unpaper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/unpaper.rb b/Formula/unpaper.rb index b58ce68a421a4..6ed7569657cfc 100644 --- a/Formula/unpaper.rb +++ b/Formula/unpaper.rb @@ -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