avidemux/gst-plugins-ugly/ffmpeg: revision bump

Bump revision of formulas that use x264, update HEAD for avidemux, and
modernize.

Closes #37624.

Signed-off-by: Tim D. Smith <git@tim-smith.us>

3 files changed, 39 insertions, 34 deletions

diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
index f9d8a101b..303f1477e 100644
--- a/Library/Formula/avidemux.rb
+++ b/Library/Formula/avidemux.rb
@@ -2,8 +2,13 @@
 class Avidemux < Formula
   homepage "http://fixounet.free.fr/avidemux/"
   url "https://downloads.sourceforge.net/avidemux/avidemux_2.6.8.tar.gz"
-  sha1 "50f3dfe270e6272fce46d725b198b9d0dd95664b"
-  head "git://gitorious.org/avidemux2-6/avidemux2-6.git"
+  sha256 "02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682"
+  revision 1
+
+  head do
+    url "https://github.com/mean00/avidemux2.git"
+    depends_on "x265"
+  end
 
   bottle do
     sha1 "5a168ebcb9661ba351bc09d734437fc93ef57cd0" => :mavericks
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 238bfa87a..44211b2f2 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -2,6 +2,7 @@ class Ffmpeg < Formula
   homepage "https://ffmpeg.org/"
   url "https://www.ffmpeg.org/releases/ffmpeg-2.6.tar.bz2"
   sha256 "23c38ecc0dd6cae5e9a3c5c2c967b10480dc4f7159d094ade13b0775d1fd4791"
+  revision 1
 
   head "git://git.videolan.org/ffmpeg.git"
 
diff --git a/Library/Formula/gst-plugins-ugly.rb b/Library/Formula/gst-plugins-ugly.rb
index da97d634d..e3b210a37 100644
--- a/Library/Formula/gst-plugins-ugly.rb
+++ b/Library/Formula/gst-plugins-ugly.rb
@@ -1,10 +1,9 @@
-require 'formula'
-
 class GstPluginsUgly < Formula
-  homepage 'http://gstreamer.freedesktop.org/'
-  url 'http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz'
-  mirror 'http://ftp.osuosl.org/pub/blfs/svn/g/gst-plugins-ugly-1.4.5.tar.xz'
+  homepage "http://gstreamer.freedesktop.org/"
+  url "http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz"
+  mirror "http://ftp.osuosl.org/pub/blfs/svn/g/gst-plugins-ugly-1.4.5.tar.xz"
   sha256 "5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067"
+  revision 1
 
   bottle do
     sha1 "4b95eec86a459f5ba50facc1f72ef1a6a899a98f" => :yosemite
@@ -13,40 +12,40 @@ class GstPluginsUgly < Formula
   end
 
   head do
-    url 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'
+    url "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly"
 
     depends_on "autoconf" => :build
     depends_on "automake" => :build
     depends_on "libtool" => :build
   end
 
-  depends_on 'pkg-config' => :build
-  depends_on 'gettext'
-  depends_on 'gst-plugins-base'
+  depends_on "pkg-config" => :build
+  depends_on "gettext"
+  depends_on "gst-plugins-base"
 
   # The set of optional dependencies is based on the intersection of
   # gst-plugins-ugly-0.10.17/REQUIREMENTS and Homebrew formulae
-  depends_on 'dirac' => :optional
-  depends_on 'mad' => :optional
-  depends_on 'jpeg' => :optional
-  depends_on 'libvorbis' => :optional
-  depends_on 'cdparanoia' => :optional
-  depends_on 'lame' => :optional
-  depends_on 'two-lame' => :optional
-  depends_on 'libshout' => :optional
-  depends_on 'aalib' => :optional
-  depends_on 'libcaca' => :optional
-  depends_on 'libdvdread' => :optional
-  depends_on 'libmpeg2' => :optional
-  depends_on 'a52dec' => :optional
-  depends_on 'liboil' => :optional
-  depends_on 'flac' => :optional
-  depends_on 'gtk+' => :optional
-  depends_on 'pango' => :optional
-  depends_on 'theora' => :optional
-  depends_on 'libmms' => :optional
-  depends_on 'x264' => :optional
-  depends_on 'opencore-amr' => :optional
+  depends_on "dirac" => :optional
+  depends_on "mad" => :optional
+  depends_on "jpeg" => :optional
+  depends_on "libvorbis" => :optional
+  depends_on "cdparanoia" => :optional
+  depends_on "lame" => :optional
+  depends_on "two-lame" => :optional
+  depends_on "libshout" => :optional
+  depends_on "aalib" => :optional
+  depends_on "libcaca" => :optional
+  depends_on "libdvdread" => :optional
+  depends_on "libmpeg2" => :optional
+  depends_on "a52dec" => :optional
+  depends_on "liboil" => :optional
+  depends_on "flac" => :optional
+  depends_on "gtk+" => :optional
+  depends_on "pango" => :optional
+  depends_on "theora" => :optional
+  depends_on "libmms" => :optional
+  depends_on "x264" => :optional
+  depends_on "opencore-amr" => :optional
   # Does not work with libcdio 0.9
 
   def install
@@ -67,8 +66,8 @@ class GstPluginsUgly < Formula
       # https://github.com/Homebrew/homebrew/issues/14078
       nbcflags = `pkg-config --cflags opencore-amrnb`.chomp
       wbcflags = `pkg-config --cflags opencore-amrwb`.chomp
-      ENV['AMRNB_CFLAGS'] = nbcflags + "-I#{HOMEBREW_PREFIX}/include/opencore-amrnb"
-      ENV['AMRWB_CFLAGS'] = wbcflags + "-I#{HOMEBREW_PREFIX}/include/opencore-amrwb"
+      ENV["AMRNB_CFLAGS"] = nbcflags + "-I#{HOMEBREW_PREFIX}/include/opencore-amrnb"
+      ENV["AMRWB_CFLAGS"] = wbcflags + "-I#{HOMEBREW_PREFIX}/include/opencore-amrwb"
     else
       args << "--disable-amrnb" << "--disable-amrwb"
     end