Accepting request 485819 from X11:XOrg
1 OBS-URL: https://build.opensuse.org/request/show/485819 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=286
This commit is contained in:
Yuchen Lin
Git OBS Bridge
commit
4df52bf090
98
Mesa.changes
98
Mesa.changes
@ -1,3 +1,101 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 5 11:32:26 UTC 2017 - afaerber@suse.de
|
||||
|
||||
- Prepare building OpenCL for non-x86 architectures, too
|
||||
* s390x can build it right away (swrast)
|
||||
* %arm aarch64 ppc64 ppc64le depend on LLVM amdgpu target for r600
|
||||
- Fix typo in specfile comment
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 1 15:59:08 UTC 2017 - mimi.vx@gmail.com
|
||||
|
||||
- update to 17.0.3
|
||||
- change Mesa.keyring to new release manager key
|
||||
* fdo#96743 [BYT, HSW, SKL, BXT, KBL] GPU hangs with GfxBench 4.0 CarChase
|
||||
* fdo#99246 [d3dadapter+radeonsi] EVE-Online : hang on wormhole sight
|
||||
* fdo#100061 LODQ instruction generated with invalid dst mask
|
||||
* fdo#100182 Flickering in The Talos Principle on Sky Lake GT4
|
||||
* radeonsi: add new polaris12 pci id
|
||||
* many fixes for RADV, ANV, i915, radeonsi and freedreno drivers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 29 15:18:19 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- specfile: Remove requires to libglvnd0/libglvnd-devel from
|
||||
baselibs.conf when libglvnd build has been disabled; ugly ...
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 29 09:23:27 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- specfile: only require libglvnd0/libglvnd-devel, if libglvnd build
|
||||
is enabled
|
||||
- baselibs.conf: added requires to libglvnd0/libglvnd-devel where
|
||||
needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 27 13:56:35 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- disable libglvnd for openSUSE Leap 42.x and sle12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 24 14:45:49 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- update to 17.0.2
|
||||
* fdo#97988 [radeonsi] playing back videos with VDPAU exhibits
|
||||
deinterlacing/anti-aliasing issues not visible with VA-API
|
||||
* fdo#99484 Crusader Kings 2 - Loading bars, siege bars, morale bars, etc.
|
||||
do not render correctly
|
||||
* fdo#100049 ralloc: Make sure ralloc() allocations match malloc()'s
|
||||
alignment. causes seg fault in 32bit build
|
||||
* many fixes for ANV, RADV, Vulkan and i965 + radeonsi drivers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 23 13:41:27 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- fedora_0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
|
||||
* Fix glXGetDriverConfig not working with glvnd
|
||||
(https://bugzilla.redhat.com/show_bug.cgi?id=1429894)
|
||||
- Fix indirect rendering, add libGLX_indirect.so.0 symlink
|
||||
(https://bugzilla.redhat.com/show_bug.cgi?id=1427174)
|
||||
- added Requires to libglvnd0/libglvnd-devel where still needed
|
||||
- patches picked from fedora:
|
||||
http://pkgs.fedoraproject.org/cgit/rpms/mesa.git/tree/
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 22 11:21:25 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- re-enabled GLES build with libglvnd build, just not package GLES
|
||||
libs and require libglvnd0/libglvnd-devel instead
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 21 10:57:54 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
||||
* fixes libglvnd support for osmesa
|
||||
- archlinux_glvnd-fix-gl-dot-pc.patch
|
||||
* fixes libglvnd support in pkgconfig file
|
||||
- archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch/
|
||||
archlinux_0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
|
||||
* adds libglvnd support for EGL
|
||||
- patches picked from archlinux:
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/mesa
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 17 15:06:03 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- archlinux_glapi-Link-with-glapi-when-built-shared.patch
|
||||
* currently needed for libglvnd support; picked from archlinux
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/mesa
|
||||
- fixed typo in Requires to libglvnd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 9 14:20:22 UTC 2017 - sndirsch@suse.com
|
||||
|
||||
- build with libglvnd support enabled (can be easily disabled via
|
||||
specfile define); requires libglvnd runtime and development
|
||||
packages; disabled build of GLESv1/v2 libs/packages provided now
|
||||
via libglvnd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 4 16:29:46 UTC 2017 - mimi.vx@gmail.com
|
||||
|
||||
|
||||
136
Mesa.keyring
136
Mesa.keyring
@ -1,52 +1,90 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2
|
||||
|
||||
mQINBFQDrA8BEACyGXUc6vSmNkwZdTTzX1vHRgIDWoppot56E5oOO+gM6ukyMDY7
|
||||
60FxKvmh704I8NqTfg3Rcs18fSOXeRj1gDG84MsU7QM3g6IQyxCA+IV7d2r/DPZE
|
||||
z7HxEIKFxGJw24swsQJy/iiZf/b8flqiJbx3Ye1LF7T5iw/gKDsN6eqzAtLKqw9I
|
||||
/4TBVE766nwmKNQZiw2jAFCs3lwfmNIm7ZaQNBpHTRabMTLMJiFFynLsa1eVsf9D
|
||||
R3eVXW4c2oHKZbxDvSWR2yz6XcQ9ldii89sUNeclnjSFNOt761P4zBNwcEX2GuQs
|
||||
JO/haw5FyrMJJexAbdUTtshZ7XvhDv/UCHtyqQBUw/vwYe8Rx79Hq/fOOUdMjWOW
|
||||
cDCzyYTmGdbEJYRHrENcsOhoti3IkOjgzw0UDyCHyjapFV1ZJT/Kz7rkMmsdNtoi
|
||||
1BVTLIdOvQmeXQtN2caZSN20wZWHdZnrz1/JOfOxpEsf2R78zavIfobReQdFoYMC
|
||||
jv4b49WB/Gytd5vneqk9yi9DEhCYw5uGxQgjIKC4AZPVtD//GY+iYiPe5dPwrhU1
|
||||
FyD3b9SgYxFE/uZlgbzBIV4akK11vC5Q+Co5PYzhnPPgd7cYLjr/ceMfGPkeWLCY
|
||||
OxZbXg92BZKKJnFHYx7FJ04WKS8SjzIn/qEzvy7SmPGxSCX6zdwn0fKZYQARAQAB
|
||||
tCdFbWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT6JAjkEEwEC
|
||||
ACMFAlQDrA8CGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDtrjewLOtJ
|
||||
DV/AEACd/RKvSzL0L4/9HYvFskjNR40NPFyQHyMaPg9eeblhfbnH7mWYXJ2MPGTR
|
||||
bgvQCr0zZ3R7u8E8Rxulwifbm20x0WhYOKkDuSROjroRqvDhxfuLtXtBKqfVGw6T
|
||||
0rMEOOWdqGhql4yuVpqGbgHa5ZfFvQi2EtT40QDdD052adzWeT96aFQB6Gf3CRMf
|
||||
a4y7hawbUV10XL3BUljUcyh+SJv9lPclW09WNE+tuCmdIqoP927BSjXwh2GR6dM0
|
||||
z0aDf3wOxRc9S8q34jS+xN8hsXmYFAqkn0YkVIQ0M0PaQ89ltcyonbG6rZ+1rNgx
|
||||
tiLEpfOZpzr7LowVsw9R6ky/pvhBHfVIM4aT17hbi2XfnMihmt/T1SZqb36+aYFt
|
||||
j8Bc/o9I5crPXwOP4in3heY2ZmDWeGkPSRNix0VLQHL0HzOxjMAEm+y5ROLDo7Z/
|
||||
sGOebYxMYPIK5mJzrKhk737FEI57cvUSRXzbjmV3CIOIJbaNULWFXkCHRhdyk8mh
|
||||
sVzKkl7IDiWPBj1RC5r0EXmrjUzK8QfzrTWiOa6z9WIkZ4sSs0bz14Q4pZR2qi8L
|
||||
KLVjCNf/FusqCTgbZU06x1S/75XJwcsFENWkWYPEaxxzQiCs1rVzG8SnrOjcyc5F
|
||||
T0rEAQLWU7eq9U6nd4BXMkokiuzlOKWqsDyXibR3wkhI80kAJ7kCDQRUA6wPARAA
|
||||
s3BLiblcIb800EHz2X01BZ2w3VAxLVHIOlMyRNO3KFkK1Whw1l5PM0z1PxqBXhcb
|
||||
gEwPX4gEwFgBHoHoNDguwzUeP/NKqDUUVe/KEHnvWcgvAwSunOh0doZ/2+TB+oms
|
||||
DrsYVfMc/r6jXRy0eHoAPQfKnY8XPSwZ9HQI1lyNhMoIFEvA0mYFdM/B7YEQz9fK
|
||||
/6GiDa5d2E5E7OE9bWy+PPz0MRq3IAddXLyJh+CM4n3vK0HljJOD8N3zc/i7DqM9
|
||||
j5Lqi6lHwXdoYLNtwRmoE+F+niQuV+8RXMaRIG4pxhOLA9tYxh2P8zxEJPkh8YAy
|
||||
g4nLYZr80Pt1j8acxLZkNKPpuX9P9JmKtW1WerZuWyC0SrkozB0gEMzZpHPsNy52
|
||||
Hxem7d4m1tY51cx299VSa+fM5qS2bISoO5ddPHXm3gPhUt0qsWFk6mb+/MnTsyrI
|
||||
RREbmozhzq1pOXoXQXRzck+JrmifrHIGWqHXYu+VdDK8YfVUPVALgLADnM6da66w
|
||||
7qNolFuKN21O0KBjij09jWksLh3dsSJEKYrWkOKZIr2kHTQrjQwMelh66YPQArl1
|
||||
nk3A0qYAYwOB1vWvQIWn7NAoRfIaR6vCa4mT4YVBtdCkJ7fLzyqeezaXaUMRp0gA
|
||||
t2WLj2ekRMfzGI3yZso2eu1JvEUHmh49FBY+IqEPlWsAEQEAAYkCHwQYAQIACQUC
|
||||
VAOsDwIbDAAKCRDtrjewLOtJDbFTD/0e1rCRuRQEJXbirUAW/LxN3KuVhOyVONFc
|
||||
+iu6ua46wFtbYmiVXjIKZneCUkXYf6y38rQWa4w/iz3xtYqtGX9jSMSiR6OQRfyW
|
||||
lr/DdQXPCw1PAgx7gdSYg0TebzoHmOIDOUjquM5xnFgd32DbejaOzMiDGyzUOYvh
|
||||
yP+3j/nbUwI1hFkucVck1EyupF0aXPc2JJpCasZGTdRKL029ot177jSNbZ53Kbjj
|
||||
H+wWS4yT1EzutcVrRkErG+rvJozpNtKccNnjxygRYT6yKppUvc/8f1AnGdY0azr5
|
||||
d9jFU9SL+Vsm+jaS/pSWI7mwy6RL2kRHe0CVF33st2+8CX6ayXcAv5ur72Q/unRa
|
||||
qaXv5zjsMj7E8KgvUw3IEU/iQ/3WR27uf+AV1CrjRX3A2SossHiJD0/2zZvkjnwM
|
||||
pvHmH43V8LssfiwhKHmJu8SpHrDUHjrtI0eNKTyDT+7s0OFUbnQBlKgmpTO93m1e
|
||||
nK3ef8wcqkToST6DfCs3ePLsLRs1Y8Tryblds1c3OjSPyGWPbroUdW9ZlBkvA3lH
|
||||
RY3LXCO5wlyIEPHn1L42VQc7Bq2yRTm1PKxMQsLpFV/9KXzZiwP12xmh0LXIw3wG
|
||||
kLK/gqBFGHh/TO5DEl6X/TP380DYdazZpa31S+Ixwt+RkP9ZkvOWGMIG7Nf+G+r+
|
||||
Omj3BC4KcQ==
|
||||
=XQbm
|
||||
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
|
||||
=ttHE
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
119
Mesa.spec
119
Mesa.spec
@ -20,12 +20,16 @@
|
||||
# They may fix KDE on Nouveau. They may also deadlock your userland.
|
||||
%define use_broken_nouveau_locking_patches 0
|
||||
|
||||
%define libglvnd 0
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%define libglvnd 1
|
||||
%endif
|
||||
%define glamor 1
|
||||
%define _name_archive mesa
|
||||
%define _version 17.0.1
|
||||
%define _version 17.0.3
|
||||
%define with_opencl 0
|
||||
%define with_vulkan 0
|
||||
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
|
||||
%ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
|
||||
%define gallium_loader 1
|
||||
%else
|
||||
%define gallium_loader 0
|
||||
@ -41,15 +45,19 @@
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
%define with_nine 1
|
||||
%endif
|
||||
%if 0%{gallium_loader} && 0%{?suse_version} >= 1330
|
||||
# llvm >= 3.9 not provided for <= 1330
|
||||
%ifarch %ix86 x86_64 s390x
|
||||
%define with_opencl 1
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
%define with_vulkan 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Name: Mesa
|
||||
Version: 17.0.1
|
||||
Version: 17.0.3
|
||||
Release: 0
|
||||
Summary: System for rendering interactive 3-D graphics
|
||||
License: MIT
|
||||
@ -75,6 +83,13 @@ Patch15: u_mesa-8.0-llvmpipe-shmget.patch
|
||||
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
|
||||
# never to be upstreamed
|
||||
Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch
|
||||
# currently needed for libglvnd support
|
||||
Patch30: archlinux_glapi-Link-with-glapi-when-built-shared.patch
|
||||
Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
|
||||
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
|
||||
Patch33: archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
|
||||
Patch34: archlinux_0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
|
||||
Patch35: fedora_0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
|
||||
|
||||
# Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking
|
||||
Patch61: N_01-WIP-nouveau-add-locking.patch
|
||||
@ -103,6 +118,9 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.66
|
||||
BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.63
|
||||
BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66
|
||||
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56
|
||||
%if 0%{?libglvnd}
|
||||
BuildRequires: pkgconfig(libglvnd) >= 0.1.0
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libkms) >= 1.0.0
|
||||
BuildRequires: pkgconfig(libudev) > 151
|
||||
BuildRequires: pkgconfig(libva)
|
||||
@ -139,8 +157,12 @@ BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74
|
||||
%ifarch x86_64 %ix86
|
||||
BuildRequires: libelf-devel
|
||||
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.61
|
||||
%else
|
||||
%if 0%{with_opencl}
|
||||
BuildRequires: libelf-devel
|
||||
%endif
|
||||
# Requirments for wayland bumped up from 17.0
|
||||
%endif
|
||||
# Requirements for wayland bumped up from 17.0
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
@ -155,6 +177,10 @@ BuildRequires: libclc
|
||||
BuildRequires: llvm-clang-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd0 >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description
|
||||
Mesa is a 3-D graphics library with an API which is very similar to
|
||||
that of OpenGL.* To the extent that Mesa utilizes the OpenGL command
|
||||
@ -211,6 +237,9 @@ just Mesa or The Mesa 3-D graphics library.
|
||||
# Kudos to Debian for the descriptions
|
||||
Summary: Free implementation of the EGL API
|
||||
Group: System/Libraries
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd0 >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-libEGL1
|
||||
This package contains the EGL native platform graphics interface
|
||||
@ -227,6 +256,9 @@ support.
|
||||
Summary: Development files for the EGL API
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: Mesa-libEGL1 = %{version}
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd-devel >= 0.1.0
|
||||
%endif
|
||||
# Other requires taken care of by pkgconfig already
|
||||
|
||||
%description -n Mesa-libEGL-devel
|
||||
@ -243,6 +275,9 @@ programs against the EGL library.
|
||||
Summary: The GL/GLX runtime of the Mesa 3D graphics library
|
||||
Group: System/Libraries
|
||||
Requires: Mesa = %{version}
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd0 >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-libGL1
|
||||
Mesa is a software library for 3D computer graphics that provides a
|
||||
@ -258,6 +293,9 @@ the X Window System.
|
||||
Summary: GL/GLX development files of the OpenGL API
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: Mesa-libGL1 = %{version}
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd-devel >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-libGL-devel
|
||||
Mesa is a software library for 3D computer graphics that provides a
|
||||
@ -270,6 +308,9 @@ programs with Mesa.
|
||||
%package -n Mesa-libGLESv1_CM1
|
||||
Summary: Free implementation of the OpenGL|ES 1.x Common Profile API
|
||||
Group: System/Libraries
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd0 >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-libGLESv1_CM1
|
||||
OpenGL|ES is a cross-platform API for full-function 2D and 3D
|
||||
@ -283,6 +324,9 @@ 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}
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd-devel >= 0.1.0
|
||||
%endif
|
||||
Requires: pkgconfig(egl)
|
||||
|
||||
%description -n Mesa-libGLESv1_CM-devel
|
||||
@ -299,6 +343,9 @@ using the OpenGL|ES 1.x APIs.
|
||||
%package -n Mesa-libGLESv2-2
|
||||
Summary: Free implementation of the OpenGL|ES 2.x API
|
||||
Group: System/Libraries
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd0 >= 0.1.0
|
||||
%endif
|
||||
|
||||
%description -n Mesa-libGLESv2-2
|
||||
OpenGL|ES is a cross-platform API for full-function 2D and 3D
|
||||
@ -316,6 +363,9 @@ 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}
|
||||
%if 0%{?libglvnd}
|
||||
Requires: libglvnd-devel >= 0.1.0
|
||||
%endif
|
||||
Requires: pkgconfig(egl)
|
||||
|
||||
%description -n Mesa-libGLESv2-devel
|
||||
@ -333,7 +383,9 @@ applications using the OpenGL|ES 2.x APIs.
|
||||
%package -n Mesa-libGLESv3-devel
|
||||
Summary: Development files for the OpenGL ES 3.x API
|
||||
Group: Development/Libraries/C and C++
|
||||
%if 0%{?libglvnd} == 0
|
||||
Requires: Mesa-libGLESv2-2 = %{version}
|
||||
%endif
|
||||
Requires: pkgconfig(egl)
|
||||
|
||||
%description -n Mesa-libGLESv3-devel
|
||||
@ -347,8 +399,8 @@ applications using the OpenGL|ES 3.x APIs.
|
||||
|
||||
%package -n libOSMesa8
|
||||
Summary: Mesa Off-screen rendering extension
|
||||
# Wrongly named package shipped .so.8
|
||||
Group: System/Libraries
|
||||
# Wrongly named package shipped .so.8
|
||||
Obsoletes: libOSMesa9 < %{version}-%{release}
|
||||
Provides: libOSMesa9 = %{version}-%{release}
|
||||
|
||||
@ -454,8 +506,8 @@ implementation of Mesa.
|
||||
|
||||
%package libd3d
|
||||
Summary: Mesa Direct3D9 state tracker
|
||||
# Manually provide d3d library (bnc#918294)
|
||||
Group: System/Libraries
|
||||
# Manually provide d3d library (bnc#918294)
|
||||
%ifarch x86_64 s390x ppc64le aarch64
|
||||
Provides: d3dadapter9.so.1()(64bit)
|
||||
%else
|
||||
@ -606,6 +658,15 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
||||
%patch18 -p1
|
||||
%patch21 -p1
|
||||
|
||||
%if 0%{?libglvnd}
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
%patch33 -p1
|
||||
%patch34 -p1
|
||||
%patch35 -p1
|
||||
%endif
|
||||
|
||||
%if %{use_broken_nouveau_locking_patches}
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
@ -614,6 +675,13 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
||||
%patch65 -p1
|
||||
%endif
|
||||
|
||||
# Remove requires to libglvnd0/libglvnd-devel from baselibs.conf when
|
||||
# disabling libglvnd build; ugly ...
|
||||
%if 0%{?libglvnd} == 0
|
||||
grep -v libglvnd $RPM_SOURCE_DIR/baselibs.conf > $RPM_SOURCE_DIR/temp && \
|
||||
mv $RPM_SOURCE_DIR/temp $RPM_SOURCE_DIR/baselibs.conf
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} > 1320
|
||||
egl_platforms=x11,drm,wayland
|
||||
@ -622,7 +690,11 @@ egl_platforms=x11,drm
|
||||
%endif
|
||||
autoreconf -fvi
|
||||
|
||||
%configure --enable-gles1 \
|
||||
%configure \
|
||||
%if 0%{?libglvnd}
|
||||
--enable-libglvnd \
|
||||
%endif
|
||||
--enable-gles1 \
|
||||
--enable-gles2 \
|
||||
--enable-dri \
|
||||
--with-egl-platforms=$egl_platforms \
|
||||
@ -677,9 +749,16 @@ make %{?_smp_mflags}
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%if 0%{?libglvnd} == 0
|
||||
# Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306)
|
||||
test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \
|
||||
ln -s `readlink %{buildroot}%{_libdir}/libGL.so.1` %{buildroot}%{_libdir}/libGL.so.1.2
|
||||
%else
|
||||
rm -f %{buildroot}%{_libdir}/libGLES*
|
||||
# glvnd needs a default provider for indirect rendering where it cannot
|
||||
# determine the vendor
|
||||
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
|
||||
%endif
|
||||
|
||||
for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
|
||||
pushd $dir
|
||||
@ -703,6 +782,7 @@ done
|
||||
|
||||
%postun -n Mesa-libGL1 -p /sbin/ldconfig
|
||||
|
||||
%if 0%{?libglvnd} == 0
|
||||
%post -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
||||
@ -710,6 +790,7 @@ done
|
||||
%post -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
||||
|
||||
%postun -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%post -n libOSMesa8 -p /sbin/ldconfig
|
||||
|
||||
@ -789,46 +870,70 @@ done
|
||||
|
||||
%files -n Mesa-libEGL1
|
||||
%defattr(-,root,root)
|
||||
%if 0%{?libglvnd}
|
||||
%{_libdir}/libEGL_mesa.so*
|
||||
%dir %{_datadir}/glvnd
|
||||
%dir %{_datadir}/glvnd/egl_vendor.d
|
||||
%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
|
||||
%else
|
||||
%{_libdir}/libEGL.so.1*
|
||||
%endif
|
||||
|
||||
%files -n Mesa-libEGL-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/EGL
|
||||
%{_includedir}/KHR
|
||||
%if !0%{?libglvnd}
|
||||
%{_libdir}/libEGL.so
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/egl.pc
|
||||
|
||||
%files -n Mesa-libGL1
|
||||
%defattr(-,root,root)
|
||||
%if 0%{?libglvnd}
|
||||
%{_libdir}/libGLX_mesa.so*
|
||||
%{_libdir}/libGLX_indirect.so*
|
||||
%else
|
||||
%{_libdir}/libGL.so.1*
|
||||
%endif
|
||||
|
||||
%files -n Mesa-libGL-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/GL
|
||||
%{_includedir}/GL/*.h
|
||||
%exclude %{_includedir}/GL/osmesa.h
|
||||
%if 0%{?libglvnd} == 0
|
||||
%{_libdir}/libGL.so
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/gl.pc
|
||||
%{_mandir}/man3/gl[A-Z]*
|
||||
|
||||
%files -n Mesa-libGLESv1_CM1
|
||||
%defattr(-,root,root)
|
||||
%if 0%{?libglvnd} == 0
|
||||
%{_libdir}/libGLESv1_CM.so.1*
|
||||
%endif
|
||||
|
||||
%files -n Mesa-libGLESv1_CM-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/GLES
|
||||
%if 0%{?libglvnd} == 0
|
||||
%{_libdir}/libGLESv1_CM.so
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/glesv1_cm.pc
|
||||
|
||||
%files -n Mesa-libGLESv2-2
|
||||
%defattr(-,root,root)
|
||||
%if 0%{?libglvnd} == 0
|
||||
%{_libdir}/libGLESv2.so.2*
|
||||
%endif
|
||||
|
||||
%files -n Mesa-libGLESv2-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/GLES2
|
||||
%if 0%{?libglvnd} == 0
|
||||
%{_libdir}/libGLESv2.so
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/glesv2.pc
|
||||
|
||||
%files -n Mesa-libGLESv3-devel
|
||||
|
||||
3940
archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
Normal file
3940
archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
Normal file
File diff suppressed because it is too large
Load Diff
26
archlinux_0001-Fix-linkage-against-shared-glapi.patch
Normal file
26
archlinux_0001-Fix-linkage-against-shared-glapi.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed, 12 Oct 2016 13:41:33 -0400
|
||||
Subject: [PATCH] Fix linkage against shared glapi
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
src/gallium/targets/osmesa/Makefile.am | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
|
||||
index 5d39486..04add87 100644
|
||||
--- a/src/gallium/targets/osmesa/Makefile.am
|
||||
+++ b/src/gallium/targets/osmesa/Makefile.am
|
||||
@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
|
||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
|
||||
- $(top_builddir)/src/mapi/glapi/libglapi.la \
|
||||
+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
|
||||
$(SHARED_GLAPI_LIB) \
|
||||
$(OSMESA_LIB_DEPS) \
|
||||
$(CLOCK_LIB)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From 2d4094c2caad6cef2f5544b3966fcc37ceb32036 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Brenneman <kbrenneman@nvidia.com>
|
||||
Date: Thu, 5 Jan 2017 14:29:47 -0700
|
||||
Subject: [PATCH 2/2] fixup! EGL: Implement the libglvnd interface for EGL (v2)
|
||||
|
||||
---
|
||||
src/egl/generate/eglFunctionList.py | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/egl/generate/eglFunctionList.py b/src/egl/generate/eglFunctionList.py
|
||||
index b19b5f7193..80cb83437c 100644
|
||||
--- a/src/egl/generate/eglFunctionList.py
|
||||
+++ b/src/egl/generate/eglFunctionList.py
|
||||
@@ -53,12 +53,14 @@ method values:
|
||||
Select the vendor that owns the current context.
|
||||
"""
|
||||
|
||||
-def _eglFunc(name, method, static=False, public=False, inheader=None, prefix="", extension=None, retval=None):
|
||||
+def _eglFunc(name, method, static=None, public=False, inheader=None, prefix="dispatch_", extension=None, retval=None):
|
||||
"""
|
||||
A convenience function to define an entry in the EGL function list.
|
||||
"""
|
||||
+ if static is None:
|
||||
+ static = (not public and method != "custom")
|
||||
if inheader is None:
|
||||
- inheader = (not public)
|
||||
+ inheader = (not static)
|
||||
values = {
|
||||
"method" : method,
|
||||
"prefix" : prefix,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
82
archlinux_glapi-Link-with-glapi-when-built-shared.patch
Normal file
82
archlinux_glapi-Link-with-glapi-when-built-shared.patch
Normal file
@ -0,0 +1,82 @@
|
||||
From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Chauvet <kwizart@gmail.com>
|
||||
Date: Tue, 25 Oct 2016 09:35:13 +0200
|
||||
Subject: [PATCH 1/3] glapi: Link with glapi when built shared
|
||||
|
||||
This patch explicitly links to libglapi when built shared.
|
||||
This was specially needed to avoid undefined non-weak-symbol as shown
|
||||
with:
|
||||
|
||||
ldd -r /usr/lib64/dri/i915_dri.so
|
||||
linux-vdso.so.1 (0x00007fff821f4000)
|
||||
libdrm_intel.so.1 => /lib64/libdrm_intel.so.1 (0x00007f6adf2c7000)
|
||||
libdrm_nouveau.so.2 => /lib64/libdrm_nouveau.so.2 (0x00007f6adf0be000)
|
||||
libdrm_radeon.so.1 => /lib64/libdrm_radeon.so.1 (0x00007f6adeeb2000)
|
||||
libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6adec8b000)
|
||||
libdrm.so.2 => /lib64/libdrm.so.2 (0x00007f6adea7c000)
|
||||
libexpat.so.1 => /lib64/libexpat.so.1 (0x00007f6ade84f000)
|
||||
libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6ade633000)
|
||||
libdl.so.2 => /lib64/libdl.so.2 (0x00007f6ade42f000)
|
||||
libm.so.6 => /lib64/libm.so.6 (0x00007f6ade125000)
|
||||
libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f6addf0e000)
|
||||
libc.so.6 => /lib64/libc.so.6 (0x00007f6addb4c000)
|
||||
/lib64/ld-linux-x86-64.so.2 (0x000056274e913000)
|
||||
libpciaccess.so.0 => /lib64/libpciaccess.so.0 (0x00007f6add941000)
|
||||
libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f6add6ce000)
|
||||
undefined symbol: _glapi_get_dispatch_table_size (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_get_context (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_add_dispatch (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_check_multithread (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_tls_Context (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_set_context (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_set_dispatch (/usr/lib64/dri/i915_dri.so)
|
||||
undefined symbol: _glapi_tls_Dispatch (/usr/lib64/dri/i915_dri.so)
|
||||
|
||||
v3: Add gallium counterpart for radeon cases
|
||||
Reported-by: Jonathan Dieter <jdieter@lesbg.com>
|
||||
|
||||
v2: Add Bugzilla and Signed-off
|
||||
|
||||
Fixes: 0cbc90c57c ("mesa: dri: Add shared glapi to LIBADD on Android")
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428
|
||||
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
||||
---
|
||||
src/gallium/targets/dri/Makefile.am | 2 --
|
||||
src/mesa/drivers/dri/Makefile.am | 3 ---
|
||||
2 files changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
|
||||
index bca747f..05f6c8c 100644
|
||||
--- a/src/gallium/targets/dri/Makefile.am
|
||||
+++ b/src/gallium/targets/dri/Makefile.am
|
||||
@@ -1,10 +1,8 @@
|
||||
include $(top_srcdir)/src/gallium/Automake.inc
|
||||
|
||||
-if HAVE_ANDROID
|
||||
if HAVE_SHARED_GLAPI
|
||||
SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
|
||||
endif
|
||||
-endif
|
||||
|
||||
AM_CFLAGS = \
|
||||
-I$(top_srcdir)/src/mapi \
|
||||
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
|
||||
index 1c6dd08..8e68fc0 100644
|
||||
--- a/src/mesa/drivers/dri/Makefile.am
|
||||
+++ b/src/mesa/drivers/dri/Makefile.am
|
||||
@@ -6,12 +6,9 @@ MEGADRIVERS_DEPS =
|
||||
|
||||
SUBDIRS+=common
|
||||
|
||||
-# On Android, we need to explicitly link to libglapi.so.
|
||||
-if HAVE_ANDROID
|
||||
if HAVE_SHARED_GLAPI
|
||||
SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
|
||||
endif
|
||||
-endif
|
||||
|
||||
if HAVE_I915_DRI
|
||||
SUBDIRS += i915
|
||||
--
|
||||
2.7.4
|
||||
|
||||
12
archlinux_glvnd-fix-gl-dot-pc.patch
Normal file
12
archlinux_glvnd-fix-gl-dot-pc.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
|
||||
--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500
|
||||
+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
|
||||
@@ -7,7 +7,7 @@ Name: gl
|
||||
Description: Mesa OpenGL library
|
||||
Requires.private: @GL_PC_REQ_PRIV@
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Libs: -L${libdir} -l@GL_LIB@
|
||||
+Libs: -L${libdir} -lGL
|
||||
Libs.private: @GL_PC_LIB_PRIV@
|
||||
Cflags: -I${includedir} @GL_PC_CFLAGS@
|
||||
glx_tls: @GLX_TLS@
|
||||
@ -3,6 +3,7 @@ Mesa
|
||||
provides "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
|
||||
provides "Mesa-libIndirectGL1-<targettype> = <version>"
|
||||
obsoletes "Mesa-libIndirectGL1-<targettype> < <version>"
|
||||
requires "libglvnd0-<targettype> >= 0.1.0"
|
||||
Mesa-devel
|
||||
#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
|
||||
requires "Mesa-<targettype> = <version>"
|
||||
@ -14,28 +15,36 @@ Mesa-devel
|
||||
requires "Mesa-libglapi-devel-<targettype> = <version>"
|
||||
requires "libOSMesa-devel-<targettype> = <version>"
|
||||
requires "libgbm-devel-<targettype> = <version>"
|
||||
#Activate libwayland-egl-devel once 12.2 is gone
|
||||
#requires "libwayland-egl-devel-<targettype> = <version>"
|
||||
requires "libwayland-egl-devel-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
|
||||
provides "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
|
||||
obsoletes "Mesa-libIndirectGL-devel-<targettype> < <version>"
|
||||
provides "Mesa-libIndirectGL-devel-<targettype> = <version>"
|
||||
|
||||
Mesa-libEGL1
|
||||
requires "libglvnd0-<targettype> >= 0.1.0"
|
||||
Mesa-libEGL-devel
|
||||
requires "Mesa-libEGL1-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
Mesa-libGL1
|
||||
requires "Mesa-<targettype>"
|
||||
requires "libglvnd0-<targettype> >= 0.1.0"
|
||||
Mesa-libGL-devel
|
||||
requires "Mesa-libGL1-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
Mesa-libGLESv1_CM1
|
||||
requires "libglvnd0-<targettype> >= 0.1.0"
|
||||
Mesa-libGLESv1_CM-devel
|
||||
requires "Mesa-libEGL-devel-<targettype> = <version>"
|
||||
requires "Mesa-libGLESv1_CM1-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
Mesa-libGLESv2-2
|
||||
requires "libglvnd0-<targettype> >= 0.1.0"
|
||||
Mesa-libGLESv2-devel
|
||||
requires "Mesa-libEGL-devel-<targettype> = <version>"
|
||||
requires "Mesa-libGLESv2-2-<targettype> = <version>"
|
||||
requires "libglvnd-devel-<targettype> >= 0.1.0"
|
||||
Mesa-libGLESv3-devel
|
||||
requires "Mesa-libEGL-devel-<targettype> = <version>"
|
||||
libOSMesa8
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
From efa4f2ebc1e788c3f1cfcf3842058cf838171653 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Mon, 20 Mar 2017 08:41:26 +0100
|
||||
Subject: [PATCH] glxglvnddispatch: Add missing dispatch for GetDriverConfig
|
||||
|
||||
Together with some fixes to xdriinfo this fixes xdriinfo not working
|
||||
with glvnd.
|
||||
|
||||
Since apps (xdriinfo) expect GetDriverConfig to work without going to
|
||||
need through the dance to setup a glxcontext (which is a reasonable
|
||||
expectation IMHO), the dispatch for this ends up significantly different
|
||||
then any other dispatch function.
|
||||
|
||||
This patch gets the job done, but I'm not really happy with how this
|
||||
patch turned out, suggestions for a better fix are welcome.
|
||||
|
||||
Cc: Kyle Brenneman <kbrenneman@nvidia.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
src/glx/g_glxglvnddispatchfuncs.c | 18 ++++++++++++++++++
|
||||
src/glx/g_glxglvnddispatchindices.h | 1 +
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c
|
||||
index b5e3398..040cdf8 100644
|
||||
--- a/src/glx/g_glxglvnddispatchfuncs.c
|
||||
+++ b/src/glx/g_glxglvnddispatchfuncs.c
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include "glxclient.h"
|
||||
#include "glxglvnd.h"
|
||||
#include "glxglvnddispatchfuncs.h"
|
||||
#include "g_glxglvnddispatchindices.h"
|
||||
@@ -50,6 +51,7 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] = {
|
||||
__ATTRIB(GetCurrentDisplayEXT),
|
||||
// glXGetCurrentDrawable implemented by libglvnd
|
||||
// glXGetCurrentReadDrawable implemented by libglvnd
|
||||
+ __ATTRIB(GetDriverConfig),
|
||||
// glXGetFBConfigAttrib implemented by libglvnd
|
||||
__ATTRIB(GetFBConfigAttribSGIX),
|
||||
__ATTRIB(GetFBConfigFromVisualSGIX),
|
||||
@@ -334,6 +336,21 @@ static Display *dispatch_GetCurrentDisplayEXT(void)
|
||||
|
||||
|
||||
|
||||
+static const char *dispatch_GetDriverConfig(const char *driverName)
|
||||
+{
|
||||
+ /*
|
||||
+ * The options are constant for a given driverName, so we do not need
|
||||
+ * a context (and apps expect to be able to call this without one).
|
||||
+ */
|
||||
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
|
||||
+ return glXGetDriverConfig(driverName);
|
||||
+#else
|
||||
+ return NULL;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
static int dispatch_GetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config,
|
||||
int attribute, int *value_return)
|
||||
{
|
||||
@@ -939,6 +956,7 @@ const void * const __glXDispatchFunctions[DI_LAST_INDEX + 1] = {
|
||||
__ATTRIB(DestroyGLXPbufferSGIX),
|
||||
__ATTRIB(GetContextIDEXT),
|
||||
__ATTRIB(GetCurrentDisplayEXT),
|
||||
+ __ATTRIB(GetDriverConfig),
|
||||
__ATTRIB(GetFBConfigAttribSGIX),
|
||||
__ATTRIB(GetFBConfigFromVisualSGIX),
|
||||
__ATTRIB(GetMscRateOML),
|
||||
diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h
|
||||
index 05a2c8c..3ba50a7 100644
|
||||
--- a/src/glx/g_glxglvnddispatchindices.h
|
||||
+++ b/src/glx/g_glxglvnddispatchindices.h
|
||||
@@ -39,6 +39,7 @@ typedef enum __GLXdispatchIndex {
|
||||
DI_GetCurrentDisplayEXT,
|
||||
// GetCurrentDrawable implemented by libglvnd
|
||||
// GetCurrentReadDrawable implemented by libglvnd
|
||||
+ DI_GetDriverConfig,
|
||||
// GetFBConfigAttrib implemented by libglvnd
|
||||
DI_GetFBConfigAttribSGIX,
|
||||
DI_GetFBConfigFromVisualSGIX,
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c
|
||||
size 9447712
|
||||
Binary file not shown.
3
mesa-17.0.3.tar.xz
Normal file
3
mesa-17.0.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed
|
||||
size 9485792
|
||||
BIN
mesa-17.0.3.tar.xz.sig
Normal file
BIN
mesa-17.0.3.tar.xz.sig
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user