diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest deleted file mode 100644 index 2d6ed76..0000000 --- a/app-emulation/dxvk/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dxvk-1.10.1.tar.gz 1188138 BLAKE2B e4c5c5052de3f0976581317b9e6de148735198d2545e961ed4540be8660fbba0bcd30f81a1b55f032a1e00e226993d1ab3e4017b104f2829bf37d2ee4fc4420a SHA512 8fd34d9f14a7013cdc1957f63bf60feb19748fddc1cd6ec40cf271005f636de62965efb42ddf2598dad3e37a4f59a870bf769387b2534db93451d1ea6aa65410 -DIST dxvk-1.10.2.tar.gz 1199562 BLAKE2B 8605d80de3640845589727999da8d19f235eafd52dc693ddfc6a6c54da4525ab5a1418694767395e37cfd84ab55bfd33867cd8608ff2e34965759f68832f55ee SHA512 2a68ececd405e38b6a463637f98c871e53f83c0b232bbf45f08b6b2cac01637eecea90f9337d8ebc600e174a65fe2b10236b1b29afdbd0ad0a9d970a050678a4 diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild deleted file mode 100644 index 3909f15..0000000 --- a/app-emulation/dxvk/dxvk-1.10.1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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="~amd64" -fi -IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi video_cards_nvidia skip-toolchain-check 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-20.2 - ) - || ( - >=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 )" - -pkg_pretend () { - if ! use skip-toolchain-check; 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 - 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 - fi - - 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/dxvk-1.10.2.ebuild b/app-emulation/dxvk/dxvk-1.10.2.ebuild deleted file mode 100644 index 3909f15..0000000 --- a/app-emulation/dxvk/dxvk-1.10.2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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="~amd64" -fi -IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi video_cards_nvidia skip-toolchain-check 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-20.2 - ) - || ( - >=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 )" - -pkg_pretend () { - if ! use skip-toolchain-check; 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 - 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 - fi - - 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/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild deleted file mode 100644 index 3909f15..0000000 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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="~amd64" -fi -IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi video_cards_nvidia skip-toolchain-check 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-20.2 - ) - || ( - >=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 )" - -pkg_pretend () { - if ! use skip-toolchain-check; 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 - 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 - fi - - 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.8_add-compiler-flags.patch b/app-emulation/dxvk/files/dxvk-1.8_add-compiler-flags.patch deleted file mode 100644 index eee9dd5..0000000 --- a/app-emulation/dxvk/files/dxvk-1.8_add-compiler-flags.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fa1ead4a488b90593c05f5ce634fd3f9e8dd6b81 Mon Sep 17 00:00:00 2001 -From: tastytea -Date: Wed, 13 Jan 2021 16:35:34 +0100 -Subject: [PATCH] Add compiler and linker flags. - ---- - build-win32.txt | 5 +++++ - build-win64.txt | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/build-win32.txt b/build-win32.txt -index a1406832..c3c9521c 100644 ---- a/build-win32.txt -+++ b/build-win32.txt -@@ -7,6 +7,11 @@ strip = 'i686-w64-mingw32-strip' - [properties] - needs_exe_wrapper = true - -+c_args = @CFLAGS@ -+cpp_args = @CXXFLAGS@ -+c_link_args = @LDFLAGS@ -+cpp_link_args = @LDFLAGS@ -+ - [host_machine] - system = 'windows' - cpu_family = 'x86' -diff --git a/build-win64.txt b/build-win64.txt -index 1aee4626..50960343 100644 ---- a/build-win64.txt -+++ b/build-win64.txt -@@ -7,6 +7,11 @@ strip = 'x86_64-w64-mingw32-strip' - [properties] - needs_exe_wrapper = true - -+c_args = @CFLAGS@ -+cpp_args = @CXXFLAGS@ -+c_link_args = @LDFLAGS@ -+cpp_link_args = @LDFLAGS@ -+ - [host_machine] - system = 'windows' - cpu_family = 'x86_64' --- -2.26.2 - diff --git a/app-emulation/dxvk/metadata.xml b/app-emulation/dxvk/metadata.xml deleted file mode 100644 index 09a02e7..0000000 --- a/app-emulation/dxvk/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - gentoo@tastytea.de - tastytea - - - https://github.com/doitsujin/dxvk/issues - - - Build D3D9 - Build D3D10 - Build D3D11 - Build DXGI - Do not check if the toolchain - is installed correctly - - diff --git a/profiles/package.mask b/profiles/package.mask index a722062..e69de29 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,3 +0,0 @@ -# tastytea (2022-07-25) -# Package is in ::gentoo now, removal on 2022-08-25. -app-emulation/dxvk