diff options
| author | Jack Nagel | 2014-03-17 11:12:54 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-17 11:12:54 -0500 |
| commit | d87ec16871e5ae947f6b355c2f587c538c03cb04 (patch) | |
| tree | b91062272ccd3d182f6ee11274071ebeae57b59c /Library/Formula | |
| parent | 66ceb6f7e78c43a3a81a3566fcdf2228525e49d1 (diff) | |
| download | homebrew-d87ec16871e5ae947f6b355c2f587c538c03cb04.tar.bz2 | |
babl: use git-diff patch format
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/babl.rb | 104 |
1 files changed, 40 insertions, 64 deletions
diff --git a/Library/Formula/babl.rb b/Library/Formula/babl.rb index c04a97dad..9f274fa6d 100644 --- a/Library/Formula/babl.rb +++ b/Library/Formula/babl.rb @@ -11,13 +11,11 @@ class Babl < Formula option :universal - def patches - # There are two patches. - # The first one changes an include <values.h> (deleted on Mac OS X) to <limits.h> - # The second one fixes an error when compiling with clang. See: - # https://trac.macports.org/browser/trunk/dports/graphics/babl/files/clang.patch - { :p0 => DATA } - end + # There are two patches. + # The first one changes an include <values.h> (deleted on Mac OS X) to <limits.h> + # The second one fixes an error when compiling with clang. See: + # https://trac.macports.org/browser/trunk/dports/graphics/babl/files/clang.patch + patch :DATA def install if build.universal? @@ -34,60 +32,38 @@ class Babl < Formula end __END__ -diff -cr babl.ori/babl-palette.c babl/babl-palette.c -*** babl.ori/babl-palette.c Sat Apr 14 01:31:40 2012 ---- babl/babl-palette.c Sat Apr 14 01:32:15 2012 -*************** -*** 19,25 **** - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -! #include <values.h> - #include <assert.h> - #include "config.h" - #include "babl-internal.h" ---- 19,25 ---- - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -! #include <limits.h> - #include <assert.h> - #include "config.h" - #include "babl-internal.h" -diff -cr extensions.ori/sse-fixups.c extensions/sse-fixups.c -*** extensions.ori/sse-fixups.c Sat Apr 14 01:31:40 2012 ---- extensions/sse-fixups.c Sat Apr 14 01:33:44 2012 -*************** -*** 21,27 **** - - #include "config.h" - -! #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) - - #include <stdint.h> - #include <stdlib.h> ---- 21,27 ---- - - #include "config.h" - -! #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) - - #include <stdint.h> - #include <stdlib.h> -*************** -*** 177,183 **** - int - init (void) - { -! #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) - - const Babl *rgbaF_linear = babl_format_new ( - babl_model ("RGBA"), ---- 177,183 ---- - int - init (void) - { -! #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) - - const Babl *rgbaF_linear = babl_format_new ( - babl_model ("RGBA"), +diff --git a/babl/babl-palette.c b/babl/babl-palette.c +index 7e72eaa..2f9bf8d 100644 +--- a/babl/babl-palette.c ++++ b/babl/babl-palette.c +@@ -19,7 +19,7 @@ + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +-#include <values.h> ++#include <limits.h> + #include <assert.h> + #include "config.h" + #include "babl-internal.h" +diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c +index b44bb5e..7f633d1 100644 +--- a/extensions/sse-fixups.c ++++ b/extensions/sse-fixups.c +@@ -21,7 +21,7 @@ + + #include "config.h" + +-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) + + #include <stdint.h> + #include <stdlib.h> +@@ -177,7 +177,7 @@ int init (void); + int + init (void) + { +-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) + + const Babl *rgbaF_linear = babl_format_new ( + babl_model ("RGBA"), |
