1 |
commit: 41810774f0d1b34b9469cac2113c4bb047c1c3b5 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 1 16:41:26 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 1 16:41:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41810774 |
7 |
|
8 |
app-emulation/wine-vanilla: Sync with ::wine |
9 |
|
10 |
Require vulkan for vkd3d |
11 |
Bump to 3.14 |
12 |
|
13 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
14 |
|
15 |
app-emulation/wine-vanilla/Manifest | 1 + |
16 |
app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild | 3 ++- |
17 |
app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild | 3 ++- |
18 |
app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild | 3 ++- |
19 |
app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild | 5 +++-- |
20 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.14.ebuild} | 3 ++- |
21 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 3 ++- |
22 |
7 files changed, 14 insertions(+), 7 deletions(-) |
23 |
|
24 |
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest |
25 |
index ca91d76c80b..e774020e9b5 100644 |
26 |
--- a/app-emulation/wine-vanilla/Manifest |
27 |
+++ b/app-emulation/wine-vanilla/Manifest |
28 |
@@ -4,3 +4,4 @@ DIST wine-3.0.2.tar.xz 19726920 BLAKE2B e108f851b2d893b052a26ae4368f3337bebcc81b |
29 |
DIST wine-3.11.tar.xz 20501100 BLAKE2B 793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576 SHA512 8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7 |
30 |
DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1 |
31 |
DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59 |
32 |
+DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1 |
33 |
|
34 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild |
35 |
index cdb123c486e..1336c2357bf 100644 |
36 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild |
37 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.11.ebuild |
38 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
39 |
X? ( truetype ) |
40 |
elibc_glibc? ( threads ) |
41 |
osmesa? ( opengl ) |
42 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
43 |
+ test? ( abi_x86_32 ) |
44 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
45 |
|
46 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
47 |
# or fail due to Xvfb's opengl limitations. |
48 |
|
49 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild |
50 |
index cdb123c486e..1336c2357bf 100644 |
51 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild |
52 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild |
53 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
54 |
X? ( truetype ) |
55 |
elibc_glibc? ( threads ) |
56 |
osmesa? ( opengl ) |
57 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
58 |
+ test? ( abi_x86_32 ) |
59 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
60 |
|
61 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
62 |
# or fail due to Xvfb's opengl limitations. |
63 |
|
64 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild |
65 |
index 96e3367ccf4..9a0d8ea7f20 100644 |
66 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild |
67 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild |
68 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
69 |
X? ( truetype ) |
70 |
elibc_glibc? ( threads ) |
71 |
osmesa? ( opengl ) |
72 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
73 |
+ test? ( abi_x86_32 ) |
74 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
75 |
|
76 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
77 |
# or fail due to Xvfb's opengl limitations. |
78 |
|
79 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild |
80 |
index cdb123c486e..9a0d8ea7f20 100644 |
81 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild |
82 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.13.ebuild |
83 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
84 |
X? ( truetype ) |
85 |
elibc_glibc? ( threads ) |
86 |
osmesa? ( opengl ) |
87 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
88 |
+ test? ( abi_x86_32 ) |
89 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
90 |
|
91 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
92 |
# or fail due to Xvfb's opengl limitations. |
93 |
@@ -107,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} |
94 |
!app-emulation/wine:0 |
95 |
dos? ( >=games-emulation/dosbox-0.74_p20160629 ) |
96 |
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) |
97 |
- mono? ( app-emulation/wine-mono:4.7.1 ) |
98 |
+ mono? ( app-emulation/wine-mono:4.7.3 ) |
99 |
perl? ( |
100 |
dev-lang/perl |
101 |
dev-perl/XML-Simple |
102 |
|
103 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild |
104 |
similarity index 99% |
105 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
106 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild |
107 |
index 96e3367ccf4..9a0d8ea7f20 100644 |
108 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
109 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.14.ebuild |
110 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
111 |
X? ( truetype ) |
112 |
elibc_glibc? ( threads ) |
113 |
osmesa? ( opengl ) |
114 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
115 |
+ test? ( abi_x86_32 ) |
116 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
117 |
|
118 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
119 |
# or fail due to Xvfb's opengl limitations. |
120 |
|
121 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
122 |
index 96e3367ccf4..9a0d8ea7f20 100644 |
123 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
124 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
125 |
@@ -40,7 +40,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
126 |
X? ( truetype ) |
127 |
elibc_glibc? ( threads ) |
128 |
osmesa? ( opengl ) |
129 |
- test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 |
130 |
+ test? ( abi_x86_32 ) |
131 |
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
132 |
|
133 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
134 |
# or fail due to Xvfb's opengl limitations. |