Skip to content
Snippets Groups Projects
Commit 2beb4ada authored by Felix Yan's avatar Felix Yan
Browse files

upgpkg: 3.18-1

parent eb7268bb
No related branches found
No related tags found
No related merge requests found
......@@ -4,18 +4,16 @@
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=wine
pkgver=3.17
pkgver=3.18
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
source=(https://dl.winehq.org/wine/source/3.x/$pkgname-$_pkgbasever.tar.xz{,.sign}
harmony-fix.diff
30-win32-aliases.conf
wine-binfmt.conf)
sha512sums=('ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66'
sha512sums=('2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e'
'SKIP'
'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
......@@ -100,8 +98,6 @@ prepare() {
export CFLAGS="${CFLAGS/-fno-plt/}"
export LDFLAGS="${LDFLAGS/,-z,now/}"
patch -d $pkgname -Np1 < harmony-fix.diff
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
# Get rid of old build dirs
......
diff -u -r wine/dlls/gdi32/freetype.c wine-ft281/dlls/gdi32/freetype.c
--- wine/dlls/gdi32/freetype.c 2017-10-04 18:01:36.000000000 +0200
+++ wine-ft281/dlls/gdi32/freetype.c 2017-10-10 10:29:17.506632615 +0200
@@ -996,18 +996,23 @@
static BOOL is_subpixel_rendering_enabled( void )
{
-#ifdef FT_LCD_FILTER_H
static int enabled = -1;
if (enabled == -1)
{
- enabled = (pFT_Library_SetLcdFilter &&
- pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
+ /* >= 2.8.1 provides LCD rendering without filters */
+ if (FT_Version.major > 2 ||
+ FT_Version.major == 2 && FT_Version.minor > 8 ||
+ FT_Version.major == 2 && FT_Version.minor == 8 && FT_Version.patch >= 1)
+ enabled = TRUE;
+#ifdef FT_LCD_FILTER_H
+ else if (pFT_Library_SetLcdFilter &&
+ pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature)
+ enabled = TRUE;
+#endif
+ else enabled = FALSE;
TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
}
return enabled;
-#else
- return FALSE;
-#endif
}
@@ -7271,7 +7276,6 @@
case WINE_GGO_HBGR_BITMAP:
case WINE_GGO_VRGB_BITMAP:
case WINE_GGO_VBGR_BITMAP:
-#ifdef FT_LCD_FILTER_H
{
switch (ft_face->glyph->format)
{
@@ -7357,8 +7361,11 @@
if ( needsTransform )
pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
+#ifdef FT_LCD_FILTER_H
if ( pFT_Library_SetLcdFilter )
pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );
+#endif
+
pFT_Render_Glyph (ft_face->glyph, render_mode);
src = ft_face->glyph->bitmap.buffer;
@@ -7439,9 +7446,6 @@
break;
}
-#else
- return GDI_ERROR;
-#endif
case GGO_NATIVE:
{
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment