From 66f43c91607f6731b3cb6d5a4c56699cd32e7268705caa3d185ecd52593cd00f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 23 Jan 2023 18:46:43 +0000 Subject: [PATCH 1/3] - re-enable build on Leap, but only for 15.5; there is no gcc12 on Leap 15.4, which is now officially required by Mesa 22.3 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1180 --- Mesa.changes | 6 ++++++ Mesa.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 612a36a..e90053d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 23 18:43:50 UTC 2023 - Stefan Dirsch + +- re-enable build on Leap, but only for 15.5; there is no gcc12 + on Leap 15.4, which is now officially required by Mesa 22.3 + ------------------------------------------------------------------- Mon Jan 16 22:44:11 UTC 2023 - Martin Hauke diff --git a/Mesa.spec b/Mesa.spec index 54166e5..b3a7b70 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -154,7 +154,7 @@ BuildRequires: bison BuildRequires: cmake BuildRequires: fdupes BuildRequires: flex -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150500 BuildRequires: gcc12-c++ %else BuildRequires: gcc-c++ From 98e38d64e2966758d25eab093a8ab88e28825fb661abcb697e98ae7429f693a6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 24 Jan 2023 11:08:12 +0000 Subject: [PATCH 2/3] - force usage of gcc 12 only on Leap 15.5; there is no gcc12 on Leap 15.4 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1181 --- Mesa.changes | 6 ++++++ Mesa.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index e90053d..0f1b5fa 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 24 11:06:48 UTC 2023 - Stefan Dirsch + +- force usage of gcc 12 only on Leap 15.5; there is no gcc12 on + Leap 15.4 + ------------------------------------------------------------------- Mon Jan 23 18:43:50 UTC 2023 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index b3a7b70..9fd6b3a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -805,7 +805,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %ifarch ppc64 ppc64le %limit_build -m 1024 %endif -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150500 export CC=gcc-12 export CXX=g++-12 %endif From aadbf26bd704a21784f7b26fc7f43368446bf4a60a62fcdb7450c6ea9ddebb33 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 24 Jan 2023 14:18:51 +0000 Subject: [PATCH 3/3] Accepting request 1060610 from home:manfred-h - Add BuildRequires for x264 and x265 in case video_codecs should be built. OBS-URL: https://build.opensuse.org/request/show/1060610 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1182 --- Mesa.changes | 6 ++++++ Mesa.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Mesa.changes b/Mesa.changes index 0f1b5fa..5867732 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -4,6 +4,12 @@ Tue Jan 24 11:06:48 UTC 2023 - Stefan Dirsch - force usage of gcc 12 only on Leap 15.5; there is no gcc12 on Leap 15.4 +------------------------------------------------------------------- +Tue Jan 24 09:32:12 UTC 2023 - Manfred Hollstein + +- Add BuildRequires for x264 and x265 in case video_codecs should + be built. + ------------------------------------------------------------------- Mon Jan 23 18:43:50 UTC 2023 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 9fd6b3a..b48b3d5 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -286,6 +286,12 @@ BuildRequires: pkgconfig(LLVMSPIRVLib) BuildRequires: pkgconfig(SPIRV-Tools) %endif %endif +%if "%{flavor}" == "drivers" +%if %{video_codecs} +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +%endif +%endif Requires: Mesa-libEGL1 = %{version} Requires: Mesa-libGL1 = %{version}