Accepting request 198946 from X11:Wayland

- wayland-egl-pc-require-wayland is now mainline

OBS-URL: https://build.opensuse.org/request/show/198946
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=323

Mesa.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 13 12:53:33 UTC 2013 - duwe@suse.com
+
+- wayland-egl-pc-require-wayland is now mainline
+
 -------------------------------------------------------------------
 Thu Sep 12 12:13:11 UTC 2013 - schwab@suse.de
 

Mesa.spec

@@ -110,7 +110,7 @@ Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 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
-Patch18:        u_wayland-egl-pc-require-wayland.patch
+Patch18:        U_wayland-egl-pc-require-wayland.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 

U_wayland-egl-pc-require-wayland.patch

@@ -1,5 +1,7 @@
 From: Torsten Duwe <duwe@suse.de>
 Subject: require wayland.pc in wayland-egl.pc
+Git-commit: 3bc642cbf69b3ba71fc636d6120fc7ac0b83aecb
+Patch-mainline: 9.2
 
 Mesa provides the wayland-egl libs and the pkgconfig file, but
 the headers originate from the wayland package. Ensure everything
@@ -7,6 +9,7 @@ matches, by requiring application builds to look at the wayland
 headers as well.
 
 Signed-off-by: Torsten Duwe <duwe@suse.de>
+Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.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
@@ -14,6 +17,6 @@ Signed-off-by: Torsten Duwe <duwe@suse.de>
  Name: wayland-egl
  Description: Mesa wayland-egl library
  Version: @VERSION@
-+Requires: wayland
++Requires: wayland-client
  Libs: -L${libdir} -lwayland-egl
  Cflags: -I${includedir}