From 3e3283c5b2c818bc30d75a8e6b1579d7432a80425e4d42dc9c94c8539eba8526 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 9 Feb 2018 14:08:44 +0000
Subject: [PATCH 1/6] - Update to 18.0.0-rc4 - supersedes
 u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=698
---
 Mesa-drivers.changes                          |   6 ++
 Mesa-drivers.spec                             |   4 +-
 Mesa.changes                                  |   6 ++
 Mesa.spec                                     |   4 +-
 mesa-18.0.0-rc3.tar.xz                        |   3 -
 mesa-18.0.0-rc3.tar.xz.sig                    | Bin 566 -> 0 bytes
 mesa-18.0.0-rc4.tar.xz                        |   3 +
 mesa-18.0.0-rc4.tar.xz.sig                    | Bin 0 -> 566 bytes
 ...restore-num_tgsi_tokens-when-loading.patch | 101 ------------------
 9 files changed, 17 insertions(+), 110 deletions(-)
 delete mode 100644 mesa-18.0.0-rc3.tar.xz
 delete mode 100644 mesa-18.0.0-rc3.tar.xz.sig
 create mode 100644 mesa-18.0.0-rc4.tar.xz
 create mode 100644 mesa-18.0.0-rc4.tar.xz.sig
 delete mode 100644 u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index f67fe0e..88eaa5e 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  9 13:45:16 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.0-rc4
+- supersedes u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch 
+
 -------------------------------------------------------------------
 Tue Feb  6 08:42:03 UTC 2018 - msrb@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index 5117d0b..ffbcf52 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -43,7 +43,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.0-rc3
+%define _version 18.0.0-rc4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -141,7 +141,6 @@ Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
 Patch43:        u_mesa-python3-only.patch
-Patch44:        u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 
 BuildRequires:  autoconf >= 2.60
@@ -750,7 +749,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %endif
 
 %patch43 -p1
-%patch44 -p1
 %patch45 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
diff --git a/Mesa.changes b/Mesa.changes
index f67fe0e..88eaa5e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  9 13:45:16 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.0-rc4
+- supersedes u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch 
+
 -------------------------------------------------------------------
 Tue Feb  6 08:42:03 UTC 2018 - msrb@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 6e37cc0..204b582 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.0-rc3
+%define _version 18.0.0-rc4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -140,7 +140,6 @@ Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
 Patch43:        u_mesa-python3-only.patch
-Patch44:        u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 
 BuildRequires:  autoconf >= 2.60
@@ -749,7 +748,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %endif
 
 %patch43 -p1
-%patch44 -p1
 %patch45 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
diff --git a/mesa-18.0.0-rc3.tar.xz b/mesa-18.0.0-rc3.tar.xz
deleted file mode 100644
index 7d4d8a8..0000000
--- a/mesa-18.0.0-rc3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27c1ade098d9e0afaa7ecaa2d4ce7fe1e84f105b82c0d19926f9694087ea5758
-size 10964880
diff --git a/mesa-18.0.0-rc3.tar.xz.sig b/mesa-18.0.0-rc3.tar.xz.sig
deleted file mode 100644
index 13161e553eaaa1f3a48d0dedb68ee8123e00c4c0b7b65e81844458851e2396f0..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$OhdjQ|P>5bdrv
zuq^9I4RG5J|7NBtIio<DrwCrgS6T9|d$QZRuscIX=p@HZErCIRjO{Y77vFq70(k1}
zouc1(d9V{v$wXc`kZQM5XjoWt?A<~&stsM9d%^}xN}-}|0a{`2L5~ZIu=1_Fj?jNi
zvY|XE|C+$!^<c^^x1$39dYb<qtPs1)+RS)BM7O7-UhR|YZe+SfQ_ldBWbF9+xZFLh
z6R<4(<@gFNYiFAlBVyJV5>8l`@-IN1Zlz?MKoc+#v+lu6ZcCH1{vq#&SI%Mf{<9F%
zD?<P{Ns7>j(R%VG9@8yca%73^;~hA|FfVJyke(=L%MJGvVGm6+^M&qTXC}|44_6bM
zM$Lr0qUw*|<xuI<VybJNOpX>8R!-1SLluJfH6XU&$<Yr#n_`EHEin1O{~Z}OfL#WW
zF3U)Rkv-Y6ebZ61-Q!g>I>M1E1u4<N77-_pPS~7dS?TCo2LWPV$sKdTs<5;I58+|g
zXCZWlmIU%uT#elw_ut3^Wdg!hrLwPwZ?=QuTM2h$qXNqM9$J5bZ)<+FDnr`3&yO+5
z8OUSYz{-Vt{2o6~P_2P;1biN;31-kTjwmgSk~o3n@H};e7Q1Nl@R`4DMa6ict3EZi
z7)iAn=Cs2zZ`$oR@6Qb)4oxa-)wHRz&HaOq6on|u?pBOEE&YS=cpX^#5W^x~=trw!
EaB;5?9smFU

