[115754] trunk/dports/x11/wine
ryandesign at macports.org
ryandesign at macports.org
Fri Jan 10 13:24:47 PST 2014
Revision: 115754
https://trac.macports.org/changeset/115754
Author: ryandesign at macports.org
Date: 2014-01-10 13:24:47 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
wine: update to 1.6.2
Modified Paths:
--------------
trunk/dports/x11/wine/Portfile
Removed Paths:
-------------
trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2014-01-10 21:07:28 UTC (rev 115753)
+++ trunk/dports/x11/wine/Portfile 2014-01-10 21:24:47 UTC (rev 115754)
@@ -13,8 +13,7 @@
name wine
conflicts wine-devel wine-crossover
set my_name wine
-version 1.6.1
-revision 1
+version 1.6.2
license LGPL-2.1+
categories x11
maintainers ryandesign jwa openmaintainer
@@ -40,8 +39,8 @@
sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
checksums ${wine_distfile} \
- rmd160 b3544b271ea31336c9a3b283b4bc882f5fcb185d \
- sha256 d5bc2c088b555caa60a7ba1156e6ed74d791ba3c438129c75ab53805215a384c \
+ rmd160 7252851af5e9f748750685900c918e4fcb31c1f6 \
+ sha256 f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe \
${wine_gecko_distfile} \
rmd160 e5aded4dfcde2462d9802478efe5aae1552e842d \
sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
@@ -101,12 +100,8 @@
patchfiles BOOL.patch \
mach_machine.patch \
- patch-freetype-2.5.1.diff \
tiger-shell.patch
-# rebuild configure after freetype 2.5.1 patch
-use_autoreconf yes
-
configure.ldflags-append -framework CoreServices \
-lz
@@ -153,7 +148,7 @@
# llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run
# http://bugs.winehq.org/show_bug.cgi?id=28030
-compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
+compiler.blacklist-append *llvm-gcc-4.2
# clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
# http://bugs.winehq.org/show_bug.cgi?id=32872
Deleted: trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff 2014-01-10 21:07:28 UTC (rev 115753)
+++ trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff 2014-01-10 21:24:47 UTC (rev 115754)
@@ -1,206 +0,0 @@
-Fix build with freetype 2.5.1.
-http://bugs.winehq.org/show_bug.cgi?id=35010
---- configure.ac.orig 2013-11-15 13:30:24.000000000 -0600
-+++ configure.ac 2013-12-02 01:04:51.000000000 -0600
-@@ -1467,43 +1467,23 @@
- WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype],
- [`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`],
- [`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`])
-- WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS])
-- if test "$ft_lib" = "yes"
-+ AC_CHECK_HEADERS([ft2build.h])
-+ if test "$ac_cv_header_ft2build_h" = "yes"
- then
-- AC_CHECK_HEADERS(ft2build.h \
-- freetype/freetype.h \
-- freetype/ftglyph.h \
-- freetype/fttypes.h \
-- freetype/tttables.h \
-- freetype/ftsnames.h \
-- freetype/ttnameid.h \
-- freetype/ftoutln.h \
-- freetype/ftwinfnt.h \
-- freetype/ftmodapi.h \
-- freetype/ftlcdfil.h,,,
-- [#ifdef HAVE_FT2BUILD_H
-- # include <ft2build.h>
-- #endif])
-- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
-- #include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
-- [Define if you have the <freetype/fttrigon.h> header file.])
-- wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
-- AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
-- dnl Check that we have at least freetype/freetype.h
-- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
-- then
-- AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-- else
-- FREETYPE_LIBS=""
-- fi
-+ WINE_CHECK_SONAME(freetype,FT_Init_FreeType,
-+ [AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-+ AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <ft2build.h>
-+#include FT_MODULE_H])],
-+ [FREETYPE_LIBS=""],[$FREETYPE_LIBS])
- else
-+ FREETYPE_CFLAGS=""
- FREETYPE_LIBS=""
- fi
- CPPFLAGS="$ac_save_CPPFLAGS"
- fi
--WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
-+WINE_ERROR_WITH(freetype,[test "x$ac_cv_lib_soname_freetype" = x],
- [FreeType ${notice_platform}development files not found. Fonts will not be built.])
--test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
-+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
-
- dnl **** Check for parport (currently Linux only) ****
- AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
---- dlls/gdi32/freetype.c.orig 2013-11-30 18:22:25.000000000 -0600
-+++ dlls/gdi32/freetype.c 2013-11-30 18:22:25.000000000 -0600
-@@ -79,6 +79,23 @@
- #undef SetRectRgn
- #endif /* HAVE_CARBON_CARBON_H */
-
-+#ifdef HAVE_FT2BUILD_H
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_TYPES_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_SFNT_NAMES_H
-+#include FT_TRUETYPE_IDS_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
-+#include FT_MODULE_H
-+#include FT_WINFONTS_H
-+#ifdef FT_LCD_FILTER_H
-+#include FT_LCD_FILTER_H
-+#endif
-+#endif /* HAVE_FT2BUILD_H */
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winternl.h"
-@@ -97,43 +114,6 @@
-
- #ifdef HAVE_FREETYPE
-
--#ifdef HAVE_FT2BUILD_H
--#include <ft2build.h>
--#endif
--#ifdef HAVE_FREETYPE_FREETYPE_H
--#include <freetype/freetype.h>
--#endif
--#ifdef HAVE_FREETYPE_FTGLYPH_H
--#include <freetype/ftglyph.h>
--#endif
--#ifdef HAVE_FREETYPE_TTTABLES_H
--#include <freetype/tttables.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTYPES_H
--#include <freetype/fttypes.h>
--#endif
--#ifdef HAVE_FREETYPE_FTSNAMES_H
--#include <freetype/ftsnames.h>
--#endif
--#ifdef HAVE_FREETYPE_TTNAMEID_H
--#include <freetype/ttnameid.h>
--#endif
--#ifdef HAVE_FREETYPE_FTOUTLN_H
--#include <freetype/ftoutln.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTRIGON_H
--#include <freetype/fttrigon.h>
--#endif
--#ifdef HAVE_FREETYPE_FTWINFNT_H
--#include <freetype/ftwinfnt.h>
--#endif
--#ifdef HAVE_FREETYPE_FTMODAPI_H
--#include <freetype/ftmodapi.h>
--#endif
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
--#include <freetype/ftlcdfil.h>
--#endif
--
- #ifndef HAVE_FT_TRUETYPEENGINETYPE
- typedef enum
- {
-@@ -186,7 +166,7 @@
- MAKE_FUNCPTR(FT_Vector_Transform);
- MAKE_FUNCPTR(FT_Vector_Unit);
- static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter);
- #endif
-
-@@ -924,7 +904,7 @@
-
- static BOOL is_subpixel_rendering_enabled( void )
- {
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- static int enabled = -1;
- if (enabled == -1)
- {
-@@ -3912,7 +3892,7 @@
- #undef LOAD_FUNCPTR
- /* Don't warn if these ones are missing */
- pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
- #endif
-
-@@ -6655,7 +6635,7 @@
- case WINE_GGO_HBGR_BITMAP:
- case WINE_GGO_VRGB_BITMAP:
- case WINE_GGO_VBGR_BITMAP:
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- {
- switch (ft_face->glyph->format)
- {
---- include/config.h.in.orig 2013-11-15 13:30:24.000000000 -0600
-+++ include/config.h.in 2013-12-01 03:04:06.000000000 -0600
-@@ -132,39 +132,6 @@
- /* Define if FreeType 2 is installed */
- #undef HAVE_FREETYPE
-
--/* Define to 1 if you have the <freetype/freetype.h> header file. */
--#undef HAVE_FREETYPE_FREETYPE_H
--
--/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
--#undef HAVE_FREETYPE_FTGLYPH_H
--
--/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
--#undef HAVE_FREETYPE_FTLCDFIL_H
--
--/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
--#undef HAVE_FREETYPE_FTMODAPI_H
--
--/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
--#undef HAVE_FREETYPE_FTOUTLN_H
--
--/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
--#undef HAVE_FREETYPE_FTSNAMES_H
--
--/* Define if you have the <freetype/fttrigon.h> header file. */
--#undef HAVE_FREETYPE_FTTRIGON_H
--
--/* Define to 1 if you have the <freetype/fttypes.h> header file. */
--#undef HAVE_FREETYPE_FTTYPES_H
--
--/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
--#undef HAVE_FREETYPE_FTWINFNT_H
--
--/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
--#undef HAVE_FREETYPE_TTNAMEID_H
--
--/* Define to 1 if you have the <freetype/tttables.h> header file. */
--#undef HAVE_FREETYPE_TTTABLES_H
--
- /* Define to 1 if the system has the type `fsblkcnt_t'. */
- #undef HAVE_FSBLKCNT_T
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/51e81072/attachment-0001.html>
More information about the macports-changes
mailing list