[85238] trunk/dports/x11/wine-devel

[ryandesign at macports.org]

Revision: 85238
          http://trac.macports.org/changeset/85238
Author:   ryandesign at macports.org
Date:     2011-10-11 20:18:37 -0700 (Tue, 11 Oct 2011)
Log Message:
-----------
wine-devel: update to 1.3.30, add forgotten gstreamer/gst-plugins-base dependencies

Modified Paths:
--------------
    trunk/dports/x11/wine-devel/Portfile

Removed Paths:
-------------
    trunk/dports/x11/wine-devel/files/patch-tools-winegcc-winegcc.c.diff

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2011-10-12 03:03:59 UTC (rev 85237)
+++ trunk/dports/x11/wine-devel/Portfile	2011-10-12 03:18:37 UTC (rev 85238)
@@ -8,7 +8,7 @@
 name                        wine-devel
 conflicts                   wine wine-crossover-games wine-crossover
 set my_name                 wine
-version                     1.3.29
+version                     1.3.30
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -36,8 +36,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  514df9f87b1441839477914ec2070d10407341ad \
-                            sha256  41fa0f7a9d67de65bd5813405a49b3f6b91a1672cde85570b22a567cd7ef24d6 \
+                            rmd160  661293913dee2a7aa324e620c8e5784a5e1ae14b \
+                            sha256  05edc5b5a214edf6f1d0a3a7f6e2cdbace7d261763b41d832d62b6d3872a543e \
                             ${wine_gecko_distfile} \
                             rmd160  3368c7d826da7f0b99c2e4cfa96a2a48a00a3e1b \
                             sha256  4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae
@@ -46,6 +46,8 @@
 depends_lib                 port:expat \
                             port:fontconfig \
                             port:freetype \
+                            port:gstreamer \
+                            port:gst-plugins-base \
                             port:jpeg \
                             port:lcms \
                             port:libiconv \
@@ -93,8 +95,6 @@
                             port:flex \
                             port:pkgconfig
 
-patchfiles                  patch-tools-winegcc-winegcc.c.diff
-
 configure.ldflags-append    -framework CoreServices \
                             -lz
 

Deleted: trunk/dports/x11/wine-devel/files/patch-tools-winegcc-winegcc.c.diff
===================================================================
--- trunk/dports/x11/wine-devel/files/patch-tools-winegcc-winegcc.c.diff	2011-10-12 03:03:59 UTC (rev 85237)
+++ trunk/dports/x11/wine-devel/files/patch-tools-winegcc-winegcc.c.diff	2011-10-12 03:18:37 UTC (rev 85238)
@@ -1,59 +0,0 @@
-From cd623377cd0f481793ae73a949871c20dd912403 Mon Sep 17 00:00:00 2001
-From: Charles Davis <cdavis at mymail.mines.edu>
-Date: Fri, 30 Sep 2011 22:56:26 -0600
-Subject: [PATCH] winegcc: On Mac OS, turn -s into -Wl,-x.
-Reply-To: wine-devel <wine-devel at winehq.org>
-
-With the old "classic" ld, if the output file type is MH_BUNDLE, ld will
-refuse to link if -s is specified. At least one user complained on
-wine-users because of this.
-
-In the new ld (ld64), this option is obsolete anyway; it is simply
-ignored. In fact, in Xcode 4.2, ld will now warn if it is given -s.
-
-The error message the user reported suggested using -x instead. The -Wl
-is obviously needed to get the flag past gcc.
----
- tools/winegcc/winegcc.c |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
-index 3a7e93a..adb1873 100644
---- tools/winegcc/winegcc.c
-+++ tools/winegcc/winegcc.c
-@@ -199,6 +199,7 @@ struct options
-     int force_pointer_size;
-     int large_address_aware;
-     int unwind_tables;
-+    int strip;
-     const char* wine_objdir;
-     const char* output_name;
-     const char* image_base;
-@@ -1009,6 +1010,8 @@ static void build(struct options* opts)
-             strarray_add(link_args, "-image_base");
-             strarray_add(link_args, opts->image_base);
-         }
-+        if (opts->strip)
-+            strarray_add(link_args, "-Wl,-x");
-         break;
-     case PLATFORM_SOLARIS:
-         {
-@@ -1417,6 +1420,15 @@ int main(int argc, char **argv)
- 			opts.shared = 1;
-                         raw_compiler_arg = raw_linker_arg = 0;
- 		    }
-+                    else if (strcmp("-s", argv[i]) == 0 && opts.target_platform == PLATFORM_APPLE)
-+                    {
-+                        /* On Mac, change -s into -Wl,-x. ld's -s switch
-+                         * is deprecated, and it doesn't work on Tiger with
-+                         * MH_BUNDLEs anyway
-+                         */
-+                        opts.strip = 1;
-+                        raw_linker_arg = 0;
-+                    }
-                     break;
-                 case 'v':
-                     if (argv[i][2] == 0) verbose++;
--- 
-1.7.6.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111011/896c04e0/attachment.html>