Djam/mesa
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/mesa.git synced 2025-02-23 22:52:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 20.1.1

Browse source
This commit is contained in:
Alzim 2020-06-24 16:41:23 +03:00
commit 4e78cba0e1
5 changed files with 104 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,3 +1,2 @@
sources:
mesa-18.3.6.tar.xz: cc7cb8cef999bc89142eaf5e162fcb24f6569645
mesa-18.3.6.tar.xz.sig: 274c219cbf0ef870a9c437de1f9b35ca6b54aa46
mesa-20.1.1.tar.xz: 44d474a9a66505f751374796be8f4d5e4785a2b3

36
mesa-9.2-hardware-float.patch
View file

@ -1,36 +0,0 @@
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 5ec1df6..a0406fc 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -306,6 +306,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
if (!format_desc)
return FALSE;
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
+ util_format_is_float(format)) {
+ return FALSE;
+ }
+
assert(target == PIPE_BUFFER ||
target == PIPE_TEXTURE_1D ||
target == PIPE_TEXTURE_1D_ARRAY ||
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 937035e..2f5e571 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -291,6 +291,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
if (!format_desc)
return FALSE;
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
+ util_format_is_float(format)) {
+ return FALSE;
+ }
+
if (sample_count > 1)
return FALSE;

73
mesa-driver-install Normal file
View file

