From 704b90f5fed923da811eedd57e42e2069f776945 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Mon, 1 Jan 2018 23:48:43 +0100 Subject: [PATCH] patch from fedora to fix gl.pc when building with glvnd --- Mesa.spec | 4 ++++ glvnd-fix-gl-dot-pc.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 glvnd-fix-gl-dot-pc.patch diff --git a/Mesa.spec b/Mesa.spec index 25bfa06..a503316 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -66,6 +66,7 @@ Group: X11/Libraries Source0: ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz # Source0-md5: b4b021279ea21e1eb8a1369afa6f19a0 Patch0: %{name}-link.patch +Patch1: glvnd-fix-gl-dot-pc.patch URL: http://www.mesa3d.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -1263,6 +1264,9 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD. %prep %setup -q -n mesa-%{version} %patch0 -p1 +%if %{with glvnd} +%patch1 -p1 +%endif %build %{__libtoolize} diff --git a/glvnd-fix-gl-dot-pc.patch b/glvnd-fix-gl-dot-pc.patch new file mode 100644 index 0000000..68118f4 --- /dev/null +++ b/glvnd-fix-gl-dot-pc.patch @@ -0,0 +1,12 @@ +diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in +--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 ++++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 +@@ -7,7 +7,7 @@ Name: gl + Description: Mesa OpenGL library + Requires.private: @GL_PC_REQ_PRIV@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -l@GL_LIB@ ++Libs: -L${libdir} -lGL + Libs.private: @GL_PC_LIB_PRIV@ + Cflags: -I${includedir} @GL_PC_CFLAGS@ + glx_tls: @GLX_TLS@ -- 2.43.0