rpms/libepoxy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild for libglvnd 1.2, drop work-arounds

Browse Source
This commit is contained in:
Peter Robinson 2019-10-25 15:53:57 +01:00
parent f49344224d
commit ff4e55dead
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libepoxy-1.5.3-pkgconfig_drop_private_gl.patch
View File

@ -1,9 +0,0 @@
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@

25
libepoxy.spec
View File

@ -1,28 +1,18 @@
Summary: epoxy runtime library
Name: libepoxy
Version: 1.5.3
Release: 4%{?dist}
Release: 5%{?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
# Until patch1 is no longer needed, don't rely on pkgconfig
#BuildRequires: pkgconfig(gl)
#BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(egl)
BuildRequires: libGL-devel
BuildRequires: libEGL-devel
BuildRequires: libX11-devel
BuildRequires: pkgconfig(glesv2)
BuildRequires: python3
BuildRequires: xorg-x11-server-Xvfb mesa-dri-drivers
@ -33,10 +23,6 @@ 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
@ -71,6 +57,9 @@ xvfb-run -d -s "-screen 0 640x480x24" ninja -C %{_vpath_builddir} test || \
%{_libdir}/pkgconfig/epoxy.pc
%changelog
* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1.5.3-5
- Rebuild for libglvnd 1.2, drop work-arounds
* Thu Aug 22 2019 Rex Dieter <rdieter@fedoraproject.org> - 1.5.3-4
- epoxy.pc: -Requires.private: gl egl (#1744320)