From 6ed1b04ae409f8da4ef5781f5100ab72df43c2b1 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Jul 15 2024 22:43:53 +0000
Subject: Drop unnecesssary libdrm build as the libdrm in FDO SDK is sufficient


The additional `-I/usr/include/drm` in mesa's cflags is only required
due to an apparently broken include statemenmt in mesa.

---

diff --git a/mesa-asahi-flatpak.spec b/mesa-asahi-flatpak.spec
index 49876c2..629536d 100644
--- a/mesa-asahi-flatpak.spec
+++ b/mesa-asahi-flatpak.spec
@@ -5,7 +5,6 @@
 %global sdk_ver 22.08
 %global llvm_major 16
 
-%global libdrm_ver libdrm-2.4.121
 %global libclc_ver llvmorg-16.0.2
 %global spirv_tools_ver v2024.2
 %global spirv_headers_ver vulkan-sdk-1.3.283.0
@@ -23,12 +22,11 @@ Source0:        org.freedesktop.Platform.GL.asahi.yml
 Source1:        bwrapwrapper
 
 Source10:        https://gitlab.freedesktop.org/asahi/mesa/-/archive/%{git_tag}/mesa-%{git_tag}.tar.bz2
-Source11:        https://gitlab.freedesktop.org/mesa/drm/-/archive/%{libdrm_ver}/drm-%{libdrm_ver}.tar.bz2
-Source12:        https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/%{spirv_llvm_translator_ver}.tar.gz
-Source13:        https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/%{spirv_headers_ver}.tar.gz
-Source14:        https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/%{spirv_tools_ver}.tar.gz
-Source15:        https://github.com/llvm/llvm-project/archive/refs/tags/%{libclc_ver}.tar.gz
-Source16:        https://files.pythonhosted.org/packages/d6/97/852cc27c460d5fae07c6d7e4a2744f5684760358de3456b5ee9f130b8f57/meson-%{meson_ver}.tar.gz
+Source11:        https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/%{spirv_llvm_translator_ver}.tar.gz
+Source12:        https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/%{spirv_headers_ver}.tar.gz
+Source13:        https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/%{spirv_tools_ver}.tar.gz
+Source14:        https://github.com/llvm/llvm-project/archive/refs/tags/%{libclc_ver}.tar.gz
+Source15:        https://files.pythonhosted.org/packages/d6/97/852cc27c460d5fae07c6d7e4a2744f5684760358de3456b5ee9f130b8f57/meson-%{meson_ver}.tar.gz
 
 Requires:       flatpak
 
@@ -47,12 +45,11 @@ BuildRequires:  fdo-sdk-extension-llvm%{llvm_major}-%{sdk_ver}-flatpak
 %prep
 sed \
   -e "s,\%SRC_MESA,%SOURCE10,g" \
-  -e "s,\%SRC_LIBDRM,%SOURCE11,g" \
-  -e "s,\%SRC_SPIRV_LLVM_TRANSLATOR,%SOURCE12,g" \
-  -e "s,\%SRC_SPIRV_HEADERS,%SOURCE13,g" \
-  -e "s,\%SRC_SPIRV_TOOLS,%SOURCE14,g" \
-  -e "s,\%SRC_LIBCLC,%SOURCE15,g" \
-  -e "s,\%SRC_MESON,%SOURCE16,g" \
+  -e "s,\%SRC_SPIRV_LLVM_TRANSLATOR,%SOURCE11,g" \
+  -e "s,\%SRC_SPIRV_HEADERS,%SOURCE12,g" \
+  -e "s,\%SRC_SPIRV_TOOLS,%SOURCE13,g" \
+  -e "s,\%SRC_LIBCLC,%SOURCE14,g" \
+  -e "s,\%SRC_MESON,%SOURCE15,g" \
   %SOURCE0 > org.freedesktop.Platform.GL.asahi.yml
 
 cp %SOURCE1 .
diff --git a/org.freedesktop.Platform.GL.asahi.yml b/org.freedesktop.Platform.GL.asahi.yml
index f91ee41..f7497ca 100644
--- a/org.freedesktop.Platform.GL.asahi.yml
+++ b/org.freedesktop.Platform.GL.asahi.yml
@@ -87,25 +87,6 @@ cleanup:
   - '*.la'
   - '*.a'
 modules:
-  - name: libdrm
-    build-options:
-      arch:
-        x86_64: *x86_64-build-options
-        aarch64: *aarch64-build-options
-    buildsystem: meson
-    config-opts:
-      - -Damdgpu=disabled
-      - -Detnaviv=disabled
-      - -Dfreedreno=disabled
-      - -Dnouveau=disabled
-      - -Dradeon=disabled
-      - -Dcairo-tests=disabled
-      - -Dman-pages=disabled
-      - -Dudev=false
-    sources:
-      - type: archive
-        path: %SRC_LIBDRM
-
   - name: spirv-tools
     build-options:
       arch:
@@ -178,7 +159,7 @@ modules:
         aarch64: *aarch64-build-options
 
       # From upstream: Build only minimal debug info to reduce size
-      cflags: -g1
+      cflags: -g1 -I/usr/include/drm
       cxxflags: -g1
 
     buildsystem: meson
diff --git a/sources b/sources
index 72e936b..c8d8d2b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (drm-libdrm-2.4.121.tar.bz2) = f7edf39613003e003c8677f34645836697d3567d3e3a022a7a72971290d6476e6d7ed91501bfee89692a640bac2cdcf8032b389d506147d7902fbcabfd6132c4
 SHA512 (mesa-asahi-20240527.tar.bz2) = cb956656fa7b674f33d97ff876fe662248bb0b30b3a2dad09c320f3c850319c28d9f18990a030a57a941bfbe25a5849ad9a4d7d0150f9acf10405ffa294ef58d
 SHA512 (llvmorg-16.0.2.tar.gz) = 56ddd825cf1470fc932dfa9b58ec37e37cffae368cf60a4ab20bc86525220ac1e8606cd0b925d59ecd239e42151e0776596c86ba4efae99ff50d2eaf0853d86b
 SHA512 (meson-1.5.0.tar.gz) = f0a25cf134949739c698eddaea602bf7852866b3fee3d2c11c1e6b6e48c944cf92abc3d171a2e42e21077edc01f1e7079d451f5624e2b6131382e114e814db3e