From c5641f91b032a36a7374f86d1996344cf1cf1ca2 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Thu, 17 Oct 2019 13:00:54 +0200
Subject: [PATCH] libdrm: updated to 2.4.100 / cleaned up package

---
 packages/graphics/libdrm/package.mk | 62 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk
index 19c7d02369..070c7c4ac0 100644
--- a/packages/graphics/libdrm/package.mk
+++ b/packages/graphics/libdrm/package.mk
@@ -4,45 +4,22 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.99"
-PKG_SHA256="4dbf539c7ed25dbb2055090b77ab87508fc46be39a9379d15fed4b5517e1da5e"
+PKG_VERSION="2.4.100"
+PKG_SHA256="c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dri.freedesktop.org"
-PKG_URL="http://dri.freedesktop.org/libdrm/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://dri.freedesktop.org/libdrm/libdrm-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libpciaccess"
 PKG_LONGDESC="The userspace interface library to kernel DRM services."
 PKG_TOOLCHAIN="meson"
 
 get_graphicdrivers
 
-PKG_DRM_CONFIG="-Dnouveau=false \
-                -Domap=false \
-                -Dexynos=false \
-                -Dtegra=false"
-
-listcontains "$GRAPHIC_DRIVERS" "(i915|i965)" &&
-  PKG_DRM_CONFIG+=" -Dintel=true" || PKG_DRM_CONFIG+=" -Dintel=false"
-
-listcontains "$GRAPHIC_DRIVERS" "(r200|r300|r600|radeonsi)" &&
-  PKG_DRM_CONFIG+=" -Dradeon=true" || PKG_DRM_CONFIG+=" -Dradeon=false"
-
-listcontains "$GRAPHIC_DRIVERS" "radeonsi" &&
-  PKG_DRM_CONFIG+=" -Damdgpu=true" || PKG_DRM_CONFIG+=" -Damdgpu=false"
-
-listcontains "$GRAPHIC_DRIVERS" "vmware" &&
-  PKG_DRM_CONFIG+=" -Dvmwgfx=true" || PKG_DRM_CONFIG+=" -Dvmwgfx=false"
-
-listcontains "$GRAPHIC_DRIVERS" "vc4" &&
-  PKG_DRM_CONFIG+=" -Dvc4=true" || PKG_DRM_CONFIG+=" -Dvc4=false"
-
-listcontains "$GRAPHIC_DRIVERS" "freedreno" &&
-  PKG_DRM_CONFIG+=" -Dfreedreno=true" || PKG_DRM_CONFIG+=" -Dfreedreno=false"
-
-listcontains "$GRAPHIC_DRIVERS" "etnaviv" &&
-  PKG_DRM_CONFIG+=" -Detnaviv=true" || PKG_DRM_CONFIG+=" -Detnaviv=false"
-
 PKG_MESON_OPTS_TARGET="-Dlibkms=false \
-                       $PKG_DRM_CONFIG \
+                       -Dnouveau=false \
+                       -Domap=false \
+                       -Dexynos=false \
+                       -Dtegra=false \
                        -Dcairo-tests=false \
                        -Dman-pages=false \
                        -Dvalgrind=false \
@@ -50,7 +27,28 @@ PKG_MESON_OPTS_TARGET="-Dlibkms=false \
                        -Dinstall-test-programs=false \
                        -Dudev=false"
 
+listcontains "${GRAPHIC_DRIVERS}" "(i915|i965)" &&
+  PKG_MESON_OPTS_TARGET+=" -Dintel=true" || PKG_MESON_OPTS_TARGET+=" -Dintel=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "(r200|r300|r600|radeonsi)" &&
+  PKG_MESON_OPTS_TARGET+=" -Dradeon=true" || PKG_MESON_OPTS_TARGET+=" -Dradeon=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "radeonsi" &&
+  PKG_MESON_OPTS_TARGET+=" -Damdgpu=true" || PKG_MESON_OPTS_TARGET+=" -Damdgpu=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "vmware" &&
+  PKG_MESON_OPTS_TARGET+=" -Dvmwgfx=true" || PKG_MESON_OPTS_TARGET+=" -Dvmwgfx=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "vc4" &&
+  PKG_MESON_OPTS_TARGET+=" -Dvc4=true" || PKG_MESON_OPTS_TARGET+=" -Dvc4=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "freedreno" &&
+  PKG_MESON_OPTS_TARGET+=" -Dfreedreno=true" || PKG_MESON_OPTS_TARGET+=" -Dfreedreno=false"
+
+listcontains "${GRAPHIC_DRIVERS}" "etnaviv" &&
+  PKG_MESON_OPTS_TARGET+=" -Detnaviv=true" || PKG_MESON_OPTS_TARGET+=" -Detnaviv=false"
+
 post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp -a $PKG_BUILD/.$TARGET_NAME/tests/modetest/modetest $INSTALL/usr/bin/
+  mkdir -p ${INSTALL}/usr/bin
+    cp -a ${PKG_BUILD}/.${TARGET_NAME}/tests/modetest/modetest ${INSTALL}/usr/bin/
 }