gmmlib: Uprev to 20.1.1.
This CL uprevs gmmlib to the upstream release. cros_portage_upgrade
--unstable-ok is used to perform a pristine upgrade on portage-stable
and then the media-libs/gmmlib folder is copied to chromiumos-overlay.
After that, the following changes are made:
- We remove 9999 stuff from the ebuild because we don't expect to use
cros_workon with this package.
- We remove commented code from upstream.
- We remove the multilib_src_configure() definition since it's
essentially the same as the one in the eclass.
See the diff since PS1 for these changes.
BUG=b:159825228
TEST=emerge-eve media-libs/gmmlib
Cq-Depend: chromium:2270741
Change-Id: I40ee1f71e13e1a2281a494038f83387f91e36563
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2269971
Tested-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Andres Calderon Jaramillo <andrescj@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 8facc4c..08180cf 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1 +1 @@
-DIST intel-gmmlib-19.4.1.tar.gz 707375 SHA256 bb874b41c499abb8f6253b1834e93a02ed9744de71f2503ee9cd4100af7c1860 SHA512 264f111348bbaccd6c14c31ab15c7b02e63def56b0d3effa01067fb5e696d6d3e2ad3d5a9cc3a36f33b835dda12ec3916a31d3a812443de9d5dd815e2e4cde53 WHIRLPOOL 754ca3d5bc315f0da66da975c314216d91f5fa255d03eaf2d76f0aa4c716f74e9b2faaa75303b5e1ab19dbf06210c5a023070cbb177a5f92fcd57e06576ca188
+DIST intel-gmmlib-20.1.1.tar.gz 707814 BLAKE2B 49983345d0187114de6622522a1342f978f67347f210a0f5a67c847089268e9f6730f76f365c2e15160c538231f057be68ca3b1dd1c4c5deb0693ab7c94f54f7 SHA512 e16472f24c5d1fb9f56c45ce1aefe6b1799a2c968aab09808115eeb9deda9a7610da989ae2fdc1796d94d05ca09a19ab2e74be62b4192eeee70ead404561a03f
diff --git a/media-libs/gmmlib/gmmlib-19.4.1-r1.ebuild b/media-libs/gmmlib/gmmlib-19.4.1-r1.ebuild
deleted file mode 120000
index 20f3bf2..0000000
--- a/media-libs/gmmlib/gmmlib-19.4.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-gmmlib-19.4.1.ebuild
\ No newline at end of file
diff --git a/media-libs/gmmlib/gmmlib-19.4.1.ebuild b/media-libs/gmmlib/gmmlib-19.4.1.ebuild
deleted file mode 100644
index f571782..0000000
--- a/media-libs/gmmlib/gmmlib-19.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_BUILD_TYPE="Release"
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
- : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
- if [[ ${PV%9999} != "" ]] ; then
- : ${EGIT_BRANCH:="release/${PV%.9999}"}
- fi
- inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="*"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DRUN_TEST_SUITE=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-20.1.1-r1.ebuild b/media-libs/gmmlib/gmmlib-20.1.1-r1.ebuild
new file mode 120000
index 0000000..536141a
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-20.1.1-r1.ebuild
@@ -0,0 +1 @@
+gmmlib-20.1.1.ebuild
\ No newline at end of file
diff --git a/media-libs/gmmlib/gmmlib-20.1.1.ebuild b/media-libs/gmmlib/gmmlib-20.1.1.ebuild
new file mode 100644
index 0000000..224a25b
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-20.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+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="*"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="${DEPEND}"
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
new file mode 100644
index 0000000..7ed71e5
--- /dev/null
+++ b/media-libs/gmmlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>media-video@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+</maintainer>
+</pkgmetadata>
