Mesa (staging/21.2): AOSP: Extract version from libdrm instead of hardcoding it.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 0702cd0685471bd638f3d6c1c8c9214d6d44ba59
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0702cd0685471bd638f3d6c1c8c9214d6d44ba59

Author: Roman Stratiienko <r.stratiienko at gmail.com>
Date:   Tue Aug 10 13:10:44 2021 +0300

AOSP: Extract version from libdrm instead of hardcoding it.

mesa3d require up-to-date version of libdrm.
Hardcoding it to 2.4.105 is wrong.

Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson")
Signed-off-by: Roman Stratiienko <r.stratiienko at gmail.com>
Tested-by: Mauro Rossi <issor.oruam at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12304>
(cherry picked from commit a70ff21efbb48f851c5cdd10c43c4c8a3d49b071)

---

 .pick_status.json  |  2 +-
 android/Android.mk | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2a7176bc0c3..c77a97d88af 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -283,7 +283,7 @@
         "description": "AOSP: Extract version from libdrm instead of hardcoding it.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8621bd8d5e67173281c6a6dd64054d4b0366f023"
     },
diff --git a/android/Android.mk b/android/Android.mk
index 243da8493af..ed310929a29 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -26,6 +26,8 @@ ifneq ($(filter true, $(BOARD_MESA3D_USES_MESON_BUILD)),)
 LOCAL_PATH := $(call my-dir)
 MESA3D_TOP := $(dir $(LOCAL_PATH))
 
+LIBDRM_VERSION = $(shell cat external/libdrm/meson.build | grep -o "\<version\>\s*:\s*'\w*\.\w*\.\w*'" | grep -o "\w*\.\w*\.\w*" | head -1)
+
 MESA_VK_LIB_SUFFIX_amd := radeon
 MESA_VK_LIB_SUFFIX_intel := intel
 MESA_VK_LIB_SUFFIX_freedreno := freedreno
@@ -38,7 +40,7 @@ include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := libc libdl libdrm libm liblog libcutils libz libc++ libnativewindow libsync libhardware
 LOCAL_STATIC_LIBRARIES := libexpat libarect libelf
 LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers libbacktrace_headers
-MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:2.4.105 nativewindow sync zlib:1.2.11 libelf
+MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf
 
 ifneq ($(filter swr swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)
 MESON_GEN_LLVM_STUB := true
@@ -51,24 +53,24 @@ endif
 
 ifneq ($(filter iris,$(BOARD_MESA3D_GALLIUM_DRIVERS)),)
 LOCAL_SHARED_LIBRARIES += libdrm_intel
-MESON_GEN_PKGCONFIGS += libdrm_intel:2.4.105
+MESON_GEN_PKGCONFIGS += libdrm_intel:$(LIBDRM_VERSION)
 endif
 
 ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)
 MESON_GEN_LLVM_STUB := true
 LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare LLVMInitializeAMDGPU* functions
 LOCAL_SHARED_LIBRARIES += libdrm_amdgpu
-MESON_GEN_PKGCONFIGS += libdrm_amdgpu:2.4.105
+MESON_GEN_PKGCONFIGS += libdrm_amdgpu:$(LIBDRM_VERSION)
 endif
 
 ifneq ($(filter radeonsi r300 r600,$(BOARD_MESA3D_GALLIUM_DRIVERS)),)
 LOCAL_SHARED_LIBRARIES += libdrm_radeon
-MESON_GEN_PKGCONFIGS += libdrm_radeon:2.4.105
+MESON_GEN_PKGCONFIGS += libdrm_radeon:$(LIBDRM_VERSION)
 endif
 
 ifneq ($(filter nouveau,$(BOARD_MESA3D_GALLIUM_DRIVERS)),)
 LOCAL_SHARED_LIBRARIES += libdrm_nouveau
-MESON_GEN_PKGCONFIGS += libdrm_nouveau:2.4.105
+MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION)
 endif
 
 ifneq ($(MESON_GEN_LLVM_STUB),)