From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EBB0158086 for ; Sat, 30 Oct 2021 21:24:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92C6AE07FA; Sat, 30 Oct 2021 21:24:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7676AE07FA for ; Sat, 30 Oct 2021 21:24:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C96D343341 for ; Sat, 30 Oct 2021 21:24:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41A59D0 for ; Sat, 30 Oct 2021 21:24:21 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1635627278.ade3ea6a875a5db0711c8ca12fca4f8560624d98.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gmmlib/, media-libs/gmmlib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch media-libs/gmmlib/gmmlib-9999.ebuild X-VCS-Directories: media-libs/gmmlib/ media-libs/gmmlib/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: ade3ea6a875a5db0711c8ca12fca4f8560624d98 X-VCS-Branch: master Date: Sat, 30 Oct 2021 21:24:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64231b0f-8823-4cf5-a08b-1201728d89b6 X-Archives-Hash: 5f2d623dbd5106fee0887ec14aeb2713 commit: ade3ea6a875a5db0711c8ca12fca4f8560624d98 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Oct 30 20:54:38 2021 +0000 Commit: Conrad Kostecki gentoo 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 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 }