From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- media-libs/intel-mediasdk/Manifest | 5 ++- ...el-mediasdk-20.3.0-missing-limits-include.patch | 26 ++++++++++++ .../intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild | 47 ++++++++++++++++++++++ .../intel-mediasdk/intel-mediasdk-20.3.0.ebuild | 41 ------------------- .../intel-mediasdk/intel-mediasdk-9999.ebuild | 4 +- 5 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch create mode 100644 media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild delete mode 100644 media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild (limited to 'media-libs/intel-mediasdk') diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest index a37724090828..ebd8377ecb62 100644 --- a/media-libs/intel-mediasdk/Manifest +++ b/media-libs/intel-mediasdk/Manifest @@ -1,4 +1,5 @@ +AUX intel-mediasdk-20.3.0-missing-limits-include.patch 751 BLAKE2B a43734984dad9be29ae79677c05d20c245e704d6cef9c6d69d06d38973eb2dadae34cbcba74a120061dfeef6bc10a5ca76fd9a252d35c25025158aaf251bc122 SHA512 a5a681d43613a20b9c8cd1549d6b4fa4288c401716cd95ab08e314855fea01acc24d4fc0f5c687a002ca2440b7eb4f14c64c727b2b0382ca9c99ab8981e051b3 DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4 -EBUILD intel-mediasdk-20.3.0.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192 -EBUILD intel-mediasdk-9999.ebuild 796 BLAKE2B 66540f6c44cbe7affbcfdbfc9959aae80bfcc9ac72d4412d6b73d8c3bdeda13636f958d6c33d77d27e5ed55b7972bca89254c01c6372f3a3eb39870d31190244 SHA512 cf7b180f5b2f8d8413be38d3adfd3b34ee200a408895e2d75ed378d45f636791071c6e566c9e352a4cfa23c168b6aa1a2cb58befd1b172fc4d36f8b867943192 +EBUILD intel-mediasdk-20.3.0-r1.ebuild 975 BLAKE2B 89348fe099e7cc04aca1cf0783db27a23db5c4b38bcbb01608c7127d9ca3e276818b13dd3f56335dd2e19f0c277059de25d8874e5ae04aa08dbac606ba3bf7d5 SHA512 86f3a0092e8108bf824e7d66d4060e65444140728a3937bd0490ee3fd5d6c8ec7cae901b0a2ca01ebdb9c1f0dcfdf03d2345dbebd1811461fcac24dadf073b8d +EBUILD intel-mediasdk-9999.ebuild 905 BLAKE2B 6d20e929400fa7bbdfa328167d1bb77630ff1f0db2c429689759d3684ef7bdd6a98abc35abc2afc296fcee22f6db40ea85f4e8227658790ad8ed2a7c209d7bef SHA512 0a1111fd1d60b63b922322d89f308ea5cf4e999425cc679e11e5e2a852fd684b6780a08be98023005026979677dbbe3dca9a603769169a3d9e995641aff4ff1e MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3 diff --git a/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch new file mode 100644 index 000000000000..a3a5c1e06ec4 --- /dev/null +++ b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/789726 + +From fb9829058e35405081c8b361fb402eeaa6b78ed9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 4 Aug 2021 21:47:49 +0100 +Subject: [PATCH] Add missing limits include + +--- + _studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp +index 5774702..ed1c1b7 100644 +--- a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp ++++ b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + #include "cmrt_cross_platform.h" + + using std::min; +-- +2.32.0 + diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild new file mode 100644 index 000000000000..2849dead015e --- /dev/null +++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +fi + +DESCRIPTION="Intel Media SDK" +HOMEPAGE="http://mediasdk.intel.com" +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" +else + SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz" + S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" + +# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples +# bug #805224 +DEPEND=" + >=x11-libs/libva-intel-media-driver-${PV} + x11-libs/libdrm[video_cards_intel] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-20.3.0-missing-limits-include.patch +) + +src_configure() { + local mycmakeargs=( + -DENABLE_OPENCL=OFF + ) + + cmake_src_configure +} diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild deleted file mode 100644 index 930261567424..000000000000 --- a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Intel Media SDK" -HOMEPAGE="http://mediasdk.intel.com" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -else - SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz" - S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - >=x11-libs/libva-intel-media-driver-${PV} -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENCL=OFF - ) - - cmake_src_configure -} diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild index 930261567424..33349a103358 100644 --- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild +++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild @@ -25,10 +25,12 @@ fi LICENSE="MIT" SLOT="0" -IUSE="" +# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples +# bug #805224 DEPEND=" >=x11-libs/libva-intel-media-driver-${PV} + x11-libs/libdrm[video_cards_intel] " RDEPEND="${DEPEND}" -- cgit v1.2.3