Dominique Leuenberger 2018-06-27 08:14:42 +00:00 committed by Git OBS Bridge
commit cbf0108c20
9 changed files with 115 additions and 138 deletions

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sun Jun 17 17:57:44 UTC 2018 - mimi.vx@gmail.com
- add mako_4_radv.patch - fixes Mako detection for RADV/intel
-------------------------------------------------------------------
Sun Jun 17 11:11:53 UTC 2018 - mimi.vx@gmail.com
- update to 18.1.2
* Fixes for libatomic checks on non-arm and non-x86 platforms
* porting of additional libatomic checks to meson from autotools
* numerous radv fixes
* numerous intel fixes
* A few fixes each for radeonsi, r300, ac, glx, and vulkan
-------------------------------------------------------------------
Sat Jun 2 15:44:36 UTC 2018 - mimi.vx@gmail.com

View File

@ -34,7 +34,6 @@
##### WARNING: please do not edit this auto generated spec file. Use the Mesa.spec! #####
%define drivers 1
%define libglvnd 0
%if 0%{?suse_version} >= 1330
@ -43,12 +42,12 @@
%define glamor 1
%define _name_archive mesa
%define _version 18.1.1
%define _version 18.1.2
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
%ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x
%define gallium_loader 1
%else
%define gallium_loader 0
@ -58,13 +57,13 @@
%define vdpau_nouveau 0
%define vdpau_radeon 0
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le
%define xvmc_support 1
%define vdpau_nouveau 1
%define vdpau_radeon 1
%endif
%ifarch %ix86 x86_64 %arm aarch64
%ifarch %{ix86} x86_64 %{arm} aarch64
%define with_nine 1
%endif
@ -72,12 +71,12 @@
%ifnarch ppc
%define with_opencl 1
%endif
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
%define with_vulkan 1
%endif
%endif
%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64
%ifarch aarch64 %{arm} ppc64 ppc64le s390x %{ix86} x86_64
%define with_llvm 1
%endif
@ -113,12 +112,12 @@
%endif
Name: Mesa-drivers
Version: 18.1.1
Version: 18.1.2
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
Group: System/Libraries
Url: http://www.mesa3d.org
URL: http://www.mesa3d.org
#Git-Clone: git://anongit.freedesktop.org/mesa/mesa
# For now directory structure of Mesa's ftp changed
# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz
@ -140,6 +139,7 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
Patch48: mako_4_radv.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -197,12 +197,11 @@ Provides: s2tc = %{version}
Obsoletes: s2tc < %{version}
Provides: libtxc_dxtn = %{version}
Obsoletes: libtxc_dxtn < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch %arm
%ifarch %{arm}
BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74
BuildRequires: pkgconfig(libelf)
%endif
%ifarch x86_64 %ix86
%ifarch x86_64 %{ix86}
BuildRequires: libelf-devel
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75
%else
@ -226,8 +225,8 @@ BuildRequires: libclc
%endif
%if 0%{?libglvnd}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: libglvnd >= 0.1.0
%endif
@ -386,10 +385,10 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
Summary: Development files for the OpenGL ES 1.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv1_CM1 = %{version}
Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Requires: pkgconfig(egl)
%description libGLESv1_CM-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -425,10 +424,10 @@ ES 3 entry points.
Summary: Development files for the OpenGL ES 2.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv2-2 = %{version}
Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Requires: pkgconfig(egl)
%description libGLESv2-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -445,10 +444,10 @@ applications using the OpenGL|ES 2.x APIs.
%package libGLESv3-devel
Summary: Development files for the OpenGL ES 3.x API
Group: Development/Libraries/C and C++
Requires: pkgconfig(egl)
%if 0%{?libglvnd} == 0
Requires: Mesa-libGLESv2-2 = %{version}
%endif
Requires: pkgconfig(egl)
%description libGLESv3-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -692,8 +691,8 @@ This package contains the Vulkan parts for Mesa.
%package -n libvulkan_radeon
Summary: Mesa vulkan driver for AMD GPU
Group: System/Libraries
Supplements: xf86-video-ati
Supplements: xf86-video-amdgpu
Supplements: xf86-video-ati
%description -n libvulkan_radeon
This package contains the Vulkan parts for Mesa.
@ -750,6 +749,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch43 -p1
%patch44 -p1
%patch47 -p1
%patch48 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -773,7 +773,7 @@ egl_platforms=x11,drm
%endif
autoreconf -fvi
export PYTHON2=/usr/bin/python3
export PYTHON2=%{_bindir}/python3
%configure \
%if %{drivers}
--disable-gles1 \
@ -818,12 +818,12 @@ export PYTHON2=/usr/bin/python3
--with-vulkan-drivers=intel,radeon \
%endif
%if %{drivers}
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
--enable-xa \
--with-dri-drivers=i915,i965,nouveau,r200,radeon \
--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
%endif
%ifarch %arm aarch64
%ifarch %{arm} aarch64
--enable-xa \
--with-dri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast,freedreno,vc4 \
@ -845,7 +845,7 @@ export PYTHON2=/usr/bin/python3
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%if %{drivers}
@ -947,12 +947,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files
%defattr(-,root,root)
%doc docs/README* docs/license.html
%license docs/license.html
%doc docs/README*
%config %{_sysconfdir}/drirc
%files libEGL1
%defattr(-,root,root)
%if 0%{?libglvnd}
%{_libdir}/libEGL_mesa.so*
%dir %{_datadir}/glvnd
@ -963,7 +962,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%files libEGL-devel
%defattr(-,root,root)
%{_includedir}/EGL
%{_includedir}/KHR
%if !0%{?libglvnd}
@ -972,7 +970,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/egl.pc
%files libGL1
%defattr(-,root,root)
%if 0%{?libglvnd}
%{_libdir}/libGLX_mesa.so*
%{_libdir}/libGLX_indirect.so*
@ -981,7 +978,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%files libGL-devel
%defattr(-,root,root)
%dir %{_includedir}/GL
%{_includedir}/GL/*.h
%exclude %{_includedir}/GL/osmesa.h
@ -992,13 +988,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_mandir}/man3/gl[A-Z]*
%files libGLESv1_CM1
%defattr(-,root,root)
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so.1*
%endif
%files libGLESv1_CM-devel
%defattr(-,root,root)
%{_includedir}/GLES
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so
@ -1006,13 +1000,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2
%defattr(-,root,root)
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so.2*
%endif
%files libGLESv2-devel
%defattr(-,root,root)
%{_includedir}/GLES2
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so
@ -1020,52 +1012,43 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel
%defattr(-,root,root)
%{_includedir}/GLES3
#%_libdir/libGLESv3.so
#%_libdir/pkgconfig/glesv3.pc
%files -n libOSMesa8
%defattr(-,root,root)
%{_libdir}/libOSMesa.so.8.0.0
%{_libdir}/libOSMesa.so.8
%files -n libOSMesa-devel
%defattr(-,root,root)
%{_includedir}/GL/osmesa.h
%{_libdir}/libOSMesa.so
%{_libdir}/pkgconfig/osmesa.pc
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
%files -n libwayland-egl1
%defattr(-,root,root)
%{_libdir}/libwayland-egl.so.1*
%files -n libwayland-egl-devel
%defattr(-,root,root)
%{_libdir}/libwayland-egl.so
%{_libdir}/pkgconfig/wayland-egl.pc
%endif
%files -n libgbm1
%defattr(-,root,root)
%{_libdir}/libgbm.so.1*
%files -n libgbm-devel
%defattr(-,root,root)
%{_includedir}/gbm.h
%{_libdir}/libgbm.so
%{_libdir}/pkgconfig/gbm.pc
%endif
%if %{drivers}
%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le
%ifarch aarch64 %{ix86} x86_64 %{arm} ppc64 ppc64le
%files -n libxatracker2
%defattr(-,root,root)
%{_libdir}/libxatracker.so.2*
%files -n libxatracker-devel
%defattr(-,root,root)
%{_includedir}/xa_*.h
%{_libdir}/libxatracker.so
%{_libdir}/pkgconfig/xatracker.pc
@ -1073,14 +1056,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support}
%files -n libXvMC_nouveau
%defattr(-,root,root)
%{_libdir}/libXvMCnouveau.so
%{_libdir}/libXvMCnouveau.so.1
%{_libdir}/libXvMCnouveau.so.1.0
%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600
%defattr(-,root,root)
%{_libdir}/libXvMCr600.so
%{_libdir}/libXvMCr600.so.1
%{_libdir}/libXvMCr600.so.1.0
@ -1089,7 +1070,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{vdpau_nouveau}
%files -n libvdpau_nouveau
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_nouveau.so
%{_libdir}/vdpau/libvdpau_nouveau.so.1
%{_libdir}/vdpau/libvdpau_nouveau.so.1.0
@ -1098,23 +1078,20 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{vdpau_radeon}
%files -n libvdpau_r300
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_r300.so
%{_libdir}/vdpau/libvdpau_r300.so.1
%{_libdir}/vdpau/libvdpau_r300.so.1.0
%{_libdir}/vdpau/libvdpau_r300.so.1.0.0
%files -n libvdpau_r600
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_r600.so
%{_libdir}/vdpau/libvdpau_r600.so.1
%{_libdir}/vdpau/libvdpau_r600.so.1.0
%{_libdir}/vdpau/libvdpau_r600.so.1.0.0
%endif
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
%files -n libvdpau_radeonsi
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_radeonsi.so
%{_libdir}/vdpau/libvdpau_radeonsi.so.1
%{_libdir}/vdpau/libvdpau_radeonsi.so.1.0
@ -1124,11 +1101,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files libglapi0
%defattr(-,root,root)
%{_libdir}/libglapi.so.0*
%files libglapi-devel
%defattr(-,root,root)
%{_libdir}/libglapi.so
%endif
@ -1136,11 +1111,11 @@ 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
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%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
%ifarch %{arm} aarch64
%exclude %{_libdir}/dri/vc4_dri.so
%endif
@ -1151,13 +1126,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/gallium-pipe/pipe_*.so
%endif
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%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
%ifarch aarch64 %{arm}
%files -n Mesa-dri-vc4
%{_libdir}/dri/vc4_dri.so
%endif
@ -1167,12 +1142,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files dri-devel
%defattr(-,root,root)
%{_includedir}/GL/internal
%{_libdir}/pkgconfig/dri.pc
%files devel
%defattr(-,root,root)
%doc docs/*.html
# !drivers
@ -1180,13 +1153,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?with_nine}
%files -n Mesa-libd3d
%defattr(-,root,root)
%dir %{_libdir}/d3d/
%{_libdir}/d3d/*.so.*
#%%{_sysconfdir}/OpenCL/vendors/mesa.icd
%files -n Mesa-libd3d-devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/d3d.pc
%{_includedir}/d3dadapter/
%{_libdir}/d3d/*.so
@ -1194,7 +1165,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{with_opencl}
%files -n Mesa-libOpenCL
%defattr(-,root,root)
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%{_sysconfdir}/OpenCL/vendors/mesa.icd
@ -1202,32 +1172,28 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%if %{drivers}
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le
%files -n Mesa-libva
%defattr(-,root,root)
%{_libdir}/dri/*_drv_video.so
%endif
%endif
%if 0%{with_vulkan}
%files -n libvulkan_intel
%defattr(-,root,root)
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/intel_icd.*.json
%{_libdir}/libvulkan_intel.so
%files -n libvulkan_radeon
%defattr(-,root,root)
%{_libdir}/libvulkan_radeon.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
%files -n Mesa-libVulkan-devel
%defattr(-,root,root)
%dir %_includedir/vulkan
%_includedir/vulkan
%dir %{_includedir}/vulkan
%{_includedir}/vulkan
%endif
%changelog

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sun Jun 17 17:57:44 UTC 2018 - mimi.vx@gmail.com
- add mako_4_radv.patch - fixes Mako detection for RADV/intel
-------------------------------------------------------------------
Sun Jun 17 11:11:53 UTC 2018 - mimi.vx@gmail.com
- update to 18.1.2
* Fixes for libatomic checks on non-arm and non-x86 platforms
* porting of additional libatomic checks to meson from autotools
* numerous radv fixes
* numerous intel fixes
* A few fixes each for radeonsi, r300, ac, glx, and vulkan
-------------------------------------------------------------------
Sat Jun 2 15:44:36 UTC 2018 - mimi.vx@gmail.com

100
Mesa.spec
View File

@ -33,7 +33,6 @@
# from Mesa-driver.
%define drivers 0
%define libglvnd 0
%if 0%{?suse_version} >= 1330
@ -42,12 +41,12 @@
%define glamor 1
%define _name_archive mesa
%define _version 18.1.1
%define _version 18.1.2
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
%ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x
%define gallium_loader 1
%else
%define gallium_loader 0
@ -57,13 +56,13 @@
%define vdpau_nouveau 0
%define vdpau_radeon 0
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le
%define xvmc_support 1
%define vdpau_nouveau 1
%define vdpau_radeon 1
%endif
%ifarch %ix86 x86_64 %arm aarch64
%ifarch %{ix86} x86_64 %{arm} aarch64
%define with_nine 1
%endif
@ -71,12 +70,12 @@
%ifnarch ppc
%define with_opencl 1
%endif
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
%define with_vulkan 1
%endif
%endif
%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64
%ifarch aarch64 %{arm} ppc64 ppc64le s390x %{ix86} x86_64
%define with_llvm 1
%endif
@ -112,12 +111,12 @@
%endif
Name: Mesa
Version: 18.1.1
Version: 18.1.2
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
Group: System/Libraries
Url: http://www.mesa3d.org
URL: http://www.mesa3d.org
#Git-Clone: git://anongit.freedesktop.org/mesa/mesa
# For now directory structure of Mesa's ftp changed
# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz
@ -139,6 +138,7 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
Patch48: mako_4_radv.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -196,12 +196,11 @@ Provides: s2tc = %{version}
Obsoletes: s2tc < %{version}
Provides: libtxc_dxtn = %{version}
Obsoletes: libtxc_dxtn < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch %arm
%ifarch %{arm}
BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74
BuildRequires: pkgconfig(libelf)
%endif
%ifarch x86_64 %ix86
%ifarch x86_64 %{ix86}
BuildRequires: libelf-devel
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75
%else
@ -225,8 +224,8 @@ BuildRequires: libclc
%endif
%if 0%{?libglvnd}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: libglvnd >= 0.1.0
%endif
@ -385,10 +384,10 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
Summary: Development files for the OpenGL ES 1.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv1_CM1 = %{version}
Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Requires: pkgconfig(egl)
%description libGLESv1_CM-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -424,10 +423,10 @@ ES 3 entry points.
Summary: Development files for the OpenGL ES 2.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv2-2 = %{version}
Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Requires: pkgconfig(egl)
%description libGLESv2-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -444,10 +443,10 @@ applications using the OpenGL|ES 2.x APIs.
%package libGLESv3-devel
Summary: Development files for the OpenGL ES 3.x API
Group: Development/Libraries/C and C++
Requires: pkgconfig(egl)
%if 0%{?libglvnd} == 0
Requires: Mesa-libGLESv2-2 = %{version}
%endif
Requires: pkgconfig(egl)
%description libGLESv3-devel
OpenGL|ES is an API for full-function 2D and 3D
@ -691,8 +690,8 @@ This package contains the Vulkan parts for Mesa.
%package -n libvulkan_radeon
Summary: Mesa vulkan driver for AMD GPU
Group: System/Libraries
Supplements: xf86-video-ati
Supplements: xf86-video-amdgpu
Supplements: xf86-video-ati
%description -n libvulkan_radeon
This package contains the Vulkan parts for Mesa.
@ -749,6 +748,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch43 -p1
%patch44 -p1
%patch47 -p1
%patch48 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -772,7 +772,7 @@ egl_platforms=x11,drm
%endif
autoreconf -fvi
export PYTHON2=/usr/bin/python3
export PYTHON2=%{_bindir}/python3
%configure \
%if %{drivers}
--disable-gles1 \
@ -817,12 +817,12 @@ export PYTHON2=/usr/bin/python3
--with-vulkan-drivers=intel,radeon \
%endif
%if %{drivers}
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
--enable-xa \
--with-dri-drivers=i915,i965,nouveau,r200,radeon \
--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
%endif
%ifarch %arm aarch64
%ifarch %{arm} aarch64
--enable-xa \
--with-dri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast,freedreno,vc4 \
@ -844,7 +844,7 @@ export PYTHON2=/usr/bin/python3
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%if %{drivers}
@ -946,12 +946,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files
%defattr(-,root,root)
%doc docs/README* docs/license.html
%license docs/license.html
%doc docs/README*
%config %{_sysconfdir}/drirc
%files libEGL1
%defattr(-,root,root)
%if 0%{?libglvnd}
%{_libdir}/libEGL_mesa.so*
%dir %{_datadir}/glvnd
@ -962,7 +961,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%files libEGL-devel
%defattr(-,root,root)
%{_includedir}/EGL
%{_includedir}/KHR
%if !0%{?libglvnd}
@ -971,7 +969,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/egl.pc
%files libGL1
%defattr(-,root,root)
%if 0%{?libglvnd}
%{_libdir}/libGLX_mesa.so*
%{_libdir}/libGLX_indirect.so*
@ -980,7 +977,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%files libGL-devel
%defattr(-,root,root)
%dir %{_includedir}/GL
%{_includedir}/GL/*.h
%exclude %{_includedir}/GL/osmesa.h
@ -991,13 +987,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_mandir}/man3/gl[A-Z]*
%files libGLESv1_CM1
%defattr(-,root,root)
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so.1*
%endif
%files libGLESv1_CM-devel
%defattr(-,root,root)
%{_includedir}/GLES
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so
@ -1005,13 +999,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2
%defattr(-,root,root)
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so.2*
%endif
%files libGLESv2-devel
%defattr(-,root,root)
%{_includedir}/GLES2
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so
@ -1019,52 +1011,43 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel
%defattr(-,root,root)
%{_includedir}/GLES3
#%_libdir/libGLESv3.so
#%_libdir/pkgconfig/glesv3.pc
%files -n libOSMesa8
%defattr(-,root,root)
%{_libdir}/libOSMesa.so.8.0.0
%{_libdir}/libOSMesa.so.8
%files -n libOSMesa-devel
%defattr(-,root,root)
%{_includedir}/GL/osmesa.h
%{_libdir}/libOSMesa.so
%{_libdir}/pkgconfig/osmesa.pc
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
%files -n libwayland-egl1
%defattr(-,root,root)
%{_libdir}/libwayland-egl.so.1*
%files -n libwayland-egl-devel
%defattr(-,root,root)
%{_libdir}/libwayland-egl.so
%{_libdir}/pkgconfig/wayland-egl.pc
%endif
%files -n libgbm1
%defattr(-,root,root)
%{_libdir}/libgbm.so.1*
%files -n libgbm-devel
%defattr(-,root,root)
%{_includedir}/gbm.h
%{_libdir}/libgbm.so
%{_libdir}/pkgconfig/gbm.pc
%endif
%if %{drivers}
%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le
%ifarch aarch64 %{ix86} x86_64 %{arm} ppc64 ppc64le
%files -n libxatracker2
%defattr(-,root,root)
%{_libdir}/libxatracker.so.2*
%files -n libxatracker-devel
%defattr(-,root,root)
%{_includedir}/xa_*.h
%{_libdir}/libxatracker.so
%{_libdir}/pkgconfig/xatracker.pc
@ -1072,14 +1055,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support}
%files -n libXvMC_nouveau
%defattr(-,root,root)
%{_libdir}/libXvMCnouveau.so
%{_libdir}/libXvMCnouveau.so.1
%{_libdir}/libXvMCnouveau.so.1.0
%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600
%defattr(-,root,root)
%{_libdir}/libXvMCr600.so
%{_libdir}/libXvMCr600.so.1
%{_libdir}/libXvMCr600.so.1.0
@ -1088,7 +1069,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{vdpau_nouveau}
%files -n libvdpau_nouveau
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_nouveau.so
%{_libdir}/vdpau/libvdpau_nouveau.so.1
%{_libdir}/vdpau/libvdpau_nouveau.so.1.0
@ -1097,23 +1077,20 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{vdpau_radeon}
%files -n libvdpau_r300
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_r300.so
%{_libdir}/vdpau/libvdpau_r300.so.1
%{_libdir}/vdpau/libvdpau_r300.so.1.0
%{_libdir}/vdpau/libvdpau_r300.so.1.0.0
%files -n libvdpau_r600
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_r600.so
%{_libdir}/vdpau/libvdpau_r600.so.1
%{_libdir}/vdpau/libvdpau_r600.so.1.0
%{_libdir}/vdpau/libvdpau_r600.so.1.0.0
%endif
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
%files -n libvdpau_radeonsi
%defattr(-,root,root)
%{_libdir}/vdpau/libvdpau_radeonsi.so
%{_libdir}/vdpau/libvdpau_radeonsi.so.1
%{_libdir}/vdpau/libvdpau_radeonsi.so.1.0
@ -1123,11 +1100,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files libglapi0
%defattr(-,root,root)
%{_libdir}/libglapi.so.0*
%files libglapi-devel
%defattr(-,root,root)
%{_libdir}/libglapi.so
%endif
@ -1135,11 +1110,11 @@ 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
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%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
%ifarch %{arm} aarch64
%exclude %{_libdir}/dri/vc4_dri.so
%endif
@ -1150,13 +1125,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/gallium-pipe/pipe_*.so
%endif
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%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
%ifarch aarch64 %{arm}
%files -n Mesa-dri-vc4
%{_libdir}/dri/vc4_dri.so
%endif
@ -1166,12 +1141,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !%{drivers}
%files dri-devel
%defattr(-,root,root)
%{_includedir}/GL/internal
%{_libdir}/pkgconfig/dri.pc
%files devel
%defattr(-,root,root)
%doc docs/*.html
# !drivers
@ -1179,13 +1152,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?with_nine}
%files -n Mesa-libd3d
%defattr(-,root,root)
%dir %{_libdir}/d3d/
%{_libdir}/d3d/*.so.*
#%%{_sysconfdir}/OpenCL/vendors/mesa.icd
%files -n Mesa-libd3d-devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/d3d.pc
%{_includedir}/d3dadapter/
%{_libdir}/d3d/*.so
@ -1193,7 +1164,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{with_opencl}
%files -n Mesa-libOpenCL
%defattr(-,root,root)
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%{_sysconfdir}/OpenCL/vendors/mesa.icd
@ -1201,32 +1171,28 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%if %{drivers}
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le
%files -n Mesa-libva
%defattr(-,root,root)
%{_libdir}/dri/*_drv_video.so
%endif
%endif
%if 0%{with_vulkan}
%files -n libvulkan_intel
%defattr(-,root,root)
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/intel_icd.*.json
%{_libdir}/libvulkan_intel.so
%files -n libvulkan_radeon
%defattr(-,root,root)
%{_libdir}/libvulkan_radeon.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
%files -n Mesa-libVulkan-devel
%defattr(-,root,root)
%dir %_includedir/vulkan
%_includedir/vulkan
%dir %{_includedir}/vulkan
%{_includedir}/vulkan
%endif
%changelog

15
mako_4_radv.patch Normal file
View File

@ -0,0 +1,15 @@
Index: mesa-18.1.2/m4/ax_check_python_mako_module.m4
===================================================================
--- mesa-18.1.2.orig/m4/ax_check_python_mako_module.m4
+++ mesa-18.1.2/m4/ax_check_python_mako_module.m4
@@ -48,8 +48,8 @@ try:
except ImportError as err:
sys.exit(err)
else:
- ver_req = map(int, '$1'.split('.'))
- ver_act = map(int, mako.__version__.split('.'))
+ ver_req = list(map(int, '$1'.split('.')))
+ ver_act = list(map(int, mako.__version__.split('.')))
sys.exit(int(ver_req > ver_act))
" | $PYTHON2 -

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781
size 11110892

View File

@ -1 +0,0 @@
60d6b58f8f119b3731de587bdad30c1ecbb52678 mesa-18.1.1.tar.xz

3
mesa-18.1.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9
size 11124408

View File

@ -0,0 +1 @@
938d22b966e9861a5387d31c44cd4753931d3076 mesa-18.1.2.tar.xz