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] 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>"