* [gentoo-commits] repo/gentoo:master commit in: media-libs/intel-mediasdk/files/, media-libs/intel-mediasdk/
@ 2022-12-21 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-12-21 8:20 UTC (permalink / raw
To: gentoo-commits
commit: fbe16ab55d389c374dfcb71277df2a99b241d36a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 21:20:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:19:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe16ab5
media-libs/intel-mediasdk: drop 20.3.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/intel-mediasdk/Manifest | 1 -
...el-mediasdk-20.3.0-missing-limits-include.patch | 26 ------------
.../intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild | 47 ----------------------
3 files changed, 74 deletions(-)
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 4936a453e419..41712f525acd 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,2 +1 @@
-DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4
DIST intel-mediasdk-22.6.3.tar.gz 11657130 BLAKE2B 3f63cf85716159f38f52cd0941cb716d9a25d2635e8b6da295a8fb78898ae007c3216148db580b94aa83742803effc0c1c2b0a431414a85f6feb44c93ae04738 SHA512 bd9fb9ca5b96bb2911db7fdf2622127f0dc3e86de8dc732bc6df6f4fcb343406e3ab14ffa5ce4595ed9b3bf19a73652681137fbe5b473c812c5b74554998a2b0
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
deleted file mode 100644
index a3a5c1e06ec4..000000000000
--- a/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/789726
-
-From fb9829058e35405081c8b361fb402eeaa6b78ed9 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-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 <algorithm>
- #include <climits>
- #include <cmath>
-+#include <limits>
- #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
deleted file mode 100644
index 0e5426e4bf7a..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +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"
-
-# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
-# bug #805224
-DEPEND="
- >=media-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/intel-mediasdk/files/, media-libs/intel-mediasdk/
@ 2023-04-30 8:56 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-04-30 8:56 UTC (permalink / raw
To: gentoo-commits
commit: ccf50a719d99a3b4528857b7075ccdbde2935b50
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 08:55:56 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 08:56:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf50a71
media-libs/intel-mediasdk: add 23.2.0
Closes: https://bugs.gentoo.org/895432
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-libs/intel-mediasdk/Manifest | 1 +
.../files/intel-mediasdk-23.2.0-gcc13.patch | 12 +++
.../intel-mediasdk/intel-mediasdk-23.2.0.ebuild | 91 ++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 5a3680127e1e..9f46f7d6c11a 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,3 +1,4 @@
DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
DIST intel-mediasdk-23.1.3.tar.gz 11657956 BLAKE2B 69aeed5c706381571c03f5e62471ee6494182b181c682f959cfde88294d132872674aa04e59f91ac02718a87b2c9155122d72719dcffa23f441c21c3de9cea76 SHA512 560ac33ce6afaf078ae004d9d73ac4614b68596f961a1068bded738b4c4564c133b94a0f2b32b8c54a76ea70f0db2fcf21a68f74f59a3a3efe063d7c73ec6f29
DIST intel-mediasdk-23.1.5.tar.gz 11657487 BLAKE2B c86fef7a53f706f124f22ecc85f7fa93ecd5b828f01ade1fca9053867880b54f75b945e0054a408d42abccff14d9727927e8137c68de5b22e3f52a42fd2c1c68 SHA512 65444c903a3c2be0d890d42802f5b00caba109e7b7e3f2b165daaae2d37584fb31a9bd697a955273fee96c3d0a16af4ee7b16ee24c4c83c085b3cb76d209ae1d
+DIST intel-mediasdk-23.2.0.tar.gz 22528541 BLAKE2B 12b613ea4e60c99383edb7703892931d5b787d78610972e1cc64c679333ca421c947075cbaec660db1ab4a5f0ac1f816bfa0f0e037e3800612cbfbd2b5038389 SHA512 43faa24cd2b8270dd74845063e2a61635e9d0adf5cf335f5eb805d686cc9feb22e69f1e14fd5cc75c0a4fc665898dde121c469a70a681caace3e18efad57ead5
diff --git a/media-libs/intel-mediasdk/files/intel-mediasdk-23.2.0-gcc13.patch b/media-libs/intel-mediasdk/files/intel-mediasdk-23.2.0-gcc13.patch
new file mode 100644
index 000000000000..5aefc4bf2d1d
--- /dev/null
+++ b/media-libs/intel-mediasdk/files/intel-mediasdk-23.2.0-gcc13.patch
@@ -0,0 +1,12 @@
+diff --git a/api/mfx_dispatch/linux/mfxparser.cpp b/api/mfx_dispatch/linux/mfxparser.cpp
+index 9d3823ec3e..12e46d1881 100644
+--- a/api/mfx_dispatch/linux/mfxparser.cpp
++++ b/api/mfx_dispatch/linux/mfxparser.cpp
+@@ -20,6 +20,7 @@
+
+ #include <ctype.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-23.2.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.2.0.ebuild
new file mode 100644
index 000000000000..5b13e7ba04b4
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib optfeature
+
+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="https://github.com/Intel-Media-SDK/MediaSDK"
+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="dri test tools wayland X"
+# Test not working at the moment
+#RESTRICT="!test? ( test )"
+RESTRICT="test"
+REQUIRED_USE="
+ dri? ( X )
+"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+RDEPEND="
+ x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+ >=media-libs/libva-intel-media-driver-${PV}[${MULTILIB_USEDEP}]
+ media-libs/libva[X?,wayland?,${MULTILIB_USEDEP}]
+ x11-libs/libdrm[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ wayland? (
+ dev-libs/wayland-protocols
+ )
+"
+BDEPEND="
+ wayland? (
+ dev-util/wayland-scanner
+ )
+"
+
+PATCHES=(
+ # https://github.com/Intel-Media-SDK/MediaSDK/pull/2998
+ "${FILESDIR}/${P}-gcc13.patch"
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ # OpenCL only has an effect if we build kernels
+ -DENABLE_OPENCL=OFF
+ -DBUILD_TUTORIALS=OFF
+ # Need to package the cm-compiler to build kernels, use pre-built instead
+ -DBUILD_KERNELS=OFF
+ -DBUILD_RUNTIME=ON
+ -DBUILD_DISPATCHER=ON
+ -DBUILD_TOOLS="$(usex tools)"
+ # Cannot build tools without samples
+ -DBUILD_SAMPLES="$(usex tools)"
+ -DBUILD_TESTS="$(usex test)"
+ -DENABLE_X11="$(usex X)"
+ -DENABLE_X11_DRI3="$(usex dri)"
+ -DENABLE_WAYLAND="$(usex wayland)"
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-30 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-30 8:56 [gentoo-commits] repo/gentoo:master commit in: media-libs/intel-mediasdk/files/, media-libs/intel-mediasdk/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-12-21 8:20 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox