1 |
commit: e08033079026092e4aaf3bc2027015e0c92f1b76 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 29 01:06:40 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 29 01:13:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0803307 |
7 |
|
8 |
x11-apps/igt-gpu-tools: Rename and version bump to 1.23 |
9 |
|
10 |
Project is not Intel-specific anymore and changed its name to |
11 |
igt-gpu-tools for version 1.23. |
12 |
|
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
profiles/updates/4Q-2018 | 1 + |
16 |
x11-apps/igt-gpu-tools/Manifest | 1 + |
17 |
.../igt-gpu-tools-1.23.ebuild} | 6 +- |
18 |
.../igt-gpu-tools-9999.ebuild} | 6 +- |
19 |
.../metadata.xml | 0 |
20 |
x11-apps/intel-gpu-tools/Manifest | 1 - |
21 |
.../intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch | 53 ------------- |
22 |
.../intel-gpu-tools/intel-gpu-tools-1.22.ebuild | 90 ---------------------- |
23 |
8 files changed, 8 insertions(+), 150 deletions(-) |
24 |
|
25 |
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018 |
26 |
index 5510200255e..6e3e02489a6 100644 |
27 |
--- a/profiles/updates/4Q-2018 |
28 |
+++ b/profiles/updates/4Q-2018 |
29 |
@@ -2,3 +2,4 @@ slotmove dev-libs/girara 3 0 |
30 |
move dev-python/CommonMark dev-python/commonmark |
31 |
move dev-libs/mini-xml dev-libs/mxml |
32 |
move x11-misc/xembedsniproxy kde-plasma/xembed-sni-proxy |
33 |
+move x11-apps/intel-gpu-tools x11-apps/igt-gpu-tools |
34 |
|
35 |
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest |
36 |
new file mode 100644 |
37 |
index 00000000000..f9704cb9027 |
38 |
--- /dev/null |
39 |
+++ b/x11-apps/igt-gpu-tools/Manifest |
40 |
@@ -0,0 +1 @@ |
41 |
+DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839 |
42 |
|
43 |
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild |
44 |
similarity index 86% |
45 |
copy from x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild |
46 |
copy to x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild |
47 |
index dcf138f5a86..65bdd0b6068 100644 |
48 |
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild |
49 |
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild |
50 |
@@ -1,8 +1,8 @@ |
51 |
-# Copyright 1999-2018 Gentoo Foundation |
52 |
+# Copyright 1999-2018 Gentoo Authors |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
|
55 |
EAPI=6 |
56 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/app/${PN}.git" |
57 |
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git" |
58 |
if [[ ${PV} = *9999* ]]; then |
59 |
GIT_ECLASS="git-r3" |
60 |
fi |
61 |
@@ -11,7 +11,7 @@ inherit ${GIT_ECLASS} meson |
62 |
|
63 |
DESCRIPTION="Intel GPU userland tools" |
64 |
|
65 |
-HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" |
66 |
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools" |
67 |
if [[ ${PV} = *9999* ]]; then |
68 |
SRC_URI="" |
69 |
else |
70 |
|
71 |
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
72 |
similarity index 86% |
73 |
rename from x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild |
74 |
rename to x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
75 |
index dcf138f5a86..65bdd0b6068 100644 |
76 |
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild |
77 |
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild |
78 |
@@ -1,8 +1,8 @@ |
79 |
-# Copyright 1999-2018 Gentoo Foundation |
80 |
+# Copyright 1999-2018 Gentoo Authors |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
|
83 |
EAPI=6 |
84 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/app/${PN}.git" |
85 |
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git" |
86 |
if [[ ${PV} = *9999* ]]; then |
87 |
GIT_ECLASS="git-r3" |
88 |
fi |
89 |
@@ -11,7 +11,7 @@ inherit ${GIT_ECLASS} meson |
90 |
|
91 |
DESCRIPTION="Intel GPU userland tools" |
92 |
|
93 |
-HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" |
94 |
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools" |
95 |
if [[ ${PV} = *9999* ]]; then |
96 |
SRC_URI="" |
97 |
else |
98 |
|
99 |
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml |
100 |
similarity index 100% |
101 |
rename from x11-apps/intel-gpu-tools/metadata.xml |
102 |
rename to x11-apps/igt-gpu-tools/metadata.xml |
103 |
|
104 |
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest |
105 |
deleted file mode 100644 |
106 |
index 28006c423b5..00000000000 |
107 |
--- a/x11-apps/intel-gpu-tools/Manifest |
108 |
+++ /dev/null |
109 |
@@ -1 +0,0 @@ |
110 |
-DIST intel-gpu-tools-1.22.tar.xz 1022396 BLAKE2B c84338f3f84fcbe21a5b918b1afcc47d5419bd37828054fc3fa128d346b0f1b633d42f842464d96b28d4430788bfa9945a7596c14e6a79f8183440d3b9329c92 SHA512 af7964a3782bbc335c50c1c9c42f090306932423e76b9968d6919a2b633f3c11837e7ba572d352632c2b4db79bc98218d9d425c3b62e69abad5aa83d733dea8a |
111 |
|
112 |
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch |
113 |
deleted file mode 100644 |
114 |
index ff51969def4..00000000000 |
115 |
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch |
116 |
+++ /dev/null |
117 |
@@ -1,53 +0,0 @@ |
118 |
-From 0896b88d1b80244832f9eacbca993c5121315d05 Mon Sep 17 00:00:00 2001 |
119 |
-From: Paulo Zanoni <paulo.r.zanoni@×××××.com> |
120 |
-Date: Thu, 26 Apr 2018 17:49:41 -0700 |
121 |
-Subject: lib: sync with the newer i915_pciids.h from the Kernel (KBL + ICL) |
122 |
- |
123 |
-I just copied the Kernel file into the IGT repository. |
124 |
- |
125 |
-New IDs: |
126 |
-- KBL GT2 sku from 672e314b21dc ("drm/i915/kbl: Add KBL GT2 sku") |
127 |
-- ICL IDs from d55cb4fa2cf0 ("drm/i915/icl: Add the ICL PCI IDs") |
128 |
- |
129 |
-Cc: Matt Atwood <matthew.s.atwood@×××××.com> |
130 |
-Acked-by: Antonio Argenziano <antonio.argenziano@×××××.com> |
131 |
-Reviewed-by: Jose Roberto de Souza <jose.souza@×××××.com> |
132 |
-Signed-off-by: Paulo Zanoni <paulo.r.zanoni@×××××.com> |
133 |
---- |
134 |
- lib/i915_pciids.h | 13 +++++++++++++ |
135 |
- 1 file changed, 13 insertions(+) |
136 |
- |
137 |
-https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/patch/?id=0896b88d1b80244832f9eacbca993c5121315d05 |
138 |
- |
139 |
-diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h |
140 |
-index 0b2ba46..bab70ff 100644 |
141 |
---- a/lib/i915_pciids.h |
142 |
-+++ b/lib/i915_pciids.h |
143 |
-@@ -349,6 +349,7 @@ |
144 |
- #define INTEL_KBL_GT2_IDS(info) \ |
145 |
- INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ |
146 |
- INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \ |
147 |
-+ INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ |
148 |
- INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \ |
149 |
- INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ |
150 |
- INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ |
151 |
-@@ -431,4 +432,16 @@ |
152 |
- INTEL_VGA_DEVICE(0x5A44, info), \ |
153 |
- INTEL_VGA_DEVICE(0x5A4C, info) |
154 |
- |
155 |
-+/* ICL */ |
156 |
-+#define INTEL_ICL_11_IDS(info) \ |
157 |
-+ INTEL_VGA_DEVICE(0x8A50, info), \ |
158 |
-+ INTEL_VGA_DEVICE(0x8A51, info), \ |
159 |
-+ INTEL_VGA_DEVICE(0x8A5C, info), \ |
160 |
-+ INTEL_VGA_DEVICE(0x8A5D, info), \ |
161 |
-+ INTEL_VGA_DEVICE(0x8A52, info), \ |
162 |
-+ INTEL_VGA_DEVICE(0x8A5A, info), \ |
163 |
-+ INTEL_VGA_DEVICE(0x8A5B, info), \ |
164 |
-+ INTEL_VGA_DEVICE(0x8A71, info), \ |
165 |
-+ INTEL_VGA_DEVICE(0x8A70, info) |
166 |
-+ |
167 |
- #endif /* _I915_PCIIDS_H */ |
168 |
--- |
169 |
-cgit v1.1 |
170 |
- |
171 |
|
172 |
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild |
173 |
deleted file mode 100644 |
174 |
index 805a51f6379..00000000000 |
175 |
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild |
176 |
+++ /dev/null |
177 |
@@ -1,90 +0,0 @@ |
178 |
-# Copyright 1999-2018 Gentoo Foundation |
179 |
-# Distributed under the terms of the GNU General Public License v2 |
180 |
- |
181 |
-EAPI="5" |
182 |
- |
183 |
-XORG_EAUTORECONF="yes" |
184 |
- |
185 |
-inherit xorg-2 |
186 |
- |
187 |
-DESCRIPTION="Intel GPU userland tools" |
188 |
- |
189 |
-HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" |
190 |
-SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz" |
191 |
-KEYWORDS="~amd64 ~x86" |
192 |
-LICENSE="MIT" |
193 |
-SLOT="0" |
194 |
-IUSE="alsa chamelium doc glib gsl sound test-programs valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv" |
195 |
-REQUIRED_USE=" |
196 |
- test-programs? ( sound? ( alsa gsl ) ) |
197 |
- chamelium? ( glib gsl )" |
198 |
-RESTRICT="test" |
199 |
- |
200 |
-X86_RDEPEND=" |
201 |
- xv? ( |
202 |
- x11-libs/libX11 |
203 |
- x11-libs/libXext |
204 |
- x11-libs/libXv |
205 |
- )" |
206 |
-X86_DEPEND="x11-base/xorg-proto |
207 |
- >=dev-util/peg-0.1.18" |
208 |
-RDEPEND="sys-apps/kmod:= |
209 |
- sys-libs/libunwind:= |
210 |
- sys-process/procps:= |
211 |
- virtual/libudev:= |
212 |
- >=x11-libs/cairo-1.12.0[X?] |
213 |
- >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] |
214 |
- >=x11-libs/libpciaccess-0.10 |
215 |
- alsa? ( media-libs/alsa-lib:= ) |
216 |
- chamelium? ( dev-libs/xmlrpc-c ) |
217 |
- glib? ( dev-libs/glib:2 ) |
218 |
- gsl? ( sci-libs/gsl ) |
219 |
- valgrind? ( dev-util/valgrind ) |
220 |
- video_cards_intel? ( sys-libs/zlib:= ) |
221 |
- xrandr? ( >=x11-libs/libXrandr-1.3 ) |
222 |
- amd64? ( ${X86_RDEPEND} ) |
223 |
- x86? ( ${X86_RDEPEND} )" |
224 |
-DEPEND="${RDEPEND} |
225 |
- amd64? ( ${X86_DEPEND} ) |
226 |
- x86? ( ${X86_DEPEND} ) |
227 |
- >=dev-util/gtk-doc-1.25-r1" |
228 |
- |
229 |
-PATCHES=( |
230 |
- "${FILESDIR}"/${P}-KBL-ICL-PCI-IDs.patch |
231 |
-) |
232 |
- |
233 |
-src_configure() { |
234 |
- XORG_CONFIGURE_OPTIONS=( |
235 |
- $(usex test-programs $(use_enable sound audio) --disable-audio) |
236 |
- $(use_enable chamelium) |
237 |
- $(use_enable doc gtk-doc) |
238 |
- $(use_enable test-programs tests) |
239 |
- $(use_enable video_cards_amdgpu amdgpu) |
240 |
- $(use_enable video_cards_intel intel) |
241 |
- $(use_enable video_cards_nouveau nouveau) |
242 |
- ) |
243 |
- xorg-2_src_configure |
244 |
-} |
245 |
- |
246 |
-src_install() { |
247 |
- xorg-2_src_install |
248 |
- if use test-programs; then |
249 |
- local testprogram |
250 |
- pushd "${AUTOTOOLS_BUILD_DIR}"/tests >/dev/null || die |
251 |
- for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do |
252 |
- if [[ -f ${testprogram} ]]; then |
253 |
- dobin "${testprogram}" |
254 |
- fi |
255 |
- done |
256 |
- popd >/dev/null |
257 |
- fi |
258 |
-} |
259 |
- |
260 |
-pkg_postinst() { |
261 |
- xorg-2_pkg_postinst |
262 |
- if use test-programs; then |
263 |
- elog "Test programs for DRM driver development were installed. These are not" |
264 |
- elog "designed to run outside their source tree, so may or may not work as" |
265 |
- elog "intended." |
266 |
- fi |
267 |
-} |