From 124ab8bbf92b8bbf76032bffeb0573a6fd49d8777e6729717d0606d81761b7c0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Jan 2019 10:40:50 +0000 Subject: [PATCH] Accepting request 663596 from home:Guillaume_G:branches:X11:XOrg - Add etnaviv, imx and tegra supports for %arm and arch64 OBS-URL: https://build.opensuse.org/request/show/663596 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=799 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 34 ++++++++++++++++++++++++++++++---- Mesa.changes | 5 +++++ Mesa.spec | 34 ++++++++++++++++++++++++++++++---- 4 files changed, 70 insertions(+), 8 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 68d6fb7..e2755c7 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -4,6 +4,11 @@ Sat Jan 5 23:31:00 UTC 2019 - Fabian Vogt - Enable the surfaceless platform, which is needed by KDE CI environment for testing (https://phabricator.kde.org/T10245) +------------------------------------------------------------------- +Wed Dec 19 15:01:41 UTC 2018 - Guillaume GARDET + +- Add etnaviv, imx and tegra supports for %arm and arch64 + ------------------------------------------------------------------- Wed Dec 12 15:29:53 UTC 2018 - Dominique Leuenberger diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index f27d754..6329812 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -56,6 +56,7 @@ %define xvmc_support 0 %define vdpau_nouveau 0 %define vdpau_radeon 0 +%define vdpau_tegra 0 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le %define xvmc_support 1 @@ -63,6 +64,10 @@ %define vdpau_radeon 1 %endif +%ifarch aarch64 %{arm} + %define vdpau_tegra 1 +%endif + %ifarch %{ix86} x86_64 %{arm} aarch64 %define with_nine 1 %endif @@ -104,6 +109,9 @@ # Not built because nouveau driver is not built. %define vdpau_nouveau 0 + # Not built because tegra driver is not built. + %define vdpau_tegra 0 + # Not built. (Why?) %define xvmc_support 0 @@ -159,7 +167,7 @@ BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(libdrm) >= 2.4.75 -BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.79 +BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.95 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71 %if 0%{?libglvnd} @@ -199,8 +207,10 @@ Provides: s2tc = %{version} Obsoletes: s2tc < %{version} Provides: libtxc_dxtn = %{version} Obsoletes: libtxc_dxtn < %{version} -%ifarch %{arm} +%ifarch %{arm} aarch64 +BuildRequires: pkgconfig(libdrm_etnaviv) >= 2.4.89 BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74 +BuildRequires: pkgconfig(libdrm_tegra) BuildRequires: pkgconfig(libelf) %endif %ifarch x86_64 %{ix86} @@ -633,6 +643,14 @@ Supplements: xf86-video-nouveau %description -n libvdpau_nouveau This package contains the VDPAU state tracker for Nouveau. +%package -n libvdpau_tegra +Summary: XVMC state tracker for Tegra +Group: System/Libraries +Supplements: xf86-video-nouveau + +%description -n libvdpau_tegra +This package contains the VDPAU state tracker for Tegra. + %package -n libvdpau_r300 Summary: XVMC state tracker for R300 Group: System/Libraries @@ -819,7 +837,7 @@ export PYTHON2=%{_bindir}/python3 %ifarch %{arm} aarch64 --enable-xa \ --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4 \ + --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx,tegra \ %endif %ifarch ppc64 ppc64le --enable-xa \ @@ -1067,6 +1085,14 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/vdpau/libvdpau_nouveau.so.1.0.0 %endif +%if %{vdpau_tegra} +%files -n libvdpau_tegra +%{_libdir}/vdpau/libvdpau_tegra.so +%{_libdir}/vdpau/libvdpau_tegra.so.1 +%{_libdir}/vdpau/libvdpau_tegra.so.1.0 +%{_libdir}/vdpau/libvdpau_tegra.so.1.0.0 +%endif + %if %{vdpau_radeon} %files -n libvdpau_r300 %{_libdir}/vdpau/libvdpau_r300.so diff --git a/Mesa.changes b/Mesa.changes index 68d6fb7..e2755c7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -4,6 +4,11 @@ Sat Jan 5 23:31:00 UTC 2019 - Fabian Vogt - Enable the surfaceless platform, which is needed by KDE CI environment for testing (https://phabricator.kde.org/T10245) +------------------------------------------------------------------- +Wed Dec 19 15:01:41 UTC 2018 - Guillaume GARDET + +- Add etnaviv, imx and tegra supports for %arm and arch64 + ------------------------------------------------------------------- Wed Dec 12 15:29:53 UTC 2018 - Dominique Leuenberger diff --git a/Mesa.spec b/Mesa.spec index 01d0c9b..50e08d7 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -55,6 +55,7 @@ %define xvmc_support 0 %define vdpau_nouveau 0 %define vdpau_radeon 0 +%define vdpau_tegra 0 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le %define xvmc_support 1 @@ -62,6 +63,10 @@ %define vdpau_radeon 1 %endif +%ifarch aarch64 %{arm} + %define vdpau_tegra 1 +%endif + %ifarch %{ix86} x86_64 %{arm} aarch64 %define with_nine 1 %endif @@ -103,6 +108,9 @@ # Not built because nouveau driver is not built. %define vdpau_nouveau 0 + # Not built because tegra driver is not built. + %define vdpau_tegra 0 + # Not built. (Why?) %define xvmc_support 0 @@ -158,7 +166,7 @@ BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(libdrm) >= 2.4.75 -BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.79 +BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.95 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71 %if 0%{?libglvnd} @@ -198,8 +206,10 @@ Provides: s2tc = %{version} Obsoletes: s2tc < %{version} Provides: libtxc_dxtn = %{version} Obsoletes: libtxc_dxtn < %{version} -%ifarch %{arm} +%ifarch %{arm} aarch64 +BuildRequires: pkgconfig(libdrm_etnaviv) >= 2.4.89 BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74 +BuildRequires: pkgconfig(libdrm_tegra) BuildRequires: pkgconfig(libelf) %endif %ifarch x86_64 %{ix86} @@ -632,6 +642,14 @@ Supplements: xf86-video-nouveau %description -n libvdpau_nouveau This package contains the VDPAU state tracker for Nouveau. +%package -n libvdpau_tegra +Summary: XVMC state tracker for Tegra +Group: System/Libraries +Supplements: xf86-video-nouveau + +%description -n libvdpau_tegra +This package contains the VDPAU state tracker for Tegra. + %package -n libvdpau_r300 Summary: XVMC state tracker for R300 Group: System/Libraries @@ -818,7 +836,7 @@ export PYTHON2=%{_bindir}/python3 %ifarch %{arm} aarch64 --enable-xa \ --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4 \ + --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx,tegra \ %endif %ifarch ppc64 ppc64le --enable-xa \ @@ -1066,6 +1084,14 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/vdpau/libvdpau_nouveau.so.1.0.0 %endif +%if %{vdpau_tegra} +%files -n libvdpau_tegra +%{_libdir}/vdpau/libvdpau_tegra.so +%{_libdir}/vdpau/libvdpau_tegra.so.1 +%{_libdir}/vdpau/libvdpau_tegra.so.1.0 +%{_libdir}/vdpau/libvdpau_tegra.so.1.0.0 +%endif + %if %{vdpau_radeon} %files -n libvdpau_r300 %{_libdir}/vdpau/libvdpau_r300.so