@ -0,0 +1,73 @@
#!/bin/bash
#
# Copyright 2005 by Red Hat, Inc.
# Author: Mike A. Harris <mharris@redhat.com>
#
# License: MIT/X11
# <FIXME: Insert legal terms here>
# redhat-mesa-driver-install:
#
# The purpose of this script is to address some inadequacies of the current
# Mesa 6.3.2 upstream install script. We ship DRI on some OS/arch
# combinations, and disable it on other combinations, so we need a simple
# way to control wether or not DRI modules will get installed, and an easy
# way of specifying which drivers we'll ship on a particular OS/arch
# combination.
#---------------------------------------------------------------------
# NOTE: FC5's current kernel has the following DRM modules. Some of them
# shouldn't be there at all (ppc64), some don't make much sense (via on
# ppc). We'll have to talk to kernel folk to get the ones disabled that
# don't make sense, or which we don't want to ship for some reason or
# another.
#
# for a in i586 i686 ia64 ppc ppc64 s390x x86_64 ; do (echo -n "${a}:" \
# rpm -qlp <path to kernel src.rpm with all arch components replaced by $a) | \
# grep /drm/ | sed -e 's;.*/;;g' |xargs echo ) ;done
#
# i586: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# i686: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ia64: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ppc: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ppc64: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# s390x:
# x86_64: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
#---------------------------------------------------------------------
# Define list of all of the DRI drivers Mesa builds by default.
DRI_DRIVERS_ALL="ffb i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome"
# Current build architecture, passed by rpm spec
if [ $# -gt 0 ] ; then
echo "Usage: ${0##*/}"
echo " Be sure to set 'DRIMODULE_SRCDIR=<libdir>' first"
echo " Be sure to set 'DRIMODULE_DESTDIR=<moduledir>' first"
echo " Be sure to set 'DRI_DRIVERS=<drivers>' first"
exit 1
fi
if [ -z $DRIMODULE_SRCDIR ] ; then
echo "Error: DRIMODULE_SRCDIR not set in environment"
exit
fi
if [ -z $DRIMODULE_DESTDIR ] ; then
echo "Error: DRIMODULE_DESTDIR not set in environment"
exit
else
[ ! -d $DRIMODULE_DESTDIR ] && mkdir -p $DRIMODULE_DESTDIR
fi
#DRIMODULE_DESTDIR=${1##DRIMODULE_DESTDIR=}
ARCH=$1
if [ -z "$DRI_DRIVERS" ]; then
DRI_DRIVERS="$DRI_DRIVERS_ALL"
fi
# Install DRI drivers
for driver in $DRI_DRIVERS ; do
set -vx
install -m 0755 $DRIMODULE_SRCDIR/${driver}_dri.so $DRIMODULE_DESTDIR/
set -
done

6
mesa.rpmlintrc
View file

@ -6,5 +6,11 @@ addFilter("E: invalid-ldconfig-symlink")
# dri-drivers is a collection of special shared objects rather than a
# single shared library.
addFilter("E: incoherent-version-in-name")
addFilter("E: executable-in-library-package")
addFilter("E: invalid-soname")
addFilter("E: no-binary")
addFilter("E: outside-libdir-files")
addFilter("W: shared-lib-calls-exit")
addFilter("W: no-documentation")
addFilter("W: name-repeated-in-summary C Intel-ui")

46
mesa.spec
View file

@ -31,19 +31,18 @@
Summary: OpenGL-compatible 3D graphics library
Name: mesa
Version: 18.3.6
Release: 6
Version: 20.1.1
Release: 2
License: MIT
Group: System/Libraries
Url: http://www.mesa3d.org
Source0: https://mesa.freedesktop.org/archive/mesa-%{version}.tar.xz
Source1: https://mesa.freedesktop.org/archive/mesa-%{version}.tar.xz.sig
Source3: make-git-snapshot.sh
Source101: mesa.rpmlintrc
Patch1: mesa-9.2-hardware-float.patch
Patch2: mesa-11.2-evergreen-big-endian.patch
Patch0: mesa-11.2-evergreen-big-endian.patch
BuildRequires: cmake
BuildRequires: meson >= 0.48.0
BuildRequires: intltool
BuildRequires: itstool
@ -57,7 +56,7 @@ BuildRequires: pkgconfig(libomxil-bellagio)
BuildRequires: makedepend
BuildRequires: python3-mako
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libdrm) >= 2.4.95
BuildRequires: pkgconfig(libdrm) >= 2.4.99
BuildRequires: pkgconfig(libunwind)
BuildRequires: pkgconfig(python3)
%if %{with va}
@ -67,10 +66,12 @@ BuildRequires: pkgconfig(talloc)
%if %{with vdpau}
BuildRequires: pkgconfig(vdpau)
%endif
%if %{with opencl}
BuildRequires: gcc >= 5.3
BuildRequires: clang >= 6.0.0
BuildRequires: clang-devel >= 6.0.0
BuildRequires: clang >= 7.0.0
BuildRequires: clang-devel >= 7.0.0
BuildRequires: llvm >= 7.0.0
BuildRequires: llvm-devel >= 7.0.0
%if %{without opencl}
BuildRequires: opencl-headers >= 2.1
BuildRequires: pkgconfig(OpenCL) >= 2.1
%endif
@ -87,6 +88,7 @@ BuildRequires: pkgconfig(xmu)
BuildRequires: pkgconfig(xproto)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(xvmc)
BuildRequires: pkgconfig(xxf86vm)
# Needed to build with support for DRI2 and DRI3 X11 extensions.
@ -96,26 +98,23 @@ BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xcb-dri3)
BuildRequires: pkgconfig(xcb-present)
%if %{with selinux}
BuildRequires: pkgconfig(libselinux)
BuildRequires: libselinux-devel
%endif
%if %{with vulkan}
# for SHA1 implementation from libnettle:
BuildRequires: pkgconfig(nettle)
%endif
# [NB] Do not mark it noarch, otherwise rpm will be confused on where
# [NB] Do not mark it noarch, otherwise rpm will be confused on where
# to store debuginfo for the subpackages (all debug info should be stored
# in mesa-debuginfo).
%description
Mesa is an OpenGL compatible 3D graphics library. This particular package
Mesa is an OpenGL compatible 3D graphics library. This particular package
contains no libraries but rather the common files.
%files
%doc docs/README.*
# This file will be included to mesa package automatically
# due to being located in %{_defaultdocdir}/%{name}:
#%{_defaultdocdir}/mesa/00-mesa-defaults_%{_arch}.conf.sample
#----------------------------------------------------------------------------
@ -150,7 +149,7 @@ Group. It has been adopted by Intel, AMD, Nvidia, and ARM Holdings.
%endif
#-----------------------------------------------------------------------------
#----------------------------------------------------------------------------
%define dridrivers %mklibname dri-drivers
@ -173,6 +172,7 @@ vdpau and xvmc state trackers.
%dir %{_libdir}/dri
%{_libdir}/dri/i915_dri.so
%{_libdir}/dri/i965_dri.so
%{_libdir}/dri/iris_dri.so
%{_libdir}/dri/nouveau_dri.so
%{_libdir}/dri/nouveau_vieux_dri.so
%{_libdir}/dri/r200_dri.so
@ -209,8 +209,8 @@ vdpau and xvmc state trackers.
%{_libdir}/vdpau/libvdpau_r300.so.*
%{_libdir}/vdpau/libvdpau_radeonsi.so.*
# XvMC and VDPAU are no longer supported for softpipe, see the commits
# 7c253184, 5f7233c8 and a few other in mesa git repo. For r300, VDPAU
# XvMC and VDPAU are no longer supported for softpipe, see the commits
# 7c253184, 5f7233c8 and a few other in mesa git repo. For r300, VDPAU
# support has been re-enabled.
%post -n %{dridrivers}
@ -303,11 +303,9 @@ package contains the headers needed to compile Mesa programs.
%files -n %{devgl}
%{_includedir}/GL/gl.h
%{_includedir}/GL/gl_mangle.h
%{_includedir}/GL/glext.h
%{_includedir}/GL/glx.h
%{_includedir}/GL/glxext.h
%{_includedir}/GL/glx_mangle.h
%if !%{with osmesa}
%{_includedir}/GL/osmesa.h
%endif
@ -706,14 +704,18 @@ Mesa common meta package for development files.
-Dgallium-vdpau=true \
-Dgallium-xvmc=true \
-Dgallium-omx=bellagio \
%if %{with va}
-Dgallium-va=true \
%else
-Dgallium-va=false \
%endif
-Dgallium-xa=true \
-Dgallium-nine=true \
-Dgallium-opencl=disabled \
-Dgbm=true \
-Dglx=dri \
-Degl=true \
-Dllvm=true \
-Dllvm="true" \
-Dlibunwind=true \
-Dlmsensors=true \
-Dtexture-float=true \
@ -733,7 +735,7 @@ for l in ../libGL.so.*; do cp -a $l .; done
popd
%ifarch %{x86_64}
mkdir -p %{buildroot}%{_prefix}/lib/dri
mkdir -p %{buildroot}%{_libdir}/dri
%endif
rm -f %{buildroot}/%{_includedir}/GL/glut.h