From 6e229153b979f030e23a4c1cbc1b1bf9bf4ba1df46ec159cc926bfc7193e95f8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 27 Aug 2018 11:00:14 +0000 Subject: [PATCH 1/2] Accepting request 631630 from home:Vogtinator:branches:X11:XOrg - Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798) - Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798) OBS-URL: https://build.opensuse.org/request/show/631630 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=768 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 8 +++++++- Mesa.changes | 5 +++++ Mesa.spec | 8 +++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index d7f8381..4fa1b19 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de + +- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798) + ------------------------------------------------------------------- Fri Aug 17 11:53:08 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4f421d7..cc702d1 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -764,7 +764,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) egl_platforms=x11,drm,wayland %else egl_platforms=x11,drm @@ -846,6 +846,12 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print +%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) +# libwayland-egl is provided by wayland itself +rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* +rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +%endif + %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can # not disable from buildling and installing. diff --git a/Mesa.changes b/Mesa.changes index d7f8381..4fa1b19 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de + +- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798) + ------------------------------------------------------------------- Fri Aug 17 11:53:08 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 9a9bd14..35d2351 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -763,7 +763,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) egl_platforms=x11,drm,wayland %else egl_platforms=x11,drm @@ -845,6 +845,12 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -type f -name "*.la" -delete -print +%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))) +# libwayland-egl is provided by wayland itself +rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* +rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +%endif + %if %{drivers} # Delete things that we do not package in the Mesa-drivers variant, but can # not disable from buildling and installing. From f4b78c23bd89f1970015e94414a4be637197b510c7ef5009ad810fa0032a29ab Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 27 Aug 2018 12:43:05 +0000 Subject: [PATCH 2/2] - update to 18.1.7 * Mesa 18.1.7 is now available for general consumption. This release has been rather small compared to the last few release, There's just a handful of fixes in total. Meson, radv, anv, gallium winsys, intel, i965, and r600 were the only recipients of fixs this go around. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=769 --- Mesa-drivers.changes | 10 ++++++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 10 ++++++++++ Mesa.spec | 4 ++-- mesa-18.1.6.tar.xz | 3 --- mesa-18.1.6.tar.xz.sha1sum | 1 - mesa-18.1.7.tar.xz | 3 +++ mesa-18.1.7.tar.xz.sha1sum | 1 + 8 files changed, 28 insertions(+), 8 deletions(-) delete mode 100644 mesa-18.1.6.tar.xz delete mode 100644 mesa-18.1.6.tar.xz.sha1sum create mode 100644 mesa-18.1.7.tar.xz create mode 100644 mesa-18.1.7.tar.xz.sha1sum diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 4fa1b19..81566bd 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com + +- update to 18.1.7 + * Mesa 18.1.7 is now available for general consumption. This + release has been rather small compared to the last few + release, There's just a handful of fixes in total. Meson, + radv, anv, gallium winsys, intel, i965, and r600 were the + only recipients of fixs this go around. + ------------------------------------------------------------------- Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index cc702d1..8286b1a 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.1.6 +%define _version 18.1.7 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -112,7 +112,7 @@ %endif Name: Mesa-drivers -Version: 18.1.6 +Version: 18.1.7 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 4fa1b19..81566bd 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 27 12:07:28 UTC 2018 - sndirsch@suse.com + +- update to 18.1.7 + * Mesa 18.1.7 is now available for general consumption. This + release has been rather small compared to the last few + release, There's just a handful of fixes in total. Meson, + radv, anv, gallium winsys, intel, i965, and r600 were the + only recipients of fixs this go around. + ------------------------------------------------------------------- Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de diff --git a/Mesa.spec b/Mesa.spec index 35d2351..3d0cc35 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.1.6 +%define _version 18.1.7 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -111,7 +111,7 @@ %endif Name: Mesa -Version: 18.1.6 +Version: 18.1.7 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-18.1.6.tar.xz b/mesa-18.1.6.tar.xz deleted file mode 100644 index edbe79e..0000000 --- a/mesa-18.1.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb7ce759069801804fcfb8152da3457f76cd7b4e0096e4870ff5adcb5c894289 -size 11142884 diff --git a/mesa-18.1.6.tar.xz.sha1sum b/mesa-18.1.6.tar.xz.sha1sum deleted file mode 100644 index 5cb63d9..0000000 --- a/mesa-18.1.6.tar.xz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8d4daf725f20404f980b981c9693b58756ba6c48 mesa-18.1.6.tar.xz diff --git a/mesa-18.1.7.tar.xz b/mesa-18.1.7.tar.xz new file mode 100644 index 0000000..c5a0690 --- /dev/null +++ b/mesa-18.1.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306 +size 11136580 diff --git a/mesa-18.1.7.tar.xz.sha1sum b/mesa-18.1.7.tar.xz.sha1sum new file mode 100644 index 0000000..aeb93b6 --- /dev/null +++ b/mesa-18.1.7.tar.xz.sha1sum @@ -0,0 +1 @@ +8f86e16a1c03665e55bc284c0e4a5b0a953bcadc mesa-18.1.7.tar.xz