From 65e4244e411c4f65f55f2aa91f39e228f4c0680b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Mar 2023 13:38:05 +0000 Subject: gentoo auto-resync : 04:03:2023 - 13:38:04 --- x11-libs/cmrt/Manifest | 3 ++- x11-libs/cmrt/cmrt-1.0.6-r2.ebuild | 31 ------------------------ x11-libs/cmrt/cmrt-1.0.6-r3.ebuild | 35 +++++++++++++++++++++++++++ x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch | 15 ++++++++++++ 4 files changed, 52 insertions(+), 32 deletions(-) delete mode 100644 x11-libs/cmrt/cmrt-1.0.6-r2.ebuild create mode 100644 x11-libs/cmrt/cmrt-1.0.6-r3.ebuild create mode 100644 x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch (limited to 'x11-libs/cmrt') diff --git a/x11-libs/cmrt/Manifest b/x11-libs/cmrt/Manifest index b582bfbe59d7..1d2d5a1b1ae3 100644 --- a/x11-libs/cmrt/Manifest +++ b/x11-libs/cmrt/Manifest @@ -1,3 +1,4 @@ +AUX cmrt-1.0.6-musl-fix.patch 448 BLAKE2B 78c4cc6683a0eda732ad7c012069cba3f951b825bb8fdcd1c1a350dfaa1489349a0239f86660c22becc21c196e65df84447bb1478fee74eb54a3d0b3f72cd158 SHA512 d2e7a562bcc49099a6e3fbe584f9f868ba9818980d9e4743eb9139a3d4733d64603b2ee6e05aad19b8aaeca9aa9aca3e18fc95a8f7babfce95af8dfd4c839913 DIST cmrt-1.0.6.tar.gz 3717552 BLAKE2B 0bfb121f37b9b2e9e672d6129a6b7207ccfc3455ea613c8ae000965ee49260e56a154fba8595d8f3b022d153c9d84c7ded7b9f0914f7387eeca826acca9acfa0 SHA512 de115e86e4dc65e617e5e39dd1a14a4baa301480915d1ef31245b759acebbd2c85647e3affb9ccda3b55f7f9008b03d561689d2b63a61a70feba72c9a62b6505 -EBUILD cmrt-1.0.6-r2.ebuild 634 BLAKE2B 968e6359dacfee5b2cdab96d59fc90ff0afe4431f01401329aee21bc0cde91b2d9f861ea496a4ee0666f1c9a0680d54122fca98c5cc0e141f981cfee4a9b82b7 SHA512 287165baf65533f7e62b6950bd4bdd9c6f2fba80a850c7ce6363927bac4e92bded25d32a7707f4612b803a52150653209cb4603650ec42ea43cb7472eb193de1 +EBUILD cmrt-1.0.6-r3.ebuild 687 BLAKE2B 942d176ce3af6d4ab7d8ea1fded2a7b5eba874548837bb93bc1d526283c1c7b437b400c8ad8bbf48ca16c6fe1ec1b94462ec2081e073ab20927d0fc48e6ce07b SHA512 74e190297a8547a7a8b65c5d231926a6ad9129fe9a1b5ba45f0eb8f61e9c84a4c9dd258d9decc58b31a29fcb5496b22a66236e2f03c95f8eca438f51debbcd4a MISC metadata.xml 578 BLAKE2B e5bd4b4ba88fb40cf5a699e9af6cc53e0daa380e690eaf33bc54840bf4dc53176f8c8f4c13320759409c0bff287eeb93704bddfb66d2243381ba8dea8846b76a SHA512 b7747429dfca4a8f3e7d1899e7846fe06235d97cf3a7e79385d1701e21538186b31819c777bc30954417338867de3057f37e3543c51744da49ad965fd5e6688b diff --git a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild deleted file mode 100644 index 335b0341d47e..000000000000 --- a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Intel C for Media RunTime GPU kernel manager" -HOMEPAGE="https://github.com/intel/cmrt" -SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - >=x11-libs/libdrm-2.4.23[video_cards_intel] - >=media-libs/libva-2.0.0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild new file mode 100644 index 000000000000..6ccae4fc9c5d --- /dev/null +++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Intel C for Media RunTime GPU kernel manager" +HOMEPAGE="https://github.com/intel/cmrt" +SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + >=x11-libs/libdrm-2.4.23[video_cards_intel] + >=media-libs/libva-2.0.0 +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-musl-fix.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch new file mode 100644 index 000000000000..91bae74ed8a1 --- /dev/null +++ b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/os_defs.h b/src/os_defs.h +index 82794f5..13539ee 100644 +--- a/src/os_defs.h ++++ b/src/os_defs.h +@@ -109,6 +109,10 @@ typedef struct tagRECT { + + #define CONST const + ++#ifndef __CONCAT ++ #define __CONCAT( a1, a2 ) a1 ## a2 ++#endif ++ + #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) + #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) + #define STATIC_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1] -- cgit v1.2.3