avidemux: 2.6.4, --HEAD and builds with clang

A major rework of this formula.
Removed patch and some inreplace and fixes we needed earlier.
Need to deparallelize the core build, too.

Unfortunately, still doesn't build with SDL.
In the Qt-GUI it reports that the build options don't include
gettext, freetype etc. but in fact we added all of them and during
the build Avidemux seems to pick them up correctly. Therefore, the
GUI reporting code is perhaps broken.

1 files changed, 98 insertions, 150 deletions

diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
index 1b4530418..ab6a819fa 100644
--- a/Library/Formula/avidemux.rb
+++ b/Library/Formula/avidemux.rb
@@ -1,11 +1,12 @@
 require 'formula'
 
+# Help! Wanted: someone who can get Avidemux working with SDL.
+
 class Avidemux < Formula
   homepage 'http://avidemux.sourceforge.net/'
-  url 'http://downloads.sourceforge.net/avidemux/avidemux_2.5.6.tar.gz'
-  sha1 '47205c236bf6a4435b9d4dd944493c7b7e2752f5'
-
-  head 'http://svn.berlios.de/svnroot/repos/avidemux/branches/avidemux_2.5_branch_gruntster'
+  url 'http://downloads.sourceforge.net/avidemux/avidemux_2.6.4.tar.gz'
+  sha1 '7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3'
+  head 'git://gitorious.org/avidemux2-6/avidemux2-6.git'
 
   option 'with-debug', 'Enable debug build.'
 
@@ -14,75 +15,53 @@ class Avidemux < Formula
   depends_on 'yasm' => :build
   depends_on :fontconfig
   depends_on 'gettext'
-  depends_on 'aften'
-  depends_on 'mad'
-  depends_on 'lame'
-  depends_on 'faad2'
-  depends_on 'faac'
-  depends_on 'a52dec'
-  depends_on 'libdca'
-  depends_on 'libogg'
-  depends_on 'libvpx'
-  depends_on 'libvorbis'
-  depends_on 'opencore-amr'
-  depends_on 'xvid'
-  depends_on 'x264'
-  depends_on 'qt' => :optional
-
-  fails_with :clang do
-    build 425
-    cause "error: ambiguous instructions require an explicit suffix"
-  end
+  depends_on 'x264' => :recommended
+  depends_on 'faac' => :recommended
+  depends_on 'faad2' => :recommended
+  depends_on 'lame' => :recommended
+  depends_on 'xvid' => :recommended
+  depends_on :freetype => :recommended
+  depends_on 'theora' => :recommended
+  depends_on 'libvorbis' => :recommended
+  depends_on 'libvpx' => :recommended
+  depends_on 'rtmpdump' => :recommended
+  depends_on 'opencore-amr' => :recommended
+  depends_on 'libvo-aacenc' => :recommended
+  depends_on 'libass' => :recommended
+  depends_on 'openjpeg' => :recommended
+  depends_on 'speex' => :recommended
+  depends_on 'schroedinger' => :recommended
+  depends_on 'fdk-aac' => :recommended
+  depends_on 'opus' => :recommended
+  depends_on 'frei0r' => :recommended
+  depends_on 'libcaca' => :recommended
+  depends_on 'qt' => :recommended
 
-  def patches
-    # Symbols undefined due to optimization.  Fixed in head. Remove @ 2.5.7.
-    DATA if Hardware.is_32_bit? and not build.head?
-  end
 
   def install
-    # Avidemux is coded to use the .svn or .git directory to find its revision,
-    # but neither vcs copies those during clone from the cache to the stagedir.
-    # Modify cmake/admMainChecks.cmake to look in the Homebrew cache.
-    if build.head?
-      inreplace 'CMakeLists.txt',
-        'admGetRevision(${PROJECT_SOURCE_DIR} ADM_SUBVERSION)',
-        "admGetRevision(\"#{cached_download}\" ADM_SUBVERSION)"
-    end
-
-    # Turn off CMake's builtin app packager for the CLI that we want loose.
-    inreplace 'avidemux/CMakeLists.txt',
-        'avidemux2_cli MACOSX_BUNDLE',
-        'avidemux2_cli'
-
-    # Use an identifier that is unique to this app following Apple style.
-    inreplace 'avidemux/CMakeLists.txt',
-                'SET(MACOSX_BUNDLE_GUI_IDENTIFIER www.avidemux.org)',
-                'SET(MACOSX_BUNDLE_GUI_IDENTIFIER org.avidemux.avidemux2)'
+    ENV['REV'] = version.to_s
 
     # For 32-bit compilation under gcc 4.2, see:
     # http://trac.macports.org/ticket/20938#comment:22
