diff options
| -rw-r--r-- | .SRCINFO | 27 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | harmony-fix.diff | 63 | ||||
| -rw-r--r-- | wine-binfmt.conf | 2 | ||||
| -rw-r--r-- | wine-staging-git.install | 7 |
5 files changed, 108 insertions, 16 deletions
@@ -1,10 +1,9 @@ -# Generated by mksrcinfo v8 -# Sat Dec 9 01:42:42 UTC 2017 pkgbase = wine-staging-git pkgdesc = A compatibility layer for running Windows programs (staging branch, git version) - pkgver = 2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4 + pkgver = 3.3.r0.ge09e1fd3+wine.3.3.r0.gf17120d11b pkgrel = 1 url = https://www.wine-staging.com/ + install = wine-staging-git.install arch = i686 arch = x86_64 license = LGPL @@ -58,6 +57,10 @@ pkgbase = wine-staging-git makedepends = lib32-gtk3 makedepends = gst-plugins-base-libs makedepends = lib32-gst-plugins-base-libs + makedepends = vulkan-icd-loader + makedepends = lib32-vulkan-icd-loader + makedepends = sdl2 + makedepends = lib32-sdl2 makedepends = samba makedepends = opencl-headers makedepends = attr @@ -121,8 +124,6 @@ pkgbase = wine-staging-git optdepends = lib32-opencl-icd-loader optdepends = libxslt optdepends = lib32-libxslt - optdepends = libtxc_dxtn - optdepends = lib32-libtxc_dxtn optdepends = libva optdepends = lib32-libva optdepends = gtk3 @@ -131,24 +132,30 @@ pkgbase = wine-staging-git optdepends = lib32-gst-plugins-base-libs optdepends = vulkan-icd-loader optdepends = lib32-vulkan-icd-loader + optdepends = sdl2 + optdepends = lib32-sdl2 optdepends = cups optdepends = samba optdepends = dosbox - provides = wine=2.21.r0.g53290d2ec4 - provides = wine-wow64=2.21.r0.g53290d2ec4 - provides = wine-git=2.21.r0.g53290d2ec4 - provides = wine-staging=2.21.r0.g90679f2f + provides = wine=3.3.r0.gf17120d11b + provides = wine-wow64=3.3.r0.gf17120d11b + provides = wine-git=3.3.r0.gf17120d11b + provides = wine-staging=3.3.r0.ge09e1fd3 conflicts = wine conflicts = wine-wow64 conflicts = wine-git conflicts = wine-staging options = staticlibs source = wine-git::git://source.winehq.org/git/wine.git - source = wine-staging-git::git+https://github.com/wine-compholio/wine-staging.git + source = wine-staging-git::git+https://github.com/wine-staging/wine-staging.git + source = harmony-fix.diff source = 30-win32-aliases.conf + source = wine-binfmt.conf sha256sums = SKIP sha256sums = SKIP + sha256sums = 50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1 sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7 + sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4 pkgname = wine-staging-git depends = attr @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond < yahoo-com: danielbermond > pkgname=wine-staging-git -pkgver=2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4 +pkgver=3.3.r0.ge09e1fd3+wine.3.3.r0.gf17120d11b pkgrel=1 pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)' arch=('i686' 'x86_64') @@ -47,6 +47,8 @@ makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' 'libva' 'lib32-libva' 'gtk3' 'lib32-gtk3' 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs' + 'vulkan-icd-loader' 'lib32-vulkan-icd-loader' + 'sdl2' 'lib32-sdl2' 'samba' 'opencl-headers' ) @@ -67,22 +69,27 @@ optdepends=( 'ncurses' 'lib32-ncurses' 'opencl-icd-loader' 'lib32-opencl-icd-loader' 'libxslt' 'lib32-libxslt' - 'libtxc_dxtn' 'lib32-libtxc_dxtn' 'libva' 'lib32-libva' 'gtk3' 'lib32-gtk3' 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs' 'vulkan-icd-loader' 'lib32-vulkan-icd-loader' + 'sdl2' 'lib32-sdl2' 'cups' 'samba' 'dosbox' ) options=('staticlibs') +install="$pkgname".install source=('wine-git'::'git://source.winehq.org/git/wine.git' - "$pkgname"::'git+https://github.com/wine-compholio/wine-staging.git' - '30-win32-aliases.conf') + "$pkgname"::'git+https://github.com/wine-staging/wine-staging.git' + 'harmony-fix.diff' + '30-win32-aliases.conf' + 'wine-binfmt.conf') sha256sums=('SKIP' 'SKIP' - '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7') + '50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1' + '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7' + '6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4') if [ "$CARCH" = 'i686' ] then @@ -123,6 +130,9 @@ prepare() { # fix path of opencl headers sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* + + # freetype harmony fix + patch -Np1 -i "${srcdir}/harmony-fix.diff" } pkgver() { @@ -213,5 +223,8 @@ package() { # font aliasing settings for Win32 applications install -d "$pkgdir"/etc/fonts/conf.{avail,d} install -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/etc/fonts/conf.avail" - ln -s ../conf.avail/30-win32-aliases.conf "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf" + ln -s ../conf.avail/30-win32-aliases.conf "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf" + + # wine binfmt + install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/lib/binfmt.d/wine.conf" } 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: + { diff --git a/wine-binfmt.conf b/wine-binfmt.conf new file mode 100644 index 000000000000..4d4307336587 --- /dev/null +++ b/wine-binfmt.conf @@ -0,0 +1,2 @@ +# Start WINE on Windows executables +:DOSWin:M::MZ::/usr/bin/wine: diff --git a/wine-staging-git.install b/wine-staging-git.install new file mode 100644 index 000000000000..88a31c4353e6 --- /dev/null +++ b/wine-staging-git.install @@ -0,0 +1,7 @@ +post_install() { + printf '%s\n' "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system." +} + +post_remove() { + printf '%s\n' "binfmt binary formats will be updated at reboot" +} |