[97181] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 97181
          https://trac.macports.org/changeset/97181
Author:   raimue at macports.org
Date:     2012-08-29 04:42:38 -0700 (Wed, 29 Aug 2012)
Log Message:
-----------
emulators/qemu:
Update to version 1.1.1.
Patchi cocoa-uint16-redefined.diff has been applied upstream.

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile
    trunk/dports/emulators/qemu/files/patch-configure.diff

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

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2012-08-29 10:53:31 UTC (rev 97180)
+++ trunk/dports/emulators/qemu/Portfile	2012-08-29 11:42:38 UTC (rev 97181)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 1.0.1
+version                 1.1.1
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -17,13 +17,15 @@
 
 homepage                http://qemu.org
 master_sites            ${homepage}/download
+use_bzip2 yes
+# 1.1.1 was repackaged as 1.1.1-1
+distname                ${name}-${version}-1
+worksrcdir              ${name}-${version}
 
-checksums           sha1    4d08b5a83538fcd7b222bec6f1c584da8d12497a \
-                    rmd160  dcef344f150e238880871768f2f07ccb6e8ecce7 \
-                    sha256  198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378
+checksums               rmd160  e1fa73652dbcfd234f862ce1979adf16182f00bc \
+                        sha256  6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8
 
-patchfiles              patch-configure.diff \
-                        patch-cocoa-uint16-redefined.diff
+patchfiles              patch-configure.diff
 
 depends_build           port:texinfo \
                         port:pkgconfig

Deleted: trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff	2012-08-29 10:53:31 UTC (rev 97180)
+++ trunk/dports/emulators/qemu/files/patch-cocoa-uint16-redefined.diff	2012-08-29 11:42:38 UTC (rev 97181)
@@ -1,38 +0,0 @@
-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

Modified: trunk/dports/emulators/qemu/files/patch-configure.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-configure.diff	2012-08-29 10:53:31 UTC (rev 97180)
+++ trunk/dports/emulators/qemu/files/patch-configure.diff	2012-08-29 11:42:38 UTC (rev 97181)
@@ -1,6 +1,6 @@
---- configure.orig	2010-02-23 21:54:38.000000000 +0100
-+++ configure	2010-03-24 14:42:52.000000000 +0100
-@@ -317,18 +317,7 @@
+--- configure.orig	2012-07-17 20:11:14.000000000 +0200
++++ configure	2012-08-29 12:24:15.000000000 +0200
+@@ -411,18 +411,7 @@
  Darwin)
    bsd="yes"
    darwin="yes"
@@ -17,6 +17,6 @@
 -    QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
 -  fi
 +  QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
-   darwin_user="yes"
    cocoa="yes"
    audio_drv_list="coreaudio"
+   audio_possible_drivers="coreaudio sdl fmod"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120829/3c105802/attachment-0001.html>