From d9e93d9d4f86956d5fd9b774b2aa43233e89c3b35b6df90a5e989ff369aae1c1 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 5 Jan 2019 13:58:04 +0000
Subject: [PATCH] Accepting request 660017 from
 home:Guillaume_G:branches:X11:XOrg

- Enable aarch64 build for: etnaviv, exynos and tegra

OBS-URL: https://build.opensuse.org/request/show/660017
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=272
---
 libdrm.changes |  5 +++++
 libdrm.spec    | 46 ++++++++++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/libdrm.changes b/libdrm.changes
index ad58162..6011031 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 19 13:46:33 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Enable aarch64 build for: etnaviv, exynos and tegra
+
 -------------------------------------------------------------------
 Wed Dec 19 08:47:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/libdrm.spec b/libdrm.spec
index 60233b0..c0d6b71 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -68,14 +68,14 @@ Requires:       libdrm_amdgpu1 = %{version}
 Requires:       libdrm_nouveau2 = %{version}
 Requires:       libdrm_radeon1 = %{version}
 %ifarch %{arm} aarch64
-Requires:       libdrm_freedreno1 = %{version}
-%endif
-%ifarch %{arm}
 Requires:       libdrm_etnaviv1 = %{version}
 Requires:       libdrm_exynos1 = %{version}
-Requires:       libdrm_omap1 = %{version}
+Requires:       libdrm_freedreno1 = %{version}
 Requires:       libdrm_tegra0 = %{version}
 %endif
+%ifarch %{arm}
+Requires:       libdrm_omap1 = %{version}
+%endif
 %ifarch %{ix86} x86_64
 Requires:       libdrm_intel1 = %{version}
 %endif
@@ -202,10 +202,12 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %endif
 %ifarch %{arm}
 	   --enable-omap-experimental-api \
+%endif
+%ifarch %{arm} aarch64
 	   --enable-etnaviv-experimental-api \
 	   --enable-exynos-experimental-api \
 	   --enable-freedreno \
-           --enable-tegra-experimental-api \
+       --enable-tegra-experimental-api \
 %endif
 	   --enable-manpages \
 	   --enable-udev
@@ -225,7 +227,7 @@ mkdir -p %{buildroot}%{_prefix}/bin
 install  \
     tests/modeprint/.libs/modeprint \
     tests/modetest/.libs/modetest %{buildroot}%{_prefix}/bin
-%ifarch %arm
+%ifarch %arm aarch64
 install tests/exynos/.libs/exynos_fimg2d_test  %{buildroot}%{_prefix}/bin
 %endif
 
@@ -243,23 +245,23 @@ install tests/exynos/.libs/exynos_fimg2d_test  %{buildroot}%{_prefix}/bin
 %postun -n libkms1 -p /sbin/ldconfig
 
 %ifarch %{arm}
+%post   -n libdrm_omap1 -p /sbin/ldconfig
+%postun -n libdrm_omap1 -p /sbin/ldconfig
+%endif
+
+%ifarch %{arm} aarch64
 %post   -n libdrm_etnaviv1 -p /sbin/ldconfig
 %postun -n libdrm_etnaviv1 -p /sbin/ldconfig
 %post   -n libdrm_exynos1 -p /sbin/ldconfig
 %postun -n libdrm_exynos1 -p /sbin/ldconfig
-%post   -n libdrm_omap1 -p /sbin/ldconfig
-%postun -n libdrm_omap1 -p /sbin/ldconfig
+%post   -n libdrm_freedreno1 -p /sbin/ldconfig
+%postun -n libdrm_freedreno1 -p /sbin/ldconfig
 %post   -n libdrm_tegra0 -p /sbin/ldconfig
 %postun -n libdrm_tegra0 -p /sbin/ldconfig
 %endif
 
-%ifarch %{arm} aarch64
-%post   -n libdrm_freedreno1 -p /sbin/ldconfig
-%postun -n libdrm_freedreno1 -p /sbin/ldconfig
-%endif
-
 %files tools
-%ifarch %arm
+%ifarch %arm aarch64
 %{_bindir}/exynos_fimg2d_test
 %endif
 %{_bindir}/modeprint
@@ -272,10 +274,10 @@ install tests/exynos/.libs/exynos_fimg2d_test  %{buildroot}%{_prefix}/bin
 %{_mandir}/man7/*
 %{_includedir}/libdrm
 %ifarch %{arm}
-%{_includedir}/exynos
 %{_includedir}/omap
 %endif
 %ifarch %{arm} aarch64
+%{_includedir}/exynos
 %{_includedir}/freedreno
 %endif
 %{_includedir}/xf86drm.h
@@ -312,22 +314,22 @@ install tests/exynos/.libs/exynos_fimg2d_test  %{buildroot}%{_prefix}/bin
 %{_libdir}/pkgconfig/libkms.pc
 
 %ifarch %{arm}
+%files -n libdrm_omap1
+%{_libdir}/libdrm_omap.so.1*
+%endif
+
+%ifarch %{arm} aarch64
 %files -n libdrm_etnaviv1
 %_libdir/libdrm_etnaviv.so.1*
 
 %files -n libdrm_exynos1
 %_libdir/libdrm_exynos.so.1*
 
-%files -n libdrm_omap1
-%{_libdir}/libdrm_omap.so.1*
+%files -n libdrm_freedreno1
+%{_libdir}/libdrm_freedreno.so.1*
 
 %files -n libdrm_tegra0
 %{_libdir}/libdrm_tegra.so.0*
 %endif
 
-%ifarch %{arm} aarch64
-%files -n libdrm_freedreno1
-%{_libdir}/libdrm_freedreno.so.1*
-%endif
-
 %changelog