patch from fedora to fix gl.pc when building with glvnd

diff --git a/Mesa.spec b/Mesa.spec
index 25bfa06f0b6c11f7b0a17c91d84d09201614eb38..a5033163b06cd00bc9c512534e8f509370a1247d 100644 (file)
--- 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 (file)
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@