app-emulation/dxvk: Update live ebuild, revbump to r4.

app-emulation/dxvk/Manifest

@@ -2,16 +2,18 @@
 Hash: SHA512
 
 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
 EBUILD dxvk-1.6.1-r1.ebuild 4925 BLAKE2B e1589d6a8df377d8be08f100bc02f150c2636f8c558d0b1846ec943a022827dd35fc77193715ce361b339f56b3a5eb57372a67f363e2399d3d6a643eb2871ac3 SHA512 a07b7e6791b3b29f836f4ef3863e78aeeae8bc074dedf37fbc0ddb432fc8b83bd51bddf70521d521c262918b2ca30cb62f082d23ebab1320ff00fafcc8fd168c
 EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
 EBUILD dxvk-9999-r3.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
+EBUILD dxvk-9999-r4.ebuild 4924 BLAKE2B 1c97a1625a03317922797a19b6a4ace73cc0c716fc0853f6b78dc5bc0ec8c7ee72b11f14f1aa2150a1211ed0182dc7e428f6d5e3ba5471efe90d6926e5ba57ae SHA512 bbb870d2f176632635b13eb41449ff95d292d14c6750d9e0d42466e6e8348df4ff30db94152dec1d19340cacdb1a5a81c061d5f21e857a22fbb22537bfee3e2c
 MISC metadata.xml 643 BLAKE2B 0b5aa604f15a049ffce213c45e4731da24bc903d54dfce84692be92f106a271fde885ada19f5a44781452423178b1361e9fe2152cc4c689dbd4fe8e04f241ade SHA512 49f429099195f87d22cf8a5a549074b881aed6b7ff1f76427497f730137d002ee3d8b0a6d1cf4322588e8d3a4d61d9387d72e668eab8b9fa2e0cebb17f942802
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp8bXQAKCRDPw5SX8bJu
-B0PtAP4qUoBROpYKk0pHWN0S3WKWHVfS7MHVoXNu9vJMQytofgD+MQdLblCW8rjv
-a8eMDwN+rgIcvsM9zYEsIIIBMT1IfX4=
-=JV5g
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp8blQAKCRDPw5SX8bJu
+B4bCAP9pvhIAtCUW1xgd7tUweyRyV9aVxhsa/xeFLCnbfAAomwD/W8P8e2gQihmF
+EYgsSK1DwndjBEL4tPtraytebgAQxO8=
+=bXyF
 -----END PGP SIGNATURE-----

app-emulation/dxvk/dxvk-9999-r4.ebuild

