pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 494543 from X11:XOrg

Browse Source 
- baselibs.conf: libglvnd0 -> libglvnd; missed the package name
  change in libglvnd package (boo#1038619)

- update to 17.1.0
- drop upstreamed patches:
    archlinux_0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
    archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
    archlinux_glapi-Link-with-glapi-when-built-shared.patch
+ New major release with:
  + OpenGL 4.2 support for Intel Ivy Bridge chips.
  + The RADV driver passes the Khronos CTS
  + Shader on-disk cache. Improving the startup and shader compilation
      times in some games.
  + This release includes significant performance improvements for games by
     Feral Interactive.
 * for full list of changes please check docs/relnotes/17.1.0.html

OBS-URL: https://build.opensuse.org/request/show/494543
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=290
This commit is contained in:
Dominique Leuenberger 2017-05-20 08:07:19 +00:00 committed by Git OBS Bridge
commit a51e3a5bbd
10 changed files with 41 additions and 4078 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Mesa.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu May 11 09:10:25 UTC 2017 - sndirsch@suse.com
- baselibs.conf: libglvnd0 -> libglvnd; missed the package name
change in libglvnd package (boo#1038619)
-------------------------------------------------------------------
Wed May 10 17:44:38 UTC 2017 - mimi.vx@gmail.com
- update to 17.1.0
- drop upstreamed patches:
archlinux_0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
archlinux_glapi-Link-with-glapi-when-built-shared.patch
+ New major release with:
+ OpenGL 4.2 support for Intel Ivy Bridge chips.
+ The RADV driver passes the Khronos CTS
+ Shader on-disk cache. Improving the startup and shader compilation
times in some games.
+ This release includes significant performance improvements for games by
Feral Interactive.
* for full list of changes please check docs/relnotes/17.1.0.html
-------------------------------------------------------------------
Sat Apr 29 06:36:50 UTC 2017 - mimi.vx@gmail.com

24
Mesa.spec
View File

@ -22,7 +22,7 @@
%endif
%define glamor 1
%define _name_archive mesa
%define _version 17.0.5
%define _version 17.1.0
%define with_opencl 0
%define with_vulkan 0
%ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
@ -54,7 +54,7 @@
%endif
Name: Mesa
Version: 17.0.5
Version: 17.1.0
Release: 0
Summary: System for rendering interactive 3-D graphics
License: MIT
@ -82,11 +82,8 @@ 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
Patch40: u_gallivm-correct-channel-shift-logic-on-big-endian.patch
@ -106,10 +103,10 @@ BuildRequires: pkgconfig(dri2proto)
BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(libdrm) >= 2.4.66
BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.63
BuildRequires: pkgconfig(libdrm) >= 2.4.75
BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.79
BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71
%if 0%{?libglvnd}
BuildRequires: pkgconfig(libglvnd) >= 0.1.0
%endif
@ -145,10 +142,11 @@ Obsoletes: xorg-x11-Mesa < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch %arm
BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74
BuildRequires: pkgconfig(libelf)
%endif
%ifarch x86_64 %ix86
BuildRequires: libelf-devel
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.61
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75
%else
%if 0%{with_opencl}
BuildRequires: libelf-devel
@ -654,11 +652,8 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch21 -p1
%if 0%{?libglvnd}
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%endif
@ -686,12 +681,11 @@ autoreconf -fvi
--enable-gles1 \
--enable-gles2 \
--enable-dri \
--with-egl-platforms=$egl_platforms \
--with-platforms=$egl_platforms \
--enable-shared-glapi \
--enable-texture-float \
--enable-osmesa \
--enable-dri3 \
--enable-shader-cache \
%{?with_nine:--enable-nine} \
%if %{glamor}
--enable-gbm \
@ -703,7 +697,7 @@ autoreconf -fvi
%endif
--with-dri-searchpath=%{_libdir}/dri \
%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64
--enable-gallium-llvm \
--enable-llvm \
--enable-llvm-shared-libs \
%endif
--enable-vdpau \

3940
archlinux_0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
View File

File diff suppressed because it is too large Load Diff

33
archlinux_0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
View File

@ -1,33 +0,0 @@
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
View File

@ -1,82 +0,0 @@
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

10
baselibs.conf
View File

@ -3,7 +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"
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-devel
#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
requires "Mesa-<targettype> = <version>"
@ -23,24 +23,24 @@ Mesa-devel
provides "Mesa-libIndirectGL-devel-<targettype> = <version>"
Mesa-libEGL1
requires "libglvnd0-<targettype> >= 0.1.0"
requires "libglvnd-<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"
requires "libglvnd-<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"
requires "libglvnd-<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"
requires "libglvnd-<targettype> >= 0.1.0"
Mesa-libGLESv2-devel
requires "Mesa-libEGL-devel-<targettype> = <version>"
requires "Mesa-libGLESv2-2-<targettype> = <version>"

3
mesa-17.0.5.tar.xz
View File

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

BIN
mesa-17.0.5.tar.xz.sig
View File

Binary file not shown.

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

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

BIN
mesa-17.1.0.tar.xz.sig Normal file
View File

Binary file not shown.