From b5c9a5fae4be16873b7bcc8fd07f252b15a9ac4ead752521ca480f5233677c86 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 25 Sep 2019 18:06:30 +0000 Subject: [PATCH 01/25] - fixed build against latest libXvMC 1.0.12 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=864 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 4 ++++ Mesa.changes | 5 +++++ Mesa.spec | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index d14083b..ca7b6ad 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch + +- fixed build against latest libXvMC 1.0.12 + ------------------------------------------------------------------- Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index daec8e8..f90da6c 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -218,6 +218,10 @@ BuildRequires: clang-devel BuildRequires: libclc %endif +%if %{xvmc_support} +BuildRequires: pkgconfig(xv) +%endif + %if 0%{?libglvnd} Requires: Mesa-libEGL1 = %{version} Requires: Mesa-libGL1 = %{version} diff --git a/Mesa.changes b/Mesa.changes index d14083b..ca7b6ad 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch + +- fixed build against latest libXvMC 1.0.12 + ------------------------------------------------------------------- Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 975028b..c4a94dd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -217,6 +217,10 @@ BuildRequires: clang-devel BuildRequires: libclc %endif +%if %{xvmc_support} +BuildRequires: pkgconfig(xv) +%endif + %if 0%{?libglvnd} Requires: Mesa-libEGL1 = %{version} Requires: Mesa-libGL1 = %{version} From f33c67cb4967e09cc3cf144bce702aa52687d9e8618808089bb23d7b2e0e2ca9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 12:26:35 +0000 Subject: [PATCH 02/25] Accepting request 733402 from home:aaronpuchert:llvm-next - n_opencl_dep_libclang.patch * Link OpenCL library with libclang-cpp.so instead of the component libraries for LLVM >= 9. OBS-URL: https://build.opensuse.org/request/show/733402 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=865 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 6 ++++++ Mesa.changes | 7 +++++++ Mesa.spec | 6 ++++++ n_opencl_dep_libclang.patch | 40 +++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 n_opencl_dep_libclang.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ca7b6ad..ac2d4d1 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert + +- n_opencl_dep_libclang.patch + * Link OpenCL library with libclang-cpp.so instead of the + component libraries for LLVM >= 9. + ------------------------------------------------------------------- Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index f90da6c..eafca1c 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -125,6 +125,7 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +Patch1: n_opencl_dep_libclang.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -731,6 +732,11 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 +%if 0%{with_llvm} +%if %{_llvm_sonum} >= 9 +%patch1 -p1 +%endif +%endif %patch54 -p1 %patch58 -p1 %patch60 -p1 diff --git a/Mesa.changes b/Mesa.changes index ca7b6ad..ac2d4d1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert + +- n_opencl_dep_libclang.patch + * Link OpenCL library with libclang-cpp.so instead of the + component libraries for LLVM >= 9. + ------------------------------------------------------------------- Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index c4a94dd..87787bb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -124,6 +124,7 @@ Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +Patch1: n_opencl_dep_libclang.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -730,6 +731,11 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 +%if 0%{with_llvm} +%if %{_llvm_sonum} >= 9 +%patch1 -p1 +%endif +%endif %patch54 -p1 %patch58 -p1 %patch60 -p1 diff --git a/n_opencl_dep_libclang.patch b/n_opencl_dep_libclang.patch new file mode 100644 index 0000000..15c0934 --- /dev/null +++ b/n_opencl_dep_libclang.patch @@ -0,0 +1,40 @@ +From 993bc3af95819bb9a4354b7da2ddb7cfe196f90b Mon Sep 17 00:00:00 2001 +From: Aaron Puchert +Date: Wed, 25 Sep 2019 18:34:34 +0000 +Subject: [PATCH] Link with clang-cpp instead of Clang component libraries + +Since LLVM 9, the Clang C++ API is exposed via the new clang-cpp target, +and the component libraries need no longer be packaged [1]. + +[1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes +--- + src/gallium/targets/opencl/meson.build | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index 317ad8dab4a..5fc00390b00 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -42,18 +42,7 @@ libopencl = shared_library( + link_with : [libpipe_loader_dynamic, libgallium, libmesa_util], + dependencies : [ + dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat, +- cpp.find_library('clangCodeGen', dirs : llvm_libdir), +- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), +- cpp.find_library('clangFrontend', dirs : llvm_libdir), +- cpp.find_library('clangDriver', dirs : llvm_libdir), +- cpp.find_library('clangSerialization', dirs : llvm_libdir), +- cpp.find_library('clangParse', dirs : llvm_libdir), +- cpp.find_library('clangSema', dirs : llvm_libdir), +- cpp.find_library('clangAnalysis', dirs : llvm_libdir), +- cpp.find_library('clangAST', dirs : llvm_libdir), +- cpp.find_library('clangEdit', dirs : llvm_libdir), +- cpp.find_library('clangLex', dirs : llvm_libdir), +- cpp.find_library('clangBasic', dirs : llvm_libdir), ++ cpp.find_library('clang-cpp', dirs : llvm_libdir), + ], + version : '@0@.0.0'.format(opencl_version), + install : true, +-- +2.23.0 + From aee05b7978daf40e78d56644a7961caf5d32d6c8030bd99600702bc9b5e01eac Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 14:05:58 +0000 Subject: [PATCH 03/25] - Mesa-devel: no longer require * Mesa-libEGL-devel * Mesa-libGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=866 --- Mesa.changes | 11 +++++++++++ Mesa.spec | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index ac2d4d1..2f8748f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch + +- Mesa-devel: no longer require + * Mesa-libEGL-devel + * Mesa-libGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + since the header files for OpenGL, GLES, EGL, and GLX are now + included by libglvnd-devel + ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 87787bb..76ca055 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -256,10 +256,10 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -Requires: Mesa-libEGL-devel = %{version} -Requires: Mesa-libGL-devel = %{version} -Requires: Mesa-libGLESv1_CM-devel = %{version} -Requires: Mesa-libGLESv2-devel = %{version} +#Requires: Mesa-libEGL-devel = %{version} +#Requires: Mesa-libGL-devel = %{version} +#Requires: Mesa-libGLESv1_CM-devel = %{version} +#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel From 12a462023226c0ee39d4984186c39167ed8bd5fdc6da1b82f5947e0b74a8ac2f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 14:28:28 +0000 Subject: [PATCH 04/25] - Mesa-devel: no longer require * Mesa-libEGL-devel * Mesa-libGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=867 --- Mesa-drivers.changes | 11 +++++++++++ Mesa-drivers.spec | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ac2d4d1..2f8748f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch + +- Mesa-devel: no longer require + * Mesa-libEGL-devel + * Mesa-libGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + since the header files for OpenGL, GLES, EGL, and GLX are now + included by libglvnd-devel + ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index eafca1c..9f5dda6 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -257,10 +257,10 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -Requires: Mesa-libEGL-devel = %{version} -Requires: Mesa-libGL-devel = %{version} -Requires: Mesa-libGLESv1_CM-devel = %{version} -Requires: Mesa-libGLESv2-devel = %{version} +#Requires: Mesa-libEGL-devel = %{version} +#Requires: Mesa-libGL-devel = %{version} +#Requires: Mesa-libGLESv1_CM-devel = %{version} +#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel From c21293ead2366ebb1481944b81ccad96a312e5f0a43b0de50422580387b5d032 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 14:49:27 +0000 Subject: [PATCH 05/25] - modified check for llvm version in a way so it works also with older llvm packages (by making use of "llvm-config -version"), where there is %{_llvm_sonum} macro defined yet OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=868 --- Mesa-drivers.changes | 3 +++ Mesa-drivers.spec | 8 ++------ Mesa.changes | 3 +++ Mesa.spec | 8 ++------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 2f8748f..1b35f9f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -8,6 +8,9 @@ Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 9f5dda6..758599b 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -257,10 +257,6 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -#Requires: Mesa-libEGL-devel = %{version} -#Requires: Mesa-libGL-devel = %{version} -#Requires: Mesa-libGLESv1_CM-devel = %{version} -#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel @@ -733,9 +729,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 %if 0%{with_llvm} -%if %{_llvm_sonum} >= 9 +if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 -%endif +fi %endif %patch54 -p1 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index 2f8748f..1b35f9f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -8,6 +8,9 @@ Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 76ca055..1931bdb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -256,10 +256,6 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -#Requires: Mesa-libEGL-devel = %{version} -#Requires: Mesa-libGL-devel = %{version} -#Requires: Mesa-libGLESv1_CM-devel = %{version} -#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel @@ -732,9 +728,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 %if 0%{with_llvm} -%if %{_llvm_sonum} >= 9 +if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 -%endif +fi %endif %patch54 -p1 %patch58 -p1 From ee5b7cd70ac681b93d365a9713aeea236f8cbc7fce1c4a81bb62f263a9ddc214 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 15:44:26 +0000 Subject: [PATCH 06/25] - no longer build * Mesa-libGL-devel * Mesa-libEGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel Instead of requiring these let Mesa-devel package require libglvnd-devel >= 1.2.0, which provides the contents of these packages now OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=869 --- Mesa.changes | 12 ++++++++++++ Mesa.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 1b35f9f..c9d5a26 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch + +- no longer build + * Mesa-libGL-devel + * Mesa-libEGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + Instead of requiring these let Mesa-devel package require + libglvnd-devel >= 1.2.0, which provides the contents of these + packages now + ------------------------------------------------------------------- Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 1931bdb..3c8779c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -36,7 +36,7 @@ %define libglvnd 0 %if 0%{?suse_version} >= 1330 - %define libglvnd 1 + %define libglvnd 120 %endif %define glamor 1 @@ -259,6 +259,7 @@ Requires: Mesa-dri-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel +Requires: libglvnd-devel >= 1.2.0 Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} Obsoletes: Mesa-devel-static < %{version} @@ -968,6 +969,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libEGL.so.1* %endif +%if 0%{?libglvnd} < 120 %files libEGL-devel %{_includedir}/EGL %if !0%{?libglvnd} @@ -978,6 +980,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files KHR-devel %dir %{_includedir}/KHR %{_includedir}/KHR +%endif %files libGL1 %if 0%{?libglvnd} @@ -987,6 +990,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libGL.so.1* %endif +%if 0%{?libglvnd} < 120 %files libGL-devel %dir %{_includedir}/GL %{_includedir}/GL/*.h @@ -996,30 +1000,35 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %{_libdir}/pkgconfig/gl.pc %{_mandir}/man3/gl[A-Z]* +%endif %files libGLESv1_CM1 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv1_CM.so.1* %endif +%if 0%{?libglvnd} < 120 %files libGLESv1_CM-devel %{_includedir}/GLES %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv1_CM.so %endif %{_libdir}/pkgconfig/glesv1_cm.pc +%endif %files libGLESv2-2 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv2.so.2* %endif +%if 0%{?libglvnd} < 120 %files libGLESv2-devel %{_includedir}/GLES2 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv2.so %endif %{_libdir}/pkgconfig/glesv2.pc +%endif %files libGLESv3-devel %{_includedir}/GLES3 From 16b61d0a8e610322152465a6889781d175e79c653cdf4f0200e9371d6f9688a8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 15:45:32 +0000 Subject: [PATCH 07/25] forgot to run ./pre_checkin.sh ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=870 --- Mesa-drivers.changes | 12 ++++++++++++ Mesa-drivers.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 1b35f9f..c9d5a26 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch + +- no longer build + * Mesa-libGL-devel + * Mesa-libEGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + Instead of requiring these let Mesa-devel package require + libglvnd-devel >= 1.2.0, which provides the contents of these + packages now + ------------------------------------------------------------------- Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 758599b..1bf841c 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -37,7 +37,7 @@ %define libglvnd 0 %if 0%{?suse_version} >= 1330 - %define libglvnd 1 + %define libglvnd 120 %endif %define glamor 1 @@ -260,6 +260,7 @@ Requires: Mesa-dri-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel +Requires: libglvnd-devel >= 1.2.0 Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} Obsoletes: Mesa-devel-static < %{version} @@ -969,6 +970,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libEGL.so.1* %endif +%if 0%{?libglvnd} < 120 %files libEGL-devel %{_includedir}/EGL %if !0%{?libglvnd} @@ -979,6 +981,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files KHR-devel %dir %{_includedir}/KHR %{_includedir}/KHR +%endif %files libGL1 %if 0%{?libglvnd} @@ -988,6 +991,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libGL.so.1* %endif +%if 0%{?libglvnd} < 120 %files libGL-devel %dir %{_includedir}/GL %{_includedir}/GL/*.h @@ -997,30 +1001,35 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %{_libdir}/pkgconfig/gl.pc %{_mandir}/man3/gl[A-Z]* +%endif %files libGLESv1_CM1 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv1_CM.so.1* %endif +%if 0%{?libglvnd} < 120 %files libGLESv1_CM-devel %{_includedir}/GLES %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv1_CM.so %endif %{_libdir}/pkgconfig/glesv1_cm.pc +%endif %files libGLESv2-2 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv2.so.2* %endif +%if 0%{?libglvnd} < 120 %files libGLESv2-devel %{_includedir}/GLES2 %if 0%{?libglvnd} == 0 %{_libdir}/libGLESv2.so %endif %{_libdir}/pkgconfig/glesv2.pc +%endif %files libGLESv3-devel %{_includedir}/GLES3 From 7e44e24eaffa305580fd8d8321a9f78ae3889216fd32f268708df54da0bd9f00 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 18:35:45 +0000 Subject: [PATCH 08/25] exclude files ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=871 --- Mesa.spec | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Mesa.spec b/Mesa.spec index 3c8779c..5c03740 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -958,6 +958,33 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %doc docs/README* %dir %{_datadir}/drirc.d %config %{_datadir}/drirc.d/* +%if 0%{?libglvnd} >= 120 +%exclude /usr/include/EGL/egl.h +%exclude /usr/include/EGL/eglext.h +%exclude /usr/include/EGL/eglextchromium.h +%exclude /usr/include/EGL/eglmesaext.h +%exclude /usr/include/EGL/eglplatform.h +%exclude /usr/include/GL/gl.h +%exclude /usr/include/GL/gl_mangle.h +%exclude /usr/include/GL/glcorearb.h +%exclude /usr/include/GL/glext.h +%exclude /usr/include/GL/glx.h +%exclude /usr/include/GL/glx_mangle.h +%exclude /usr/include/GL/glxext.h +%exclude /usr/include/GLES/egl.h +%exclude /usr/include/GLES/gl.h +%exclude /usr/include/GLES/glext.h +%exclude /usr/include/GLES/glplatform.h +%exclude /usr/include/GLES2/gl2.h +%exclude /usr/include/GLES2/gl2ext.h +%exclude /usr/include/GLES2/gl2platform.h +%exclude /usr/include/KHR/khrplatform.h +%exclude /usr/lib64/pkgconfig/egl.pc +%exclude /usr/lib64/pkgconfig/gl.pc +%exclude /usr/lib64/pkgconfig/glesv1_cm.pc +%exclude /usr/lib64/pkgconfig/glesv2.pc +%exclude /usr/share/man/man3/* +%endif %files libEGL1 %if 0%{?libglvnd} From e877b33434a543667ac714235cc76157da2f3f79d9fb3ff5a50ae3b92c223396 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 20:50:02 +0000 Subject: [PATCH 09/25] fixed build on i586 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=872 --- Mesa.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mesa.spec b/Mesa.spec index 5c03740..4c72206 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -979,10 +979,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %exclude /usr/include/GLES2/gl2ext.h %exclude /usr/include/GLES2/gl2platform.h %exclude /usr/include/KHR/khrplatform.h -%exclude /usr/lib64/pkgconfig/egl.pc -%exclude /usr/lib64/pkgconfig/gl.pc -%exclude /usr/lib64/pkgconfig/glesv1_cm.pc -%exclude /usr/lib64/pkgconfig/glesv2.pc +%exclude %{_libdir}/pkgconfig/egl.pc +%exclude %{_libdir}/pkgconfig/gl.pc +%exclude %{_libdir}/pkgconfig/glesv1_cm.pc +%exclude %{_libdir}/pkgconfig/glesv2.pc %exclude /usr/share/man/man3/* %endif From c3d49fc8961040692bdf4e8c93b23f224eb2a233fbaedf8c66d66f21b6d1c781 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 22:53:15 +0000 Subject: [PATCH 10/25] * Mesa-libGLESv3-devel packages now. Adjusted baselibs.conf accordingly. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=873 --- Mesa.changes | 3 ++- Mesa.spec | 2 +- baselibs.conf | 6 +----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index c9d5a26..167ef4c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -6,9 +6,10 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch * Mesa-libEGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel + * Mesa-libGLESv3-devel Instead of requiring these let Mesa-devel package require libglvnd-devel >= 1.2.0, which provides the contents of these - packages now + packages now. Adjusted baselibs.conf accordingly. ------------------------------------------------------------------- Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 4c72206..94d3831 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1055,10 +1055,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libGLESv2.so %endif %{_libdir}/pkgconfig/glesv2.pc -%endif %files libGLESv3-devel %{_includedir}/GLES3 +%endif %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 diff --git a/baselibs.conf b/baselibs.conf index 07f377d..c6d7a3c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -15,15 +15,11 @@ Mesa Mesa-devel #We need Mesa-!, do not put requires -Mesa-. requires "Mesa- = " - requires "Mesa-libEGL-devel- = " - requires "Mesa-libGL-devel- = " - requires "Mesa-libGLESv1_CM-devel- = " - requires "Mesa-libGLESv2-devel- = " requires "Mesa-libIndirectGL-devel- = " requires "Mesa-libglapi-devel- = " requires "libOSMesa-devel- = " requires "libgbm-devel- = " - requires "libglvnd-devel- >= 0.1.0" + requires "libglvnd-devel- >= 1.2.0" obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" obsoletes "Mesa-libIndirectGL-devel- < " From 1faa2da88a9db5e083c16df99fd97734c89fad9d865a63017256f7245f832114 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 22:59:16 +0000 Subject: [PATCH 11/25] * Mesa-libGLESv3-devel replaced by libglvnd-devel Adjusted baselibs.conf accordingly. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=874 --- Mesa-drivers.changes | 3 ++- Mesa-drivers.spec | 30 +++++++++++++++++++++++++++++- Mesa.spec | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index c9d5a26..167ef4c 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -6,9 +6,10 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch * Mesa-libEGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel + * Mesa-libGLESv3-devel Instead of requiring these let Mesa-devel package require libglvnd-devel >= 1.2.0, which provides the contents of these - packages now + packages now. Adjusted baselibs.conf accordingly. ------------------------------------------------------------------- Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 1bf841c..57b7b1a 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -959,6 +959,34 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %doc docs/README* %dir %{_datadir}/drirc.d %config %{_datadir}/drirc.d/* +%if 0%{?libglvnd} >= 120 +%exclude /usr/include/EGL/egl.h +%exclude /usr/include/EGL/eglext.h +%exclude /usr/include/EGL/eglextchromium.h +%exclude /usr/include/EGL/eglmesaext.h +%exclude /usr/include/EGL/eglplatform.h +%exclude /usr/include/GL/gl.h +%exclude /usr/include/GL/gl_mangle.h +%exclude /usr/include/GL/glcorearb.h +%exclude /usr/include/GL/glext.h +%exclude /usr/include/GL/glx.h +%exclude /usr/include/GL/glx_mangle.h +%exclude /usr/include/GL/glxext.h +%exclude /usr/include/GLES/egl.h +%exclude /usr/include/GLES/gl.h +%exclude /usr/include/GLES/glext.h +%exclude /usr/include/GLES/glplatform.h +%exclude /usr/include/GLES2/gl2.h +%exclude /usr/include/GLES2/gl2ext.h +%exclude /usr/include/GLES2/gl2platform.h +%exclude /usr/include/GLES3/ +%exclude /usr/include/KHR/khrplatform.h +%exclude %{_libdir}/pkgconfig/egl.pc +%exclude %{_libdir}/pkgconfig/gl.pc +%exclude %{_libdir}/pkgconfig/glesv1_cm.pc +%exclude %{_libdir}/pkgconfig/glesv2.pc +%exclude /usr/share/man/man3/* +%endif %files libEGL1 %if 0%{?libglvnd} @@ -1029,10 +1057,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libGLESv2.so %endif %{_libdir}/pkgconfig/glesv2.pc -%endif %files libGLESv3-devel %{_includedir}/GLES3 +%endif %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 diff --git a/Mesa.spec b/Mesa.spec index 94d3831..025c76d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -978,6 +978,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %exclude /usr/include/GLES2/gl2.h %exclude /usr/include/GLES2/gl2ext.h %exclude /usr/include/GLES2/gl2platform.h +%exclude /usr/include/GLES3/ %exclude /usr/include/KHR/khrplatform.h %exclude %{_libdir}/pkgconfig/egl.pc %exclude %{_libdir}/pkgconfig/gl.pc From cae1de1ab9ed546fc5188d261d1eed4b66fb6f71da68505355f138817600401f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 28 Sep 2019 13:38:12 +0000 Subject: [PATCH 12/25] cleanup OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=875 --- Mesa-drivers.changes | 19 ++----------------- Mesa-drivers.spec | 4 ---- Mesa.changes | 19 ++----------------- Mesa.spec | 4 ---- 4 files changed, 4 insertions(+), 42 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 167ef4c..3e49bac 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -9,18 +9,8 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch * Mesa-libGLESv3-devel Instead of requiring these let Mesa-devel package require libglvnd-devel >= 1.2.0, which provides the contents of these - packages now. Adjusted baselibs.conf accordingly. - -------------------------------------------------------------------- -Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch - -- Mesa-devel: no longer require - * Mesa-libEGL-devel - * Mesa-libGL-devel - * Mesa-libGLESv1_CM-devel - * Mesa-libGLESv2-devel - since the header files for OpenGL, GLES, EGL, and GLX are now - included by libglvnd-devel + packages now (header files for OpenGL, GLES, EGL, and GLX). + Adjusted baselibs.conf accordingly. - modified check for llvm version in a way so it works also with older llvm packages (by making use of "llvm-config -version"), where there is %{_llvm_sonum} macro defined yet @@ -32,11 +22,6 @@ Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert * Link OpenCL library with libclang-cpp.so instead of the component libraries for LLVM >= 9. -------------------------------------------------------------------- -Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch - -- fixed build against latest libXvMC 1.0.12 - ------------------------------------------------------------------- Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 57b7b1a..977a1fd 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -219,10 +219,6 @@ BuildRequires: clang-devel BuildRequires: libclc %endif -%if %{xvmc_support} -BuildRequires: pkgconfig(xv) -%endif - %if 0%{?libglvnd} Requires: Mesa-libEGL1 = %{version} Requires: Mesa-libGL1 = %{version} diff --git a/Mesa.changes b/Mesa.changes index 167ef4c..3e49bac 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -9,18 +9,8 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch * Mesa-libGLESv3-devel Instead of requiring these let Mesa-devel package require libglvnd-devel >= 1.2.0, which provides the contents of these - packages now. Adjusted baselibs.conf accordingly. - -------------------------------------------------------------------- -Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch - -- Mesa-devel: no longer require - * Mesa-libEGL-devel - * Mesa-libGL-devel - * Mesa-libGLESv1_CM-devel - * Mesa-libGLESv2-devel - since the header files for OpenGL, GLES, EGL, and GLX are now - included by libglvnd-devel + packages now (header files for OpenGL, GLES, EGL, and GLX). + Adjusted baselibs.conf accordingly. - modified check for llvm version in a way so it works also with older llvm packages (by making use of "llvm-config -version"), where there is %{_llvm_sonum} macro defined yet @@ -32,11 +22,6 @@ Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert * Link OpenCL library with libclang-cpp.so instead of the component libraries for LLVM >= 9. -------------------------------------------------------------------- -Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch - -- fixed build against latest libXvMC 1.0.12 - ------------------------------------------------------------------- Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 025c76d..67061ee 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -218,10 +218,6 @@ BuildRequires: clang-devel BuildRequires: libclc %endif -%if %{xvmc_support} -BuildRequires: pkgconfig(xv) -%endif - %if 0%{?libglvnd} Requires: Mesa-libEGL1 = %{version} Requires: Mesa-libGL1 = %{version} From 9a69166f4129bbf76451249035b7f8ada9fd43934b97ebccc90c1654f491a19d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 28 Sep 2019 13:44:37 +0000 Subject: [PATCH 13/25] - moved manual pages to Mesa-devel package OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=876 --- Mesa-drivers.changes | 3 ++- Mesa-drivers.spec | 4 +++- Mesa.changes | 3 ++- Mesa.spec | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 3e49bac..275ff7f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch +Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch - no longer build * Mesa-libGL-devel @@ -14,6 +14,7 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch - modified check for llvm version in a way so it works also with older llvm packages (by making use of "llvm-config -version"), where there is %{_llvm_sonum} macro defined yet +- moved manual pages to Mesa-devel package ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 977a1fd..630d341 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -981,7 +981,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %exclude %{_libdir}/pkgconfig/gl.pc %exclude %{_libdir}/pkgconfig/glesv1_cm.pc %exclude %{_libdir}/pkgconfig/glesv2.pc -%exclude /usr/share/man/man3/* %endif %files libEGL1 @@ -1174,6 +1173,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif diff --git a/Mesa.changes b/Mesa.changes index 3e49bac..275ff7f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch +Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch - no longer build * Mesa-libGL-devel @@ -14,6 +14,7 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch - modified check for llvm version in a way so it works also with older llvm packages (by making use of "llvm-config -version"), where there is %{_llvm_sonum} macro defined yet +- moved manual pages to Mesa-devel package ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 67061ee..bab9615 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -980,7 +980,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %exclude %{_libdir}/pkgconfig/gl.pc %exclude %{_libdir}/pkgconfig/glesv1_cm.pc %exclude %{_libdir}/pkgconfig/glesv2.pc -%exclude /usr/share/man/man3/* %endif %files libEGL1 @@ -1173,6 +1172,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif From a9aed9c53949283e898dad12f5224e3b54a453c2ff9aef12fa28cee8c917b81b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 30 Sep 2019 09:49:23 +0000 Subject: [PATCH 14/25] - Update to version 19.2.0 including changes to * release-infastructure * the build * drivers: turnip, radv, android, intel and amd common code * new features: check Phoronix https://www.phoronix.com/scan.php?page=news_item&px=Mesa-19.2-Released - supersedes U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch - adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch - supersedes n_glesv1_cm-glesv2.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=877 --- Mesa-drivers.changes | 13 ++ Mesa-drivers.spec | 8 +- Mesa.changes | 13 ++ Mesa.spec | 8 +- ...-use-u_ringbuffer-for-lp_scene_queue.patch | 186 ------------------ mesa-19.1.7.tar.xz | 3 - mesa-19.1.7.tar.xz.sig | Bin 566 -> 0 bytes mesa-19.2.0.tar.xz | 3 + mesa-19.2.0.tar.xz.sig | Bin 0 -> 119 bytes ...rc-disable-rgb10-for-chromium-on-amd.patch | 16 +- 10 files changed, 41 insertions(+), 209 deletions(-) delete mode 100644 U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch delete mode 100644 mesa-19.1.7.tar.xz delete mode 100644 mesa-19.1.7.tar.xz.sig create mode 100644 mesa-19.2.0.tar.xz create mode 100644 mesa-19.2.0.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 275ff7f..db2d59f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch + +- Update to version 19.2.0 including changes to + * release-infastructure + * the build + * drivers: turnip, radv, android, intel and amd common code + * new features: check Phoronix + https://www.phoronix.com/scan.php?page=news_item&px=Mesa-19.2-Released +- supersedes U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- supersedes n_glesv1_cm-glesv2.patch + ------------------------------------------------------------------- Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 630d341..b6d9b1d 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.1.7 +%define _version 19.2.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -110,7 +110,7 @@ %endif Name: Mesa-drivers -Version: 19.1.7 +Version: 19.2.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -124,12 +124,10 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring -Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch Patch1: n_opencl_dep_libclang.patch # 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 @@ -724,7 +722,6 @@ programs against the XA state tracker. # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch0 -p1 %if 0%{with_llvm} if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 @@ -732,7 +729,6 @@ fi %endif %patch54 -p1 %patch58 -p1 -%patch60 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/Mesa.changes b/Mesa.changes index 275ff7f..db2d59f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch + +- Update to version 19.2.0 including changes to + * release-infastructure + * the build + * drivers: turnip, radv, android, intel and amd common code + * new features: check Phoronix + https://www.phoronix.com/scan.php?page=news_item&px=Mesa-19.2-Released +- supersedes U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- supersedes n_glesv1_cm-glesv2.patch + ------------------------------------------------------------------- Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index bab9615..88e6400 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.1.7 +%define _version 19.2.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa -Version: 19.1.7 +Version: 19.2.0 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -123,12 +123,10 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring -Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch Patch1: n_opencl_dep_libclang.patch # 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 @@ -723,7 +721,6 @@ programs against the XA state tracker. # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch0 -p1 %if 0%{with_llvm} if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 @@ -731,7 +728,6 @@ fi %endif %patch54 -p1 %patch58 -p1 -%patch60 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch b/U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch deleted file mode 100644 index c4a799f..0000000 --- a/U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 397d1a18ef78ddf46efda44d6783105f9fd87f7e Mon Sep 17 00:00:00 2001 -From: Caio Marcelo de Oliveira Filho -Date: Wed, 12 Jun 2019 15:32:30 -0700 -Subject: [PATCH] llvmpipe: Don't use u_ringbuffer for lp_scene_queue - -Inline the ring buffer and signal logic into lp_scene_queue instead of -using a u_ringbuffer. The code ends up simpler since there's no need -to handle serializing data from / to packets. - -This fixes a crash when compiling Mesa with LTO, that happened because -of util_ringbuffer_dequeue() was writing data after the "header -packet", as shown below - - struct scene_packet { - struct util_packet header; - struct lp_scene *scene; - }; - - /* Snippet of old lp_scene_deque(). */ - packet.scene = NULL; - ret = util_ringbuffer_dequeue(queue->ring, - &packet.header, - sizeof packet / 4, - return packet.scene; - -but due to the way aliasing analysis work the compiler didn't -considered the "&packet->header" to alias with "packet->scene". With -the aggressive inlining done by LTO, this would end up always -returning NULL instead of the content read by -util_ringbuffer_dequeue(). - -Issue found by Marco Simental and iThiago Macieira. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110884 -Reviewed-by: Roland Scheidegger ---- - src/gallium/drivers/llvmpipe/lp_scene_queue.c | 84 +++++++++++++++------------ - 1 file changed, 48 insertions(+), 36 deletions(-) - -diff --git a/src/gallium/drivers/llvmpipe/lp_scene_queue.c b/src/gallium/drivers/llvmpipe/lp_scene_queue.c -index debc7a6fe18..5f267d04ca4 100644 ---- a/src/gallium/drivers/llvmpipe/lp_scene_queue.c -+++ b/src/gallium/drivers/llvmpipe/lp_scene_queue.c -@@ -32,25 +32,33 @@ - * which are produced by the "rast" code when it finishes rendering a scene. - */ - --#include "util/u_ringbuffer.h" -+#include "os/os_thread.h" - #include "util/u_memory.h" - #include "lp_scene_queue.h" -+#include "util/u_math.h" - - - --#define MAX_SCENE_QUEUE 4 -+#define SCENE_QUEUE_SIZE 4 -+ - --struct scene_packet { -- struct util_packet header; -- struct lp_scene *scene; --}; - - /** - * A queue of scenes - */ - struct lp_scene_queue - { -- struct util_ringbuffer *ring; -+ struct lp_scene *scenes[SCENE_QUEUE_SIZE]; -+ -+ mtx_t mutex; -+ cnd_t change; -+ -+ /* These values wrap around, so that head == tail means empty. When used -+ * to index the array, we use them modulo the queue size. This scheme -+ * works because the queue size is a power of two. -+ */ -+ unsigned head; -+ unsigned tail; - }; - - -@@ -59,20 +67,19 @@ struct lp_scene_queue - struct lp_scene_queue * - lp_scene_queue_create(void) - { -+ /* Circular queue behavior depends on size being a power of two. */ -+ STATIC_ASSERT(SCENE_QUEUE_SIZE > 0); -+ STATIC_ASSERT((SCENE_QUEUE_SIZE & (SCENE_QUEUE_SIZE - 1)) == 0); -+ - struct lp_scene_queue *queue = CALLOC_STRUCT(lp_scene_queue); -+ - if (!queue) - return NULL; - -- queue->ring = util_ringbuffer_create( MAX_SCENE_QUEUE * -- sizeof( struct scene_packet ) / 4); -- if (queue->ring == NULL) -- goto fail; -+ (void) mtx_init(&queue->mutex, mtx_plain); -+ cnd_init(&queue->change); - - return queue; -- --fail: -- FREE(queue); -- return NULL; - } - - -@@ -80,7 +87,8 @@ fail: - void - lp_scene_queue_destroy(struct lp_scene_queue *queue) - { -- util_ringbuffer_destroy(queue->ring); -+ cnd_destroy(&queue->change); -+ mtx_destroy(&queue->mutex); - FREE(queue); - } - -@@ -89,19 +97,25 @@ lp_scene_queue_destroy(struct lp_scene_queue *queue) - struct lp_scene * - lp_scene_dequeue(struct lp_scene_queue *queue, boolean wait) - { -- struct scene_packet packet; -- enum pipe_error ret; -+ mtx_lock(&queue->mutex); - -- packet.scene = NULL; -+ if (wait) { -+ /* Wait for queue to be not empty. */ -+ while (queue->head == queue->tail) -+ cnd_wait(&queue->change, &queue->mutex); -+ } else { -+ if (queue->head == queue->tail) { -+ mtx_unlock(&queue->mutex); -+ return NULL; -+ } -+ } - -- ret = util_ringbuffer_dequeue(queue->ring, -- &packet.header, -- sizeof packet / 4, -- wait ); -- if (ret != PIPE_OK) -- return NULL; -+ struct lp_scene *scene = queue->scenes[queue->head++ % SCENE_QUEUE_SIZE]; -+ -+ cnd_signal(&queue->change); -+ mtx_unlock(&queue->mutex); - -- return packet.scene; -+ return scene; - } - - -@@ -109,16 +123,14 @@ lp_scene_dequeue(struct lp_scene_queue *queue, boolean wait) - void - lp_scene_enqueue(struct lp_scene_queue *queue, struct lp_scene *scene) - { -- struct scene_packet packet; -- -- packet.header.dwords = sizeof packet / 4; -- packet.header.data24 = 0; -- packet.scene = scene; -- -- util_ringbuffer_enqueue(queue->ring, &packet.header); --} -- -- -+ mtx_lock(&queue->mutex); - -+ /* Wait for free space. */ -+ while (queue->tail - queue->head >= SCENE_QUEUE_SIZE) -+ cnd_wait(&queue->change, &queue->mutex); - -+ queue->scenes[queue->tail++ % SCENE_QUEUE_SIZE] = scene; - -+ cnd_signal(&queue->change); -+ mtx_unlock(&queue->mutex); -+} --- -2.16.4 - diff --git a/mesa-19.1.7.tar.xz b/mesa-19.1.7.tar.xz deleted file mode 100644 index 06ffb86..0000000 --- a/mesa-19.1.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e287920fdb38712a9fed448dc90b3ca95048c7face5db52e58361f8b6e0f3cd5 -size 10941152 diff --git a/mesa-19.1.7.tar.xz.sig b/mesa-19.1.7.tar.xz.sig deleted file mode 100644 index 064cac727b089ae4c21b31d1514b01cf407c984d49ecbfdd5d4f282ef3290bf1..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*j))5UXZd zsqQB}b42A2{TTS7IdKSl>F*LGW-ci5P1!m^7=N~K+rDQ>raHGnHtFfq2@WpT&*(a` zF&m7}X7RB^eq=ILn;uY6tNoWiz?Kt|~z)Ui}!1-IqnV1ua zJ){TG8Ay3-P$@VUy%pgNdbAiDz2Wvwk4tr}Zg7n%>&b&>&W&?81)>e&?9m+{6{)1R zQ8NyDh7pMaXE65=HoYR^V%5?kNgPafc^tlaI$*75?#Ti}V(z@B`c9NV` zc=d8Wpd&u`Q?8iU0G?~wu8+k!M9csFkK(QgFDz-(Ojg9e>6W;=xaQZyGa5}BzV$Ht zzX4`sS~$ zCWE!&J2H~7y}Ri4bv0jN(_wm<$}~fg2x+{*`A>DIqU_r2foIh)He=xC2;vj3eCa^p EQJgXq*Z=?k diff --git a/mesa-19.2.0.tar.xz b/mesa-19.2.0.tar.xz new file mode 100644 index 0000000..58c8efb --- /dev/null +++ b/mesa-19.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b060caa2a00f856431160ff7377d0e8f58f2aa48c16ee5a9e265ebdccb10852a +size 11464180 diff --git a/mesa-19.2.0.tar.xz.sig b/mesa-19.2.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..c610429c3cfd2bd42da5f8d94f7e6d504634ebb01beaa3c989a43d513b06d2e4 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7r6x%)jJOdY}08HfM8ixN~ z>s8EBGV6Za(rZc=3_C16w8HSsGt>y~PVECWKv^wbEoPhN)i -