[89247] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 89247
          http://trac.macports.org/changeset/89247
Author:   ryandesign at macports.org
Date:     2012-01-21 16:11:55 -0800 (Sat, 21 Jan 2012)
Log Message:
-----------
webp: fix compile errors with gcc-4.0 on i386

Modified Paths:
--------------
    trunk/dports/graphics/ImageMagick/Portfile
    trunk/dports/graphics/graphviz-devel/Portfile
    trunk/dports/graphics/webp/Portfile

Added Paths:
-----------
    trunk/dports/graphics/webp/files/
    trunk/dports/graphics/webp/files/patch-src-dsp-cpu.c.diff

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2012-01-21 23:55:11 UTC (rev 89246)
+++ trunk/dports/graphics/ImageMagick/Portfile	2012-01-22 00:11:55 UTC (rev 89247)
@@ -138,14 +138,6 @@
 test.target                 check
 test.env                    DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs
 
-platform darwin 8 i386 {
-    # webp doesn't currently build on darwin 8 i386
-    depends_lib-delete          port:webp
-    archcheck.files-delete      lib/libwebp.dylib
-    configure.args-delete       --with-webp
-    configure.args-append       --without-webp
-}
-
 variant graphviz description {Support Graphviz} {
     depends_lib-append      path:bin/dot:graphviz
     archcheck.files-append  lib/libgvc.dylib

Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile	2012-01-21 23:55:11 UTC (rev 89246)
+++ trunk/dports/graphics/graphviz-devel/Portfile	2012-01-22 00:11:55 UTC (rev 89247)
@@ -121,14 +121,6 @@
     }
 }
 
-platform darwin 8 i386 {
-    # webp doesn't currently build on darwin 8 i386
-    depends_lib-delete          port:webp
-    archcheck.files-delete      lib/libwebp.dylib
-    configure.args-delete       --with-webp
-    configure.args-append       --without-webp
-}
-
 variant guile description {Include Guile language bindings} {
     depends_lib-append          port:guile
     depends_build-append        port:swig-guile

Modified: trunk/dports/graphics/webp/Portfile
===================================================================
--- trunk/dports/graphics/webp/Portfile	2012-01-21 23:55:11 UTC (rev 89246)
+++ trunk/dports/graphics/webp/Portfile	2012-01-22 00:11:55 UTC (rev 89247)
@@ -48,6 +48,8 @@
     }
 }
 
+patchfiles              patch-src-dsp-cpu.c.diff
+
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdir}
@@ -61,18 +63,6 @@
         ${docdir}
 }
 
-platform darwin 8 i386 {
-    pre-fetch {
-        ui_error "${name} ${version} cannot be compiled on Intel Macs running Mac OS X 10.4."
-        ui_error "See http://code.google.com/p/webp/issues/detail?id=103"
-        return -code error "incompatible Mac OS X version"
-    }
-}
-
-platform darwin 9 i386 {
-    configure.compiler gcc-4.2
-}
-
 variant debug description {Compile with debugging information and reduce optimization level} {
     configure.optflags -O1
     configure.cflags-append -ggdb

Added: trunk/dports/graphics/webp/files/patch-src-dsp-cpu.c.diff
===================================================================
--- trunk/dports/graphics/webp/files/patch-src-dsp-cpu.c.diff	                        (rev 0)
+++ trunk/dports/graphics/webp/files/patch-src-dsp-cpu.c.diff	2012-01-22 00:11:55 UTC (rev 89247)
@@ -0,0 +1,14 @@
+http://code.google.com/p/webp/issues/detail?id=103
+https://gerrit.chromium.org/gerrit/#change,14337
+--- src/dsp/cpu.c.orig	2011-09-22 15:53:30.000000000 -0500
++++ src/dsp/cpu.c	2012-01-20 03:53:36.000000000 -0600
+@@ -21,7 +21,8 @@
+ // SSE2 detection.
+ //
+ 
+-#if defined(__pic__) && defined(__i386__)
++// apple/darwin gcc-4.0.1 defines __PIC__, but not __pic__ with -fPIC.
++#if (defined(__pic__) || defined(__PIC__)) && defined(__i386__)
+ static inline void GetCPUInfo(int cpu_info[4], int info_type) {
+   __asm__ volatile (
+     "mov %%ebx, %%edi\n"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120121/06719905/attachment.html>