commit: ade3ea6a875a5db0711c8ca12fca4f8560624d98
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 20:54:38 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 20:54:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3ea6a
media-libs/gmmlib: update live ebuild
Changes:
- Bump to EAPI=8
- Fix CMake warnings
- Drop multilib, as not rdep package exists with multilib
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../gmmlib/files/gmmlib-20.3.2_cmake_project.patch | 8 +++++++
media-libs/gmmlib/gmmlib-9999.ebuild | 27 ++++++++--------------
2 files changed, 17 insertions(+), 18 deletions(-)
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
new file mode 100644
index 00000000000..628e9f0b295
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++project(gmmlib)
+
+ include(CTest)
+
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild
b/media-libs/gmmlib/gmmlib-9999.ebuild
index 4e796e2186d..1f972c3b191 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
+inherit cmake
if [[ ${PV} == *9999 ]] ; then
: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -17,32 +15,25 @@ fi
DESCRIPTION="Intel Graphics Memory Management Library"
HOMEPAGE="https://github.com/intel/gmmlib";
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz";
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="~amd64"
-fi
+SRC_URI=""
LICENSE="MIT"
SLOT="0"
IUSE="test +custom-cflags"
-
RESTRICT="!test? ( test )"
-RDEPEND="${DEPEND}"
-
PATCHES=(
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
)
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
)
+
cmake_src_configure
}
