1 |
commit: ade3ea6a875a5db0711c8ca12fca4f8560624d98 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 30 20:54:38 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 30 20:54:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3ea6a |
7 |
|
8 |
media-libs/gmmlib: update live ebuild |
9 |
|
10 |
Changes: |
11 |
- Bump to EAPI=8 |
12 |
- Fix CMake warnings |
13 |
- Drop multilib, as not rdep package exists with multilib |
14 |
|
15 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
16 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
17 |
|
18 |
.../gmmlib/files/gmmlib-20.3.2_cmake_project.patch | 8 +++++++ |
19 |
media-libs/gmmlib/gmmlib-9999.ebuild | 27 ++++++++-------------- |
20 |
2 files changed, 17 insertions(+), 18 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..628e9f0b295 |
25 |
--- /dev/null |
26 |
+++ b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch |
27 |
@@ -0,0 +1,8 @@ |
28 |
+--- a/CMakeLists.txt |
29 |
++++ b/CMakeLists.txt |
30 |
+@@ -1,4 +1,5 @@ |
31 |
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR) |
32 |
++project(gmmlib) |
33 |
+ |
34 |
+ include(CTest) |
35 |
+ |
36 |
|
37 |
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild |
38 |
index 4e796e2186d..1f972c3b191 100644 |
39 |
--- a/media-libs/gmmlib/gmmlib-9999.ebuild |
40 |
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild |
41 |
@@ -1,11 +1,9 @@ |
42 |
# Copyright 1999-2021 Gentoo Authors |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
-EAPI=7 |
46 |
+EAPI=8 |
47 |
|
48 |
-CMAKE_ECLASS=cmake |
49 |
- |
50 |
-inherit cmake-multilib |
51 |
+inherit cmake |
52 |
|
53 |
if [[ ${PV} == *9999 ]] ; then |
54 |
: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} |
55 |
@@ -17,32 +15,25 @@ fi |
56 |
|
57 |
DESCRIPTION="Intel Graphics Memory Management Library" |
58 |
HOMEPAGE="https://github.com/intel/gmmlib" |
59 |
-if [[ ${PV} == *9999 ]] ; then |
60 |
- SRC_URI="" |
61 |
-else |
62 |
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" |
63 |
- S="${WORKDIR}/${PN}-intel-${P}" |
64 |
- KEYWORDS="~amd64" |
65 |
-fi |
66 |
+SRC_URI="" |
67 |
|
68 |
LICENSE="MIT" |
69 |
SLOT="0" |
70 |
IUSE="test +custom-cflags" |
71 |
- |
72 |
RESTRICT="!test? ( test )" |
73 |
|
74 |
-RDEPEND="${DEPEND}" |
75 |
- |
76 |
PATCHES=( |
77 |
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch |
78 |
"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch |
79 |
+ "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch |
80 |
) |
81 |
|
82 |
-multilib_src_configure() { |
83 |
+src_configure() { |
84 |
local mycmakeargs=( |
85 |
- -DBUILD_TYPE=Release |
86 |
- -DBUILD_TESTING=$(usex test) |
87 |
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) |
88 |
+ -DBUILD_TESTING="$(usex test)" |
89 |
+ -DBUILD_TYPE="Release" |
90 |
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" |
91 |
) |
92 |
+ |
93 |
cmake_src_configure |
94 |
} |