[88044] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 88044
          http://trac.macports.org/changeset/88044
Author:   raimue at macports.org
Date:     2011-12-16 20:06:43 -0800 (Fri, 16 Dec 2011)
Log Message:
-----------
emulators/qemu:
Update to version 1.0, update master_sites, add a new patch file.
Build both i386 and x86_64 by default.

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2011-12-17 03:17:01 UTC (rev 88043)
+++ trunk/dports/emulators/qemu/Portfile	2011-12-17 04:06:43 UTC (rev 88044)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 0.14.1
+version                 1.0
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -15,14 +15,15 @@
                         different machine. By using dynamic translation, it \
                         achieves very good performance.
 
-homepage                http://wiki.qemu.org/
-master_sites            nongnu
+homepage                http://qemu.org
+master_sites            ${homepage}/download
 
-checksums           md5     b6c713a8db638e173af53a62d5178640 \
-                    sha1    1a5003a03004b62b52562d1cbb8f50c5f135e0b8 \
-                    rmd160  0601ff4e613fea0a6ce80907e2bfa11704048b36
+checksums               md5     a64b36067a191451323b0d34ebb44954 \
+                        sha1    7dcb1b3516554d6d899d7488cd444dbb7721fcee \
+                        rmd160  3a60aef6cfebba6896bdb12c99525da5456172fd
 
-patchfiles              patch-configure.diff
+patchfiles              patch-configure.diff \
+                        patch-cocoa-uint16-redefined.diff
 
 depends_build           port:texinfo
 depends_lib             port:curl \
@@ -59,7 +60,7 @@
 foreach t {i386 x86_64 ppc ppc64 arm cris m68k mips mipsel mips64 mips64el ppcemb sh4 sh4eb sparc} {
     variant target_${t} description "add ${t} target support" "append target_list \",${t}-softmmu\""
 }
-default_variants    +target_i386
+default_variants    +target_i386 +target_x86_64
 
 # Default universal variant does not work
 universal_variant       no

Added: trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff	                        (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff	2011-12-17 04:06:43 UTC (rev 88044)
@@ -0,0 +1,38 @@
+http://lists.gnu.org/archive/html/qemu-devel/2011-10/msg03794.html
+http://lists.gnu.org/archive/html/qemu-devel/2011-11/msg00027.html
+diff --git a/fpu/softfloat.h b/fpu/softfloat.h
+index 07c2929..229d834 100644
+--- fpu/softfloat.h
++++ fpu/softfloat.h
+@@ -57,7 +57,9 @@  typedef uint8_t flag;
+ typedef uint8_t uint8;
+ typedef int8_t int8;
+ #ifndef _AIX
++#if !(defined(__APPLE__) && defined(_UINT16))
+ typedef int uint16;
++#endif
+ typedef int int16;
+ #endif
+ typedef unsigned int uint32;
+diff --git a/ui/cocoa.m b/ui/cocoa.m
+index d9e4e3d..ac15418 100644
+--- ui/cocoa.m
++++ ui/cocoa.m
+@@ -22,13 +22,14 @@
+  * THE SOFTWARE.
+  */
+
+-#import <Cocoa/Cocoa.h>
+-#include <crt_externs.h>
+-
+ #include "qemu-common.h"
+ #include "console.h"
+ #include "sysemu.h"
+
++#define _UINT16
++#import <Cocoa/Cocoa.h>
++#include <crt_externs.h>
++
+ #ifndef MAC_OS_X_VERSION_10_4
+ #define MAC_OS_X_VERSION_10_4 1040
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111216/cb4f1584/attachment-0001.html>