diff options
-rw-r--r-- | .SRCINFO | 186 | ||||
-rw-r--r-- | 30-win32-aliases.conf | 20 | ||||
-rw-r--r-- | PKGBUILD | 227 | ||||
-rw-r--r-- | fo4.patch | 17 |
4 files changed, 450 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..b399284d9fbf --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,186 @@ +# Generated by mksrcinfo v8 +# Wed Nov 29 20:37:57 UTC 2017 +pkgbase = wine-staging-fallout4-git + pkgdesc = A compatibility layer for running Windows programs (staging branch, git version, with a patch to fix wine bug 43932) + pkgver = 2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4 + pkgrel = 1 + url = https://www.wine-staging.com/ + arch = i686 + arch = x86_64 + license = LGPL + makedepends = git + makedepends = autoconf + makedepends = ncurses + makedepends = bison + makedepends = perl + makedepends = fontforge + makedepends = flex + makedepends = gcc>=4.5.0-2 + makedepends = gcc-multilib>=4.5.0-2 + makedepends = giflib + makedepends = lib32-giflib + makedepends = libpng + makedepends = lib32-libpng + makedepends = gnutls + makedepends = lib32-gnutls + makedepends = libxinerama + makedepends = lib32-libxinerama + makedepends = libxcomposite + makedepends = lib32-libxcomposite + makedepends = libxmu + makedepends = lib32-libxmu + makedepends = libxxf86vm + makedepends = lib32-libxxf86vm + makedepends = libldap + makedepends = lib32-libldap + makedepends = mpg123 + makedepends = lib32-mpg123 + makedepends = openal + makedepends = lib32-openal + makedepends = v4l-utils + makedepends = lib32-v4l-utils + makedepends = alsa-lib + makedepends = lib32-alsa-lib + makedepends = libxcomposite + makedepends = lib32-libxcomposite + makedepends = mesa + makedepends = lib32-mesa + makedepends = libgl + makedepends = lib32-libgl + makedepends = opencl-icd-loader + makedepends = lib32-opencl-icd-loader + makedepends = libxslt + makedepends = lib32-libxslt + makedepends = libpulse + makedepends = lib32-libpulse + makedepends = libva + makedepends = lib32-libva + makedepends = gtk3 + makedepends = lib32-gtk3 + makedepends = gst-plugins-base-libs + makedepends = lib32-gst-plugins-base-libs + makedepends = samba + makedepends = opencl-headers + makedepends = attr + makedepends = lib32-attr + makedepends = fontconfig + makedepends = lib32-fontconfig + makedepends = lcms2 + makedepends = lib32-lcms2 + makedepends = libxml2 + makedepends = lib32-libxml2 + makedepends = libxcursor + makedepends = lib32-libxcursor + makedepends = libxrandr + makedepends = lib32-libxrandr + makedepends = libxdamage + makedepends = lib32-libxdamage + makedepends = libxi + makedepends = lib32-libxi + makedepends = gettext + makedepends = lib32-gettext + makedepends = freetype2 + makedepends = lib32-freetype2 + makedepends = glu + makedepends = lib32-glu + makedepends = libsm + makedepends = lib32-libsm + makedepends = gcc-libs + makedepends = lib32-gcc-libs + makedepends = libpcap + makedepends = lib32-libpcap + makedepends = desktop-file-utils + optdepends = giflib + optdepends = lib32-giflib + optdepends = libpng + optdepends = lib32-libpng + optdepends = libldap + optdepends = lib32-libldap + optdepends = gnutls + optdepends = lib32-gnutls + optdepends = mpg123 + optdepends = lib32-mpg123 + optdepends = openal + optdepends = lib32-openal + optdepends = v4l-utils + optdepends = lib32-v4l-utils + optdepends = libpulse + optdepends = lib32-libpulse + optdepends = alsa-plugins + optdepends = lib32-alsa-plugins + optdepends = alsa-lib + optdepends = lib32-alsa-lib + optdepends = libjpeg-turbo + optdepends = lib32-libjpeg-turbo + optdepends = libxcomposite + optdepends = lib32-libxcomposite + optdepends = libxinerama + optdepends = lib32-libxinerama + optdepends = ncurses + optdepends = lib32-ncurses + optdepends = opencl-icd-loader + optdepends = lib32-opencl-icd-loader + optdepends = libxslt + optdepends = lib32-libxslt + optdepends = libtxc_dxtn + optdepends = lib32-libtxc_dxtn + optdepends = libva + optdepends = lib32-libva + optdepends = gtk3 + optdepends = lib32-gtk3 + optdepends = gst-plugins-base-libs + optdepends = lib32-gst-plugins-base-libs + optdepends = vulkan-icd-loader + optdepends = lib32-vulkan-icd-loader + 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 + 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-fallout4-git::git+https://github.com/wine-compholio/wine-staging.git + source = fo4.patch + source = 30-win32-aliases.conf + sha256sums = SKIP + sha256sums = SKIP + sha256sums = 0f70c435c8705a390892e03e0af93fd2d8a56be515229bcd425bbe55c388c8bb + sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7 + +pkgname = wine-staging-fallout4-git + depends = attr + depends = lib32-attr + depends = fontconfig + depends = lib32-fontconfig + depends = lcms2 + depends = lib32-lcms2 + depends = libxml2 + depends = lib32-libxml2 + depends = libxcursor + depends = lib32-libxcursor + depends = libxrandr + depends = lib32-libxrandr + depends = libxdamage + depends = lib32-libxdamage + depends = libxi + depends = lib32-libxi + depends = gettext + depends = lib32-gettext + depends = freetype2 + depends = lib32-freetype2 + depends = glu + depends = lib32-glu + depends = libsm + depends = lib32-libsm + depends = gcc-libs + depends = lib32-gcc-libs + depends = libpcap + depends = lib32-libpcap + depends = desktop-file-utils + diff --git a/30-win32-aliases.conf b/30-win32-aliases.conf new file mode 100644 index 000000000000..99ae1f7b83a5 --- /dev/null +++ b/30-win32-aliases.conf @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <alias binding="same"> + <family>MS Shell Dlg</family> + <accept><family>Microsoft Sans Serif</family></accept> + <default><family>sans-serif</family></default> + </alias> + <alias binding="same"> + <family>MS Shell Dlg 2</family> + <accept><family>Tahoma</family></accept> + <default><family>sans-serif</family></default> + </alias> + + <alias binding="same"> + <family>MS Sans Serif</family> + <prefer><family>Microsoft Sans Serif</family></prefer> + <default><family>sans-serif</family></default> + </alias> +</fontconfig> diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..d258aebb3358 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,227 @@ +# Maintainer: Daniel Bermond < yahoo-com: danielbermond > +# Patch by Thomas +# Dumb copy of wine-stafing-git by NeoTheFox + +pkgname=wine-staging-fallout4-git +pkgver=2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4 +pkgrel=1 +pkgdesc='A compatibility layer for running Windows programs (staging branch, git version, with a patch to fix wine bug 43932)' +arch=('i686' 'x86_64') +url='https://www.wine-staging.com/' +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=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' + 'gcc>=4.5.0-2' 'gcc-multilib>=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' + 'libgl' 'lib32-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' + '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' + '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' + 'cups' + 'samba' + 'dosbox' +) +options=('staticlibs') +source=('wine-git'::'git://source.winehq.org/git/wine.git' + "$pkgname"::'git+https://github.com/wine-compholio/wine-staging.git' + 'fo4.patch' + '30-win32-aliases.conf') +sha256sums=('SKIP' + 'SKIP' + '0f70c435c8705a390892e03e0af93fd2d8a56be515229bcd425bbe55c388c8bb' + '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7') + +if [ "$CARCH" = 'i686' ] +then + # strip lib32 etc. on i686 + _depends=("${_depends[@]/*32-*/}") + makedepends=("${makedepends[@]/*32-*/}" "${_depends[@]}") + makedepends=("${makedepends[@]/*-multilib*/}") + optdepends=("${optdepends[@]/*32-*/}") + provides=( + "wine=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')" + "wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')" + "wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')" + ) + conflicts=('wine' 'wine-git' 'wine-staging') +else + makedepends=("${makedepends[@]}" "${_depends[@]}") + provides=( + "wine=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')" + "wine-wow64=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')" + "wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')" + "wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')" + ) + conflicts=('wine' 'wine-wow64' 'wine-git' 'wine-staging') +fi + +prepare() { + cd 'wine-git' + + # restore the wine tree to its git origin state, without wine-staging patches + # (necessary for reapllying wine-staging patches in succedent builds, + # otherwise the patches will fail to be reapplied) + msg2 'Cleaning wine source code tree...' + git reset --hard HEAD # restore tracked files + git clean -xdf # delete untracked files + + # change back to the wine upstream commit that this version of wine-staging is based in + msg2 'Changing wine HEAD to the wine-staging base commit...' + git checkout "$(../"$pkgname"/patches/patchinstall.sh --upstream-commit)" + + # fix path of opencl headers + sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* +} + +pkgver() { + cd "$pkgname" + local _staging_tag="$(git tag --sort='version:refname' | tail -n1 | sed 's/-/./g;s/^v//')" + local _staging_version="$(git describe --long --tags \ + | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' \ + | sed "s/^latest.release/${_staging_tag}/")" + cd "${srcdir}/wine-git" + local _wine_version="$(git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')" + + printf '%s+%s' "$_staging_version" "$_wine_version" +} + +build() { + # delete old build dirs (from previous builds) and make new ones + rm -rf "$pkgname"-{32,64}-build + mkdir -p "$pkgname"-32-build + + # apply all wine-staging patches + msg2 'Applying wine-staging patches...' + ./"${pkgname}"/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" --all + + msg2 'Fixing Fallout 4...' + cd wine-git + patch -p2 < ../fo4.patch + cd .. + + # workaround for FS#55128 + # https://bugs.archlinux.org/task/55128 + # https://bugs.winehq.org/show_bug.cgi?id=43530 + export CFLAGS="${CFLAGS/-fno-plt/}" + export LDFLAGS="${LDFLAGS/,-z,now/}" + + # build wine-staging 64-bit + # (according to the wine wiki, this 64-bit/32-bit building order is mandatory) + if [ "$CARCH" = "x86_64" ] + then + msg2 'Building Wine-64...' + mkdir -p "$pkgname"-64-build + cd "$pkgname"-64-build + ../wine-git/configure \ + --prefix='/usr' \ + --libdir='/usr/lib' \ + --with-x \ + --with-gstreamer \ + --enable-win64 \ + --with-xattr + make + local _wine32opts=( + '--libdir=/usr/lib32' + "--with-wine64=${srcdir}/${pkgname}-64-build" + ) + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + fi + + # build wine-staging 32-bit + msg2 'Building Wine-32...' + cd "${srcdir}/${pkgname}"-32-build + ../wine-git/configure \ + --prefix='/usr' \ + --with-x \ + --with-gstreamer \ + --with-xattr \ + "${_wine32opts[@]}" + make +} + +package() { + depends=("${_depends[@]}") + + # package wine-staging 32-bit + # (according to the wine wiki, this reverse 32-bit/64-bit packaging order is important) + msg2 'Packaging Wine-32...' + cd "$pkgname"-32-build + + if [ "$CARCH" = 'i686' ] + then + make prefix="${pkgdir}/usr" install + else + make prefix="${pkgdir}/usr" \ + libdir="${pkgdir}/usr/lib32" \ + dlldir="${pkgdir}/usr/lib32/wine" install + + # package wine-staging 64-bit + msg2 'Packaging Wine-64...' + cd "${srcdir}/${pkgname}"-64-build + make prefix="${pkgdir}/usr" \ + libdir="${pkgdir}/usr/lib" \ + dlldir="${pkgdir}/usr/lib/wine" install + fi + + # 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" +} diff --git a/fo4.patch b/fo4.patch new file mode 100644 index 000000000000..c459fada42df --- /dev/null +++ b/fo4.patch @@ -0,0 +1,17 @@ +diff --git a/wine-staging-nine.org/dlls/wined3d/glsl_shader.c b/wine-staging-nine/dlls/wined3d/glsl_shader.c +index b3952fa..c293e4c 100644 +--- a/wine-staging-nine.org/dlls/wined3d/glsl_shader.c ++++ b/wine-staging-nine/dlls/wined3d/glsl_shader.c +@@ -6709,6 +6709,12 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv + shader_addline(buffer, "gl_Layer = floatBitsToInt(outputs[%u])%s;\n", + output->register_idx, reg_mask); + } ++ else if (output->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) ++ { ++ gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0+semantic_idx); ++ shader_addline(buffer, "gl_ClipDistance[%u] = outputs[%u]%s;\n", ++ semantic_idx, output->register_idx, reg_mask); ++ } + else if (output->sysval_semantic) + { + FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); |