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

20.0.4

Browse source
This commit is contained in:
Alexander Stefanov 2020-04-03 23:51:41 +00:00
parent cdf6b37455
commit 113580a667
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
mesa-20.0.2.tar.xz: c05cd6ab77577b0ce14642ab6cde295fba0256ef
mesa-20.0.4.tar.xz: f87988896d48015dbe53be0897a9330c6c0244d8

12
mesa-20.0.0-rc1-amd-non-x86.patch
View file

@ -1,12 +0,0 @@
diff -up mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h.omv~ mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h
--- mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h.omv~ 2020-02-05 15:05:47.236576673 +0100
+++ mesa-20.0.0-rc1/src/amd/addrlib/inc/addrtypes.h 2020-02-05 15:08:09.030582925 +0100
@@ -87,7 +87,7 @@ typedef int INT;
#endif
#ifndef ADDR_FASTCALL
- #if defined(BRAHMA_ARM)
+ #if defined(BRAHMA_ARM) || (defined(__GNUC__) && !defined(__x86_64__) && !defined(__i386__))
#define ADDR_FASTCALL
#elif defined(__GNUC__)
#define ADDR_FASTCALL __attribute__((regparm(0)))

12
mesa-20.0.3-amd-non-x86.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h.2~ mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h
--- mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h.2~ 2020-04-02 13:35:20.510114470 +0200
+++ mesa-20.0.3/src/amd/addrlib/inc/addrtypes.h 2020-04-02 13:36:48.386741907 +0200
@@ -87,7 +87,7 @@ typedef int INT;
#endif
#ifndef ADDR_FASTCALL
- #if defined(__GNUC__)
+ #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
#define ADDR_FASTCALL __attribute__((regparm(0)))
#else
#define ADDR_FASTCALL __fastcall

12
mesa.spec
View file

@ -9,7 +9,7 @@
# change me if you want release-candidate
%define relc %{nil}
%bcond_with gcc
%bcond_without gcc
%bcond_without opencl
%{?build_selinux}%{?!build_selinux:%bcond_with selinux}
@ -104,7 +104,7 @@
Summary: OpenGL %{opengl_ver} compatible 3D graphics library
Name: mesa
Version: 20.0.2
Version: 20.0.4
Release: 1
Group: System/Libraries
License: MIT
@ -129,7 +129,7 @@ Obsoletes: %{name}-xorg-drivers-nouveau < %{EVRD}
#Patch1: mesa-10.2-clang-compilefix.patch
#Patch3: mesa-19.0.0-rc2-more-ARM-drivers.patch
Patch1: mesa-19.2.3-arm32-buildfix.patch
Patch2: mesa-20.0.0-rc1-amd-non-x86.patch
Patch2: mesa-20.0.3-amd-non-x86.patch
%ifarch %{ix86}
Patch4: mesa-19.2.0-rc3-32bit-buildfix.patch
%endif
@ -1198,14 +1198,14 @@ find %{buildroot} -name '*.la' |xargs rm -f
cat >%{buildroot}%{_libdir}/pkgconfig/glesv1_cm.pc <<'EOF'
Name: glesv1_cm
Description: Mesa OpenGL ES 1.1 CM library
Version: 20.0.2
Version: 20.0.4
Libs: -lGLESv1_CM
Libs.private: -lpthread -pthread -lm -ldl
EOF
cat >%{buildroot}%{_libdir}/pkgconfig/glesv2.pc <<'EOF'
Name: glesv2
Description: Mesa OpenGL ES 2.0 library
Version: 20.0.2
Version: 20.0.4
Libs: -lGLESv2
Libs.private: -lpthread -pthread -lm -ldl
EOF
@ -1217,7 +1217,7 @@ libdir=${prefix}/%{_libdir}
includedir=${prefix}/include
Name: egl
Description: Mesa EGL Library
Version: 20.0.2
Version: 20.0.4
Requires.private: x11, xext, xdamage >= 1.1, xfixes, x11-xcb, xcb, xcb-glx >= 1.8.1, xcb-dri2 >= 1.8, xxf86vm, libdrm >= 2.4.75
Libs: -L${libdir} -lEGL
Libs.private: -lpthread -pthread -lm -ldl