Date: Saturday, May 26, 2018 @ 17:03:42 Author: felixonmars Revision: 330204
archrelease: copy trunk to multilib-x86_64 Added: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 330203, wine-staging/trunk/30-win32-aliases.conf) wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 330203, wine-staging/trunk/PKGBUILD) wine-staging/repos/multilib-x86_64/harmony-fix.diff (from rev 330203, wine-staging/trunk/harmony-fix.diff) wine-staging/repos/multilib-x86_64/wine-binfmt.conf (from rev 330203, wine-staging/trunk/wine-binfmt.conf) wine-staging/repos/multilib-x86_64/wine.install (from rev 330203, wine-staging/trunk/wine.install) Deleted: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf wine-staging/repos/multilib-x86_64/PKGBUILD wine-staging/repos/multilib-x86_64/harmony-fix.diff wine-staging/repos/multilib-x86_64/wine-binfmt.conf wine-staging/repos/multilib-x86_64/wine.install ------------------+ PKGBUILD | 370 ++++++++++++++++++++++++++--------------------------- harmony-fix.diff | 126 +++++++++--------- wine-binfmt.conf | 4 wine.install | 14 +- 4 files changed, 257 insertions(+), 257 deletions(-) Deleted: 30-win32-aliases.conf =================================================================== (Binary files differ) Copied: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 330203, wine-staging/trunk/30-win32-aliases.conf) =================================================================== (Binary files differ) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-26 17:03:07 UTC (rev 330203) +++ PKGBUILD 2018-05-26 17:03:42 UTC (rev 330204) @@ -1,185 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: Eduardo Romero <edua...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=wine-staging -pkgver=3.8 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign} - "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz" - harmony-fix.diff - 30-win32-aliases.conf - wine-binfmt.conf) -sha512sums=('387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98' - 'SKIP' - '46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c' - 'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e' - '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb' - 'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285') -validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 - DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D) - -pkgdesc="A compatibility layer for running Windows programs - Staging branch" -url="http://www.wine-staging.com" -arch=(x86_64) -options=(staticlibs) -license=(LGPL) - -depends=( - attr lib32-attr - fontconfig lib32-fontconfig - lcms2 lib32-lcms2 - libxml2 lib32-libxml2 - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - freetype2 lib32-freetype2 - glu lib32-glu - libsm lib32-libsm - gcc-libs lib32-gcc-libs - libpcap lib32-libpcap - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex - 'gcc>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libldap lib32-libldap - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - mesa lib32-mesa - mesa-libgl lib32-mesa-libgl - opencl-icd-loader lib32-opencl-icd-loader - libxslt lib32-libxslt - libpulse lib32-libpulse - 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 -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - libxinerama lib32-libxinerama - ncurses lib32-ncurses - opencl-icd-loader lib32-opencl-icd-loader - libxslt lib32-libxslt - 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 -) - -provides=("wine=$pkgver" "wine-wow64=$pkgver") -conflicts=('wine' 'wine-wow64') -install=wine.install - -prepare() { - # Allow ccache to work - mv wine-$_pkgbasever $pkgname - - # apply wine-staging patchset - pushd wine-staging-$_pkgbasever/patches - ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all - popd - - # https://bugs.winehq.org/show_bug.cgi?id=43530 - 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 - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-{32,64}-build -} - -build() { - cd "$srcdir" - - msg2 "Building Wine-64..." - - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --with-x \ - --with-gstreamer \ - --enable-win64 \ - --with-xattr - - make - - msg2 "Building Wine-32..." - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --with-x \ - --with-gstreamer \ - --with-xattr \ - --libdir=/usr/lib32 \ - --with-wine64="$srcdir/$pkgname-64-build" - - make -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - - # 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" - install -Dm 644 "$srcdir/wine-binfmt.conf" "$pkgdir/usr/lib/binfmt.d/wine.conf" -} - -# vim:set ts=8 sts=2 sw=2 et: Copied: wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 330203, wine-staging/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-26 17:03:42 UTC (rev 330204) @@ -0,0 +1,185 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: Eduardo Romero <edua...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> + +pkgname=wine-staging +pkgver=3.9 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign} + "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz" + harmony-fix.diff + 30-win32-aliases.conf + wine-binfmt.conf) +sha512sums=('4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64' + 'SKIP' + '4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad' + 'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e' + '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb' + 'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285') +validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 + DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D) + +pkgdesc="A compatibility layer for running Windows programs - Staging branch" +url="http://www.wine-staging.com" +arch=(x86_64) +options=(staticlibs) +license=(LGPL) + +depends=( + attr lib32-attr + fontconfig lib32-fontconfig + lcms2 lib32-lcms2 + libxml2 lib32-libxml2 + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxi lib32-libxi + gettext lib32-gettext + freetype2 lib32-freetype2 + glu lib32-glu + libsm lib32-libsm + gcc-libs lib32-gcc-libs + libpcap lib32-libpcap + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex + 'gcc>=4.5.0-2' + giflib lib32-giflib + libpng lib32-libpng + gnutls lib32-gnutls + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libldap lib32-libldap + mpg123 lib32-mpg123 + openal lib32-openal + v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib + libxcomposite lib32-libxcomposite + mesa lib32-mesa + mesa-libgl lib32-mesa-libgl + opencl-icd-loader lib32-opencl-icd-loader + libxslt lib32-libxslt + libpulse lib32-libpulse + 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 +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + gnutls lib32-gnutls + mpg123 lib32-mpg123 + openal lib32-openal + v4l-utils lib32-v4l-utils + libpulse lib32-libpulse + alsa-plugins lib32-alsa-plugins + alsa-lib lib32-alsa-lib + libjpeg-turbo lib32-libjpeg-turbo + libxcomposite lib32-libxcomposite + libxinerama lib32-libxinerama + ncurses lib32-ncurses + opencl-icd-loader lib32-opencl-icd-loader + libxslt lib32-libxslt + 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 +) + +provides=("wine=$pkgver" "wine-wow64=$pkgver") +conflicts=('wine' 'wine-wow64') +install=wine.install + +prepare() { + # Allow ccache to work + mv wine-$_pkgbasever $pkgname + + # apply wine-staging patchset + pushd wine-staging-$_pkgbasever/patches + ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all + popd + + # https://bugs.winehq.org/show_bug.cgi?id=43530 + 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 + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-{32,64}-build +} + +build() { + cd "$srcdir" + + msg2 "Building Wine-64..." + + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --with-x \ + --with-gstreamer \ + --enable-win64 \ + --with-xattr + + make + + msg2 "Building Wine-32..." + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --with-x \ + --with-gstreamer \ + --with-xattr \ + --libdir=/usr/lib32 \ + --with-wine64="$srcdir/$pkgname-64-build" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + + # 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" + install -Dm 644 "$srcdir/wine-binfmt.conf" "$pkgdir/usr/lib/binfmt.d/wine.conf" +} + +# vim:set ts=8 sts=2 sw=2 et: Deleted: harmony-fix.diff =================================================================== --- harmony-fix.diff 2018-05-26 17:03:07 UTC (rev 330203) +++ harmony-fix.diff 2018-05-26 17:03:42 UTC (rev 330204) @@ -1,63 +0,0 @@ -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: - { Copied: wine-staging/repos/multilib-x86_64/harmony-fix.diff (from rev 330203, wine-staging/trunk/harmony-fix.diff) =================================================================== --- harmony-fix.diff (rev 0) +++ harmony-fix.diff 2018-05-26 17:03:42 UTC (rev 330204) @@ -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: + { Deleted: wine-binfmt.conf =================================================================== --- wine-binfmt.conf 2018-05-26 17:03:07 UTC (rev 330203) +++ wine-binfmt.conf 2018-05-26 17:03:42 UTC (rev 330204) @@ -1,2 +0,0 @@ -# Start WINE on Windows executables -:DOSWin:M::MZ::/usr/bin/wine: Copied: wine-staging/repos/multilib-x86_64/wine-binfmt.conf (from rev 330203, wine-staging/trunk/wine-binfmt.conf) =================================================================== --- wine-binfmt.conf (rev 0) +++ wine-binfmt.conf 2018-05-26 17:03:42 UTC (rev 330204) @@ -0,0 +1,2 @@ +# Start WINE on Windows executables +:DOSWin:M::MZ::/usr/bin/wine: Deleted: wine.install =================================================================== --- wine.install 2018-05-26 17:03:07 UTC (rev 330203) +++ wine.install 2018-05-26 17:03:42 UTC (rev 330204) @@ -1,7 +0,0 @@ -post_install() { - echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system." -} - -post_remove() { - echo "binfmt binary formats will be updated at reboot" -} Copied: wine-staging/repos/multilib-x86_64/wine.install (from rev 330203, wine-staging/trunk/wine.install) =================================================================== --- wine.install (rev 0) +++ wine.install 2018-05-26 17:03:42 UTC (rev 330204) @@ -0,0 +1,7 @@ +post_install() { + echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system." +} + +post_remove() { + echo "binfmt binary formats will be updated at reboot" +}