From 71f11e77d8c07990d3e65f1248b12d031361be94 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 22 2019 14:26:49 +0000 Subject: epoxy.pc: -Requires.private: gl egl (#1744320) --- diff --git a/libepoxy-1.5.3-pkgconfig_drop_private_gl.patch b/libepoxy-1.5.3-pkgconfig_drop_private_gl.patch new file mode 100644 index 0000000..0facacc --- /dev/null +++ b/libepoxy-1.5.3-pkgconfig_drop_private_gl.patch @@ -0,0 +1,9 @@ +diff -up libepoxy-1.5.3/epoxy.pc.in.drop_private_gl libepoxy-1.5.3/epoxy.pc.in +--- libepoxy-1.5.3/epoxy.pc.in.drop_private_gl 2019-08-22 09:20:50.508390863 -0500 ++++ libepoxy-1.5.3/epoxy.pc.in 2019-08-22 09:20:41.495226561 -0500 +@@ -13,4 +13,4 @@ Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lepoxy + Libs.private: @DLOPEN_LIBS@ +-Requires.private: @GL_REQS@ ++#Requires.private: @GL_REQS@ diff --git a/libepoxy.spec b/libepoxy.spec index 35f7a93..1677412 100644 --- a/libepoxy.spec +++ b/libepoxy.spec @@ -1,11 +1,21 @@ Summary: epoxy runtime library Name: libepoxy Version: 1.5.3 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/anholt/libepoxy Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +# WORKAROUND: non-upstreamable patch to drop +# Requires.private: gl egl +# since mesa recently droppg egl.pc from packaging. Works only +# beause fedora installs everything into prefix that's already +# included by default (why it's not upstreamable). +# see also: +# libepoxy: https://bugzilla.redhat.com/show_bug.cgi?id=1744320 +# mesa: https://bugzilla.redhat.com/show_bug.cgi?id=1744292 +Patch1: libepoxy-1.5.3-pkgconfig_drop_private_gl.patch + BuildRequires: meson BuildRequires: gcc BuildRequires: pkgconfig(gl) @@ -20,6 +30,10 @@ A library for handling OpenGL function pointer management. %package devel Summary: Development files for libepoxy Requires: %{name}%{?_isa} = %{version}-%{release} +# manually add header dependencies instead of relying on pkgconfig deps +# see patch1 +Requires: libGL-devel +Requires: libEGL-devel %description devel This package contains libraries and header files for @@ -54,6 +68,9 @@ xvfb-run -d -s "-screen 0 640x480x24" ninja -C %{_vpath_builddir} test || \ %{_libdir}/pkgconfig/epoxy.pc %changelog +* Thu Aug 22 2019 Rex Dieter - 1.5.3-4 +- epoxy.pc: -Requires.private: gl egl (#1744320) + * Thu Jul 25 2019 Fedora Release Engineering - 1.5.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild