summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2022-06-17 15:48:54 +0300
committerJoonas Niilola <juippis@gentoo.org>2022-06-19 11:34:23 +0300
commit1cabfee1095110f283ea40ac93902093f588d425 (patch)
tree9c4c67dd069b23aaacbc3aa0651a60d766d5e63e /media-libs
parentapp-admin/awscli: Stabilize 1.25.7 ALLARCHES, #852875 (diff)
downloadgentoo-1cabfee1095110f283ea40ac93902093f588d425.tar.gz
gentoo-1cabfee1095110f283ea40ac93902093f588d425.tar.bz2
gentoo-1cabfee1095110f283ea40ac93902093f588d425.zip
media-libs/libepoxy: fix pkgconfig file to use lopengl with -X
Closes: https://bugs.gentoo.org/849809 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch15
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild48
-rw-r--r--media-libs/libepoxy/libepoxy-9999.ebuild2
3 files changed, 65 insertions, 0 deletions
diff --git a/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch b/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch
new file mode 100644
index 000000000000..0ed9c2f17681
--- /dev/null
+++ b/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch
@@ -0,0 +1,15 @@
+diff -Naur a/src/meson.build b/src/meson.build
+--- a/src/meson.build 2022-02-17 14:56:12.000000000 +0200
++++ b/src/meson.build 2022-06-17 15:17:20.388423154 +0300
+@@ -98,8 +98,10 @@
+ # not needed when building Epoxy; we do want to add them to the generated
+ # pkg-config file, for consumers of Epoxy
+ gl_reqs = []
+-if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
++if build_glx and gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
+ gl_reqs += 'gl'
++else
++ gl_reqs += 'opengl'
+ endif
+ if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
+ gl_reqs += 'egl'
diff --git a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
new file mode 100644
index 000000000000..b23a8faa254c
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+)'
+inherit meson-multilib python-any-r1 virtualx
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library for handling OpenGL function pointer management"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+egl test +X"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/libepoxy-1.5.10-use-opengl.pc-without-x.patch )
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Degl=$(usex egl)
+ -Dglx=$(usex X)
+ $(meson_use X x11)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ virtx meson_src_test
+}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 9af6e42c5e71..f54d1c9ccf97 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/libepoxy-1.5.10-use-opengl.pc-without-x.patch )
+
multilib_src_configure() {
local emesonargs=(
-Degl=$(usex egl)