app-emulation/dxvk: Delete old ebuilds and files.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2020-05-18 16:04:29 +02:00
parent 4423fadede
commit 8dffcd9733
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
6 changed files with 4 additions and 389 deletions

View File

@ -1,23 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
AUX 1.6-fix-setEvent-error.patch 621 BLAKE2B c751a08dcd4a7bf14c5f049dbc0787b373f7de6f79379f4993459b9b0762f6a13334bae2b25e802d0013f943f449f24145d58ebee342694943489bb24e6e2d96 SHA512 01f0c0458b72e433988445be80f7f8e4407a8cffe9c79f7a21c7657de2b775949a8d11b6a9f4197fc2d59ef79b8fe431bb653ef3467fc451fa5c8a161b223908
AUX 1.6.1-add_compiler_flags.patch 2745 BLAKE2B b664a09dc698c24b0d699b1b717c33fd4c1d3095c861be16d5b78b2afc30e789054d654a6a49dcd007740f1098b2f1f7363be79fbbb6b47f44fc94e32cfadce4 SHA512 60439332b8ba0ac8cb37576f04385bc304868e53b27135c5eb2fbc2578eae20d1d38c9b4e13046f4494f2a2958846a04066d99fddd66369f233253d6208f60cf
AUX 9999-add_compiler_flags.patch 1519 BLAKE2B 272434af7b582a8e47a6c2bf10301bc2ba3b32eb9af60e92c77896df335a85309fe035a7d30214bd29d8fd7a85aca3752faeead1a42b2a7413054ed903ebab1f SHA512 3b35b3b2c0307c22d15acdc227e5811b12fd46594016ab9233a96ba9a4f6f57a930d49cf134d996e04f8cc3a70dde8b0f4ea0d96a132ffbaf8dc9d0207ac1307
AUX flags.patch 1400 BLAKE2B c69951eddea7b94836e9d64b39870395c4eb54dcfff31fb9ff9eafa801d989acddcf738802bbc3600a871053546dc5f641726f7e75cfdb9f101973aebd2b3571 SHA512 fd4a053775a4ab7b4df24da38ba602a5e8d43a75676bf3e870a82dd4f4e3bcf228e043139604c95941b09086ecd21887a8eaf81f2229d00abb47fdc83419284c
DIST dxvk-1.6.1.tar.gz 894553 BLAKE2B a45f905f33b255beed65daebbb946b36c28d00dc4d3830e46de342f16d95541361a31243e6ce3e8cde3b2c7297dd2b1044aa61955f1803b8bfb34ec83367c2a9 SHA512 0f3cb7096643d1bcb1db51696824c8ca16720adfe6894392122b21f400cfa416e79eb74cdcc46d1a63a276697d324324d7657afb70b9490e22e6792643fc5805
DIST dxvk-1.6.tar.gz 892463 BLAKE2B 84d1ca0b42b9b63c5efa15d284ffedd76d4f5c09a1ca3e51971d36d68f0a5346f4bf3e5ee119a90fdbf489a3e21137e9d981710cb2b33b4b6a195f941baefa15 SHA512 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca
DIST dxvk-1.7.tar.gz 899679 BLAKE2B 3e382520c136ebdb5277289ba2ba6586dbd861074f1c7d71b296ea1c564560087737044683d79db17a5faf732a9b339908d8f247225511431ed2943680c9d3ff SHA512 3a78332dbaaed71fb007ef9b441b33892bd56844dfddc72ded926108712ade34060ddb850bf3943b175aed6e89d453fb84f12fe9c00a94e03a342de61d7aed0c
EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
EBUILD dxvk-1.6.ebuild 3014 BLAKE2B f510a47962b19ab5854d8a5f5e36a2200d021f6783aa05f8222cce1d05006b97130abf186bda937236c73cc994c043d627938035d9363030605d0c082f66638c SHA512 43e80f111f51a9084b09064178bebb437b2c0931b4f65ed665a837805b6bb5dcc5a2868b05bd103fe864f6f9de59829c4c9e21734a780c4a0913b4176c7e8757
EBUILD dxvk-1.6.1-r1.ebuild 5457 BLAKE2B faa212d0ca64e3e4e2b0f2461e3941d83cb7e69310454e822b6168ccdc0bc25dbd194d749936eceecc5b70112c1a5d02155875894be401f731abed35aa2e19b3 SHA512 ecd07f8ccf742147aed6fe5b2a4f57b3a73784002ef8c7219a5d3d29bfdc7471c9e119c88cd1e89bf0de11410c7ee597d075afeb96a51abdc0ab88115e2a0d62
EBUILD dxvk-1.7.ebuild 4814 BLAKE2B 59cbf2cf123edcb0dd1e47d9f72c53322537ef6802afbe71ac2fe994591ea755fe4bf538c6d171003b107193ed035e1cb6f2534ae12f2df3d20b1213ee0b26d1 SHA512 c8694c887a4e0e4752dbbbee597d80b3e3cd4831c20c7d9a652bc7ae0262629748c4277ca78714b453a2fda61a58bb5c4bbee011844be63a0dbbf02c4d55c274
EBUILD dxvk-9999-r4.ebuild 4360 BLAKE2B 2e15a3b32068bc658ca7744f077eae84186c41068a0e2484ae52293d338281cd799795d2af6b2e625a231e4b41f2837f3af8c56c43f01399567f027f113eee85 SHA512 de80de2563ea3b1c7b88ef94c45f04c467e1dcf66e47f2223206415e56c1f97da5a52033174112986bceed09b06e49aa3d5119e8ba38487e47f5b9faace43ba7
MISC metadata.xml 643 BLAKE2B 6e4968ea2dddea57b8079e56f3c7e5f3f478a5d017d4d238d3b2326b593bb461a74ef77270bf659fecec25c564156617e287ab8a247e8b040c07e5b829e70898 SHA512 0c71cc5589839c365703bb1938fd3360adf985875a669239a45abb8f25f517330b8e72895a18db61b076eed7e71e1a804016d0d01afeadc5650340505c30eb74
-----BEGIN PGP SIGNATURE-----
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXsKVrAAKCRDPw5SX8bJu
B+EMAQCHJR0wURSDh+ZdCrWEmo+QMYDgsnBMdLJyE5If0vmXlwD/ZXSZ0BPYZiyQ
KsRBJcjHAXeOumOqsjKZhC9/EMqZsIE=
=7jvl
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXsKV7gAKCRDPw5SX8bJu
B8AGAQCLpJ9tGz4rn0lLzW/GnLuZdisQ3jyqOqMv6jm2+wpJyQD/SjxkSkJ+5XhS
+l6eNkyKMI1mx1/jGAZGZ2Q3GrGEnN0=
=YnB3
-----END PGP SIGNATURE-----

