From 32872b4a377467788ceb182ab2e273b18f4f00d4 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Sat, 6 Apr 2019 20:37:45 +0200
Subject: [PATCH] app-emulation/dxvk: Version bump 1.1

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07
---
 app-emulation/dxvk/Manifest            | 12 ++--
 app-emulation/dxvk/dxvk-1.1.ebuild     | 91 ++++++++++++++++++++++++++
 app-emulation/dxvk/dxvk-9999-r1.ebuild | 14 +++-
 3 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 app-emulation/dxvk/dxvk-1.1.ebuild

diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 385c41c..fe721c0 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST v1.0.2.tar.gz 595756 BLAKE2B 915a44017dff3414a6a074cf9e1531fc31e236d9ffd05ce6ded3b2262dbd41ce7184423059fcf67298664380005564906e417d28f64b5775766684cdbf3db96f SHA512 9a2a1027e71d067caae987e0862710dac04e3581d5fab5dbdaa4237c371952cdb631be821348ba12cf715550892c5f2abff58b51c79b62b5d13df814a48e67d8
+DIST v1.1.tar.gz 604187 BLAKE2B e2b40f3d314317d3b0a587b9620392803f7ec58aa68bb3bdbc0237d2dc5cff73475a8ad2068739af8f6fe6da81b67879148b24f6b6d381d9d78dd6561c936da9 SHA512 71e75d4042d2b1031c1cd1104505372f58e43903aa3b38dd2662afc7be1252b434b256eb2f3ea6852f005a1275b1d4543fc956603c4eba25df36d0ffe8ddc8f1
 EBUILD dxvk-1.0.2.ebuild 1797 BLAKE2B fbdcb98deddc8722b78249feda6d3985b7398c5fc17f604af78e4d552d3fe835ced916c02cd1676cb3031fd6c7fad214f0506428e0497d19bc85f91ffd3a0e54 SHA512 e049947e56984dda52e2313c230a0dc7f2551a445e224360f45bbd43945d61c65b93f3a88e1325aa0e82d070478f0973edba8d0eb2784b0ee853890a501983a7
-EBUILD dxvk-9999-r1.ebuild 1797 BLAKE2B fbdcb98deddc8722b78249feda6d3985b7398c5fc17f604af78e4d552d3fe835ced916c02cd1676cb3031fd6c7fad214f0506428e0497d19bc85f91ffd3a0e54 SHA512 e049947e56984dda52e2313c230a0dc7f2551a445e224360f45bbd43945d61c65b93f3a88e1325aa0e82d070478f0973edba8d0eb2784b0ee853890a501983a7
+EBUILD dxvk-1.1.ebuild 2073 BLAKE2B 228509fdd5b71ade979822bf0b6ffc2f0bb93e288276fe94e6dc46916d08e201de768032ca01fa116f829a3ac4fdfdea3828dbb4f71613003f505ee3bdd94f6a SHA512 46b398bac5e4a78757e46ef2480b3c866cfaeb73ac755bd5e43c1b7b63ab7db32025b3f1d6232389e528e575b852b5ba12298e742924043ff512d0eba033628f
+EBUILD dxvk-9999-r1.ebuild 2073 BLAKE2B 228509fdd5b71ade979822bf0b6ffc2f0bb93e288276fe94e6dc46916d08e201de768032ca01fa116f829a3ac4fdfdea3828dbb4f71613003f505ee3bdd94f6a SHA512 46b398bac5e4a78757e46ef2480b3c866cfaeb73ac755bd5e43c1b7b63ab7db32025b3f1d6232389e528e575b852b5ba12298e742924043ff512d0eba033628f
 MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXKJNXAAKCRDPw5SX8bJu
-ByAEAPwL66mSoVW6AmQ+bh+3P28LoEXJnR1eVyXNuFjxQQdg3AD/UULu2i860C+2
-v+gPfXiCaUK743xbC9HgUV0RxlO7mX4=
-=qCst
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXKjx+AAKCRDPw5SX8bJu
+B0TIAQCCgZQqh1gATYqk/tnC2mtzYx733ExByKErOAzi4aS7VgD/akjCQ0Ovs+cf
+o9oR0PL2CDQmwnscCAAoBCAurXhBWgo=
+=yOF/
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.1.ebuild b/app-emulation/dxvk/dxvk-1.1.ebuild
new file mode 100644
index 0000000..7226fbe
--- /dev/null
+++ b/app-emulation/dxvk/dxvk-1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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 D3D11 and D3D10 implementation 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"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="video_cards_nvidia"
+
+COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		>=app-emulation/wine-any-4.5
+		>=app-emulation/wine-d3d9-4.5
+		>=app-emulation/wine-staging-4.5
+		>=app-emulation/wine-vanilla-4.5
+	)
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-418.56 )
+		>=media-libs/mesa-19.1
+	)
+"
+
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib32/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
+multilib_src_configure() {
+	local bit="${MULTILIB_ABI_FLAG:8:2}"
+	local emesonargs=(
+		--libdir=lib${bit}/dxvk
+		--bindir=lib${bit}/dxvk/bin
+		--cross-file=../${P}/build-wine${bit}.txt
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
+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."
+}
diff --git a/app-emulation/dxvk/dxvk-9999-r1.ebuild b/app-emulation/dxvk/dxvk-9999-r1.ebuild
index e1e513a..7226fbe 100644
--- a/app-emulation/dxvk/dxvk-9999-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-9999-r1.ebuild
@@ -23,7 +23,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
+IUSE="video_cards_nvidia"
 
 COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
 DEPEND="
@@ -33,7 +33,17 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	media-libs/vulkan-loader
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		>=app-emulation/wine-any-4.5
+		>=app-emulation/wine-d3d9-4.5
+		>=app-emulation/wine-staging-4.5
+		>=app-emulation/wine-vanilla-4.5
+	)
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-418.56 )
+		>=media-libs/mesa-19.1
+	)
 "
 
 src_prepare() {