@@ -0,0 +1,179 @@
+# 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 flag-o-matic 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="+d3d9 +d3d10 +d3d11 debug +dxgi +mingw video_cards_nvidia test winegcc"
+REQUIRED_USE="^^ ( mingw winegcc )"
+
+DEPEND="
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+BDEPEND="
+	winegcc? ( || (
+		>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan]
+		>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan]
+	) )
+"
+RDEPEND="
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 )
+		>=media-libs/mesa-19.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/9999-add_compiler_flags.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
+
+	if use mingw; then
+		local -a categories
+		use abi_x86_64 && categories+=("cross-x86_64-w64-mingw32")
+		use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
+
+		for cat in ${categories[@]}; do
+			if ! has_version -b "${cat}/gcc"; then
+				eerror "${cat}/gcc is not installed."
+				elog "See <https://wiki.gentoo.org/wiki/Mingw> on how to install it."
+				einfo "In short:"
+				einfo "echo '~${cat}/mingw64-runtime-7.0.0 ~amd64' >> \\"
+				einfo "    /etc/portage/package.accept_keywords/mingw"
+				einfo "crossdev --stable --target ${cat}"
+				einfo "echo 'EXTRA_ECONF=\"--enable-threads=posix\"' >> \\"
+				einfo "    /etc/portage/env/mingw-gcc.conf"
+				einfo "echo '${cat}/gcc mingw-gcc.conf' >> \\"
+				einfo "    /etc/portage/package.env/mingw"
+				einfo "echo '${cat}/mingw64-runtime libraries' >> \\"
+				einfo "    /etc/portage/package.use/mingw"
+				einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
+				die
+			fi
+		done
+
+		ewarn "Compiling with mingw is experimental. Good luck! :-)"
+	elif use winegcc; then
+		ewarn "Compiling with winegcc is not supported by upstream."
+		ewarn "Please report compile-errors to the package maintainer via"
+		ewarn "<https://schlomp.space/tastytea/overlay/issues> or email."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# 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
+
+	patch_build_flags() {
+		local bits="${MULTILIB_ABI_FLAG:8:2}"
+		if use mingw; then
+			local buildfile="build-win${bits}.txt"
+		else
+			local buildfile="build-wine${bits}.txt"
+		fi
+
+		# Fix installation directory.
+		sed -i "s|\"x${bits}\"|\"usr/$(get_libdir)/dxvk\"|" setup_dxvk.sh || die
+
+		# Add *FLAGS to cross-file.
+		sed -i \
+			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS}")!" \
+			-e "s!@CXXFLAGS@!$(_meson_env_array "${CXXFLAGS}")!" \
+			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			"${buildfile}" || die
+	}
+	multilib_foreach_abi patch_build_flags
+
+	# Load configuration file from /etc/dxvk.conf.
+	sed -Ei 's|filePath = "^(\s+)dxvk.conf";$|\1filePath = "/etc/dxvk.conf";|' \
+		src/util/config/config.cpp || die
+}
+
+multilib_src_configure() {
+	local bits="${MULTILIB_ABI_FLAG:8:2}"
+	if use mingw; then
+		local buildfile="build-win${bits}.txt"
+	else
+		local buildfile="build-wine${bits}.txt"
+	fi
+
+	local emesonargs=(
+		--libdir="$(get_libdir)/dxvk"
+		--bindir="$(get_libdir)/dxvk"
+		--cross-file="${S}/${buildfile}"
+		--buildtype="release"
+		$(usex debug "" "--strip")
+		$(meson_use d3d9 "enable_d3d9")
+		$(meson_use d3d10 "enable_d3d10")
+		$(meson_use d3d11 "enable_d3d11")
+		$(meson_use dxgi "enable_dxgi")
+		$(meson_use test "enable_tests")
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	# The .a files are needed during the install phase.
+	use mingw && find "${D}" -name '*.a' -delete -print
+
+	dobin setup_dxvk.sh
+
+	insinto etc
+	doins "dxvk.conf"
+}
+
+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 you use symlinks, don't forget to link the new libraries."
+}

app-emulation/dxvk/files/9999-add_compiler_flags.patch

@@ -0,0 +1,47 @@
+From 3dc43a4640a9680f453c3f3ec37a966302527a07 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 21 Apr 2020 18:10:04 +0200
+Subject: [PATCH] Add compiler flags.
+
+---
+ build-win32.txt | 8 ++++----
+ build-win64.txt | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/build-win32.txt b/build-win32.txt
+index 97ec8a35..e2e2e3f9 100644
+--- a/build-win32.txt
++++ b/build-win32.txt
+@@ -5,10 +5,10 @@ ar = 'i686-w64-mingw32-ar'
+ strip = 'i686-w64-mingw32-strip'
+ 
+ [properties]
+-c_args=['-msse', '-msse2']
+-cpp_args=['-msse', '-msse2']
+-c_link_args = ['-static', '-static-libgcc']
+-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
++c_args=@CFLAGS@ + ['-msse', '-msse2']
++cpp_args=@CXXFLAGS@ + ['-msse', '-msse2']
++c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
++cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
+ needs_exe_wrapper = true
+ 
+ [host_machine]
+diff --git a/build-win64.txt b/build-win64.txt
+index 2a7fbee3..cb8bdb00 100644
+--- a/build-win64.txt
++++ b/build-win64.txt
+@@ -5,8 +5,8 @@ ar = 'x86_64-w64-mingw32-ar'
+ strip = 'x86_64-w64-mingw32-strip'
+ 
+ [properties]
+-c_link_args = ['-static', '-static-libgcc']
+-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
++c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
++cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
+ needs_exe_wrapper = true
+ 
+ [host_machine]
+-- 
+2.25.3
+