forked from tastytea/overlay
app-emulation/dxvk: Re-add 1.6.
This reverts commit 3e747a9acd.
Bug: #8
This commit is contained in:
parent
9431fbcf8e
commit
fa611deadc
GPG Key ID:
CFC39497F1B26E07
|
|
@ -1,18 +1,21 @@
|
|||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
AUX 1.6-fix-setEvent-error.patch 621 BLAKE2B c751a08dcd4a7bf14c5f049dbc0787b373f7de6f79379f4993459b9b0762f6a13334bae2b25e802d0013f943f449f24145d58ebee342694943489bb24e6e2d96 SHA512 01f0c0458b72e433988445be80f7f8e4407a8cffe9c79f7a21c7657de2b775949a8d11b6a9f4197fc2d59ef79b8fe431bb653ef3467fc451fa5c8a161b223908
|
||||
AUX 1.6.1-add_compiler_flags.patch 2745 BLAKE2B b664a09dc698c24b0d699b1b717c33fd4c1d3095c861be16d5b78b2afc30e789054d654a6a49dcd007740f1098b2f1f7363be79fbbb6b47f44fc94e32cfadce4 SHA512 60439332b8ba0ac8cb37576f04385bc304868e53b27135c5eb2fbc2578eae20d1d38c9b4e13046f4494f2a2958846a04066d99fddd66369f233253d6208f60cf
|
||||
AUX 9999-add_compiler_flags.patch 1474 BLAKE2B a38298c55d2884e661afc68d2505cec9718bdc0efcb55a2483bc874208ecbb4cc98c3d0f3a87a381d4c712052ae89479e80fa38b9385e883a525178211c8af28 SHA512 ad1ebb5f68bb88548d7cd774e03ea0d566ea5e7e5bfb1eb2994012cce6ca7ecc1d38a3dd688a3641a60627103142ba9c2d45581b8c358166538d66550fb8c4a0
|
||||
AUX flags.patch 1400 BLAKE2B c69951eddea7b94836e9d64b39870395c4eb54dcfff31fb9ff9eafa801d989acddcf738802bbc3600a871053546dc5f641726f7e75cfdb9f101973aebd2b3571 SHA512 fd4a053775a4ab7b4df24da38ba602a5e8d43a75676bf3e870a82dd4f4e3bcf228e043139604c95941b09086ecd21887a8eaf81f2229d00abb47fdc83419284c
|
||||
DIST dxvk-1.6.1.tar.gz 894553 BLAKE2B a45f905f33b255beed65daebbb946b36c28d00dc4d3830e46de342f16d95541361a31243e6ce3e8cde3b2c7297dd2b1044aa61955f1803b8bfb34ec83367c2a9 SHA512 0f3cb7096643d1bcb1db51696824c8ca16720adfe6894392122b21f400cfa416e79eb74cdcc46d1a63a276697d324324d7657afb70b9490e22e6792643fc5805
|
||||
DIST dxvk-1.6.tar.gz 892463 BLAKE2B 84d1ca0b42b9b63c5efa15d284ffedd76d4f5c09a1ca3e51971d36d68f0a5346f4bf3e5ee119a90fdbf489a3e21137e9d981710cb2b33b4b6a195f941baefa15 SHA512 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca
|
||||
EBUILD dxvk-1.6.1-r1.ebuild 5451 BLAKE2B 384298d2ca80e8057d86f16b91bdf46cb81687d499a8d4570e24b115547e7e936e02118a5e99f760b2e8c81ac0b51939e03fdf8d6fb075f60bce6230c729856f SHA512 a5e495f99a7bc2268bbb60c29869e3cf38b531cc0159fd497aa3779efb6c1ed995d85dea795410cb661afc02141c489d2de520e67f696a60a81d1ec1caa9216f
|
||||
EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
|
||||
EBUILD dxvk-1.6.ebuild 2376 BLAKE2B 97cc29f25803ec0a36a76a0fe515ade3a7cebf07f84845c9fb74fde31c40e029c78283397cce7ed84898b0bf2646ca084ee283ffe4cb1c1b28c0972375aadcf7 SHA512 b4cce9544f7eb243b7ae5adc741ad1734d59aea7deabc340d157980ab3ec41a15f86c5a4a212589f4a9062a479c78c6680a977d928a77838cf4e8b57c835c62a
|
||||
EBUILD dxvk-9999-r4.ebuild 4947 BLAKE2B d0848cd76d63343670416f7ba0d60872e7c3ac20617be556ece1e711ba11a80883238e52b9306c42d0cc290b4372bc2b580ef98755e56a9ff4998c69ae87e6fc SHA512 44d27d864244c70e273aac7094b04179fa181305b7b3afba2b59515d2dd128b073a2f2bb60bb36e14a88ded003eff72f0b0435f93e7eda77e06cdedf86a139fb
|
||||
MISC metadata.xml 643 BLAKE2B 6e4968ea2dddea57b8079e56f3c7e5f3f478a5d017d4d238d3b2326b593bb461a74ef77270bf659fecec25c564156617e287ab8a247e8b040c07e5b829e70898 SHA512 0c71cc5589839c365703bb1938fd3360adf985875a669239a45abb8f25f517330b8e72895a18db61b076eed7e71e1a804016d0d01afeadc5650340505c30eb74
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXqRDSQAKCRDPw5SX8bJu
|
||||
B0sVAQCBCWT1wgCQCovQQzT5Z71TxObZoOzAUla67aWzsfNfdgD/frcFd9nlQ8qY
|
||||
KlTh7e0iff61GdYfHCV3JlpOs/LlhRY=
|
||||
=pQQQ
|
||||
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXqRFnAAKCRDPw5SX8bJu
|
||||
B8vVAP94jBnRTKV4ZEMuW0bOSRkuG9EJKFuDZrLVYokqMLvxUQD/Rug3zwxdISZZ
|
||||
mssKNm32WiOraxrEnR9Y4/66cxZb5GA=
|
||||
=kEjb
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
MULTILIB_COMPAT=( abi_x86_{32,64} )
|
||||
inherit meson multilib-minimal ninja-utils
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
inherit git-r3
|
||||
fi
|
||||
|
||||
DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
|
||||
HOMEPAGE="https://github.com/doitsujin/dxvk"
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
|
||||
else
|
||||
SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
KEYWORDS=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
IUSE="video_cards_nvidia"
|
||||
|
||||
DEPEND="
|
||||
dev-util/vulkan-headers
|
||||
dev-util/glslang
|
||||
"
|
||||
BDEPEND="
|
||||
|| (
|
||||
>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP}]
|
||||
>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP}]
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
|
||||
|| (
|
||||
video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 )
|
||||
>=media-libs/mesa-19.2
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/1.6-fix-setEvent-error.patch"
|
||||
)
|
||||
|
||||
pkg_pretend () {
|
||||
if ! use abi_x86_64 && ! use abi_x86_32; then
|
||||
eerror "You need to enable at least one of abi_x86_32 and abi_x86_64."
|
||||
die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
|
||||
sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
|
||||
sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
|
||||
|
||||
if ! use abi_x86_64; then
|
||||
sed -i '/installFile "$win64_sys_path"/d' setup_dxvk.sh || die
|
||||
fi
|
||||
|
||||
if ! use abi_x86_32; then
|
||||
sed -i '/installFile "$win32_sys_path"/d' setup_dxvk.sh || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local bit="${MULTILIB_ABI_FLAG:8:2}"
|
||||
|
||||
local emesonargs=(
|
||||
--libdir=$(get_libdir)/dxvk
|
||||
--bindir=$(get_libdir)/dxvk/bin
|
||||
--cross-file=../${P}/build-wine${bit}.txt
|
||||
)
|
||||
meson_src_configure || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
EMESON_SOURCE="${S}"
|
||||
meson_src_compile || die
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dobin setup_dxvk.sh || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "dxvk is installed, but not activated. You have to create DLL overrides"
|
||||
elog "in order to make use of it. To do so, set WINEPREFIX and execute"
|
||||
elog "setup_dxvk.sh install --symlink."
|
||||
|
||||
elog "D9VK is part of DXVK since 1.5. If use symlinks, don't forget to link the new libraries."
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
From 3104192af717f309068d2c20fd51b339511f6552 Mon Sep 17 00:00:00 2001
|
||||
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
|
||||
Date: Fri, 20 Mar 2020 17:01:46 +0100
|
||||
Subject: [PATCH] [d3d11] Fix winelib build
|
||||
|
||||
Closes #1521.
|
||||
---
|
||||
src/util/sync/sync_signal_win32.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/util/sync/sync_signal_win32.h b/src/util/sync/sync_signal_win32.h
|
||||
index e89bec86a..8ddc5aa6b 100644
|
||||
--- a/src/util/sync/sync_signal_win32.h
|
||||
+++ b/src/util/sync/sync_signal_win32.h
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
#include <list>
|
||||
|
||||
+#include "../com/com_include.h"
|
||||
+
|
||||
#include "sync_signal.h"
|
||||
|
||||
namespace dxvk::sync {
|
||||
Loading…
Reference in New Issue