diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 8add9ad..0f54801 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,3 +1,2 @@ -DIST dxvk-1.7.3.tar.gz 1078834 BLAKE2B 6e3cc34fdf4fccf41cd391ae276196da5c0771e51871579f9fbb1b958a776da7d6e83a0c2e825808da6fe8725a4e0c0341d26d97743fcd3f4f5670a57fa488b6 SHA512 4997466ff924756789d0e040f67e83a0665edc4964d5d94ecbca47b73ae02c2b0899d68ad70f326d245e4ce57cc1f3b60f18b177f098893a6b2d2ddf70f73cd8 DIST dxvk-1.8.1.tar.gz 1086640 BLAKE2B 9b30ddeb2ae2850171b83fc1048d7529a0429aa3bdaa067f25a9b77cecd0d91f96269a0ad6ca467a7ee97e9acf0eeb65c7f04b0cd6551f47cbe66b6ae02ad4a0 SHA512 e25190c20079e4d750d4efb7494b03f57de55664e4db734e34e337259ac9f8f3170f287d299e725140bd5465c6798ccab2d615b93a859e92e9c80b445ddfddcc DIST dxvk-1.8.tar.gz 1085188 BLAKE2B 9d6613d43265b86f88cb7c2ab4cf1f1402bebc123ca1f4c8d5b318b215b121ba8201f07ac62b966b58a11eb0b603d949ff82b921987a6551c900afda130efa9e SHA512 f7b2cf3f474c24d788f119f2b5d4ce4565a72ed8e4fa6b40c7ce1c395c93a1f966ac7d0a1a7f7731ddec6394eabe4eadc43bd981f22bfeb84686c85743845956 diff --git a/app-emulation/dxvk/dxvk-1.7.3.ebuild b/app-emulation/dxvk/dxvk-1.7.3.ebuild deleted file mode 100644 index c3a63ba..0000000 --- a/app-emulation/dxvk/dxvk-1.7.3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2021 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 -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 video_cards_nvidia test" - -DEPEND=" - dev-util/vulkan-headers - dev-util/glslang -" -RDEPEND=" - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - || ( - video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) - >=media-libs/mesa-19.2 - ) - || ( - >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] - >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] - ) -" - -PATCHES=( - "${FILESDIR}/dxvk-1.7.3_add-compiler-flags.patch" -) - -RESTRICT="!test? ( test )" - -pkg_pretend () { - 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 - local thread_model="$(LC_ALL=C ${cat/cross-/}-gcc -v 2>&1 \ - | grep 'Thread model' | cut -d' ' -f3)" || die - if ! has_version -b ">=${cat}/mingw64-runtime-8.0.0[libraries]" || - ! has_version -b "${cat}/gcc" || - [[ "${thread_model}" != "posix" ]]; then - eerror "The ${cat} toolchain is not properly installed." - eerror "Make sure to install ${cat}/mingw64-runtime >= 8.0.0 with USE=\"libraries\"" - eerror "and ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\"." - eerror "See for more information." - - einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo." - - die "${cat} toolchain is not properly installed." - fi - done - - einfo "Please report build errors first to the package maintainer via" - einfo " or email." -} - -src_prepare() { - default - - # Flag modifications adapted from TheGreatMcPain's overlay. - if [[ $(is-flag "-march=*") == "true" ]]; then - append-flags "-mno-avx" - fi - - 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}" - - # 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}")!" \ - "build-win${bits}.txt" || 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}" - - local emesonargs=( - --libdir="$(get_libdir)/dxvk" - --bindir="$(get_libdir)/dxvk" - --cross-file="${S}/build-win${bits}.txt" - --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. - find "${D}" -name '*.a' -delete -print - - dobin setup_dxvk.sh - - insinto etc - doins "dxvk.conf" - - default -} - -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." -} diff --git a/app-emulation/dxvk/files/dxvk-1.7.3_add-compiler-flags.patch b/app-emulation/dxvk/files/dxvk-1.7.3_add-compiler-flags.patch deleted file mode 100644 index c917a78..0000000 --- a/app-emulation/dxvk/files/dxvk-1.7.3_add-compiler-flags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3d8f568f678ee6efbfdf27161dee7c786031fb28 Mon Sep 17 00:00:00 2001 -From: tastytea -Date: Mon, 18 May 2020 15:41:59 +0200 -Subject: [PATCH] Add compiler flags. - ---- - build-win32.txt | 8 ++++---- - build-win64.txt | 6 ++++-- - 2 files changed, 8 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..8b41ca26 100644 ---- a/build-win64.txt -+++ b/build-win64.txt -@@ -5,8 +5,10 @@ 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_args = @CFLAGS@ -+cpp_args = @CXXFLAGS@ -+c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc'] -+cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++'] - needs_exe_wrapper = true - - [host_machine] --- -2.26.2 -