[90907] trunk/dports/x11/wine-crossover
jeremyhu at macports.org
jeremyhu at macports.org
Sat Mar 17 18:26:53 PDT 2012
Revision: 90907
https://trac.macports.org/changeset/90907
Author: jeremyhu at macports.org
Date: 2012-03-17 18:26:51 -0700 (Sat, 17 Mar 2012)
Log Message:
-----------
wine-crossover: Bump to 11.0
Modified Paths:
--------------
trunk/dports/x11/wine-crossover/Portfile
trunk/dports/x11/wine-crossover/files/BOOL.patch
Removed Paths:
-------------
trunk/dports/x11/wine-crossover/files/no-quartz-wm-workaround.patch
trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff
trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff
trunk/dports/x11/wine-crossover/files/sl-audio.patch
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/Portfile 2012-03-18 01:26:51 UTC (rev 90907)
@@ -6,7 +6,7 @@
name wine-crossover
conflicts wine wine-devel wine-crossover-games
-version 10.1.0
+version 11.0.0
license LGPL-2.1+
categories x11
maintainers jeremyhu openmaintainer
@@ -15,8 +15,9 @@
distname crossover-sources-${version}
dist_subdir wine
set wine_distfile [suffix ${distname}]
-set wine_gecko_distfile wine_gecko-1.2.0-x86.msi
-distfiles ${wine_distfile} ${wine_gecko_distfile}
+set wine_gecko_version 1.4
+set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
+distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
extract.only ${wine_distfile}
worksrcdir wine
build.target depend all
@@ -24,25 +25,28 @@
minimum_xcodeversions {8 2.5}
-description Wine Is Not an Emulator (1.3.9 with CodeWeavers modifications for CrossOver)
+description Wine Is Not an Emulator (1.4-rc5 with CodeWeavers modifications for CrossOver)
long_description Wine is an implementation of the Windows APIs on top of X11. \
This version contains the Codeweavers patches for CrossOver
-master_sites http://media.codeweavers.com/pub/crossover/source/ \
- http://media.codeweavers.com/pub/crossover/source/archive/${version}/
+master_sites http://media.codeweavers.com/pub/crossover/source/:winesource \
+ http://media.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
+ sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
checksums ${wine_distfile} \
- rmd160 ff68078e199337c063f7a306d4af9cb710fee39e \
- sha256 b61721ffd06a649846f5afc45b5a2e0e4f533bbb19250539cdeef4035ab52067 \
+ rmd160 38e4db61b6f3270f429a049d0d21502709265f98 \
+ sha256 3a068f9b46feb0bbc0e87a59d294021c494da62f601375a53582f33c95129d57 \
${wine_gecko_distfile} \
- rmd160 089447eb59eea81c7b1b3d1896a20fe68586cd96 \
- sha256 d6ccdb32b5867df207c7cd89513297ceb89cfa93696bece470467845c6c4d3ee
+ rmd160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e \
+ sha256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
port:fontconfig \
port:freetype \
+ port:gstreamer \
+ port:gst-plugins-base \
port:jpeg \
port:lcms \
port:libiconv \
@@ -86,14 +90,15 @@
lib/libXrender.dylib \
lib/libGL.dylib
-depends_build port:flex \
+depends_build port:bison \
+ port:flex \
port:pkgconfig
# Extract only the wine directory. We don't need the others, and their presence
# interferes with the wine build (which uses parts of them if present).
extract.post_args-append wine
-patchfiles sl-audio.patch no-quartz-wm-workaround.patch BOOL.patch
+patchfiles BOOL.patch
configure.ldflags-append -framework CoreServices \
-lz
@@ -157,10 +162,6 @@
configure.cxx ${prefix}/bin/g++-apple-4.2
}
-# darwin 8
-patchfiles-append patch-SSLCopyPeerCertificates.diff \
- patch-dlls-windowscodecs-icnsformat.c.diff
-
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
# Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
@@ -181,6 +182,14 @@
configure.ldflags-append -Wl,-no_pie
}
+platform darwin 12 {
+ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
+ configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+
+ # Needed or wine will SIGBUS
+ configure.ldflags-append -Wl,-no_pie
+}
+
pre-fetch {
if {"big" == ${os.endian}} {
ui_error "${name} can only be used on an Intel Mac or other computer with a little-endian processor."
Modified: trunk/dports/x11/wine-crossover/files/BOOL.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/BOOL.patch 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/files/BOOL.patch 2012-03-18 01:26:51 UTC (rev 90907)
@@ -16,26 +16,8 @@
#undef LoadResource
#undef CompareString
#undef GetCurrentThread
---- dlls/dinput/joystick_osx.c.orig 2012-02-13 11:57:04.000000000 -0800
-+++ dlls/dinput/joystick_osx.c 2012-02-13 11:57:27.000000000 -0800
-@@ -24,6 +24,7 @@
- #include "wine/port.h"
-
- #if defined(HAVE_CARBON_CARBON_H) && defined(HAVE_IOKIT_HID_IOHIDLIB_H)
-+#define BOOL __carbon_BOOL
- #define LoadResource __carbon_LoadResource
- #define CompareString __carbon_CompareString
- #define GetCurrentThread __carbon_GetCurrentThread
-@@ -62,6 +63,7 @@
- #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
- #include <Carbon/Carbon.h>
- #include <IOKit/hid/IOHIDLib.h>
-+#undef BOOL
- #undef LoadResource
- #undef CompareString
- #undef GetCurrentThread
---- dlls/windowscodecs/icnsformat.c.orig 2012-02-13 12:58:07.000000000 -0800
-+++ dlls/windowscodecs/icnsformat.c 2012-02-13 12:58:31.000000000 -0800
+--- dlls/windowscodecs/icnsformat.c.orig 2012-02-12 23:54:58.000000000 -0800
++++ dlls/windowscodecs/icnsformat.c 2012-02-12 23:55:20.000000000 -0800
@@ -22,6 +22,7 @@
#include <stdarg.h>
@@ -44,7 +26,7 @@
#define GetCurrentProcess GetCurrentProcess_Mac
#define GetCurrentThread GetCurrentThread_Mac
#define LoadResource LoadResource_Mac
-@@ -37,6 +38,7 @@
+@@ -49,6 +50,7 @@
#define ShowCursor ShowCursor_Mac
#define UnionRect UnionRect_Mac
#include <ApplicationServices/ApplicationServices.h>
@@ -52,34 +34,93 @@
#undef GetCurrentProcess
#undef GetCurrentThread
#undef LoadResource
---- dlls/wineosxime.drv/mactext.c.orig 2012-02-13 14:31:06.000000000 -0800
-+++ dlls/wineosxime.drv/mactext.c 2012-02-13 14:31:58.000000000 -0800
-@@ -50,7 +50,9 @@
- #ifdef __APPLE__
+--- dlls/wineqtdecoder/qtdatahandler.c.orig 2012-02-13 00:04:58.000000000 -0800
++++ dlls/wineqtdecoder/qtdatahandler.c 2012-02-13 00:05:24.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
- #include "wine/debug.h"
+#define BOOL __carbon_BOOL
- #include <Carbon/Carbon.h>
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -62,6 +63,7 @@
+
+ #include <QuickTime/QuickTimeComponents.h>
+
+#undef BOOL
- #include <dlfcn.h>
- #include "IMKClient.h"
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtsplitter.c.orig 2012-02-13 00:19:05.000000000 -0800
++++ dlls/wineqtdecoder/qtsplitter.c 2012-02-13 00:19:26.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
---- dlls/wineqtdecoder/qtvdecoder.c.orig 2012-02-13 14:36:12.000000000 -0800
-+++ dlls/wineqtdecoder/qtvdecoder.c 2012-02-13 14:36:46.000000000 -0800
-@@ -22,6 +22,7 @@
++#define BOOL __carbon_BOOL
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -63,6 +64,7 @@
+ #include <QuickTime/Movies.h>
+ #include <QuickTime/QuickTimeComponents.h>
++#undef BOOL
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtutils.c.orig 2012-02-13 00:31:37.000000000 -0800
++++ dlls/wineqtdecoder/qtutils.c 2012-02-13 00:32:14.000000000 -0800
+@@ -23,6 +23,7 @@
#define ULONG CoreFoundation_ULONG
#define HRESULT CoreFoundation_HRESULT
-+#define BOOL CoreFoundation_BOOL
++#define BOOL __carbon_BOOL
#define LoadResource __carbon_LoadResource
#define CompareString __carbon_CompareString
-@@ -103,6 +104,8 @@
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -62,6 +63,7 @@
- #undef ULONG
- #undef HRESULT
+ #include <CoreVideo/CVPixelBuffer.h>
+
+#undef BOOL
-+
- #undef DPRINTF
- #undef STDMETHODCALLTYPE
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/wineqtdecoder/qtvdecoder.c.orig 2012-02-13 00:31:42.000000000 -0800
++++ dlls/wineqtdecoder/qtvdecoder.c 2012-02-13 00:32:30.000000000 -0800
+@@ -23,6 +23,7 @@
+ #define ULONG CoreFoundation_ULONG
+ #define HRESULT CoreFoundation_HRESULT
++#define BOOL __carbon_BOOL
+ #define LoadResource __carbon_LoadResource
+ #define CompareString __carbon_CompareString
+ #define GetCurrentThread __carbon_GetCurrentThread
+@@ -63,6 +64,7 @@
+ #include <QuickTime/ImageCompression.h>
+ #include <CoreVideo/CVPixelBuffer.h>
+
++#undef BOOL
+ #undef LoadResource
+ #undef CompareString
+ #undef GetCurrentThread
+--- dlls/dinput/joystick_osx.c.orig 2012-02-13 11:58:52.000000000 -0800
++++ dlls/dinput/joystick_osx.c 2012-02-13 11:59:09.000000000 -0800
+@@ -24,6 +24,7 @@
+ #include "wine/port.h"
+
+ #if defined(HAVE_IOKIT_HID_IOHIDLIB_H)
++#define BOOL __carbon_BOOL
+ #define ULONG __carbon_ULONG
+ #define E_INVALIDARG __carbon_E_INVALIDARG
+ #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY
+@@ -45,6 +46,7 @@
+ #define HRESULT __carbon_HRESULT
+ #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE
+ #include <IOKit/hid/IOHIDLib.h>
++#undef BOOL
+ #undef ULONG
+ #undef E_INVALIDARG
+ #undef E_OUTOFMEMORY
Deleted: trunk/dports/x11/wine-crossover/files/no-quartz-wm-workaround.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/no-quartz-wm-workaround.patch 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/files/no-quartz-wm-workaround.patch 2012-03-18 01:26:51 UTC (rev 90907)
@@ -1,81 +0,0 @@
---- dlls/winex11.drv/window.c.orig 2011-07-10 11:01:56.000000000 -0700
-+++ dlls/winex11.drv/window.c 2011-07-10 11:02:29.000000000 -0700
-@@ -1092,12 +1092,6 @@ static void set_size_hints( Display *dis
- size_hints->x = data->whole_rect.left;
- size_hints->y = data->whole_rect.top;
- size_hints->flags |= PPosition;
-- if (data->managed && applewm_title_height &&
-- get_mwm_decorations( data, style, GetWindowLongW(data->hwnd,GWL_EXSTYLE) ) & MWM_DECOR_TITLE)
-- {
-- size_hints->y -= applewm_title_height;
-- size_hints->win_gravity = NorthWestGravity;
-- }
- }
-
- if (!is_window_resizable( data, style ))
-@@ -1611,10 +1605,6 @@ static void sync_window_position( Displa
- /* and Above with a sibling doesn't work so well either, so we ignore it */
- }
-
-- if ((mask & CWY) && data->managed && applewm_title_height &&
-- get_mwm_decorations( data, style, GetWindowLongW(data->hwnd,GWL_EXSTYLE) ) & MWM_DECOR_TITLE)
-- changes.y -= applewm_title_height;
--
- wine_tsx11_lock();
- set_size_hints( display, data, style );
- data->configure_serial = NextRequest( display );
-@@ -1782,10 +1772,6 @@ static Window create_whole_window( Displ
-
- x = data->whole_rect.left - virtual_screen_rect.left;
- y = data->whole_rect.top - virtual_screen_rect.top;
-- if (data->managed && applewm_title_height &&
-- get_mwm_decorations( data, GetWindowLongW(data->hwnd,GWL_STYLE),
-- GetWindowLongW(data->hwnd,GWL_EXSTYLE) ) & MWM_DECOR_TITLE)
-- y -= applewm_title_height;
-
- wine_tsx11_lock();
- data->whole_window = XCreateWindow( display, root_window, x, y,
---- dlls/winex11.drv/x11drv_main.c.orig 2011-07-10 11:00:45.000000000 -0700
-+++ dlls/winex11.drv/x11drv_main.c 2011-07-10 11:01:21.000000000 -0700
-@@ -105,7 +105,6 @@ int xrender_error_base = 0;
- HMODULE x11drv_module = 0;
- int applewm_event_base = 0;
- int applewm_error_base = 0;
--int applewm_title_height = 0;
- int find_offscreen_formats = 0;
-
- static x11drv_error_callback err_callback; /* current callback for error */
-@@ -590,23 +589,6 @@ static BOOL process_attach(void)
- X11DRV_XComposite_Init();
- #endif
-
--#ifdef HAVE_LIBAPPLEWM
-- if (XAppleWMQueryExtension( display, &applewm_event_base, &applewm_error_base ))
-- {
-- short unused, height;
--
-- /* retrieve the offset that the Apple quartz-wm window manager will use to
-- * display the title bar. This is used to compensate the fact that quartz-wm
-- * ignores all our attempts to set the window gravity.
-- * FIXME: the frame class is hardcoded to Document for now. */
-- if (!XAppleWMFrameGetRect( display, AppleWMFrameClassDocument, AppleWMFrameRectTitleBar,
-- 0, 0, 0, 0, 0, 0, 0, 0,
-- &unused, &unused, &unused, &height )) height = 0;
-- applewm_title_height = height;
-- TRACE( "got Apple title height %d\n", height );
-- }
--#endif
--
- #ifdef HAVE_XKB
- if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL );
- #endif
---- dlls/winex11.drv/x11drv.h.orig 2011-07-10 11:01:39.000000000 -0700
-+++ dlls/winex11.drv/x11drv.h 2011-07-10 11:01:45.000000000 -0700
-@@ -612,7 +612,6 @@ extern int alloc_system_colors;
- extern int xrender_error_base;
- extern HMODULE x11drv_module;
- extern int forcealtrelease;
--extern int applewm_title_height;
- extern int find_offscreen_formats;
-
- extern BYTE key_state_table[256];
Deleted: trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff 2012-03-18 01:26:51 UTC (rev 90907)
@@ -1,26 +0,0 @@
---- dlls/secur32/schannel.c.orig 2011-07-15 12:52:44.000000000 -0500
-+++ dlls/secur32/schannel.c 2011-10-12 10:14:53.000000000 -0500
-@@ -858,7 +858,11 @@
-
- TRACE("(%p/%p, %p)\n", s, s->context, cert);
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- status = SSLCopyPeerCertificates(s->context, &certs);
-+#else
-+ status = SSLGetPeerCertificates(s->context, &certs);
-+#endif
- if (status == noErr && certs)
- {
- SecCertificateRef mac_cert;
-@@ -883,7 +887,11 @@
- CFRelease(certs);
- }
- else
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status);
-+#else
-+ WARN("SSLGetPeerCertificates failed: %ld\n", (long)status);
-+#endif
-
- return ret;
- }
Deleted: trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/files/patch-dlls-windowscodecs-icnsformat.c.diff 2012-03-18 01:26:51 UTC (rev 90907)
@@ -1,31 +0,0 @@
-From: Ken Thomases <ken at codeweavers.com>
-Date: Fri, 21 Jan 2011 00:58:57 +0000 (-0600)
-Subject: windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
-X-Git-Tag: wine-1.3.12~27
-X-Git-Url: http://source.winehq.org/git?hp=9c66f68f55beca6fc92315d40a73b41f12865353
-
-windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
----
-
---- dlls/windowscodecs/icnsformat.c.orig
-+++ dlls/windowscodecs/icnsformat.c
-@@ -68,7 +68,8 @@
-
- WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
--#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
-+#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \
-+ MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
-
- typedef struct IcnsEncoder {
- IWICBitmapEncoder IWICBitmapEncoder_iface;
-@@ -752,7 +753,8 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
- return ret;
- }
-
--#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) */
-+#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) ||
-+ MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 */
-
- HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
- {
Deleted: trunk/dports/x11/wine-crossover/files/sl-audio.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/sl-audio.patch 2012-03-18 00:17:44 UTC (rev 90906)
+++ trunk/dports/x11/wine-crossover/files/sl-audio.patch 2012-03-18 01:26:51 UTC (rev 90907)
@@ -1,23 +0,0 @@
---- dlls/winecoreaudio.drv/audio.c.orig 2010-07-27 14:56:49.000000000 -0500
-+++ dlls/winecoreaudio.drv/audio.c 2010-09-16 12:33:09.000000000 -0500
-@@ -56,7 +56,6 @@
- #include "wine/unicode.h"
- #include "wine/library.h"
- #include "wine/debug.h"
--#include "wine/list.h"
-
- WINE_DEFAULT_DEBUG_CHANNEL(wave);
-
-@@ -64,6 +63,12 @@
-
- WINE_DECLARE_DEBUG_CHANNEL(coreaudio);
-
-+/* This needs to be after CoreAudio/CoreAudio.h because
-+ * CoreAudio includes sys/queue.h which has namespace conflicts
-+ * with wine/list.h
-+ */
-+#include "wine/list.h"
-+
- /*
- Due to AudioUnit headers conflict define some needed types.
- */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120317/69802bb7/attachment-0001.html>
More information about the macports-changes
mailing list