-    if MacOS.version <= :leopard or Hardware.is_32_bit?
+    if MacOS.version <= :leopard or Hardware.is_32_bit? && Hardware.cpu_type == :intel && ENV.compiler == :clang
       inreplace 'cmake/admFFmpegBuild.cmake',
         '${CMAKE_INSTALL_PREFIX})',
         '${CMAKE_INSTALL_PREFIX} --extra-cflags=-mdynamic-no-pic)'
     end
 
-    # Build the core.
-    gettext = Formula.factory('gettext')
-    mkdir 'corebuild' do
-      args = std_cmake_args + %W[
-        -DCMAKE_PREFIX_PATH=#{gettext.prefix}
-        -DMAC_BUNDLE_DIR=#{prefix}
-        -DGTK=OFF
-        -DSDL=OFF
-      ]
+    # Build the core
+    mkdir 'buildCore' do
+      args = std_cmake_args
+      args << "-DAVIDEMUX_SOURCE_DIR=#{buildpath}"
+      args << "-DGETTEXT_INCLUDE_DIR=#{Formula.factory('gettext').opt_prefix}/include"
+      # Todo: We could depend on SDL and then remove the `-DSDL=OFF` arguments
+      # but I got build errors about NSview.
+      args << "-DSDL=OFF"
 
       if build.with? 'debug'
-        ENV.deparallelize
         ENV.enable_warnings
         args << '-DCMAKE_BUILD_TYPE=Debug'
         args << '-DCMAKE_VERBOSE_MAKEFILE=true'
-
         if ENV.compiler == :clang
           ENV.Og
         else
@@ -91,113 +70,82 @@ class Avidemux < Formula
           args << '-DCMAKE_CXX_FLAGS_DEBUG=-ggdb3'
         end
       end
-      args << buildpath
+
+      args << '../avidemux_core'
       system "cmake", *args
+      # Parallel build sometimes fails with: "ld: library not found for -lADM6avcodec"
+      ENV.deparallelize
       system "make"
-      system "make install"
-
-      # g++ links the core applications against unversioned dylibs
-      # from an internal ffmpeg, even though CMake specifies versioned
-      # dylibs. CMake then installs the versioned ffmpeg dylibs only.
-      # This patch creates the missing symlinks for unversioned libs.
-      #   * The lib version numbers are either one or two digits.
-      #   * The version numbers change every couple of months.
-      #   * So this finds the file first, then makes a symlink.
-      #   * The result of this code is a command like this:
-      #       ln_sf lib+'libADM5avcodec.53.dylib', lib+'libADM5avcodec.dylib'
-      ffpref = 'libADM5'
-      ffsuff = '.dylib'
-      %w{ avcodec avformat avutil postproc swscale }.each do |fflib|
-        ffpat = ffpref+fflib+'.{?,??}'+ffsuff
-        ffpat = lib+ffpat
-        nonver = ffpref+fflib+ffsuff
-        nonver = lib+nonver
-        hasver = Dir[ffpat]
-        ln_sf hasver.to_s, nonver.to_s
-      end
+      system "make", "install"
+      # There is no ENV.parallelize, so:
+      ENV['MAKEFLAGS'] = "-j#{ENV.make_jobs}"
     end
 
-    mkdir 'plugbuild' do
-      args = std_cmake_args + %W[
-        -DGTK=OFF
-        -DSDL=OFF
-        -DESD=OFF
-        -DJACK=OFF
-        -DCMAKE_PREFIX_PATH=#{gettext.prefix}
-        -DMAC_BUNDLE_DIR=#{prefix}
-        -DAVIDEMUX_LIB_DIR=#{lib}
-        -DAVIDEMUX_SOURCE_DIR=#{buildpath}
-        -DAVIDEMUX_INSTALL_PREFIX=#{prefix}
-        -DAVIDEMUX_CORECONFIG_DIR=#{buildpath}/corebuild/config
-      ]
+    # UIs: Build Qt4 and cli
+    interfaces = ['cli']
+    interfaces << 'qt4' if build.with? 'qt'
+    interfaces.each do |interface|
+      mkdir "build#{interface}" do
+        args = std_cmake_args
+        args << "-DAVIDEMUX_SOURCE_DIR=#{buildpath}"
+        args << "-DAVIDEMUX_LIB_DIR=#{lib}"
+        # If you get SDL to work with avidemux, you might still need to add -I like so:
+        # args << "-DCMAKE_CXX_FLAGS=-I#{Formula.factory('sdl').opt_prefix}/include/SDL"
+        args << "-DSDL=OFF"
+        args << "../avidemux/#{interface}"
+        system "cmake", *args
+        system "make"
+        system "make", "install"
+      end
+    end
 
