From f4ecd15b81607bcf243954b0aba878d6c7b51835 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 20 Mar 2020 18:44:47 +0100 Subject: [PATCH] app-emulation/dxvk: Update live ebuild. --- app-emulation/dxvk/Manifest | 10 +++++----- app-emulation/dxvk/dxvk-9999-r2.ebuild | 19 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 1d685ec..9fac545 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -5,13 +5,13 @@ AUX 1.6-fix-setEvent-error.patch 621 BLAKE2B c751a08dcd4a7bf14c5f049dbc0787b373f DIST dxvk-1.5.5.tar.gz 889000 BLAKE2B 52878a5fdd060e8a6f771a9247f141a10f11d33633240cb7aebd8421a16b0d7456989412c6b80a49e037721c12b4737a9f02949a432b2b0ea22613a47ba8bd5b SHA512 b0a71dc6383aadfe55d30d73c3aefa63785882056d53d484e6d81b4bd85d40a1cf1840b61ecb03e21a3e8ed4e9a2c2d3d8ccbbadb956752f0356fe7e1a59ab10 DIST dxvk-1.6.tar.gz 892463 BLAKE2B 84d1ca0b42b9b63c5efa15d284ffedd76d4f5c09a1ca3e51971d36d68f0a5346f4bf3e5ee119a90fdbf489a3e21137e9d981710cb2b33b4b6a195f941baefa15 SHA512 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca EBUILD dxvk-1.5.5.ebuild 2303 BLAKE2B 39fc82ff1920d036669f4c11337f68746c77ceac92c3cd1a1150ce682deccb8178e40be285079b297969a81ca5da2ba367188ab7e821b94a37342d85f12864d9 SHA512 f5abd9a6d5c76402830718715e37db5817a7a4224729388e20e471cdaa6a134fd37f8006b94fd8534adf6e50855d7fe3e62515265b8b3e304f0fed2cf1d90f61 -EBUILD dxvk-9999-r2.ebuild 2336 BLAKE2B 4044de6d61a52f1784bdaf87b72af70b065acf444751a1c204a3f209e63b1ab9f57db53e2ff48068e65f5e147ea3cdcfe6a03383a1ea0eddf41deeb08ebb25ad SHA512 d2f2cc93171b6bdede0c6adaea81ec1b521b422e3ba7eec6dc857a25a0b6c49855c406776fcfbb960bf15d939592f46b00b079a0650ea679d3b5ad0763fc4bf5 EBUILD dxvk-1.6.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844 +EBUILD dxvk-9999-r2.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844 MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXnUA2wAKCRDPw5SX8bJu -B/yWAP0ZPkCyJwuVbSm+e9lJq9bCMOVo1OL5btumHx8yB9gy4QD/RRr1YPS8r9k6 -PX5bDesDcj/7/dmKZR25iKS8T2gnMCE= -=b0P5 +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXnUBDwAKCRDPw5SX8bJu +B1axAP9Uoq0TFi7IzX/51sky3DYz7uIHXGJB6Ur1L77dbnG8ZwD/c2JTx1Iv5wWf +ZsBrPEkeTXTKnLM1gloxcZ0XHo8QBaA= +=dxzl -----END PGP SIGNATURE----- diff --git a/app-emulation/dxvk/dxvk-9999-r2.ebuild b/app-emulation/dxvk/dxvk-9999-r2.ebuild index f535176..d7050ab 100644 --- a/app-emulation/dxvk/dxvk-9999-r2.ebuild +++ b/app-emulation/dxvk/dxvk-9999-r2.ebuild @@ -25,19 +25,18 @@ else 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}] +BDEPEND=" || ( - >=app-emulation/wine-staging-4.5 - >=app-emulation/wine-vanilla-4.5 + >=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 @@ -74,12 +73,12 @@ multilib_src_configure() { --bindir=$(get_libdir)/dxvk/bin --cross-file=../${P}/build-wine${bit}.txt ) - meson_src_configure + meson_src_configure || die } multilib_src_compile() { EMESON_SOURCE="${S}" - meson_src_compile + meson_src_compile || die } multilib_src_install() { @@ -87,7 +86,7 @@ multilib_src_install() { } multilib_src_install_all() { - dobin setup_dxvk.sh + dobin setup_dxvk.sh || die } pkg_postinst() {