mirror of
https://abf.rosa.ru/djam/mesa.git
synced 2025-02-23 14:42:53 +00:00
Updated to 20.1.2
This commit is contained in:
Alzim
parent
467fb47f29
commit
e7c1f32ef3
4 changed files with 96 additions and 100 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
mesa-20.1.1.tar.xz: 44d474a9a66505f751374796be8f4d5e4785a2b3
|
||||
mesa-20.1.2.tar.xz: 9f48d8f48499018fb685b592591db351324e983b
|
||||
|
|
|
|||
21
mesa-19.2.3-arm32-buildfix.patch
Normal file
21
mesa-19.2.3-arm32-buildfix.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -up mesa-19.2.2/src/drm-shim/drm_shim.c.omv~ mesa-19.2.2/src/drm-shim/drm_shim.c
|
||||
--- mesa-19.2.2/src/drm-shim/drm_shim.c.omv~ 2019-11-08 12:22:33.561413124 +0000
|
||||
+++ mesa-19.2.2/src/drm-shim/drm_shim.c 2019-11-08 13:18:33.752306260 +0000
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
-#include <sys/mman.h>
|
||||
+//#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysmacros.h>
|
||||
#include <stdarg.h>
|
||||
@@ -52,6 +52,8 @@
|
||||
#include "util/u_debug.h"
|
||||
#include "drm_shim.h"
|
||||
|
||||
+PUBLIC void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
|
||||
+
|
||||
#define REAL_FUNCTION_POINTER(x) typeof(x) *real_##x
|
||||
|
||||
static mtx_t shim_lock = _MTX_INITIALIZER_NP;
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
#!/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
|
||||
100
mesa.spec
100
mesa.spec
|
|
@ -31,8 +31,8 @@
|
|||
|
||||
Summary: OpenGL-compatible 3D graphics library
|
||||
Name: mesa
|
||||
Version: 20.1.1
|
||||
Release: 2
|
||||
Version: 20.1.2
|
||||
Release: 1
|
||||
License: MIT
|
||||
Group: System/Libraries
|
||||
Url: http://www.mesa3d.org
|
||||
|
|
@ -41,6 +41,7 @@ Source3: make-git-snapshot.sh
|
|||
Source101: mesa.rpmlintrc
|
||||
|
||||
Patch0: mesa-11.2-evergreen-big-endian.patch
|
||||
Patch1: mesa-19.2.3-arm32-buildfix.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: meson >= 0.48.0
|
||||
|
|
@ -55,7 +56,9 @@ BuildRequires: lm_sensors-devel
|
|||
BuildRequires: pkgconfig(libomxil-bellagio)
|
||||
BuildRequires: makedepend
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: pkgconfig(epoxy)
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.99
|
||||
BuildRequires: pkgconfig(libunwind)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
|
|
@ -121,10 +124,10 @@ contains no libraries but rather the common files.
|
|||
%if %{with opencl}
|
||||
# In Rosa 2016.1 we have indipendent libopencl packages
|
||||
|
||||
%define clmajor 1
|
||||
%define clname mesaopencl
|
||||
%define libclname %mklibname %{clname} %{clmajor}
|
||||
%define develcl %mklibname %{clname} -d
|
||||
%define clmajor 1
|
||||
%define clname mesaopencl
|
||||
%define libclname %mklibname %{clname} %{clmajor}
|
||||
%define develcl %mklibname %{clname} -d
|
||||
|
||||
%package -n %{libclname}
|
||||
Summary: Files for MESA (OpenCL libraries)
|
||||
|
|
@ -692,35 +695,80 @@ Mesa common meta package for development files.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package tools
|
||||
Summary: Tools for debugging Mesa drivers
|
||||
Group: Development/Tools
|
||||
|
||||
%description tools
|
||||
Tools for debugging Mesa drivers.
|
||||
|
||||
%files tools
|
||||
%{_bindir}/aubinator
|
||||
%{_bindir}/aubinator_error_decode
|
||||
%{_bindir}/aubinator_viewer
|
||||
%{_bindir}/glsl_compiler
|
||||
%{_bindir}/glsl_test
|
||||
%{_bindir}/i965_asm
|
||||
%{_bindir}/i965_disasm
|
||||
%{_bindir}/intel_dump_gpu
|
||||
%{_bindir}/intel_error2aub
|
||||
%{_bindir}/intel_sanitize_gpu
|
||||
%{_bindir}/nouveau_compiler
|
||||
%{_bindir}/spirv2nir
|
||||
%{_bindir}/xvmc_bench
|
||||
%{_bindir}/xvmc_blocks
|
||||
%{_bindir}/xvmc_context
|
||||
%{_bindir}/xvmc_rendering
|
||||
%{_bindir}/xvmc_subpicture
|
||||
%{_bindir}/xvmc_surface
|
||||
%{_libexecdir}/libintel_dump_gpu.so
|
||||
%{_libexecdir}/libintel_sanitize_gpu.so
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%apply_patches
|
||||
|
||||
%build
|
||||
%global optflags %{optflags} -fno-strict-aliasing
|
||||
|
||||
%meson \
|
||||
-Dplatforms=x11,wayland,drm,surfaceless \
|
||||
-Ddri3=true \
|
||||
-Dgallium-extra-hud=true \
|
||||
-Dgallium-vdpau=true \
|
||||
-Dgallium-xvmc=true \
|
||||
-Dgallium-omx=bellagio \
|
||||
-Dplatforms=x11,wayland,drm,surfaceless \
|
||||
-Ddri3=true \
|
||||
-Dgallium-extra-hud=true \
|
||||
-Dgallium-vdpau=true \
|
||||
-Dgallium-xvmc=true \
|
||||
-Dgallium-omx=bellagio \
|
||||
%if %{with va}
|
||||
-Dgallium-va=true \
|
||||
-Dgallium-va=true \
|
||||
%else
|
||||
-Dgallium-va=false \
|
||||
-Dgallium-va=false \
|
||||
%endif
|
||||
-Dgallium-xa=true \
|
||||
-Dgallium-nine=true \
|
||||
-Dgallium-opencl=disabled \
|
||||
-Dgbm=true \
|
||||
-Dglx=dri \
|
||||
-Degl=true \
|
||||
-Dllvm="true" \
|
||||
-Dlibunwind=true \
|
||||
-Dlmsensors=true \
|
||||
-Dtexture-float=true \
|
||||
-Dosmesa=gallium \
|
||||
-Dswr-arches=avx,avx2
|
||||
-Dgallium-xa=true \
|
||||
-Dgallium-nine=true \
|
||||
%if %{with opencl}
|
||||
-Dgallium-opencl=icd \
|
||||
%else
|
||||
-Dgallium-opencl=disabled \
|
||||
%endif
|
||||
-Dgbm=true \
|
||||
-Dglx=dri \
|
||||
-Degl=true \
|
||||
-Dllvm="true" \
|
||||
-Dlibunwind=true \
|
||||
-Dlmsensors=true \
|
||||
-Dtexture-float=true \
|
||||
-Dosmesa=gallium \
|
||||
-Dgles1=true \
|
||||
-Dgles2=true \
|
||||
-Dglx-direct=true \
|
||||
-Dopengl=true \
|
||||
-Dshader-cache=true \
|
||||
-Dshared-glapi=true \
|
||||
-Dshared-llvm=true \
|
||||
-Dtools=all \
|
||||
-Dswr-arches=avx,avx2,knl,skx
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue