From 1d924399b054a41948bd19970a4de9b13fd69685 Mon Sep 17 00:00:00 2001
From: Kai-Chun Ning <kaichun.ning@gmail.com>
Date: Thu, 2 Mar 2023 23:47:09 +0000
Subject: x11-libs/cmrt: fix build on musl

Signed-off-by: Kai-Chun Ning <kaichun.ning@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29904
Signed-off-by: Sam James <sam@gentoo.org>
---
 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 ++++++++++++
 3 files changed, 50 insertions(+), 31 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')

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..aa680ed31eb5
--- /dev/null
+++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
@@ -0,0 +1,35 @@
+# 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}"
+
+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-65-gdbad