-      if build.with? 'debug'
-        args << '-DCMAKE_BUILD_TYPE=Debug'
-        args << '-DCMAKE_VERBOSE_MAKEFILE=true'
-        if ENV.compiler != :clang
-          args << '-DCMAKE_C_FLAGS_DEBUG=-ggdb3'
-          args << '-DCMAKE_CXX_FLAGS_DEBUG=-ggdb3'
+    # Plugins
+    plugins = ['COMMON', 'CLI']
+    plugins << 'QT4' if build.with? 'qt'
+    plugins.each do |plugin|
+      mkdir "buildplugin#{plugin}" do
+        args = std_cmake_args + %W[
+          -DPLUGIN_UI=#{plugin}
+          -DAVIDEMUX_LIB_DIR=#{lib}
+          -DAVIDEMUX_SOURCE_DIR=#{buildpath}
+        ]
+
+        if build.with? 'debug'
+          args << '-DCMAKE_BUILD_TYPE=Debug'
+          args << '-DCMAKE_VERBOSE_MAKEFILE=true'
+          if ENV.compiler != :clang
+            args << '-DCMAKE_C_FLAGS_DEBUG=-ggdb3'
+            args << '-DCMAKE_CXX_FLAGS_DEBUG=-ggdb3'
+          end
         end
-      end
-      args << "#{buildpath}/plugins"
-      system "cmake", *args
-      system "make"
 
-      # Two dylibs that are only built as part of the Qt gui need an RPATH
-      # set on their internal deps. Check if Qt4 exists before patching them,
-      # otherwise the inreplaces will fail.
-      if build.with? 'qt'
-        inreplace 'ADM_videoEncoder/ADM_vidEnc_xvid/qt4/cmake_install.cmake',
-          '"libADM_vidEnc_xvid.dylib"',
-          '"${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.dylib"'
-        inreplace 'ADM_videoEncoder/ADM_vidEnc_x264/qt4/cmake_install.cmake',
-          '"libADM_vidEnc_x264.dylib"',
-          '"${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.dylib"'
+        args << "../avidemux_plugins"
+        system "cmake", *args
+        system "make"
+        system "make install"
       end
+    end
 
-      system "make install"
-
-      # The post-build code to finalize the Qt app using BundleUtilities()
-      # was never finished, and does not work atm.  So do these manually
-      # if the Qt gui was built:
-      #   1. The plugin loading code looks for plugins in two places:
-      #         ../lib
-      #         ~/.plugins
-      #   2. So create a lib directory in the .app, one level up.
-      #   3. and copy all the plugins we made to it,
-      #   4. but omit any plugins that are for the CLI only.
-      #   5. CLI only files end in cli.dylib.
-      if File.exists? prefix+'avidemux2.app'
-        app_lib_path = prefix+'avidemux2.app/Contents/lib'
-        app_plug_path = prefix+'avidemux2.app/Contents/lib/ADM_plugins'
-        cellar_plug_path = lib+'ADM_plugins'
-        mkdir_p app_lib_path
-        cp_r cellar_plug_path, app_lib_path
-        app_plug_path.find do |f|
-          rm f if File.fnmatch('*cli.dylib', f)
-        end
-      end
-    end # of plugbuild
+    # Steps from the bootStrapOsx.bash:
+    app = prefix/"Avidemux2.6.app/Contents"
+    mkdir_p app/"Resources"
+    mkdir_p app/"MacOS"
+    cp_r "./cmake/osx/Avidemux2.6", app/"MacOS/Avidemux2.6.app"
+    chmod 0755, app/"MacOS/Avidemux2.6.app"
+    cp_r Formula.factory('qt').opt_prefix/"lib/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
+    cp "./cmake/osx/Info.plist", app
+    ln_s lib, app/"Resources/"
+    ln_s bin, app/"Resources/"
+    cp Dir["./cmake/osx/*.icns"], app/"Resources/"
   end
 
   def caveats
     if build.with? 'qt' then <<-EOS.undent
-      The Qt GUI has been installed to
-        #{opt_prefix}/avidemux2.app
+      You may want to `brew linkapps` to link the Qt GUI app
+      #{opt_prefix}/Avidemux2.6.app it to `~/Applications`.
+
+      To enable sound: In preferences, set the audio to CoreAudio instead of Dummy.
       EOS
     end
   end
 end
-
-__END__
---- a/avidemux/ADM_core/include/ADM_mangle.h    2011-12-28 16:32:37.000000000 -0800
-+++ b/avidemux/ADM_core/include/ADM_mangle.h    2012-04-07 10:49:11.000000000 -0700
-@@ -26,7 +26,7 @@
- #    else
- #        define MANGLE(a) "_" #a
- #        define FUNNY_MANGLE(x) __attribute__((used)) x asm(MANGLE(x))
--#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
-+#        define FUNNY_MANGLE_ARRAY(x, y) __attribute__((used)) x[y] asm(MANGLE(x))
- #    endif
- #else
- #    if defined(ADM_CPU_X86_64) && defined(PIC)