View File

@ -1,122 +0,0 @@
# 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 +dxgi video_cards_nvidia"
DEPEND="
dev-util/vulkan-headers
dev-util/glslang
"
BDEPEND="
|| (
>=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}/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
}
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
add_flags() {
# Fix installation directory.
sed -i "s|\"x64\"|\"usr/$(get_libdir)/dxvk\"|" setup_dxvk.sh || die
# Add *FLAGS to cross-file.
local bits="${MULTILIB_ABI_FLAG:8:2}"
sed -i \
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS}")!" \
-e "s!@CXXFLAGS@!$(_meson_env_array "${CXXFLAGS}")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
build-wine${bits}.txt || die
}
multilib_foreach_abi add_flags
}
multilib_src_configure() {
local bits="${MULTILIB_ABI_FLAG:8:2}"
local emesonargs=(
--libdir="$(get_libdir)/dxvk"
--bindir="$(get_libdir)/dxvk/bin"
--cross-file="${S}/build-wine${bits}.txt"
$(meson_use d3d9 "enable_d3d9")
$(meson_use d3d10 "enable_d3d10")
$(meson_use d3d11 "enable_d3d11")
$(meson_use dxgi "enable_dxgi")
)
meson_src_configure
}
multilib_src_compile() {
EMESON_SOURCE="${S}"
meson_src_compile
}
multilib_src_install() {
meson_src_install
}
multilib_src_install_all() {
dobin setup_dxvk.sh
}
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."
}

View File

