From ef687dd16a9b0eec6b70707839379a816c7a7286f5a56fdd1e3d13f1edc7f70d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 13 Sep 2013 13:02:08 +0000 Subject: [PATCH] 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 | 5 +++++ Mesa.spec | 2 +- ...e-wayland.patch => U_wayland-egl-pc-require-wayland.patch | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) rename u_wayland-egl-pc-require-wayland.patch => U_wayland-egl-pc-require-wayland.patch (81%) diff --git a/Mesa.changes b/Mesa.changes index 71caebd..1b330c2 100644 --- a/Mesa.changes +++ b/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 diff --git a/Mesa.spec b/Mesa.spec index 2d04c15..54e31f2 100644 --- a/Mesa.spec +++ b/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 diff --git a/u_wayland-egl-pc-require-wayland.patch b/U_wayland-egl-pc-require-wayland.patch similarity index 81% rename from u_wayland-egl-pc-require-wayland.patch rename to U_wayland-egl-pc-require-wayland.patch index 5be4f7f..99fa780 100644 --- a/u_wayland-egl-pc-require-wayland.patch +++ b/U_wayland-egl-pc-require-wayland.patch @@ -1,5 +1,7 @@ From: Torsten Duwe 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 +Signed-off-by: Johannes Obermayr --- 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 Name: wayland-egl Description: Mesa wayland-egl library Version: @VERSION@ -+Requires: wayland ++Requires: wayland-client Libs: -L${libdir} -lwayland-egl Cflags: -I${includedir}