SHA256
1
0
forked from pool/Mesa

Accepting request 198016 from home:duwe:branches:X11:XOrg

- u_wayland-egl-pc-require-wayland.patch: after finding wayland
  for egl, make sure its pkconfig is used as well.

OBS-URL: https://build.opensuse.org/request/show/198016
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=316
This commit is contained in:
Stefan Dirsch 2013-09-09 13:38:19 +00:00 committed by Git OBS Bridge
parent 9f5b38cbd4
commit f40122da29
4 changed files with 28 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 9 09:59:50 UTC 2013 - duwe@suse.com
- u_wayland-egl-pc-require-wayland.patch: after finding wayland
for egl, make sure its pkconfig is used as well.
-------------------------------------------------------------------
Fri Aug 30 09:10:22 UTC 2013 - idonmez@suse.com

View File

@ -112,8 +112,9 @@ Patch14: u_mesa-glapi_dispatch.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# PATCH-FIX-UPSTREAM gallium-egl-gbm-use-wayland-cflags.patch -- use pkgconfig for finding wayland
Patch16: U_gallium-egl-gbm-use-wayland-cflags.patch
Patch16: u_gallium-egl-gbm-use-wayland-cflags.patch
Patch17: u_mesa-9.0-i965-Make-sure-we-do-render-between-two-hiz-flushes.patch
Patch18: u_wayland-egl-pc-require-wayland.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -538,6 +539,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch16 -p1
%endif
%patch17 -p1
%patch18 -p1
%build

View File

@ -0,0 +1,19 @@
From: Torsten Duwe <duwe@suse.de>
Subject: require wayland.pc in wayland-egl.pc
Mesa provides the wayland-egl libs and the pkgconfig file, but
the headers originate from the wayland package. Ensure everything
matches, by requiring application builds to look at the wayland
headers as well.
Signed-off-by: Torsten Duwe <duwe@suse.de>
--- Mesa-9.1.5/src/egl/wayland/wayland-egl/wayland-egl.pc.in.orig 2013-04-08 20:21:04.000000000 +0200
+++ Mesa-9.1.5/src/egl/wayland/wayland-egl/wayland-egl.pc.in 2013-09-09 14:32:07.000000000 +0200
@@ -6,5 +6,6 @@ includedir=@includedir@
Name: wayland-egl
Description: Mesa wayland-egl library
Version: @VERSION@
+Requires: wayland
Libs: -L${libdir} -lwayland-egl
Cflags: -I${includedir}