From e0855e5d772a6ffa6ce8c6c005df554375963d4bd488c1ea84668e8bf3a78374 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Jan 2019 11:10:01 +0000 Subject: [PATCH] - redisabled support for tegra, since it just got disabled upstream in git master ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=800 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 29 ++--------------------------- Mesa.changes | 6 ++++++ Mesa.spec | 29 ++--------------------------- 4 files changed, 16 insertions(+), 54 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index e2755c7..8b247eb 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 9 10:49:24 UTC 2019 - sndirsch@suse.com + +- redisabled support for tegra, since it just got disabled upstream + in git master ... + ------------------------------------------------------------------- Sat Jan 5 23:31:00 UTC 2019 - Fabian Vogt diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 6329812..500d7df 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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -56,7 +56,6 @@ %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 @@ -64,10 +63,6 @@ %define vdpau_radeon 1 %endif -%ifarch aarch64 %{arm} - %define vdpau_tegra 1 -%endif - %ifarch %{ix86} x86_64 %{arm} aarch64 %define with_nine 1 %endif @@ -109,9 +104,6 @@ # 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 @@ -210,7 +202,6 @@ Obsoletes: libtxc_dxtn < %{version} %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} @@ -643,14 +634,6 @@ 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 @@ -837,7 +820,7 @@ export PYTHON2=%{_bindir}/python3 %ifarch %{arm} aarch64 --enable-xa \ --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx,tegra \ + --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ %endif %ifarch ppc64 ppc64le --enable-xa \ @@ -1085,14 +1068,6 @@ 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 e2755c7..8b247eb 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 9 10:49:24 UTC 2019 - sndirsch@suse.com + +- redisabled support for tegra, since it just got disabled upstream + in git master ... + ------------------------------------------------------------------- Sat Jan 5 23:31:00 UTC 2019 - Fabian Vogt diff --git a/Mesa.spec b/Mesa.spec index 50e08d7..5f76959 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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -55,7 +55,6 @@ %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,10 +62,6 @@ %define vdpau_radeon 1 %endif -%ifarch aarch64 %{arm} - %define vdpau_tegra 1 -%endif - %ifarch %{ix86} x86_64 %{arm} aarch64 %define with_nine 1 %endif @@ -108,9 +103,6 @@ # 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 @@ -209,7 +201,6 @@ Obsoletes: libtxc_dxtn < %{version} %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} @@ -642,14 +633,6 @@ 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 @@ -836,7 +819,7 @@ export PYTHON2=%{_bindir}/python3 %ifarch %{arm} aarch64 --enable-xa \ --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx,tegra \ + --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ %endif %ifarch ppc64 ppc64le --enable-xa \ @@ -1084,14 +1067,6 @@ 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