app-emulation/dxvk: Update 1.6.1.
Based on 9999-r3 instead of 1.6.
This commit is contained in:
parent
abe9073e96
commit
230b073c84
GPG Key ID:
CFC39497F1B26E07
|
|
@ -7,14 +7,14 @@ DIST dxvk-1.5.5.tar.gz 889000 BLAKE2B 52878a5fdd060e8a6f771a9247f141a10f11d33633
|
|||
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.5.5.ebuild 2303 BLAKE2B 39fc82ff1920d036669f4c11337f68746c77ceac92c3cd1a1150ce682deccb8178e40be285079b297969a81ca5da2ba367188ab7e821b94a37342d85f12864d9 SHA512 f5abd9a6d5c76402830718715e37db5817a7a4224729388e20e471cdaa6a134fd37f8006b94fd8534adf6e50855d7fe3e62515265b8b3e304f0fed2cf1d90f61
|
||||
EBUILD dxvk-1.6.1.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844
|
||||
EBUILD dxvk-1.6.1.ebuild 2996 BLAKE2B 85d6d7b1794ab281b382bc59ac1c5a5443f61116e1b9ccd18b599bb4b486830010406a53e14c266d60cca4d0ad90b32669e2cfb3e9ba6f1087f65c64f67e6717 SHA512 dcf51ec07f8c4ca489185467e40cbad995fa87d090062621325eed674e47cd6a598942c390839eddc5dc2f9312d6682d1fefb95d3614a7ac8125fa94d6719410
|
||||
EBUILD dxvk-1.6.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844
|
||||
EBUILD dxvk-9999-r3.ebuild 2996 BLAKE2B 85d6d7b1794ab281b382bc59ac1c5a5443f61116e1b9ccd18b599bb4b486830010406a53e14c266d60cca4d0ad90b32669e2cfb3e9ba6f1087f65c64f67e6717 SHA512 dcf51ec07f8c4ca489185467e40cbad995fa87d090062621325eed674e47cd6a598942c390839eddc5dc2f9312d6682d1fefb95d3614a7ac8125fa94d6719410
|
||||
MISC metadata.xml 500 BLAKE2B f52f73c13f36ee4ad4006cd73c7bbea3e05c750f638c29c13ece73874a2980d2c62d74ceae4b2785ea862f27db19db4c79c179e7d546c02bb21bf871e859cda2 SHA512 f3c874cf60ae01bf03ed422229ca66326f7962e7bb9e2605f0f7ae906c3c3799ddd87d41110af875fd6a0cc95b2992c6adcace9fbc0baf97aba23e4e54591f66
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp2MRQAKCRDPw5SX8bJu
|
||||
Bx8sAPsHrqDZx/Pvg3FZhLhhnL5TQ/aU4oDwyKwQ6bWxk7kHAgD/VQkpbhgEw3Ox
|
||||
58a963dttwxYkOqK2iHy2gDLLv9o/no=
|
||||
=QBR1
|
||||
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp2QCgAKCRDPw5SX8bJu
|
||||
B8rbAQCKHP/3hhFoPc1NViLsfT+05vM2V//d32BX7iZgA/wtxgEAhMbpapJsQEuV
|
||||
peY9K5ELTx75sG2sQ7EhGtImiZ7Ggh4=
|
||||
=3rhd
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
EAPI=7
|
||||
MULTILIB_COMPAT=( abi_x86_{32,64} )
|
||||
inherit meson multilib-minimal ninja-utils
|
||||
inherit flag-o-matic meson multilib-minimal ninja-utils
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
inherit git-r3
|
||||
fi
|
||||
|
|
@ -23,7 +23,7 @@ if [[ "${PV}" == "9999" ]]; then
|
|||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
IUSE="video_cards_nvidia"
|
||||
IUSE="+d3d9 +d3d10 +d3d11 +dxgi video_cards_nvidia"
|
||||
|
||||
DEPEND="
|
||||
dev-util/vulkan-headers
|
||||
|
|
@ -31,8 +31,8 @@ DEPEND="
|
|||
"
|
||||
BDEPEND="
|
||||
|| (
|
||||
>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP}]
|
||||
>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP}]
|
||||
>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan]
|
||||
>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan]
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
|
|
@ -44,7 +44,7 @@ RDEPEND="
|
|||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/1.6-fix-setEvent-error.patch"
|
||||
"${FILESDIR}/flags.patch"
|
||||
)
|
||||
|
||||
pkg_pretend () {
|
||||
|
|
@ -56,26 +56,46 @@ pkg_pretend () {
|
|||
|
||||
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
|
||||
|
||||
# Filter -march flags as this has been causing issues.
|
||||
filter-flags "-march=*"
|
||||
|
||||
sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
|
||||
|
||||
# Delete installation instructions for unused ABIs.
|
||||
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
|
||||
|
||||
add_flags() {
|
||||
# Fix installation directory.
|
||||
sed -i "s|\"x64\"|\"usr/$(get_libdir)/dxvk\"|" setup_dxvk.sh || die
|
||||
|
||||
# Add *FLAGS to cross-file.
|
||||
local bits="${MULTILIB_ABI_FLAG:8:2}"
|
||||
sed -i \
|
||||
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS}")!" \
|
||||
-e "s!@CXXFLAGS@!$(_meson_env_array "${CXXFLAGS}")!" \
|
||||
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
|
||||
build-wine${bits}.txt || die
|
||||
}
|
||||
multilib_foreach_abi add_flags
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local bit="${MULTILIB_ABI_FLAG:8:2}"
|
||||
local bits="${MULTILIB_ABI_FLAG:8:2}"
|
||||
|
||||
local emesonargs=(
|
||||
--libdir=$(get_libdir)/dxvk
|
||||
--bindir=$(get_libdir)/dxvk/bin
|
||||
--cross-file=../${P}/build-wine${bit}.txt
|
||||
--libdir="$(get_libdir)/dxvk"
|
||||
--bindir="$(get_libdir)/dxvk/bin"
|
||||
--cross-file="${S}/build-wine${bits}.txt"
|
||||
$(meson_use d3d9 "enable_d3d9")
|
||||
$(meson_use d3d10 "enable_d3d10")
|
||||
$(meson_use d3d11 "enable_d3d11")
|
||||
$(meson_use dxgi "enable_dxgi")
|
||||
)
|
||||
meson_src_configure || die
|
||||
}
|
||||
|
|
@ -98,5 +118,5 @@ pkg_postinst() {
|
|||
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."
|
||||
elog "D9VK is part of DXVK since 1.5. If you use symlinks, don't forget to link the new libraries."
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue
Block a user