From 501b14871a3f13dbda8392301be9fe0283690931 Mon Sep 17 00:00:00 2001
From: malcolmhumphreys
Date: Wed, 7 Apr 2010 23:58:08 +1000
Subject: Fixes to libquicktime

* Added --enable-gpl which means the faac, faad2, x264 codecs are now built
* Added a patch to fix crashing when using photojpeg 'jpeg' codec, this is
  because we are using libjpeg 8a when libquicktime looks like mainly built
  against 6b (patch also sent to libquicktime dev mailing list to be included
  in future versions)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

Fixes 1130
---
 Library/Formula/libquicktime.rb | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/libquicktime.rb b/Library/Formula/libquicktime.rb
index df024e551..7b9fb3d6d 100644
--- a/Library/Formula/libquicktime.rb
+++ b/Library/Formula/libquicktime.rb
@@ -1,11 +1,19 @@
 require 'formula'
 
 class Libquicktime <Formula
-
   url 'http://downloads.sourceforge.net/project/libquicktime/libquicktime/1.1.5/libquicktime-1.1.5.tar.gz'
   homepage 'http://libquicktime.sourceforge.net/'
   md5 '0fd45b3deff0317c2f85a34b1b106acf'
 
+  def patches
+      # http://bugs.gentoo.org/show_bug.cgi?id=294488
+      #
+      # Previous version jpeg automatically set dinfo.do_fancy_downsampling to FALSE.
+      # Newer versions (since 7) of media-libs/jpeg do not do that anymore and the
+      # program must do it explicitly
+      DATA
+  end
+
   depends_on 'pkg-config'
   depends_on 'gettext'
   depends_on 'jpeg' => :optional
@@ -15,9 +23,20 @@ class Libquicktime <Formula
   depends_on 'libvorbis' => :optional
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--without-doxygen"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-gpl", "--without-doxygen"
     system "make"
     system "make install"
   end
-
 end
+
+__END__
+--- libquicktime-1.1.5/plugins/mjpeg/libmjpeg.c	2010-01-15 05:41:17.000000000 +1100
++++ libquicktime-1.1.5/plugins/mjpeg/libmjpeg.c-2	2010-04-07 23:33:46.000000000 +1000
+@@ -785,6 +785,7 @@
+   result->jpeg_compress.input_components = 3;
+   result->jpeg_compress.in_color_space = JCS_RGB;
+   jpeg_set_quality(&(result->jpeg_compress), mjpeg->quality, 0);
++  result->jpeg_compress.do_fancy_downsampling = FALSE;
+ 
+   if(mjpeg->use_float) 
+     result->jpeg_compress.dct_method = JDCT_FLOAT;
-- 
cgit v1.2.3