From b5028f048a0d2757dfab0093a9fc6817f0efd71b Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 2 Aug 2024 12:27:12 +0200 Subject: [PATCH] umpf: special-case version fixup for Mesa >= 24.2.0 libgallium is versioned with project_version, so patch PACKAGE_VERSION instead. Signed-off-by: Philipp Zabel --- umpf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/umpf b/umpf index 9f90f2e..bf990ee 100755 --- a/umpf +++ b/umpf @@ -1196,6 +1196,11 @@ rebase_end() { # the project version is used in library names sed -i "s/@VCS_TAG@/\0.${version}/" src/version/version.h.in && git add src/version/version.h.in + elif grep -sq "'gallium-@0@'.format(meson.project_version())" src/gallium/targets/dri/meson.build; then + # for Mesa >= 24.2.0 fixup PACKAGE_VERSION + # the project version is used in library names + sed -i "s/-DPACKAGE_VERSION=\"@0@/\0.${version}/" meson.build && + git add meson.build elif [ -e "${meson_build}" ]; then case "${project}" in libcamera)