1 |
commit: 8dbd15d013e01918d907865b0ac1803a8ed21768 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 15:36:37 2020 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 15:42:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbd15d0 |
7 |
|
8 |
media-libs/gmmlib: bump to 20.2.2 |
9 |
|
10 |
Now with test execution moved from src_compile to src_test and controlled |
11 |
by FEATURES=test. |
12 |
|
13 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
14 |
|
15 |
media-libs/gmmlib/Manifest | 1 + |
16 |
.../files/gmmlib-20.2.2_conditional_testing.patch | 42 ++++++++++++++++++++ |
17 |
media-libs/gmmlib/gmmlib-20.2.2.ebuild | 46 ++++++++++++++++++++++ |
18 |
3 files changed, 89 insertions(+) |
19 |
|
20 |
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest |
21 |
index 09ff77d0a20..f9dde767509 100644 |
22 |
--- a/media-libs/gmmlib/Manifest |
23 |
+++ b/media-libs/gmmlib/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056f40dab97bb24acf8e700d2b83198bb8a2800ab9155aebba5138a3269d4aefe645390524d34e57706de750f8e967d106 SHA512 77c7cf1cd3e7f0c2476badca6ae7a36504afb4af5f2c2282e790744a9b8ef668f24c4db8be171eef02394966021b5647921c0faf710e26689cebbd879b786a9d |
26 |
DIST intel-gmmlib-19.4.1.tar.gz 707375 BLAKE2B 0627889bebf763a8225c691e7ec6a2b3c1f403f62e5d11b557e3578e02b6cc3fe032e8b0d79483f34e9310bcfcd7667c407b1c4e549a2bb414247468b020f796 SHA512 264f111348bbaccd6c14c31ab15c7b02e63def56b0d3effa01067fb5e696d6d3e2ad3d5a9cc3a36f33b835dda12ec3916a31d3a812443de9d5dd815e2e4cde53 |
27 |
DIST intel-gmmlib-20.1.1.tar.gz 707814 BLAKE2B 49983345d0187114de6622522a1342f978f67347f210a0f5a67c847089268e9f6730f76f365c2e15160c538231f057be68ca3b1dd1c4c5deb0693ab7c94f54f7 SHA512 e16472f24c5d1fb9f56c45ce1aefe6b1799a2c968aab09808115eeb9deda9a7610da989ae2fdc1796d94d05ca09a19ab2e74be62b4192eeee70ead404561a03f |
28 |
+DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73a97c7bc3b5730b6c270daa3eac753287cd83334085c90ce081ff4a8a4d1f79b46e832059b08c36602c5c39f3b3a1af5 SHA512 ebd23658aec78ebdf7cd13577f5ca408e2995c4df6135c951d3bea4a59a84461690d71f6e7ebc2014daa5508e07d32ff20c25019d90255150e7c93e241d403fc |
29 |
|
30 |
diff --git a/media-libs/gmmlib/files/gmmlib-20.2.2_conditional_testing.patch b/media-libs/gmmlib/files/gmmlib-20.2.2_conditional_testing.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..7d826fabd0a |
33 |
--- /dev/null |
34 |
+++ b/media-libs/gmmlib/files/gmmlib-20.2.2_conditional_testing.patch |
35 |
@@ -0,0 +1,42 @@ |
36 |
+Makes the test suite run in src_test(), not src_compile(). Note that |
37 |
+at the moment all the output from the test runner goes into the CTest log |
38 |
+and all that src_test() shows is the overall status of the execution |
39 |
+of the runner. |
40 |
+ |
41 |
+--- a/CMakeLists.txt |
42 |
++++ b/CMakeLists.txt |
43 |
+@@ -1,8 +1,6 @@ |
44 |
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR) |
45 |
+ |
46 |
+-if (NOT DEFINED RUN_TEST_SUITE) |
47 |
+-option (RUN_TEST_SUITE "run test suite after install" ON) |
48 |
+-endif (NOT DEFINED RUN_TEST_SUITE) |
49 |
++include(CTest) |
50 |
+ |
51 |
+ add_subdirectory(Source/GmmLib) |
52 |
+ |
53 |
+--- a/Source/GmmLib/CMakeLists.txt |
54 |
++++ b/Source/GmmLib/CMakeLists.txt |
55 |
+@@ -495,7 +495,7 @@ |
56 |
+ _X64) |
57 |
+ endif() |
58 |
+ |
59 |
+-if(NOT DEFINED RUN_TEST_SUITE OR RUN_TEST_SUITE) |
60 |
++if(BUILD_TESTING) |
61 |
+ add_subdirectory(ULT) |
62 |
+ endif() |
63 |
+ |
64 |
+--- a/Source/GmmLib/ULT/CMakeLists.txt |
65 |
++++ b/Source/GmmLib/ULT/CMakeLists.txt |
66 |
+@@ -151,9 +151,7 @@ |
67 |
+ |
68 |
+ add_custom_target(Run_ULT ALL DEPENDS GMMULT) |
69 |
+ |
70 |
+-add_custom_command( |
71 |
+- TARGET Run_ULT |
72 |
+- POST_BUILD |
73 |
+- COMMAND echo running ULTs |
74 |
++add_test( |
75 |
++ NAME Run_ULT |
76 |
+ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:igfx_gmmumd_dll>" ${CMAKE_CFG_INTDIR}/${EXE_NAME} --gtest_filter=CTest* |
77 |
+ ) |
78 |
|
79 |
diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild |
80 |
new file mode 100644 |
81 |
index 00000000000..2cb36edcb25 |
82 |
--- /dev/null |
83 |
+++ b/media-libs/gmmlib/gmmlib-20.2.2.ebuild |
84 |
@@ -0,0 +1,46 @@ |
85 |
+# Copyright 1999-2020 Gentoo Authors |
86 |
+# Distributed under the terms of the GNU General Public License v2 |
87 |
+ |
88 |
+EAPI=7 |
89 |
+ |
90 |
+CMAKE_ECLASS=cmake |
91 |
+ |
92 |
+inherit cmake-multilib |
93 |
+ |
94 |
+if [[ ${PV} == *9999 ]] ; then |
95 |
+ : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} |
96 |
+ if [[ ${PV%9999} != "" ]] ; then |
97 |
+ : ${EGIT_BRANCH:="release/${PV%.9999}"} |
98 |
+ fi |
99 |
+ inherit git-r3 |
100 |
+fi |
101 |
+ |
102 |
+DESCRIPTION="Intel Graphics Memory Management Library" |
103 |
+HOMEPAGE="https://github.com/intel/gmmlib" |
104 |
+if [[ ${PV} == *9999 ]] ; then |
105 |
+ SRC_URI="" |
106 |
+ KEYWORDS="" |
107 |
+else |
108 |
+ SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" |
109 |
+ S="${WORKDIR}/${PN}-intel-${P}" |
110 |
+ KEYWORDS="~amd64" |
111 |
+fi |
112 |
+ |
113 |
+LICENSE="MIT" |
114 |
+SLOT="0" |
115 |
+IUSE="test" |
116 |
+ |
117 |
+RESTRICT="!test? ( test )" |
118 |
+ |
119 |
+RDEPEND="${DEPEND}" |
120 |
+ |
121 |
+PATCHES=( |
122 |
+ "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch |
123 |
+) |
124 |
+ |
125 |
+multilib_src_configure() { |
126 |
+ local mycmakeargs=( |
127 |
+ -DBUILD_TESTING=$(usex test) |
128 |
+ ) |
129 |
+ cmake_src_configure |
130 |
+} |