Accepting request 710853 from X11:XOrg

- reverted latest change in specfile; it's not needed; llvm8 is
  already been chosen on factory/TW by default ...

- use llvm8 on factory/TW 

- n_glesv1_cm-glesv2.patch
  * reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for 
  * pkgconfig(glesv1_cm)
  * pkgconfig(glesv2)

- reenable LTO with Mesa 19.1 (boo#1133265, comment#5) 
- enabled new gallium drivers
  * iris (newer Intel GPUs) 
  * lima, panfrost on ARM64
- virtually provide
  * pkgconfig(glesv1_cm)
  * pkgconfig(glesv2)
  in libGLESv1_CM-devel/libGLESv2-devel packages, since these files
  have been removed from Mesa via git commit #1587586

- Update to 19.1.0:
  * Mesa 19.1.0 implements the OpenGL 4.5 API, but the version
    reported by glGetString(GL_VERSION) or
    glGetIntegerv(GL_MAJOR_VERSION) /
    glGetIntegerv(GL_MINOR_VERSION) depends on the particular
    driver being used. Some drivers don't support all the features
    required in OpenGL 4.5. OpenGL 4.5 is only available if
    requested at context creation. Compatibility contexts may
    report a lower version depending on each driver.
  * The top highlights include:
    - GL_ARB_parallel_shader_compile for all drivers.
    - GL_EXT_gpu_shader4 on all GL 3.1 drivers.
    - GL_EXT_shader_image_load_formatted on radeonsi.
    - GL_EXT_texture_buffer_object on all GL 3.1 drivers.
    - GL_EXT_texture_compression_s3tc_srgb on Gallium and i965
      drivers (ES extension).
    - GL_NV_compute_shader_derivatives on Iris and i965 drivers.
    - GL_KHR_parallel_shader_compile on all drivers.
    - GL_INTEL_conservative_rasterization on Iris.
- Refresh patches with quilt.
- Clean-up spec files for .pc and other files no longer built.

OBS-URL: https://build.opensuse.org/request/show/710853
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=350
This commit is contained in:
Dominique Leuenberger 2019-06-27 13:52:10 +00:00 committed by Git OBS Bridge
commit bf6df0745b
11 changed files with 160 additions and 47 deletions

View File

@ -1,3 +1,62 @@
-------------------------------------------------------------------
Wed Jun 19 09:17:51 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reverted latest change in specfile; it's not needed; llvm8 is
already been chosen on factory/TW by default ...
-------------------------------------------------------------------
Tue Jun 18 09:29:26 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- use llvm8 on factory/TW
-------------------------------------------------------------------
Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- n_glesv1_cm-glesv2.patch
* reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
-------------------------------------------------------------------
Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reenable LTO with Mesa 19.1 (boo#1133265, comment#5)
- enabled new gallium drivers
* iris (newer Intel GPUs)
* lima, panfrost on ARM64
- virtually provide
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
in libGLESv1_CM-devel/libGLESv2-devel packages, since these files
have been removed from Mesa via git commit #1587586
-------------------------------------------------------------------
Tue Jun 11 20:06:36 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to 19.1.0:
* Mesa 19.1.0 implements the OpenGL 4.5 API, but the version
reported by glGetString(GL_VERSION) or
glGetIntegerv(GL_MAJOR_VERSION) /
glGetIntegerv(GL_MINOR_VERSION) depends on the particular
driver being used. Some drivers don't support all the features
required in OpenGL 4.5. OpenGL 4.5 is only available if
requested at context creation. Compatibility contexts may
report a lower version depending on each driver.
* The top highlights include:
- GL_ARB_parallel_shader_compile for all drivers.
- GL_EXT_gpu_shader4 on all GL 3.1 drivers.
- GL_EXT_shader_image_load_formatted on radeonsi.
- GL_EXT_texture_buffer_object on all GL 3.1 drivers.
- GL_EXT_texture_compression_s3tc_srgb on Gallium and i965
drivers (ES extension).
- GL_NV_compute_shader_derivatives on Iris and i965 drivers.
- GL_KHR_parallel_shader_compile on all drivers.
- GL_INTEL_conservative_rasterization on Iris.
- Refresh patches with quilt.
- Clean-up spec files for .pc and other files no longer built.
-------------------------------------------------------------------
Wed May 22 10:21:16 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -42,7 +42,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 19.0.5
%define _version 19.1.0
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -110,7 +110,7 @@
%endif
Name: Mesa-drivers
Version: 19.0.5
Version: 19.1.0
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@ -131,6 +131,7 @@ Source7: Mesa.keyring
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch60: n_glesv1_cm-glesv2.patch
BuildRequires: bison
BuildRequires: fdupes
@ -730,6 +731,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch54 -p1
%patch58 -p1
%patch60 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -746,7 +748,6 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif
%build
%define _lto_cflags %{nil}
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,surfaceless,wayland
%else
@ -804,11 +805,11 @@ egl_platforms=x11,drm,surfaceless
%endif
%ifarch %{ix86} x86_64
-Ddri-drivers=i915,i965,nouveau,r100,r200 \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \
%else
%ifarch %{arm} aarch64
-Ddri-drivers=nouveau \
-Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv \
-Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost \
%else
%ifarch ppc64 ppc64le
-Ddri-drivers=nouveau \
@ -1019,8 +1020,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%files libGLESv3-devel
%{_includedir}/GLES3
#%%_libdir/libGLESv3.so
#%%_libdir/pkgconfig/glesv3.pc
%files -n libOSMesa8
%{_libdir}/libOSMesa.so.8.0.0
@ -1054,15 +1053,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support}
%files -n libXvMC_nouveau
%{_libdir}/libXvMCnouveau.so
#%{_libdir}/libXvMCnouveau.so.1
#%{_libdir}/libXvMCnouveau.so.1.0
#%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600
%{_libdir}/libXvMCr600.so
#%{_libdir}/libXvMCr600.so.1
#%{_libdir}/libXvMCr600.so.1.0
#%{_libdir}/libXvMCr600.so.1.0.0
%endif
%if %{vdpau_nouveau}
@ -1152,7 +1145,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%files -n Mesa-libd3d
%dir %{_libdir}/d3d/
%{_libdir}/d3d/*.so.*
#%%{_sysconfdir}/OpenCL/vendors/mesa.icd
%files -n Mesa-libd3d-devel
%{_libdir}/pkgconfig/d3d.pc

View File

@ -1,3 +1,62 @@
-------------------------------------------------------------------
Wed Jun 19 09:17:51 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reverted latest change in specfile; it's not needed; llvm8 is
already been chosen on factory/TW by default ...
-------------------------------------------------------------------
Tue Jun 18 09:29:26 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- use llvm8 on factory/TW
-------------------------------------------------------------------
Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- n_glesv1_cm-glesv2.patch
* reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
-------------------------------------------------------------------
Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reenable LTO with Mesa 19.1 (boo#1133265, comment#5)
- enabled new gallium drivers
* iris (newer Intel GPUs)
* lima, panfrost on ARM64
- virtually provide
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
in libGLESv1_CM-devel/libGLESv2-devel packages, since these files
have been removed from Mesa via git commit #1587586
-------------------------------------------------------------------
Tue Jun 11 20:06:36 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to 19.1.0:
* Mesa 19.1.0 implements the OpenGL 4.5 API, but the version
reported by glGetString(GL_VERSION) or
glGetIntegerv(GL_MAJOR_VERSION) /
glGetIntegerv(GL_MINOR_VERSION) depends on the particular
driver being used. Some drivers don't support all the features
required in OpenGL 4.5. OpenGL 4.5 is only available if
requested at context creation. Compatibility contexts may
report a lower version depending on each driver.
* The top highlights include:
- GL_ARB_parallel_shader_compile for all drivers.
- GL_EXT_gpu_shader4 on all GL 3.1 drivers.
- GL_EXT_shader_image_load_formatted on radeonsi.
- GL_EXT_texture_buffer_object on all GL 3.1 drivers.
- GL_EXT_texture_compression_s3tc_srgb on Gallium and i965
drivers (ES extension).
- GL_NV_compute_shader_derivatives on Iris and i965 drivers.
- GL_KHR_parallel_shader_compile on all drivers.
- GL_INTEL_conservative_rasterization on Iris.
- Refresh patches with quilt.
- Clean-up spec files for .pc and other files no longer built.
-------------------------------------------------------------------
Wed May 22 10:21:16 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -41,7 +41,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 19.0.5
%define _version 19.1.0
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -109,7 +109,7 @@
%endif
Name: Mesa
Version: 19.0.5
Version: 19.1.0
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@ -130,6 +130,7 @@ Source7: Mesa.keyring
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch60: n_glesv1_cm-glesv2.patch
BuildRequires: bison
BuildRequires: fdupes
@ -729,6 +730,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch54 -p1
%patch58 -p1
%patch60 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@ -745,7 +747,6 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif
%build
%define _lto_cflags %{nil}
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,surfaceless,wayland
%else
@ -803,11 +804,11 @@ egl_platforms=x11,drm,surfaceless
%endif
%ifarch %{ix86} x86_64
-Ddri-drivers=i915,i965,nouveau,r100,r200 \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
-Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \
%else
%ifarch %{arm} aarch64
-Ddri-drivers=nouveau \
-Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv \
-Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost \
%else
%ifarch ppc64 ppc64le
-Ddri-drivers=nouveau \
@ -1018,8 +1019,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%files libGLESv3-devel
%{_includedir}/GLES3
#%%_libdir/libGLESv3.so
#%%_libdir/pkgconfig/glesv3.pc
%files -n libOSMesa8
%{_libdir}/libOSMesa.so.8.0.0
@ -1053,15 +1052,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support}
%files -n libXvMC_nouveau
%{_libdir}/libXvMCnouveau.so
#%{_libdir}/libXvMCnouveau.so.1
#%{_libdir}/libXvMCnouveau.so.1.0
#%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600
%{_libdir}/libXvMCr600.so
#%{_libdir}/libXvMCr600.so.1
#%{_libdir}/libXvMCr600.so.1.0
#%{_libdir}/libXvMCr600.so.1.0.0
%endif
%if %{vdpau_nouveau}
@ -1151,7 +1144,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%files -n Mesa-libd3d
%dir %{_libdir}/d3d/
%{_libdir}/d3d/*.so.*
#%%{_sysconfdir}/OpenCL/vendors/mesa.icd
%files -n Mesa-libd3d-devel
%{_libdir}/pkgconfig/d3d.pc

View File

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

Binary file not shown.

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

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

BIN
mesa-19.1.0.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,10 +1,10 @@
Index: mesa-19.0.0/src/util/00-mesa-defaults.conf
Index: mesa-19.1.0/src/util/00-mesa-defaults.conf
===================================================================
--- mesa-19.0.0.orig/src/util/00-mesa-defaults.conf
+++ mesa-19.0.0/src/util/00-mesa-defaults.conf
@@ -412,6 +412,11 @@ TODO: document the other workarounds.
<application name="mpv" executable="mpv">
<option name="adaptive_sync" value="false" />
--- mesa-19.1.0.orig/src/util/00-mesa-defaults.conf 2019-06-11 17:12:51.000000000 +0200
+++ mesa-19.1.0/src/util/00-mesa-defaults.conf 2019-06-11 22:12:04.431893217 +0200
@@ -451,6 +451,11 @@ TODO: document the other workarounds.
<application name="Rayman Legends" executable="Rayman Legends.exe">
<option name="dynamic_texture_workaround" value="true" />
</application>
+
+ <!-- This is workaround to prevent distorted colors on hardware accelerated video in Chromium. https://bugzilla.opensuse.org/show_bug.cgi?id=1113211 -->

11
n_glesv1_cm-glesv2.patch Normal file
View File

@ -0,0 +1,11 @@
--- mesa/src/mapi/meson.build.orig 2019-06-13 11:14:34.705848000 +0200
+++ mesa/src/mapi/meson.build 2019-06-13 11:21:00.995161000 +0200
@@ -35,7 +35,7 @@ if with_shared_glapi
else
libglapi = []
endif
-if not with_glvnd
+if with_glvnd
if with_gles1
subdir('es1api')
endif

View File

@ -1,8 +1,8 @@
Index: mesa-18.3.4/meson.build
Index: mesa-19.1.0/meson.build
===================================================================
--- mesa-18.3.4.orig/meson.build
+++ mesa-18.3.4/meson.build
@@ -1379,10 +1379,12 @@ if with_platform_x11
--- mesa-19.1.0.orig/meson.build 2019-06-11 17:12:50.000000000 +0200
+++ mesa-19.1.0/meson.build 2019-06-11 22:28:12.967838857 +0200
@@ -1414,10 +1414,12 @@ if with_platform_x11
dep_x11_xcb = dependency('x11-xcb')
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
@ -15,12 +15,12 @@ Index: mesa-18.3.4/meson.build
dep_xcb_dri3 = dependency('xcb-dri3')
dep_xcb_present = dependency('xcb-present')
# until xcb-dri3 has been around long enough to make a hard-dependency:
Index: mesa-18.3.4/src/loader/meson.build
Index: mesa-19.1.0/src/loader/meson.build
===================================================================
--- mesa-18.3.4.orig/src/loader/meson.build
+++ mesa-18.3.4/src/loader/meson.build
--- mesa-19.1.0.orig/src/loader/meson.build 2019-06-11 17:12:51.000000000 +0200
+++ mesa-19.1.0/src/loader/meson.build 2019-06-11 22:28:12.967838857 +0200
@@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3
include_directories : [inc_include, inc_src, inc_drm_uapi],
include_directories : [inc_include, inc_src],
dependencies : [
dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
+ dep_xcb,