From e2a2d17cdf3e2f767e38ec94ba0a1beb459a850b Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 26 Mar 2022 12:23:55 -0400 Subject: app-emulation/dxvk: upgrade to 1.10.1 --- app-emulation/dxvk/Manifest | 2 +- app-emulation/dxvk/dxvk-1.10.1.ebuild | 118 ++++++++++++++++++++++++++++++++++ app-emulation/dxvk/dxvk-1.10.ebuild | 118 ---------------------------------- 3 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 app-emulation/dxvk/dxvk-1.10.1.ebuild delete mode 100644 app-emulation/dxvk/dxvk-1.10.ebuild diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index cf742aa..c26971c 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1 +1 @@ -DIST dxvk-1.10.tar.gz 1178320 BLAKE2B 9ad6153ceb06db31d24c982a0ecc3681b63a0e08a1c1c5800d35b90a785fe069b4ec7b579e8736d98e49b58ab5b64e7b9c806bbf160a23eefa8e32fb7bb669be SHA512 8e0e9f2ef7e6afba1463b6f59ce297cad5fc0de091bac17b4802e6c980c331d8404d12d58565f7b75be1e0f1e322951a2bcbc589f3a1dd5ab4b2810716c77a36 +DIST dxvk-1.10.1.tar.gz 1188138 BLAKE2B e4c5c5052de3f0976581317b9e6de148735198d2545e961ed4540be8660fbba0bcd30f81a1b55f032a1e00e226993d1ab3e4017b104f2829bf37d2ee4fc4420a SHA512 8fd34d9f14a7013cdc1957f63bf60feb19748fddc1cd6ec40cf271005f636de62965efb42ddf2598dad3e37a4f59a870bf769387b2534db93451d1ea6aa65410 diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild new file mode 100644 index 0000000..acb6291 --- /dev/null +++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild @@ -0,0 +1,118 @@ +# 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 + +DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" +HOMEPAGE="https://github.com/doitsujin/dxvk" +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + 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 test" + +DEPEND=" + abi_x86_32? ( cross-i686-w64-mingw32/gcc ) + abi_x86_64? ( cross-x86_64-w64-mingw32/gcc ) + dev-util/vulkan-headers + dev-util/glslang +" +RDEPEND=" + media-libs/vulkan-loader[${MULTILIB_USEDEP}] + || ( + >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] + >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] + ) +" + +PATCHES=( + "${FILESDIR}/dxvk-1.8_add-compiler-flags.patch" +) + +RESTRICT="!test? ( test )" + +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 +} + +src_prepare() { + default + + 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 + + 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 +} diff --git a/app-emulation/dxvk/dxvk-1.10.ebuild b/app-emulation/dxvk/dxvk-1.10.ebuild deleted file mode 100644 index acb6291..0000000 --- a/app-emulation/dxvk/dxvk-1.10.ebuild +++ /dev/null @@ -1,118 +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 - -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk" -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - 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 test" - -DEPEND=" - abi_x86_32? ( cross-i686-w64-mingw32/gcc ) - abi_x86_64? ( cross-x86_64-w64-mingw32/gcc ) - dev-util/vulkan-headers - dev-util/glslang -" -RDEPEND=" - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - || ( - >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] - >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] - ) -" - -PATCHES=( - "${FILESDIR}/dxvk-1.8_add-compiler-flags.patch" -) - -RESTRICT="!test? ( test )" - -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 -} - -src_prepare() { - default - - 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 - - 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 -} -- cgit v1.2.3-70-g09d2