From d479c9c5c724c7b1300a98e44975f31f4f2e51dd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Dec 2022 21:11:24 +0000 Subject: gentoo auto-resync : 06:12:2022 - 21:11:24 --- media-libs/oneVPL-cpu/Manifest | 5 ++ .../oneVPL-cpu-2022.2.5-respect-user-flags.patch | 13 +++++ .../oneVPL-cpu-2022.2.5-use-system-libs.patch | 49 +++++++++++++++++++ media-libs/oneVPL-cpu/metadata.xml | 18 +++++++ media-libs/oneVPL-cpu/oneVPL-cpu-2022.2.5.ebuild | 57 ++++++++++++++++++++++ 5 files changed, 142 insertions(+) create mode 100644 media-libs/oneVPL-cpu/Manifest create mode 100644 media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-respect-user-flags.patch create mode 100644 media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-use-system-libs.patch create mode 100644 media-libs/oneVPL-cpu/metadata.xml create mode 100644 media-libs/oneVPL-cpu/oneVPL-cpu-2022.2.5.ebuild (limited to 'media-libs/oneVPL-cpu') diff --git a/media-libs/oneVPL-cpu/Manifest b/media-libs/oneVPL-cpu/Manifest new file mode 100644 index 000000000000..3ab9f22ee9c0 --- /dev/null +++ b/media-libs/oneVPL-cpu/Manifest @@ -0,0 +1,5 @@ +AUX oneVPL-cpu-2022.2.5-respect-user-flags.patch 416 BLAKE2B c0ba2a7d75ab2d4ce93a472df09529536a141ff30563f0c6cc618a02d2766a1a88b5c3ab21fc6d02a4da6007e1b0c45df8b3c7bd206d2494200b8a835654315f SHA512 e5e7d762db4b45e84832cbee5f8e3e37e986bb0f73c07e792373c254e172fed0eb320ec58c3873aec071a51617682b0f4e2c299f701112094fec56ee74356986 +AUX oneVPL-cpu-2022.2.5-use-system-libs.patch 1884 BLAKE2B c13fecb58e2692ae53c531fe3ca4199a381f170712777d2df9f5ddd334481238f48666636dced8d39213187d9e162915b62c641d9015afe1a8326fcdcb724c88 SHA512 bffcfcc4b17145d1b1f0b608b1451d8438a77254c389ed4542c0b457b6064ad85b646605ac9cd2c176d9480aa1136412a728b172e8d2c642f8aae77ff9d18703 +DIST oneVPL-cpu-2022.2.5.tar.gz 9917180 BLAKE2B 8e0beebc226a0984474ca6822769736c78e80959bd2df9fd4a34014a31e3439cd42b9a104dfefaa70043df03834246c973e1ba29cea3a9af94a48c2b1d08edcc SHA512 e79b0f396bfcdb7156f8ec5b3008ddd813a0a01ade8e319f78afd3c9d862b111531c42a65ba19ea396b51d3e298608da271894867297dc95f51e4bcc19e9029e +EBUILD oneVPL-cpu-2022.2.5.ebuild 1350 BLAKE2B 39d7b66b53cd7f0c6a02a7f6626131adf78a176fbb270fdfd45853c99cf42655ac383feb4039d658d6ba8ff7601f0843ccac547d7116fa1e53ba98f9f05153ea SHA512 6d32c0ef1a0e77d75cc65a24c418b963be6daa2009aae32e6de92e579e81e7db302edf1ef811a0d5eea5b5474a78486b1df8d0be0aaddd812b0b36328194d45e +MISC metadata.xml 606 BLAKE2B 470321a75d274c50d7480359081d67f9a4614549af06d0172f8211815d1d70edf73fd17ab576802294c375b7ddfff1849b63647894c7dca971e3b429236501cb SHA512 3e43d49860ee353cd16b6070ff358d3bef7ab404c55bd57f22e49e6aebf3b245930554884ecc490690512c92914fe04d40b35dbb6b339f46b5314d9e3545a92f diff --git a/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-respect-user-flags.patch b/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-respect-user-flags.patch new file mode 100644 index 000000000000..59aad21af7f3 --- /dev/null +++ b/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-respect-user-flags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 981574e..7bdf346 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,8 +72,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE true) + # Keep executable bits on shared objects when installing regardless of distro + set(CMAKE_INSTALL_SO_NO_EXE 0) + +-include(cmake/CompileOptions.cmake) +- + if(NOT BUILD_GPL_X264) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(BUILD_OPENH264 ON) diff --git a/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-use-system-libs.patch b/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-use-system-libs.patch new file mode 100644 index 000000000000..aa9363a65e83 --- /dev/null +++ b/media-libs/oneVPL-cpu/files/oneVPL-cpu-2022.2.5-use-system-libs.patch @@ -0,0 +1,49 @@ +diff --git a/cpu/ext/ffmpeg-codecs/CMakeLists.txt b/cpu/ext/ffmpeg-codecs/CMakeLists.txt +index 7bde28b..c8067c4 100644 +--- a/cpu/ext/ffmpeg-codecs/CMakeLists.txt ++++ b/cpu/ext/ffmpeg-codecs/CMakeLists.txt +@@ -38,9 +38,9 @@ endif() + + # Set basic FFmpeg and codec libs + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") +- set(SVTHEVCENC_LIB ${VPL_DEP_DIR}/lib/libSvtHevcEnc.a) +- set(SVTAV1ENC_LIB ${VPL_DEP_DIR}/lib/libSvtAv1Enc.a) +- set(DAV1D_LIB ${VPL_DEP_DIR}/lib/libdav1d.a) ++ set(SVTHEVCENC_LIB ${VPL_DEP_DIR}/lib64/libSvtHevcEnc.so) ++ set(SVTAV1ENC_LIB ${VPL_DEP_DIR}/lib64/libSvtAv1Enc.so) ++ set(DAV1D_LIB ${VPL_DEP_DIR}/lib64/libdav1d.so) + + if(NOT EXISTS ${SVTHEVCENC_LIB} + OR NOT EXISTS ${SVTAV1ENC_LIB} +@@ -49,10 +49,10 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") + endif() + endif() + +-set(AVCODEC_LIB ${VPL_DEP_DIR}/lib/libavcodec.a) +-set(AVUTIL_LIB ${VPL_DEP_DIR}/lib/libavutil.a) +-set(AVFILTER_LIB ${VPL_DEP_DIR}/lib/libavfilter.a) +-set(SWSCALE_LIB ${VPL_DEP_DIR}/lib/libswscale.a) ++set(AVCODEC_LIB ${VPL_DEP_DIR}/lib64/libavcodec.so) ++set(AVUTIL_LIB ${VPL_DEP_DIR}/lib64/libavutil.so) ++set(AVFILTER_LIB ${VPL_DEP_DIR}/lib64/libavfilter.so) ++set(SWSCALE_LIB ${VPL_DEP_DIR}/lib64/libswscale.so) + + if(NOT EXISTS ${AVCODEC_LIB} + OR NOT EXISTS ${AVUTIL_LIB} +@@ -135,14 +135,14 @@ endif() + + # Set AVC encoder lib name + if(BUILD_GPL_X264) +- set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libx264.a) ++ set(H264_ENC_LIB ${VPL_DEP_DIR}/lib64/libx264.so) + if(NOT EXISTS ${H264_ENC_LIB}) + message(FATAL_ERROR "Could not find x264 libraries") + else() + message(STATUS "Building with GPL x264 for AVC implementation") + endif() + elseif(BUILD_OPENH264) +- set(H264_ENC_LIB ${VPL_DEP_DIR}/lib/libopenh264.a) ++ set(H264_ENC_LIB ${VPL_DEP_DIR}/lib64/libopenh264.so) + if(NOT EXISTS ${H264_ENC_LIB}) + message(FATAL_ERROR "Could not find openh264 libraries") + else() diff --git a/media-libs/oneVPL-cpu/metadata.xml b/media-libs/oneVPL-cpu/metadata.xml new file mode 100644 index 000000000000..d738daf38bf1 --- /dev/null +++ b/media-libs/oneVPL-cpu/metadata.xml @@ -0,0 +1,18 @@ + + + + + media-video@gentoo.org + + + andrewammerlaan@gentoo.org + Andrew Ammerlaan + + + oneapi-src/oneVPL-cpu + + + Enable experimental API + Use media-libs/openh264 instead of media-libs/x264 + + diff --git a/media-libs/oneVPL-cpu/oneVPL-cpu-2022.2.5.ebuild b/media-libs/oneVPL-cpu/oneVPL-cpu-2022.2.5.ebuild new file mode 100644 index 000000000000..8243f74846b0 --- /dev/null +++ b/media-libs/oneVPL-cpu/oneVPL-cpu-2022.2.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="oneAPI Video Processing Library CPU implementation" +HOMEPAGE="https://github.com/oneapi-src/oneVPL-cpu" +SRC_URI="https://github.com/oneapi-src/oneVPL-cpu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT x264? ( GPL-2 )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="experimental openh264 test +x264" +REQUIRED_USE="^^ ( openh264 x264 )" +# RESTRICT="!test? ( test )" +# Tests fail +RESTRICT="test" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + media-libs/dav1d + media-libs/oneVPL[experimental?] + media-libs/svt-av1 + media-libs/svt-hevc + media-video/ffmpeg + x264? ( media-libs/x264 ) + openh264? ( media-libs/openh264 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2022.2.5-use-system-libs.patch" + "${FILESDIR}/${PN}-2022.2.5-respect-user-flags.patch" +) + +src_configure() { + # Use system libraries + export VPL_BUILD_DEPENDENCIES="${ESYSROOT}/usr" + local mycmakeargs=( + -DUSE_EXPERIMENTAL_API="$(usex experimental)" + -DBUILD_OPENH264="$(usex openh264)" + -DBUILD_TESTS="$(usex test)" + -DBUILD_GPL_X264="$(usex x264)" + # Use FHS instead + -DUSE_ONEAPI_INSTALL_LAYOUT=NO + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Remove these license files + rm -r "${ED}/usr/share/oneVPL-cpu/licensing" || die +} -- cgit v1.2.3