@ -1,123 +0,0 @@
# 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 +dxgi video_cards_nvidia"
DEPEND="
dev-util/vulkan-headers
dev-util/glslang
"
BDEPEND="
|| (
>=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}/1.6-fix-setEvent-error.patch"
"${FILESDIR}/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
}
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
add_flags() {
# Fix installation directory.
sed -i "s|\"x64\"|\"usr/$(get_libdir)/dxvk\"|" setup_dxvk.sh || die
# Add *FLAGS to cross-file.
local bits="${MULTILIB_ABI_FLAG:8:2}"
sed -i \
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS}")!" \
-e "s!@CXXFLAGS@!$(_meson_env_array "${CXXFLAGS}")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
build-wine${bits}.txt || die
}
multilib_foreach_abi add_flags
}
multilib_src_configure() {
local bits="${MULTILIB_ABI_FLAG:8:2}"
local emesonargs=(
--libdir="$(get_libdir)/dxvk"
--bindir="$(get_libdir)/dxvk/bin"
--cross-file="${S}/build-wine${bits}.txt"
$(meson_use d3d9 "enable_d3d9")
$(meson_use d3d10 "enable_d3d10")
$(meson_use d3d11 "enable_d3d11")
$(meson_use dxgi "enable_dxgi")
)
meson_src_configure
}
multilib_src_compile() {
EMESON_SOURCE="${S}"
meson_src_compile
}
multilib_src_install() {
meson_src_install
}
multilib_src_install_all() {
dobin setup_dxvk.sh
}
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."
}

View File

@ -1,23 +0,0 @@
From 3104192af717f309068d2c20fd51b339511f6552 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Fri, 20 Mar 2020 17:01:46 +0100
Subject: [PATCH] [d3d11] Fix winelib build
Closes #1521.
---
src/util/sync/sync_signal_win32.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/util/sync/sync_signal_win32.h b/src/util/sync/sync_signal_win32.h
index e89bec86a..8ddc5aa6b 100644
--- a/src/util/sync/sync_signal_win32.h
+++ b/src/util/sync/sync_signal_win32.h
@@ -2,6 +2,8 @@
#include <list>
+#include "../com/com_include.h"
+
#include "sync_signal.h"
namespace dxvk::sync {

View File

@ -1,77 +0,0 @@
---
build-win32.txt | 8 ++++----
build-win64.txt | 4 ++--
build-wine32.txt | 6 +++---
build-wine64.txt | 6 +++---
4 files changed, 12 insertions(+), 12 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]
diff --git a/build-wine32.txt b/build-wine32.txt
index 9f13dbdf..a56f2fa4 100644
--- a/build-wine32.txt
+++ b/build-wine32.txt
@@ -7,9 +7,9 @@ strip = 'strip'
[properties]
needs_exe_wrapper = true
-c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden']
-cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m32', '-mwindows']
+c_args= @CFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden']
+cpp_args= @CXXFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
+cpp_link_args= @LDFLAGS@ + ['-m32', '-mwindows']
[host_machine]
system = 'linux'
diff --git a/build-wine64.txt b/build-wine64.txt
index fd7be2f8..8228a5bb 100644
--- a/build-wine64.txt
+++ b/build-wine64.txt
@@ -7,9 +7,9 @@ strip = 'strip'
[properties]
needs_exe_wrapper = true
-c_args=['-m64', '-fvisibility=hidden']
-cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m64', '-mwindows']
+c_args= @CFLAGS@ + ['-m64', '-fvisibility=hidden']
+cpp_args= @CXXFLAGS@ + ['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
+cpp_link_args= @LDFLAGS@ + ['-m64', '-mwindows']
[host_machine]
system = 'linux'
--
2.25.3

View File

@ -1,34 +0,0 @@
diff --git a/build-wine32.txt b/build-wine32.txt
index 9f13dbd..a56f2fa 100644
--- a/build-wine32.txt
+++ b/build-wine32.txt
@@ -7,9 +7,9 @@ strip = 'strip'
[properties]
needs_exe_wrapper = true
-c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden']
-cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m32', '-mwindows']
+c_args= @CFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden']
+cpp_args= @CXXFLAGS@ + ['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
+cpp_link_args= @LDFLAGS@ + ['-m32', '-mwindows']
[host_machine]
system = 'linux'
diff --git a/build-wine64.txt b/build-wine64.txt
index fd7be2f..8228a5b 100644
--- a/build-wine64.txt
+++ b/build-wine64.txt
@@ -7,9 +7,9 @@ strip = 'strip'
[properties]
needs_exe_wrapper = true
-c_args=['-m64', '-fvisibility=hidden']
-cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m64', '-mwindows']
+c_args= @CFLAGS@ + ['-m64', '-fvisibility=hidden']
+cpp_args= @CXXFLAGS@ + ['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
+cpp_link_args= @LDFLAGS@ + ['-m64', '-mwindows']
[host_machine]
system = 'linux'