From f40122da29b3d94b6777f26bdf2fa62bf3fed791898299bcbeee993dc6b5e8e8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 9 Sep 2013 13:38:19 +0000 Subject: [PATCH] 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 --- Mesa.changes | 6 ++++++ Mesa.spec | 4 +++- ...u_gallium-egl-gbm-use-wayland-cflags.patch | 0 u_wayland-egl-pc-require-wayland.patch | 19 +++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) rename U_gallium-egl-gbm-use-wayland-cflags.patch => u_gallium-egl-gbm-use-wayland-cflags.patch (100%) create mode 100644 u_wayland-egl-pc-require-wayland.patch diff --git a/Mesa.changes b/Mesa.changes index 734d8c8..ce163a8 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -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 diff --git a/Mesa.spec b/Mesa.spec index eaa65af..17cf169 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 diff --git a/U_gallium-egl-gbm-use-wayland-cflags.patch b/u_gallium-egl-gbm-use-wayland-cflags.patch similarity index 100% rename from U_gallium-egl-gbm-use-wayland-cflags.patch rename to u_gallium-egl-gbm-use-wayland-cflags.patch diff --git a/u_wayland-egl-pc-require-wayland.patch b/u_wayland-egl-pc-require-wayland.patch new file mode 100644 index 0000000..5be4f7f --- /dev/null +++ b/u_wayland-egl-pc-require-wayland.patch @@ -0,0 +1,19 @@ +From: Torsten Duwe +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 + +--- 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}