diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 49e82fb..963e32e 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch + +- U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch + * Due to a typo the private requires to libdrm were lost in dri.pc. + Fixed another typo (only comment). + ------------------------------------------------------------------- Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 5b886c9..4e54918 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -136,6 +136,7 @@ Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch200: u_fix-build-on-ppc64le.patch Patch300: n_buildfix-21.3.0.patch Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch +Patch500: U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -758,6 +759,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %ifarch %{ix86} %patch400 -p1 %endif +%patch500 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/Mesa.changes b/Mesa.changes index 49e82fb..963e32e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch + +- U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch + * Due to a typo the private requires to libdrm were lost in dri.pc. + Fixed another typo (only comment). + ------------------------------------------------------------------- Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 5fbea51..63a9330 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -135,6 +135,7 @@ Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch200: u_fix-build-on-ppc64le.patch Patch300: n_buildfix-21.3.0.patch Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch +Patch500: U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -757,6 +758,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %ifarch %{ix86} %patch400 -p1 %endif +%patch500 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch b/U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch new file mode 100644 index 0000000..b4b2c5d --- /dev/null +++ b/U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch @@ -0,0 +1,34 @@ +From 31809f8419514f2130e9661d9989662165366e83 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Mon, 14 Mar 2022 11:38:23 +0100 +Subject: [PATCH] meson: restore private requires to libdrm in dri.pc file + +Due to a typo the private requires to libdrm were lost in dri.pc. +Fixed another typo (only comment). +--- + src/gallium/frontends/dri/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build +index a0ae961c5fc..139707ea719 100644 +--- a/src/gallium/frontends/dri/meson.build ++++ b/src/gallium/frontends/dri/meson.build +@@ -68,13 +68,13 @@ libdri = static_library( + if with_dri + dri_req_private = [] + if dep_libdrm.found() +- dir_req_private = ['libdrm >= @0@'.format(_drm_ver)] ++ dri_req_private = ['libdrm >= @0@'.format(_drm_ver)] + endif + + pkg.generate( + name : 'dri', + filebase : 'dri', +- description : 'Direct Rendering Infastructure', ++ description : 'Direct Rendering Infrastructure', + version : meson.project_version(), + variables : ['dridriverdir=@0@'.format(dri_drivers_path)], + requires_private : dri_req_private, +-- +2.34.1 +