diff options
author | Daniel Bermond | 2018-03-04 16:23:24 -0300 |
---|---|---|
committer | Daniel Bermond | 2018-03-04 16:23:24 -0300 |
commit | 96cde2bedb567aefafb3429497dfb46d2a3656cd (patch) | |
tree | 9956de92a40cdb91d5d5beb05ae122d511e7fb6c /harmony-fix.diff | |
parent | 3fa525377754a7010d58253d4c7aa2c5ba87cbbc (diff) | |
download | aur-96cde2bedb567aefafb3429497dfb46d2a3656cd.tar.gz |
Change source. Other modifications.
Upstream wine-staging hosted at
'https://github.com/wine-compholio/wine-staging/' is no more
maintained. A community fork is now maintained at
'https://github.com/wine-staging/wine-staging/'. This fork was
received by mainstream Arch Linux in it's official repositories
in the stable wine-staging package, so it seems to be safe to
use it here too. Probably other mainstream Linux distributions
will follow this fork too, like Gentoo.
Other modifications on this commit:
-----------------------------------
- added freetype harmony fix
- added wine binfmt
- makedepends: added {lib32-}vulkan-icd-loader and {lib32-}sdl2
- optdepends : added {lib32-}sdl2
- optdepends : removed {lib32-}libtxc_dxtn
Note:
-----
libtxc_dxtn is now integrated into mesa. Packages libtxc_dxtn and
lib32-libtxc_dxtn were dropped from the official repositories.
References:
-----------
https://wine-staging.com/news/2018-02-17-future-wine-staging.html
https://www.winehq.org/pipermail/wine-devel/2018-February/122848.html
https://www.winehq.org/pipermail/wine-devel/2018-February/123080.html
https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/wine-staging&id=1a48e921ac7aa7f9c622f20e384e14324a609fa3
https://lists.freedesktop.org/archives/mesa-dev/2017-October/171265.html
https://cgit.freedesktop.org/mesa/mesa/commit/?id=04396a134f003aece573df593acfa1ab4418ffe8
https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7daa737d17df6d0a847e5c61e48d25e598671f4
https://cgit.freedesktop.org/mesa/mesa/commit/?id=d400348c73f0901eb24ff4d1562043d3119ef439
https://bugs.archlinux.org/task/56660
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/mesa&id=8b2dc9909803d680f67bb3d559d3e1c0a5f1e2ec
Diffstat (limited to 'harmony-fix.diff')
-rw-r--r-- | harmony-fix.diff | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/harmony-fix.diff b/harmony-fix.diff new file mode 100644 index 000000000000..fe0c8c929d4a --- /dev/null +++ b/harmony-fix.diff @@ -0,0 +1,63 @@ +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: + { |