From fc2f1018fc323ef2c6572734a9b130427cba76a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Nov 2021 06:47:15 +0000 Subject: gentoo resync : 03.11.2021 --- media-libs/gmmlib/Manifest | 9 ++++-- .../gmmlib/files/gmmlib-20.3.2_cmake_project.patch | 8 ++++++ media-libs/gmmlib/gmmlib-21.3.1.ebuild | 2 +- media-libs/gmmlib/gmmlib-21.3.2.ebuild | 33 ++++++++++++++++++++++ media-libs/gmmlib/gmmlib-9999.ebuild | 27 ++++++------------ media-libs/gmmlib/metadata.xml | 24 +++++++++------- 6 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch create mode 100644 media-libs/gmmlib/gmmlib-21.3.2.ebuild (limited to 'media-libs/gmmlib') diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 6313cd3b12a7..e6d564d1c5aa 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -1,10 +1,13 @@ AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b +AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97 DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b +DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be EBUILD gmmlib-21.2.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5 EBUILD gmmlib-21.2.2.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99 -EBUILD gmmlib-21.3.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99 -EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99 -MISC metadata.xml 505 BLAKE2B 83d6dbe0db28839e3f78541cdeb4da1056a7674369b2a6d6956ec02d411eaaee11dc8baa41c5f3a58c863459ec3673539d16691b18875248cc5ccf97912c59e9 SHA512 552cfca4c3a312374f3873be3817deca55c6935903ca3fa6aa04c3d58ecdd07f346818c349192267bcaff4d0173125858fe490ce5ebb28c955832c47c2a46f3d +EBUILD gmmlib-21.3.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5 +EBUILD gmmlib-21.3.2.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4 +EBUILD gmmlib-9999.ebuild 842 BLAKE2B b4791d7666070fc1f47b47888e6571c9844a85ec40a3c32e5b846fd7305af8943c97c6160f2995fe47a771067ab4be8d55b34d0393e3d0c13e44024f2897c609 SHA512 25f35b6bbf0033d0455585bfae6909b2bc204d4e43170c482e31b38b4b5f4302a9b6f0dd5a2f7fa2996693fe7cfa51b01165554784de03c71d4c271149608ed1 +MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159 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 000000000000..628e9f0b295e --- /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-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild index 4e796e2186d3..daef825f99e2 100644 --- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild +++ b/media-libs/gmmlib/gmmlib-21.3.1.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" S="${WORKDIR}/${PN}-intel-${P}" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi LICENSE="MIT" diff --git a/media-libs/gmmlib/gmmlib-21.3.2.ebuild b/media-libs/gmmlib/gmmlib-21.3.2.ebuild new file mode 100644 index 000000000000..75f21bc6ea03 --- /dev/null +++ b/media-libs/gmmlib/gmmlib-21.3.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Intel Graphics Memory Management Library" +HOMEPAGE="https://github.com/intel/gmmlib" +SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" +S="${WORKDIR}/${PN}-intel-${P}" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0" +IUSE="+custom-cflags test" +RESTRICT="!test? ( test )" + +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 +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + -DBUILD_TYPE="Release" + -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" + ) + + cmake_src_configure +} diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 4e796e2186d3..1f972c3b1914 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 } diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml index b2e336175431..79f6bc657e59 100644 --- a/media-libs/gmmlib/metadata.xml +++ b/media-libs/gmmlib/metadata.xml @@ -1,14 +1,18 @@ - - media-video@gentoo.org - - - k2k@narod.ru - Evgeny Grin - - - Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream. - + + media-video@gentoo.org + + + k2k@narod.ru + Evgeny Grin + + + conikost@gentoo.org + Conrad Kostecki + + + Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream. + -- cgit v1.2.3