diff --git a/mesa-18.0.0-rc4.tar.xz b/mesa-18.0.0-rc4.tar.xz
new file mode 100644
index 0000000..6160a95
--- /dev/null
+++ b/mesa-18.0.0-rc4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad575becea192f04403b6783492955f395dd8faad7e51cbcbad203be70eb9075
+size 11027596
diff --git a/mesa-18.0.0-rc4.tar.xz.sig b/mesa-18.0.0-rc4.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..c4124be7f63eb7b14d755571a225ce3f052901b8f49a66a86e7338e8cd35044d
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$P0qb^r<q5bdrv
zuq^9I4b37C{yrCrIChn_e<Oa^ppYSpkRDsF!7h)|VeJJ8xy><@DgQM?AB2@7>U3ki
zaxK=V82Dz1?Bmc8ufYh<Y8|4q%reA^Z3T6>T?Sk5`1*^fpWqfeG0<MzS2>6R$bVzy
z?NO7I-7J8|@_qFBMICwY`zuR3HLw_l>;ZBSxshO_et&{%qAp+mk3*xMB2<uSMdYO;
zSG#;9z#{B_XSQ$E=1VJB0rxk~?va4&&9M_j{ckefZ=OI#oY8p)f{R*3<wGrRjUcje
zgGT7@?g?s&Bd5@UgXUDPxbqb$zYmUWet|>e;gf^fXD)}p)GexxCkx)A%qsBk6u&)r
zQ{}@ie`RI(tQrd^p6gUW`FibnecZW{xL%6)nQb}!rW>NAB*eHeQw)X&sOMoXGxWX7
zS@zeq0#*9ln4ls3<7)pL#3bf+7P#4uv-fs2>bl+mEOZGQvC+*!e<@JaY=y#Fv&sX3
z=fIKXYR*u{%zA}_3ws<@B+sQzaT?gx)vj7Do7_zb3R48_V-LW${uB5&08|+>H3ij>
zOnfViiiA}AwLE_URA3|5J}7S+8bcD5&h%L%%dgR9);^MFjw^;>e>vL+9W<Y{C5!Tp
zQA9I_Zi<^oHKUdMfkSFRc6Gi{iLd81fzs_Mrggax^d8*i(dMj)M4Nfy1XX-`1G0#G
E5rFy=iU0rr

literal 0
HcmV?d00001

diff --git a/u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch b/u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch
deleted file mode 100644
index 7a6858c..0000000
--- a/u_mesa-st-shader_cache-restore-num_tgsi_tokens-when-loading.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Git-commit: 041b18cf23a0acf7b0eddf63cd7a2a10192432a1
-Author: Timothy Arceri <tarceri@itsqueeze.com>
-Subject: st/shader_cache: restore num_tgsi_tokens when loading from cache
-References: bnc#1079465 fdo#104762
-Patch-Mainline: Upstream
-Signed-off-by: Michal Srb <msrb@suse.com>
-
-Without this we will fail to correctly serialise programs when
-using glGetProgramBinary() if the program was retrieved from
-the disk cache rather than freshly compiled.
-
-Fixes: c69b0dd6817b "st/glsl_to_tgsi: store num_tgsi_tokens in st_*_program"
-
-Reviewed-by: Gert Wollny <gw.fossdev@gmail.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104762
----
- src/mesa/state_tracker/st_shader_cache.c | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/src/mesa/state_tracker/st_shader_cache.c b/src/mesa/state_tracker/st_shader_cache.c
-index b1b9d275f8..12d73965bf 100644
---- a/src/mesa/state_tracker/st_shader_cache.c
-+++ b/src/mesa/state_tracker/st_shader_cache.c
-@@ -142,10 +142,11 @@ read_stream_out_from_cache(struct blob_reader *blob_reader,
- 
- static void
- read_tgsi_from_cache(struct blob_reader *blob_reader,
--                     const struct tgsi_token **tokens)
-+                     const struct tgsi_token **tokens,
-+                     unsigned *num_tokens)
- {
--   uint32_t num_tokens  = blob_read_uint32(blob_reader);
--   unsigned tokens_size = num_tokens * sizeof(struct tgsi_token);
-+   *num_tokens  = blob_read_uint32(blob_reader);
-+   unsigned tokens_size = *num_tokens * sizeof(struct tgsi_token);
-    *tokens = (const struct tgsi_token*) MALLOC(tokens_size);
-    blob_copy_bytes(blob_reader, (uint8_t *) *tokens, tokens_size);
- }
-@@ -175,7 +176,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
-                       sizeof(stvp->result_to_output));
- 
-       read_stream_out_from_cache(&blob_reader, &stvp->tgsi);
--      read_tgsi_from_cache(&blob_reader, &stvp->tgsi.tokens);
-+      read_tgsi_from_cache(&blob_reader, &stvp->tgsi.tokens,
-+                           &stvp->num_tgsi_tokens);
- 
-       if (st->vp == stvp)
-          st->dirty |= ST_NEW_VERTEX_PROGRAM(st, stvp);
-@@ -189,7 +191,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
-                                 &sttcp->variants, &sttcp->tgsi);
- 
-       read_stream_out_from_cache(&blob_reader, &sttcp->tgsi);
--      read_tgsi_from_cache(&blob_reader, &sttcp->tgsi.tokens);
-+      read_tgsi_from_cache(&blob_reader, &sttcp->tgsi.tokens,
-+                           &sttcp->num_tgsi_tokens);
- 
-       if (st->tcp == sttcp)
-          st->dirty |= sttcp->affected_states;
-@@ -203,7 +206,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
-                                 &sttep->variants, &sttep->tgsi);
- 
-       read_stream_out_from_cache(&blob_reader, &sttep->tgsi);
--      read_tgsi_from_cache(&blob_reader, &sttep->tgsi.tokens);
-+      read_tgsi_from_cache(&blob_reader, &sttep->tgsi.tokens,
-+                           &sttep->num_tgsi_tokens);
- 
-       if (st->tep == sttep)
-          st->dirty |= sttep->affected_states;
-@@ -217,7 +221,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
-                                 &stgp->tgsi);
- 
-       read_stream_out_from_cache(&blob_reader, &stgp->tgsi);
--      read_tgsi_from_cache(&blob_reader, &stgp->tgsi.tokens);
-+      read_tgsi_from_cache(&blob_reader, &stgp->tgsi.tokens,
-+                           &stgp->num_tgsi_tokens);
- 
-       if (st->gp == stgp)
-          st->dirty |= stgp->affected_states;
-@@ -229,7 +234,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
- 
-       st_release_fp_variants(st, stfp);
- 
--      read_tgsi_from_cache(&blob_reader, &stfp->tgsi.tokens);
-+      read_tgsi_from_cache(&blob_reader, &stfp->tgsi.tokens,
-+                           &stfp->num_tgsi_tokens);
- 
-       if (st->fp == stfp)
-          st->dirty |= stfp->affected_states;
-@@ -242,7 +248,8 @@ st_deserialise_tgsi_program(struct gl_context *ctx,
-       st_release_cp_variants(st, stcp);
- 
-       read_tgsi_from_cache(&blob_reader,
--                           (const struct tgsi_token**) &stcp->tgsi.prog);
-+                           (const struct tgsi_token**) &stcp->tgsi.prog,
-+                           &stcp->num_tgsi_tokens);
- 
-       stcp->tgsi.req_local_mem = stcp->Base.info.cs.shared_size;
-       stcp->tgsi.req_private_mem = 0;
--- 
-2.13.6
-

From de9388e7e14e3d01b65a77fb96d15f3b7317f0151b63055644924b25cc0ea265 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 12 Feb 2018 14:47:44 +0000
Subject: [PATCH 2/6] Accepting request 575796 from
 home:worldcitizen:branches:X11:XOrg

Added %{release} so the correct package release is used when a package has been patched

OBS-URL: https://build.opensuse.org/request/show/575796
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=699
---
 Mesa-drivers.changes |  6 ++++
 Mesa-drivers.spec    | 80 ++++++++++++++++++++++----------------------
 Mesa.changes         |  6 ++++
 Mesa.spec            | 80 ++++++++++++++++++++++----------------------
 4 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 88eaa5e..02a58bf 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 12 12:32:21 UTC 2018 - joop.boonen@opensuse.org
+
+- Added %{release} so the correct package release is used
+  when a package has been patched
+
 -------------------------------------------------------------------
 Fri Feb  9 13:45:16 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index ffbcf52..aeebaba 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -231,16 +231,16 @@ BuildRequires:  libclc
 %endif
 
 %if 0%{?libglvnd}
-Requires:       Mesa-libEGL1  = %{version}
-Requires:       Mesa-libGL1  = %{version}
+Requires:       Mesa-libEGL1  = %{version}-%{release}
+Requires:       Mesa-libGL1  = %{version}-%{release}
 Requires:       libglvnd >= 0.1.0
 %endif
 
 # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
 # do not install recommends on their system still get working Mesa. It is
 # ignored in obs when Mesa is installed as build dependency.
-Requires:       Mesa-dri = %{version}
-Requires:       Mesa-gallium = %{version}
+Requires:       Mesa-dri = %{version}-%{release}
+Requires:       Mesa-gallium = %{version}-%{release}
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -260,25 +260,25 @@ just Mesa or The Mesa 3-D graphics library.
 %package devel
 Summary:        Libraries, includes and more to develop Mesa applications
 Group:          Development/Libraries/X11
-Requires:       Mesa = %{version}
-Requires:       Mesa-dri-devel = %{version}
-Requires:       Mesa-libEGL-devel = %{version}
-Requires:       Mesa-libGL-devel = %{version}
-Requires:       Mesa-libGLESv1_CM-devel = %{version}
-Requires:       Mesa-libGLESv2-devel = %{version}
-Requires:       Mesa-libglapi-devel = %{version}
-Requires:       libOSMesa-devel = %{version}
+Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa-dri-devel = %{version}-%{release}
+Requires:       Mesa-libEGL-devel = %{version}-%{release}
+Requires:       Mesa-libGL-devel = %{version}-%{release}
+Requires:       Mesa-libGLESv1_CM-devel = %{version}-%{release}
+Requires:       Mesa-libGLESv2-devel = %{version}-%{release}
+Requires:       Mesa-libglapi-devel = %{version}-%{release}
+Requires:       libOSMesa-devel = %{version}-%{release}
 Requires:       libgbm-devel
-Provides:       Mesa-devel-static = %{version}
-Provides:       xorg-x11-Mesa-devel = %{version}
-Obsoletes:      Mesa-devel-static < %{version}
-Obsoletes:      xorg-x11-Mesa-devel < %{version}
-Provides:       Mesa-libIndirectGL-devel = %{version}
-Obsoletes:      Mesa-libIndirectGL-devel < %{version}
-Provides:       s2tc-devel = %{version}
-Obsoletes:      s2tc-devel < %{version}
-Provides:       libtxc_dxtn-devel = %{version}
-Obsoletes:      libtxc_dxtn-devel < %{version}
+Provides:       Mesa-devel-static = %{version}-%{release}
+Provides:       xorg-x11-Mesa-devel = %{version}-%{release}
+Obsoletes:      Mesa-devel-static < %{version}-%{release}
+Obsoletes:      xorg-x11-Mesa-devel < %{version}-%{release}
+Provides:       Mesa-libIndirectGL-devel = %{version}-%{release}
+Obsoletes:      Mesa-libIndirectGL-devel < %{version}-%{release}
+Provides:       s2tc-devel = %{version}-%{release}
+Obsoletes:      s2tc-devel < %{version}-%{release}
+Provides:       libtxc_dxtn-devel = %{version}-%{release}
+Obsoletes:      libtxc_dxtn-devel < %{version}-%{release}
 %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
 Requires:       libwayland-egl-devel
 %endif
@@ -320,7 +320,7 @@ support.
 %package libEGL-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libEGL1 = %{version}
+Requires:       Mesa-libEGL1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -339,7 +339,7 @@ programs against the EGL library.
 %package libGL1
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd >= 0.1.0
 %endif
@@ -357,7 +357,7 @@ the X Window System.
 %package libGL-devel
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGL1 = %{version}
+Requires:       Mesa-libGL1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -388,7 +388,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 %package libGLESv1_CM-devel
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv1_CM1 = %{version}
+Requires:       Mesa-libGLESv1_CM1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -427,7 +427,7 @@ ES 3 entry points.
 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv2-2 = %{version}
+Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -449,7 +449,7 @@ applications using the OpenGL|ES 2.x APIs.
 Summary:        Development files for the OpenGL ES 3.x API
 Group:          Development/Libraries/C and C++
 %if 0%{?libglvnd} == 0
-Requires:       Mesa-libGLESv2-2 = %{version}
+Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
 %endif
 Requires:       pkgconfig(egl)
 
@@ -477,7 +477,7 @@ rendering context on an X Server. It uses a pure software renderer.
 %package -n libOSMesa-devel
 Summary:        Development files for the Mesa Offscreen Rendering extension
 Group:          Development/Libraries/C and C++
-Requires:       libOSMesa8 = %{version}
+Requires:       libOSMesa8 = %{version}-%{release}
 
 %description -n libOSMesa-devel
 Development files for the OSmesa Mesa extension that allows programs to render to an
@@ -496,7 +496,7 @@ packages.
 %package libglapi-devel
 Summary:        Development files for the Mesa GL API implementation
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libglapi0 = %{version}
+Requires:       Mesa-libglapi0 = %{version}-%{release}
 
 %description libglapi-devel
 Development files for the Mesa GL API module which is responsible for
@@ -506,7 +506,7 @@ the Mesa-libGLES* packages.
 %package -n Mesa-dri
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    Mesa
 
 %description -n Mesa-dri
@@ -515,7 +515,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
 %package dri-devel
 Summary:        Development files for the DRI API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 
 %description dri-devel
 This package contains the development environment required for
@@ -524,7 +524,7 @@ compiling programs and libraries using the DRI API.
 %package -n Mesa-dri-nouveau
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
@@ -535,7 +535,7 @@ since it is still experimental.
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    Mesa
 
 %description -n Mesa-gallium
@@ -556,7 +556,7 @@ openwfd.
 %package -n libgbm-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       libgbm1 = %{version}
+Requires:       libgbm1 = %{version}-%{release}
 
 %description -n libgbm-devel
 This package contains the GBM buffer management library. It provides
@@ -581,7 +581,7 @@ that need not run full-screen and cooperate with a compositor.
 %package -n libwayland-egl-devel
 Summary:        Development files for libwayland-egl1
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-egl1 = %{version}
+Requires:       libwayland-egl1 = %{version}-%{release}
 
 %description -n libwayland-egl-devel
 This package is required to link wayland client applications to the EGL
@@ -603,7 +603,7 @@ Mesa Direct3D9 state tracker
 %package -n Mesa-libd3d-devel
 Summary:        Mesa Direct3D9 state tracker development package
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libd3d = %{version}
+Requires:       Mesa-libd3d = %{version}-%{release}
 
 %description -n Mesa-libd3d-devel
 Mesa Direct3D9 state tracker development package
@@ -694,8 +694,8 @@ This package contains the Vulkan parts for Mesa.
 %package -n Mesa-libVulkan-devel
 Summary:        Mesa's Vulkan development files
 Group:          Development/Libraries/C and C++
-Requires:       libvulkan_intel = %{version}
-Requires:       libvulkan_radeon = %{version}
+Requires:       libvulkan_intel = %{version}-%{release}
+Requires:       libvulkan_radeon = %{version}-%{release}
 Conflicts:      vulkan-devel
 
 %description -n Mesa-libVulkan-devel
@@ -718,7 +718,7 @@ Version:        1.0.0
 Release:        0
 Summary:        Development files for the XA API
 Group:          Development/Libraries/C and C++
-Requires:       libxatracker2 = %{version}
+Requires:       libxatracker2 = %{version}-%{release}
 
 %description -n libxatracker-devel
 This package contains the XA state tracker for gallium3D driver.
diff --git a/Mesa.changes b/Mesa.changes
index 88eaa5e..b02d57c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 12 12:31:05 UTC 2018 - joop.boonen@opensuse.org
+
+- Added %{release} so the correct package release is used
+  when a package has been patched 
+
 -------------------------------------------------------------------
 Fri Feb  9 13:45:16 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 204b582..1455e36 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -230,16 +230,16 @@ BuildRequires:  libclc
 %endif
 
 %if 0%{?libglvnd}
-Requires:       Mesa-libEGL1  = %{version}
-Requires:       Mesa-libGL1  = %{version}
+Requires:       Mesa-libEGL1  = %{version}-%{release}
+Requires:       Mesa-libGL1  = %{version}-%{release}
 Requires:       libglvnd >= 0.1.0
 %endif
 
 # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
 # do not install recommends on their system still get working Mesa. It is
 # ignored in obs when Mesa is installed as build dependency.
-Requires:       Mesa-dri = %{version}
-Requires:       Mesa-gallium = %{version}
+Requires:       Mesa-dri = %{version}-%{release}
+Requires:       Mesa-gallium = %{version}-%{release}
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -259,25 +259,25 @@ just Mesa or The Mesa 3-D graphics library.
 %package devel
 Summary:        Libraries, includes and more to develop Mesa applications
 Group:          Development/Libraries/X11
-Requires:       Mesa = %{version}
-Requires:       Mesa-dri-devel = %{version}
-Requires:       Mesa-libEGL-devel = %{version}
-Requires:       Mesa-libGL-devel = %{version}
-Requires:       Mesa-libGLESv1_CM-devel = %{version}
-Requires:       Mesa-libGLESv2-devel = %{version}
-Requires:       Mesa-libglapi-devel = %{version}
-Requires:       libOSMesa-devel = %{version}
+Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa-dri-devel = %{version}-%{release}
+Requires:       Mesa-libEGL-devel = %{version}-%{release}
+Requires:       Mesa-libGL-devel = %{version}-%{release}
+Requires:       Mesa-libGLESv1_CM-devel = %{version}-%{release}
+Requires:       Mesa-libGLESv2-devel = %{version}-%{release}
+Requires:       Mesa-libglapi-devel = %{version}-%{release}
+Requires:       libOSMesa-devel = %{version}-%{release}
 Requires:       libgbm-devel
-Provides:       Mesa-devel-static = %{version}
-Provides:       xorg-x11-Mesa-devel = %{version}
-Obsoletes:      Mesa-devel-static < %{version}
-Obsoletes:      xorg-x11-Mesa-devel < %{version}
-Provides:       Mesa-libIndirectGL-devel = %{version}
-Obsoletes:      Mesa-libIndirectGL-devel < %{version}
-Provides:       s2tc-devel = %{version}
-Obsoletes:      s2tc-devel < %{version}
-Provides:       libtxc_dxtn-devel = %{version}
-Obsoletes:      libtxc_dxtn-devel < %{version}
+Provides:       Mesa-devel-static = %{version}-%{release}
+Provides:       xorg-x11-Mesa-devel = %{version}-%{release}
+Obsoletes:      Mesa-devel-static < %{version}-%{release}
+Obsoletes:      xorg-x11-Mesa-devel < %{version}-%{release}
+Provides:       Mesa-libIndirectGL-devel = %{version}-%{release}
+Obsoletes:      Mesa-libIndirectGL-devel < %{version}-%{release}
+Provides:       s2tc-devel = %{version}-%{release}
+Obsoletes:      s2tc-devel < %{version}-%{release}
+Provides:       libtxc_dxtn-devel = %{version}-%{release}
+Obsoletes:      libtxc_dxtn-devel < %{version}-%{release}
 %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
 Requires:       libwayland-egl-devel
 %endif
@@ -319,7 +319,7 @@ support.
 %package libEGL-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libEGL1 = %{version}
+Requires:       Mesa-libEGL1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -338,7 +338,7 @@ programs against the EGL library.
 %package libGL1
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd >= 0.1.0
 %endif
@@ -356,7 +356,7 @@ the X Window System.
 %package libGL-devel
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGL1 = %{version}
+Requires:       Mesa-libGL1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -387,7 +387,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 %package libGLESv1_CM-devel
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv1_CM1 = %{version}
+Requires:       Mesa-libGLESv1_CM1 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -426,7 +426,7 @@ ES 3 entry points.
 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv2-2 = %{version}
+Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -448,7 +448,7 @@ applications using the OpenGL|ES 2.x APIs.
 Summary:        Development files for the OpenGL ES 3.x API
 Group:          Development/Libraries/C and C++
 %if 0%{?libglvnd} == 0
-Requires:       Mesa-libGLESv2-2 = %{version}
+Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
 %endif
 Requires:       pkgconfig(egl)
 
@@ -476,7 +476,7 @@ rendering context on an X Server. It uses a pure software renderer.
 %package -n libOSMesa-devel
 Summary:        Development files for the Mesa Offscreen Rendering extension
 Group:          Development/Libraries/C and C++
-Requires:       libOSMesa8 = %{version}
+Requires:       libOSMesa8 = %{version}-%{release}
 
 %description -n libOSMesa-devel
 Development files for the OSmesa Mesa extension that allows programs to render to an
@@ -495,7 +495,7 @@ packages.
 %package libglapi-devel
 Summary:        Development files for the Mesa GL API implementation
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libglapi0 = %{version}
+Requires:       Mesa-libglapi0 = %{version}-%{release}
 
 %description libglapi-devel
 Development files for the Mesa GL API module which is responsible for
@@ -505,7 +505,7 @@ the Mesa-libGLES* packages.
 %package -n Mesa-dri
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    Mesa
 
 %description -n Mesa-dri
@@ -514,7 +514,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
 %package dri-devel
 Summary:        Development files for the DRI API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 
 %description dri-devel
 This package contains the development environment required for
@@ -523,7 +523,7 @@ compiling programs and libraries using the DRI API.
 %package -n Mesa-dri-nouveau
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
@@ -534,7 +534,7 @@ since it is still experimental.
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
-Requires:       Mesa = %{version}
+Requires:       Mesa = %{version}-%{release}
 Supplements:    Mesa
 
 %description -n Mesa-gallium
@@ -555,7 +555,7 @@ openwfd.
 %package -n libgbm-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       libgbm1 = %{version}
+Requires:       libgbm1 = %{version}-%{release}
 
 %description -n libgbm-devel
 This package contains the GBM buffer management library. It provides
@@ -580,7 +580,7 @@ that need not run full-screen and cooperate with a compositor.
 %package -n libwayland-egl-devel
 Summary:        Development files for libwayland-egl1
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-egl1 = %{version}
+Requires:       libwayland-egl1 = %{version}-%{release}
 
 %description -n libwayland-egl-devel
 This package is required to link wayland client applications to the EGL
@@ -602,7 +602,7 @@ Mesa Direct3D9 state tracker
 %package -n Mesa-libd3d-devel
 Summary:        Mesa Direct3D9 state tracker development package
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libd3d = %{version}
+Requires:       Mesa-libd3d = %{version}-%{release}
 
 %description -n Mesa-libd3d-devel
 Mesa Direct3D9 state tracker development package
@@ -693,8 +693,8 @@ This package contains the Vulkan parts for Mesa.
 %package -n Mesa-libVulkan-devel
 Summary:        Mesa's Vulkan development files
 Group:          Development/Libraries/C and C++
-Requires:       libvulkan_intel = %{version}
-Requires:       libvulkan_radeon = %{version}
+Requires:       libvulkan_intel = %{version}-%{release}
+Requires:       libvulkan_radeon = %{version}-%{release}
 Conflicts:      vulkan-devel
 
 %description -n Mesa-libVulkan-devel
@@ -717,7 +717,7 @@ Version:        1.0.0
 Release:        0
 Summary:        Development files for the XA API
 Group:          Development/Libraries/C and C++
-Requires:       libxatracker2 = %{version}
+Requires:       libxatracker2 = %{version}-%{release}
 
 %description -n libxatracker-devel
 This package contains the XA state tracker for gallium3D driver.

From b1b86261ef0501815c7f335ed8025b53a254ecb6e8cb726d87f6af6b352d9ae9 Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Wed, 14 Feb 2018 10:25:18 +0000
Subject: [PATCH 3/6] Accepting request 576479 from
 home:mimi_vx:branches:X11:XOrg

- add u_glsl-linker-error.patch
  * fix fdo#104777 - Attaching multiple shader objects for the same
      stage to a GLSL program triggers a linker error

  when a package has been patched
- add u_glsl-linker-error.patch
  * fix fdo#104777 - Attaching multiple shader objects for the same
      stage to a GLSL program triggers a linker error

OBS-URL: https://build.opensuse.org/request/show/576479
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=700
---
 Mesa-drivers.changes      |  11 +++-
 Mesa-drivers.spec         |   2 +
 Mesa.changes              |   7 +++
 Mesa.spec                 |   2 +
 u_glsl-linker-error.patch | 115 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 u_glsl-linker-error.patch

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 02a58bf..a8f580e 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,8 +1,15 @@
 -------------------------------------------------------------------
-Mon Feb 12 12:32:21 UTC 2018 - joop.boonen@opensuse.org
+Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
+
+- add u_glsl-linker-error.patch
+  * fix fdo#104777 - Attaching multiple shader objects for the same
+      stage to a GLSL program triggers a linker error
+
+-------------------------------------------------------------------
+Mon Feb 12 12:31:05 UTC 2018 - joop.boonen@opensuse.org
 
 - Added %{release} so the correct package release is used
-  when a package has been patched
+  when a package has been patched 
 
 -------------------------------------------------------------------
 Fri Feb  9 13:45:16 UTC 2018 - sndirsch@suse.com
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index aeebaba..a899a9a 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -142,6 +142,7 @@ Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
 Patch43:        u_mesa-python3-only.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
+Patch46:        u_glsl-linker-error.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -750,6 +751,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch43 -p1
 %patch45 -p1
+%patch46 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
diff --git a/Mesa.changes b/Mesa.changes
index b02d57c..a8f580e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
+
+- add u_glsl-linker-error.patch
+  * fix fdo#104777 - Attaching multiple shader objects for the same
+      stage to a GLSL program triggers a linker error
+
 -------------------------------------------------------------------
 Mon Feb 12 12:31:05 UTC 2018 - joop.boonen@opensuse.org
 
diff --git a/Mesa.spec b/Mesa.spec
index 1455e36..11ecc90 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -141,6 +141,7 @@ Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
 Patch43:        u_mesa-python3-only.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
+Patch46:        u_glsl-linker-error.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -749,6 +750,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch43 -p1
 %patch45 -p1
+%patch46 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
diff --git a/u_glsl-linker-error.patch b/u_glsl-linker-error.patch
new file mode 100644
index 0000000..a753642
--- /dev/null
+++ b/u_glsl-linker-error.patch
@@ -0,0 +1,115 @@
+From 4195eed961ccfe404ae81b9112189fc93a254ded Mon Sep 17 00:00:00 2001
+From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
+Date: Mon, 5 Feb 2018 17:38:39 +0100
+Subject: glsl/linker: check same name is not used in block and outside
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+According with OpenGL GLSL 3.20 spec, section 4.3.9:
+
+  "It is a link-time error if any particular shader interface
+   contains:
+     - two different blocks, each having no instance name, and each
+       having a member of the same name, or
+     - a variable outside a block, and a block with no instance name,
+       where the variable has the same name as a member in the block."
+
+This fixes a previous commit 9b894c8 ("glsl/linker: link-error using the
+same name in unnamed block and outside") that covered this case, but
+did not take in account that precision qualifiers are ignored when
+comparing blocks with no instance name.
+
+With this commit, the original tests
+KHR-GL*.shaders.uniform_block.common.name_matching keep fixed, and also
+dEQP-GLES31.functional.shaders.linkage.uniform.block.differing_precision
+regression is fixed, which was broken by previous commit.
+
+v2: use helper varibles (Matteo Bruni)
+
+Fixes: 9b894c8 ("glsl/linker: link-error using the same name in unnamed block and outside")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104668
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104777
+CC: Mark Janes <mark.a.janes@intel.com>
+CC: "18.0" <mesa-stable@lists.freedesktop.org>
+Tested-by: Matteo Bruni <matteo.mystral@gmail.com>
+Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
+Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+---
+ src/compiler/glsl/linker.cpp | 53 +++++++++++++++++++++++++-------------------
+ 1 file changed, 30 insertions(+), 23 deletions(-)
+
+diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
+index ce10193..d3d18c2 100644
+--- a/src/compiler/glsl/linker.cpp
++++ b/src/compiler/glsl/linker.cpp
+@@ -1111,29 +1111,6 @@ cross_validate_globals(struct gl_shader_program *prog,
+             return;
+          }
+ 
+-         /* In OpenGL GLSL 4.20 spec, section 4.3.9, page 57:
+-          *
+-          *   "It is a link-time error if any particular shader interface
+-          *    contains:
+-          *
+-          *    - two different blocks, each having no instance name, and each
+-          *      having a member of the same name, or
+-          *
+-          *    - a variable outside a block, and a block with no instance name,
+-          *      where the variable has the same name as a member in the block."
+-          */
+-         if (var->data.mode == existing->data.mode &&
+-             var->get_interface_type() != existing->get_interface_type()) {
+-            linker_error(prog, "declarations for %s `%s` are in "
+-                         "%s and %s\n",
+-                         mode_string(var), var->name,
+-                         existing->get_interface_type() ?
+-                           existing->get_interface_type()->name : "outside a block",
+-                         var->get_interface_type() ?
+-                           var->get_interface_type()->name : "outside a block");
+-
+-            return;
+-         }
+          /* Only in GLSL ES 3.10, the precision qualifier should not match
+           * between block members defined in matched block names within a
+           * shader interface.
+@@ -1155,6 +1132,36 @@ cross_validate_globals(struct gl_shader_program *prog,
+                               mode_string(var), var->name);
+             }
+          }
++
++         /* In OpenGL GLSL 3.20 spec, section 4.3.9:
++          *
++          *   "It is a link-time error if any particular shader interface
++          *    contains:
++          *
++          *    - two different blocks, each having no instance name, and each
++          *      having a member of the same name, or
++          *
++          *    - a variable outside a block, and a block with no instance name,
++          *      where the variable has the same name as a member in the block."
++          */
++         const glsl_type *var_itype = var->get_interface_type();
++         const glsl_type *existing_itype = existing->get_interface_type();
++         if (var_itype != existing_itype) {
++            if (!var_itype || !existing_itype) {
++               linker_error(prog, "declarations for %s `%s` are inside block "
++                            "`%s` and outside a block",
++                            mode_string(var), var->name,
++                            var_itype ? var_itype->name : existing_itype->name);
++               return;
++            } else if (strcmp(var_itype->name, existing_itype->name) != 0) {
++               linker_error(prog, "declarations for %s `%s` are inside blocks "
++                            "`%s` and `%s`",
++                            mode_string(var), var->name,
++                            existing_itype->name,
++                            var_itype->name);
++               return;
++            }
++         }
+       } else
+          variables->add_variable(var);
+    }
+-- 
+cgit v1.1
+

From 111fa9f12e75c674d0ffb0e4d3ce30215766f6e408ee3112b6316be49dbe0dab Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Wed, 14 Feb 2018 11:58:04 +0000
Subject: [PATCH 4/6] Update changelog to mention bnc#1080492.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=701
---
 Mesa-drivers.changes | 5 +++--
 Mesa.changes         | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index a8f580e..aa28db8 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -2,8 +2,9 @@
 Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
 
 - add u_glsl-linker-error.patch
-  * fix fdo#104777 - Attaching multiple shader objects for the same
-      stage to a GLSL program triggers a linker error
+  * Fix attaching multiple shader objects for the same stage to a
+    GLSL program triggers a linker error (fdo#104777, bnc#1080492)
+  * Fixes issue with wine applications.
 
 -------------------------------------------------------------------
 Mon Feb 12 12:31:05 UTC 2018 - joop.boonen@opensuse.org
diff --git a/Mesa.changes b/Mesa.changes
index a8f580e..aa28db8 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -2,8 +2,9 @@
 Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
 
 - add u_glsl-linker-error.patch
-  * fix fdo#104777 - Attaching multiple shader objects for the same
-      stage to a GLSL program triggers a linker error
+  * Fix attaching multiple shader objects for the same stage to a
+    GLSL program triggers a linker error (fdo#104777, bnc#1080492)
+  * Fixes issue with wine applications.
 
 -------------------------------------------------------------------
 Mon Feb 12 12:31:05 UTC 2018 - joop.boonen@opensuse.org

From 85a8c9217ee084223a5b94b9446316eeabd353c24a1fcbafaa56adb65bc12f02 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 15 Feb 2018 09:31:00 +0000
Subject: [PATCH 5/6] Accepting request 576934 from home:mimi_vx:test

- remove %{release} based dependecies
   Unfortuanetly Mesa and Mesa-drivers can have different release number
   Release is Commit_Count.Build_Count and build count can be different
   because both packages have different dependencies

- remove %{release} based dependecies
   Unfortuanetly Mesa and Mesa-drivers can have different release number
   Release is Commit_Count.Build_Count and build count can be different
   because both packages have different dependencies

OBS-URL: https://build.opensuse.org/request/show/576934
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=702
---
 Mesa-drivers.changes |  8 +++++
 Mesa-drivers.spec    | 84 ++++++++++++++++++++++----------------------
 Mesa.changes         |  8 +++++
 Mesa.spec            | 84 ++++++++++++++++++++++----------------------
 4 files changed, 100 insertions(+), 84 deletions(-)

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index aa28db8..8480d4f 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
+
+- remove %{release} based dependecies
+   Unfortuanetly Mesa and Mesa-drivers can have different release number
+   Release is Commit_Count.Build_Count and build count can be different
+   because both packages have different dependencies
+
 -------------------------------------------------------------------
 Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index a899a9a..d8ea154 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -232,16 +232,16 @@ BuildRequires:  libclc
 %endif
 
 %if 0%{?libglvnd}
-Requires:       Mesa-libEGL1  = %{version}-%{release}
-Requires:       Mesa-libGL1  = %{version}-%{release}
+Requires:       Mesa-libEGL1  = %{version}
+Requires:       Mesa-libGL1  = %{version}
 Requires:       libglvnd >= 0.1.0
 %endif
 
 # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
 # do not install recommends on their system still get working Mesa. It is
 # ignored in obs when Mesa is installed as build dependency.
-Requires:       Mesa-dri = %{version}-%{release}
-Requires:       Mesa-gallium = %{version}-%{release}
+Requires:       Mesa-dri = %{version}
+Requires:       Mesa-gallium = %{version}
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -261,25 +261,25 @@ just Mesa or The Mesa 3-D graphics library.
 %package devel
 Summary:        Libraries, includes and more to develop Mesa applications
 Group:          Development/Libraries/X11
-Requires:       Mesa = %{version}-%{release}
-Requires:       Mesa-dri-devel = %{version}-%{release}
-Requires:       Mesa-libEGL-devel = %{version}-%{release}
-Requires:       Mesa-libGL-devel = %{version}-%{release}
-Requires:       Mesa-libGLESv1_CM-devel = %{version}-%{release}
-Requires:       Mesa-libGLESv2-devel = %{version}-%{release}
-Requires:       Mesa-libglapi-devel = %{version}-%{release}
-Requires:       libOSMesa-devel = %{version}-%{release}
+Requires:       Mesa = %{version}
+Requires:       Mesa-dri-devel = %{version}
+Requires:       Mesa-libEGL-devel = %{version}
+Requires:       Mesa-libGL-devel = %{version}
+Requires:       Mesa-libGLESv1_CM-devel = %{version}
+Requires:       Mesa-libGLESv2-devel = %{version}
+Requires:       Mesa-libglapi-devel = %{version}
+Requires:       libOSMesa-devel = %{version}
 Requires:       libgbm-devel
-Provides:       Mesa-devel-static = %{version}-%{release}
-Provides:       xorg-x11-Mesa-devel = %{version}-%{release}
-Obsoletes:      Mesa-devel-static < %{version}-%{release}
-Obsoletes:      xorg-x11-Mesa-devel < %{version}-%{release}
-Provides:       Mesa-libIndirectGL-devel = %{version}-%{release}
-Obsoletes:      Mesa-libIndirectGL-devel < %{version}-%{release}
-Provides:       s2tc-devel = %{version}-%{release}
-Obsoletes:      s2tc-devel < %{version}-%{release}
-Provides:       libtxc_dxtn-devel = %{version}-%{release}
-Obsoletes:      libtxc_dxtn-devel < %{version}-%{release}
+Provides:       Mesa-devel-static = %{version}
+Provides:       xorg-x11-Mesa-devel = %{version}
+Obsoletes:      Mesa-devel-static < %{version}
+Obsoletes:      xorg-x11-Mesa-devel < %{version}
+Provides:       Mesa-libIndirectGL-devel = %{version}
+Obsoletes:      Mesa-libIndirectGL-devel < %{version}
+Provides:       s2tc-devel = %{version}
+Obsoletes:      s2tc-devel < %{version}
+Provides:       libtxc_dxtn-devel = %{version}
+Obsoletes:      libtxc_dxtn-devel < %{version}
 %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
 Requires:       libwayland-egl-devel
 %endif
@@ -321,7 +321,7 @@ support.
 %package libEGL-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libEGL1 = %{version}-%{release}
+Requires:       Mesa-libEGL1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -340,7 +340,7 @@ programs against the EGL library.
 %package libGL1
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd >= 0.1.0
 %endif
@@ -358,7 +358,7 @@ the X Window System.
 %package libGL-devel
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGL1 = %{version}-%{release}
+Requires:       Mesa-libGL1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -389,7 +389,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 %package libGLESv1_CM-devel
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv1_CM1 = %{version}-%{release}
+Requires:       Mesa-libGLESv1_CM1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -428,7 +428,7 @@ ES 3 entry points.
 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
+Requires:       Mesa-libGLESv2-2 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -450,7 +450,7 @@ applications using the OpenGL|ES 2.x APIs.
 Summary:        Development files for the OpenGL ES 3.x API
 Group:          Development/Libraries/C and C++
 %if 0%{?libglvnd} == 0
-Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
+Requires:       Mesa-libGLESv2-2 = %{version}
 %endif
 Requires:       pkgconfig(egl)
 
@@ -467,8 +467,8 @@ applications using the OpenGL|ES 3.x APIs.
 Summary:        Mesa Off-screen rendering extension
 # Wrongly named package shipped .so.8
 Group:          System/Libraries
-Obsoletes:      libOSMesa9 < %{version}-%{release}
-Provides:       libOSMesa9 = %{version}-%{release}
+Obsoletes:      libOSMesa9 < %{version}
+Provides:       libOSMesa9 = %{version}
 
 %description -n libOSMesa8
 OSmesa is a Mesa extension that allows programs to render to an
@@ -478,7 +478,7 @@ rendering context on an X Server. It uses a pure software renderer.
 %package -n libOSMesa-devel
 Summary:        Development files for the Mesa Offscreen Rendering extension
 Group:          Development/Libraries/C and C++
-Requires:       libOSMesa8 = %{version}-%{release}
+Requires:       libOSMesa8 = %{version}
 
 %description -n libOSMesa-devel
 Development files for the OSmesa Mesa extension that allows programs to render to an
@@ -497,7 +497,7 @@ packages.
 %package libglapi-devel
 Summary:        Development files for the Mesa GL API implementation
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libglapi0 = %{version}-%{release}
+Requires:       Mesa-libglapi0 = %{version}
 
 %description libglapi-devel
 Development files for the Mesa GL API module which is responsible for
@@ -507,7 +507,7 @@ the Mesa-libGLES* packages.
 %package -n Mesa-dri
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    Mesa
 
 %description -n Mesa-dri
@@ -516,7 +516,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
 %package dri-devel
 Summary:        Development files for the DRI API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 
 %description dri-devel
 This package contains the development environment required for
@@ -525,7 +525,7 @@ compiling programs and libraries using the DRI API.
 %package -n Mesa-dri-nouveau
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
@@ -536,7 +536,7 @@ since it is still experimental.
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    Mesa
 
 %description -n Mesa-gallium
@@ -557,7 +557,7 @@ openwfd.
 %package -n libgbm-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       libgbm1 = %{version}-%{release}
+Requires:       libgbm1 = %{version}
 
 %description -n libgbm-devel
 This package contains the GBM buffer management library. It provides
@@ -582,7 +582,7 @@ that need not run full-screen and cooperate with a compositor.
 %package -n libwayland-egl-devel
 Summary:        Development files for libwayland-egl1
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-egl1 = %{version}-%{release}
+Requires:       libwayland-egl1 = %{version}
 
 %description -n libwayland-egl-devel
 This package is required to link wayland client applications to the EGL
@@ -604,7 +604,7 @@ Mesa Direct3D9 state tracker
 %package -n Mesa-libd3d-devel
 Summary:        Mesa Direct3D9 state tracker development package
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libd3d = %{version}-%{release}
+Requires:       Mesa-libd3d = %{version}
 
 %description -n Mesa-libd3d-devel
 Mesa Direct3D9 state tracker development package
@@ -695,8 +695,8 @@ This package contains the Vulkan parts for Mesa.
 %package -n Mesa-libVulkan-devel
 Summary:        Mesa's Vulkan development files
 Group:          Development/Libraries/C and C++
-Requires:       libvulkan_intel = %{version}-%{release}
-Requires:       libvulkan_radeon = %{version}-%{release}
+Requires:       libvulkan_intel = %{version}
+Requires:       libvulkan_radeon = %{version}
 Conflicts:      vulkan-devel
 
 %description -n Mesa-libVulkan-devel
@@ -719,7 +719,7 @@ Version:        1.0.0
 Release:        0
 Summary:        Development files for the XA API
 Group:          Development/Libraries/C and C++
-Requires:       libxatracker2 = %{version}-%{release}
+Requires:       libxatracker2 = %{version}
 
 %description -n libxatracker-devel
 This package contains the XA state tracker for gallium3D driver.
diff --git a/Mesa.changes b/Mesa.changes
index aa28db8..8480d4f 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
+
+- remove %{release} based dependecies
+   Unfortuanetly Mesa and Mesa-drivers can have different release number
+   Release is Commit_Count.Build_Count and build count can be different
+   because both packages have different dependencies
+
 -------------------------------------------------------------------
 Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 11ecc90..b184f75 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -231,16 +231,16 @@ BuildRequires:  libclc
 %endif
 
 %if 0%{?libglvnd}
-Requires:       Mesa-libEGL1  = %{version}-%{release}
-Requires:       Mesa-libGL1  = %{version}-%{release}
+Requires:       Mesa-libEGL1  = %{version}
+Requires:       Mesa-libGL1  = %{version}
 Requires:       libglvnd >= 0.1.0
 %endif
 
 # This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
 # do not install recommends on their system still get working Mesa. It is
 # ignored in obs when Mesa is installed as build dependency.
-Requires:       Mesa-dri = %{version}-%{release}
-Requires:       Mesa-gallium = %{version}-%{release}
+Requires:       Mesa-dri = %{version}
+Requires:       Mesa-gallium = %{version}
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -260,25 +260,25 @@ just Mesa or The Mesa 3-D graphics library.
 %package devel
 Summary:        Libraries, includes and more to develop Mesa applications
 Group:          Development/Libraries/X11
-Requires:       Mesa = %{version}-%{release}
-Requires:       Mesa-dri-devel = %{version}-%{release}
-Requires:       Mesa-libEGL-devel = %{version}-%{release}
-Requires:       Mesa-libGL-devel = %{version}-%{release}
-Requires:       Mesa-libGLESv1_CM-devel = %{version}-%{release}
-Requires:       Mesa-libGLESv2-devel = %{version}-%{release}
-Requires:       Mesa-libglapi-devel = %{version}-%{release}
-Requires:       libOSMesa-devel = %{version}-%{release}
+Requires:       Mesa = %{version}
+Requires:       Mesa-dri-devel = %{version}
+Requires:       Mesa-libEGL-devel = %{version}
+Requires:       Mesa-libGL-devel = %{version}
+Requires:       Mesa-libGLESv1_CM-devel = %{version}
+Requires:       Mesa-libGLESv2-devel = %{version}
+Requires:       Mesa-libglapi-devel = %{version}
+Requires:       libOSMesa-devel = %{version}
 Requires:       libgbm-devel
-Provides:       Mesa-devel-static = %{version}-%{release}
-Provides:       xorg-x11-Mesa-devel = %{version}-%{release}
-Obsoletes:      Mesa-devel-static < %{version}-%{release}
-Obsoletes:      xorg-x11-Mesa-devel < %{version}-%{release}
-Provides:       Mesa-libIndirectGL-devel = %{version}-%{release}
-Obsoletes:      Mesa-libIndirectGL-devel < %{version}-%{release}
-Provides:       s2tc-devel = %{version}-%{release}
-Obsoletes:      s2tc-devel < %{version}-%{release}
-Provides:       libtxc_dxtn-devel = %{version}-%{release}
-Obsoletes:      libtxc_dxtn-devel < %{version}-%{release}
+Provides:       Mesa-devel-static = %{version}
+Provides:       xorg-x11-Mesa-devel = %{version}
+Obsoletes:      Mesa-devel-static < %{version}
+Obsoletes:      xorg-x11-Mesa-devel < %{version}
+Provides:       Mesa-libIndirectGL-devel = %{version}
+Obsoletes:      Mesa-libIndirectGL-devel < %{version}
+Provides:       s2tc-devel = %{version}
+Obsoletes:      s2tc-devel < %{version}
+Provides:       libtxc_dxtn-devel = %{version}
+Obsoletes:      libtxc_dxtn-devel < %{version}
 %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
 Requires:       libwayland-egl-devel
 %endif
@@ -320,7 +320,7 @@ support.
 %package libEGL-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libEGL1 = %{version}-%{release}
+Requires:       Mesa-libEGL1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -339,7 +339,7 @@ programs against the EGL library.
 %package libGL1
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd >= 0.1.0
 %endif
@@ -357,7 +357,7 @@ the X Window System.
 %package libGL-devel
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGL1 = %{version}-%{release}
+Requires:       Mesa-libGL1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -388,7 +388,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 %package libGLESv1_CM-devel
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv1_CM1 = %{version}-%{release}
+Requires:       Mesa-libGLESv1_CM1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -427,7 +427,7 @@ ES 3 entry points.
 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
+Requires:       Mesa-libGLESv2-2 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
@@ -449,7 +449,7 @@ applications using the OpenGL|ES 2.x APIs.
 Summary:        Development files for the OpenGL ES 3.x API
 Group:          Development/Libraries/C and C++
 %if 0%{?libglvnd} == 0
-Requires:       Mesa-libGLESv2-2 = %{version}-%{release}
+Requires:       Mesa-libGLESv2-2 = %{version}
 %endif
 Requires:       pkgconfig(egl)
 
@@ -466,8 +466,8 @@ applications using the OpenGL|ES 3.x APIs.
 Summary:        Mesa Off-screen rendering extension
 # Wrongly named package shipped .so.8
 Group:          System/Libraries
-Obsoletes:      libOSMesa9 < %{version}-%{release}
-Provides:       libOSMesa9 = %{version}-%{release}
+Obsoletes:      libOSMesa9 < %{version}
+Provides:       libOSMesa9 = %{version}
 
 %description -n libOSMesa8
 OSmesa is a Mesa extension that allows programs to render to an
@@ -477,7 +477,7 @@ rendering context on an X Server. It uses a pure software renderer.
 %package -n libOSMesa-devel
 Summary:        Development files for the Mesa Offscreen Rendering extension
 Group:          Development/Libraries/C and C++
-Requires:       libOSMesa8 = %{version}-%{release}
+Requires:       libOSMesa8 = %{version}
 
 %description -n libOSMesa-devel
 Development files for the OSmesa Mesa extension that allows programs to render to an
@@ -496,7 +496,7 @@ packages.
 %package libglapi-devel
 Summary:        Development files for the Mesa GL API implementation
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libglapi0 = %{version}-%{release}
+Requires:       Mesa-libglapi0 = %{version}
 
 %description libglapi-devel
 Development files for the Mesa GL API module which is responsible for
@@ -506,7 +506,7 @@ the Mesa-libGLES* packages.
 %package -n Mesa-dri
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    Mesa
 
 %description -n Mesa-dri
@@ -515,7 +515,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
 %package dri-devel
 Summary:        Development files for the DRI API
 Group:          Development/Libraries/C and C++
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 
 %description dri-devel
 This package contains the development environment required for
@@ -524,7 +524,7 @@ compiling programs and libraries using the DRI API.
 %package -n Mesa-dri-nouveau
 Summary:        Mesa DRI plug-in for 3D acceleration via Nouveau
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    xf86-video-nouveau
 
 %description -n Mesa-dri-nouveau
@@ -535,7 +535,7 @@ since it is still experimental.
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
-Requires:       Mesa = %{version}-%{release}
+Requires:       Mesa = %{version}
 Supplements:    Mesa
 
 %description -n Mesa-gallium
@@ -556,7 +556,7 @@ openwfd.
 %package -n libgbm-devel
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
-Requires:       libgbm1 = %{version}-%{release}
+Requires:       libgbm1 = %{version}
 
 %description -n libgbm-devel
 This package contains the GBM buffer management library. It provides
@@ -581,7 +581,7 @@ that need not run full-screen and cooperate with a compositor.
 %package -n libwayland-egl-devel
 Summary:        Development files for libwayland-egl1
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-egl1 = %{version}-%{release}
+Requires:       libwayland-egl1 = %{version}
 
 %description -n libwayland-egl-devel
 This package is required to link wayland client applications to the EGL
@@ -603,7 +603,7 @@ Mesa Direct3D9 state tracker
 %package -n Mesa-libd3d-devel
 Summary:        Mesa Direct3D9 state tracker development package
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-libd3d = %{version}-%{release}
+Requires:       Mesa-libd3d = %{version}
 
 %description -n Mesa-libd3d-devel
 Mesa Direct3D9 state tracker development package
@@ -694,8 +694,8 @@ This package contains the Vulkan parts for Mesa.
 %package -n Mesa-libVulkan-devel
 Summary:        Mesa's Vulkan development files
 Group:          Development/Libraries/C and C++
-Requires:       libvulkan_intel = %{version}-%{release}
-Requires:       libvulkan_radeon = %{version}-%{release}
+Requires:       libvulkan_intel = %{version}
+Requires:       libvulkan_radeon = %{version}
 Conflicts:      vulkan-devel
 
 %description -n Mesa-libVulkan-devel
@@ -718,7 +718,7 @@ Version:        1.0.0
 Release:        0
 Summary:        Development files for the XA API
 Group:          Development/Libraries/C and C++
-Requires:       libxatracker2 = %{version}-%{release}
+Requires:       libxatracker2 = %{version}
 
 %description -n libxatracker-devel
 This package contains the XA state tracker for gallium3D driver.

From bfb54f85e5aef286ecd21a4952a6a4904c2a46657de84220a5f4b5b6fa7ce169 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 16 Feb 2018 16:57:28 +0000
Subject: [PATCH 6/6] Accepting request 577308 from
 home:mstaudt:1081210boo-mesa-dri-vc4

- Split Nouveau and VC4 from the main driver package on all systems
  Fixes (boo#1081210).

OBS-URL: https://build.opensuse.org/request/show/577308
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=703
---
 Mesa-drivers.changes |  7 +++++++
 Mesa-drivers.spec    | 18 ++++++++++++++++--
 Mesa.changes         |  7 +++++++
 Mesa.spec            | 18 ++++++++++++++++--
 baselibs.conf        |  1 +
 5 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 8480d4f..3389b60 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 16 14:59:04 UTC 2018 - mstaudt@suse.com
+
+- Split Nouveau and VC4 from the main driver package on all systems
+
+  Fixes (boo#1081210).
+
 -------------------------------------------------------------------
 Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index d8ea154..a6ed15c 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -533,6 +533,16 @@ This package contains nouveau_dri.so, which is necessary for
 Nouveau's 3D acceleration to work. It is packaged separately
 since it is still experimental.
 
+%package -n Mesa-dri-vc4
+Summary:        Mesa DRI plug-in for 3D acceleration on Raspberry Pi
+Group:          System/Libraries
+Requires:       Mesa = %{version}
+
+%description -n Mesa-dri-vc4
+This package contains vc4_dri.so, which is necessary for 3D
+acceleration on the Raspberry Pi to work. It is packaged separately
+since it is still experimental.
+
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
@@ -1170,11 +1180,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %files -n Mesa-dri
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
-%if 0%{?is_opensuse}
 %ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %exclude %{_libdir}/dri/nouveau_dri.so
 %exclude %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
+%ifarch %arm aarch64
+%exclude %{_libdir}/dri/vc4_dri.so
 %endif
 
 %if 0%{with_opencl}
@@ -1184,12 +1195,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/gallium-pipe/pipe_*.so
 %endif
 
-%if 0%{?is_opensuse}
 %ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %files -n Mesa-dri-nouveau
 %{_libdir}/dri/nouveau_dri.so
 %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
+
+%ifarch aarch64 %arm
+%files -n Mesa-dri-vc4
+%{_libdir}/dri/vc4_dri.so
 %endif
 
 # drivers
diff --git a/Mesa.changes b/Mesa.changes
index 8480d4f..3389b60 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 16 14:59:04 UTC 2018 - mstaudt@suse.com
+
+- Split Nouveau and VC4 from the main driver package on all systems
+
+  Fixes (boo#1081210).
+
 -------------------------------------------------------------------
 Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index b184f75..5341f9e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -532,6 +532,16 @@ This package contains nouveau_dri.so, which is necessary for
 Nouveau's 3D acceleration to work. It is packaged separately
 since it is still experimental.
 
+%package -n Mesa-dri-vc4
+Summary:        Mesa DRI plug-in for 3D acceleration on Raspberry Pi
+Group:          System/Libraries
+Requires:       Mesa = %{version}
+
+%description -n Mesa-dri-vc4
+This package contains vc4_dri.so, which is necessary for 3D
+acceleration on the Raspberry Pi to work. It is packaged separately
+since it is still experimental.
+
 %package -n Mesa-gallium
 Summary:        Mesa Gallium GPU drivers
 Group:          System/Libraries
@@ -1169,11 +1179,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %files -n Mesa-dri
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
-%if 0%{?is_opensuse}
 %ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %exclude %{_libdir}/dri/nouveau_dri.so
 %exclude %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
+%ifarch %arm aarch64
+%exclude %{_libdir}/dri/vc4_dri.so
 %endif
 
 %if 0%{with_opencl}
@@ -1183,12 +1194,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/gallium-pipe/pipe_*.so
 %endif
 
-%if 0%{?is_opensuse}
 %ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %files -n Mesa-dri-nouveau
 %{_libdir}/dri/nouveau_dri.so
 %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
+
+%ifarch aarch64 %arm
+%files -n Mesa-dri-vc4
+%{_libdir}/dri/vc4_dri.so
 %endif
 
 # drivers
diff --git a/baselibs.conf b/baselibs.conf
index 9d24653..7f07edd 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -106,6 +106,7 @@ libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
 libwayland-egl1
+Mesa-dri-vc4
 Mesa-dri-nouveau
 Mesa-dri
 	supplements "Mesa-<targettype> = <version>"