From 88481e367a7e4955b387ca7242c53d5aa48096a6 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 29 May 2018 00:07:23 -0700 Subject: [PATCH 1/4] libdrm: rename DRM_CONFIG to PKG_DRM_CONFIG --- packages/graphics/libdrm/package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index 70086bfd7a..900f5a48b2 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -32,29 +32,29 @@ PKG_TOOLCHAIN="autotools" get_graphicdrivers -DRM_CONFIG="--disable-intel --disable-radeon --disable-amdgpu" -DRM_CONFIG="$DRM_CONFIG --disable-nouveau --disable-vmwgfx --disable-vc4" +PKG_DRM_CONFIG="--disable-intel --disable-radeon --disable-amdgpu" +PKG_DRM_CONFIG="$PKG_DRM_CONFIG --disable-nouveau --disable-vmwgfx --disable-vc4" for drv in $GRAPHIC_DRIVERS; do [ "$drv" = "i915" -o "$drv" = "i965" ] && \ - DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-intel/enable-intel/'` + PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-intel/enable-intel/'` [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeonsi" ] && \ - DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-radeon/enable-radeon/'` && \ - DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-amdgpu/enable-amdgpu/'` + PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-radeon/enable-radeon/'` && \ + PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-amdgpu/enable-amdgpu/'` [ "$drv" = "vmware" ] && \ - DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-vmwgfx/enable-vmwgfx/'` + PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-vmwgfx/enable-vmwgfx/'` [ "$drv" = "vc4" ] && \ - DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-vc4/enable-vc4/'` + PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-vc4/enable-vc4/'` done PKG_CONFIGURE_OPTS_TARGET="--disable-udev \ --enable-largefile \ --with-kernel-source=$(kernel_path) \ --disable-libkms \ - $DRM_CONFIG \ + $PKG_DRM_CONFIG \ --disable-nouveau \ --disable-freedreno \ --disable-install-test-programs \ From 7e816892fcb76a9a485a7ca10d93b4c863dc9d59 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 28 May 2018 23:31:45 -0700 Subject: [PATCH 2/4] libdrm: change to use meson --- packages/graphics/libdrm/package.mk | 51 +++++++++++++++-------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index 900f5a48b2..dfd1141360 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -28,36 +28,37 @@ PKG_DEPENDS_TARGET="toolchain libpciaccess" PKG_SECTION="graphics" PKG_SHORTDESC="libdrm: Userspace interface to kernel DRM services" PKG_LONGDESC="The userspace interface library to kernel DRM services." -PKG_TOOLCHAIN="autotools" +PKG_TOOLCHAIN="meson" get_graphicdrivers -PKG_DRM_CONFIG="--disable-intel --disable-radeon --disable-amdgpu" -PKG_DRM_CONFIG="$PKG_DRM_CONFIG --disable-nouveau --disable-vmwgfx --disable-vc4" +PKG_DRM_CONFIG="-Dnouveau=false \ + -Domap=false \ + -Dexynos=false \ + -Dfreedreno=false \ + -Dtegra=false \ + -Detnaviv=false" -for drv in $GRAPHIC_DRIVERS; do - [ "$drv" = "i915" -o "$drv" = "i965" ] && \ - PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-intel/enable-intel/'` +listcontains "$GRAPHIC_DRIVERS" "(i915|i965)" && + PKG_DRM_CONFIG+=" -Dintel=true" || PKG_DRM_CONFIG+=" -Dintel=false" - [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeonsi" ] && \ - PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-radeon/enable-radeon/'` && \ - PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-amdgpu/enable-amdgpu/'` +listcontains "$GRAPHIC_DRIVERS" "(r200|r300|r600|radeonsi)" && + PKG_DRM_CONFIG+=" -Dradeon=true" || PKG_DRM_CONFIG+=" -Dradeon=false" - [ "$drv" = "vmware" ] && \ - PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-vmwgfx/enable-vmwgfx/'` +listcontains "$GRAPHIC_DRIVERS" "radeonsi" && + PKG_DRM_CONFIG+=" -Damdgpu=true" || PKG_DRM_CONFIG+=" -Damdgpu=false" - [ "$drv" = "vc4" ] && \ - PKG_DRM_CONFIG=`echo $PKG_DRM_CONFIG | sed -e 's/disable-vc4/enable-vc4/'` -done +listcontains "$GRAPHIC_DRIVERS" "vmware" && + PKG_DRM_CONFIG+=" -Dvmwgfx=true" || PKG_DRM_CONFIG+=" -Dvmwgfx=false" -PKG_CONFIGURE_OPTS_TARGET="--disable-udev \ - --enable-largefile \ - --with-kernel-source=$(kernel_path) \ - --disable-libkms \ - $PKG_DRM_CONFIG \ - --disable-nouveau \ - --disable-freedreno \ - --disable-install-test-programs \ - --disable-cairo-tests \ - --disable-manpages \ - --disable-valgrind" +listcontains "$GRAPHIC_DRIVERS" "vc4" && + PKG_DRM_CONFIG+=" -Dvc4=true" || PKG_DRM_CONFIG+=" -Dvc4=false" + +PKG_MESON_OPTS_TARGET="-Dlibkms=false \ + $PKG_DRM_CONFIG \ + -Dcairo-tests=false \ + -Dman-pages=false \ + -Dvalgrind=false \ + -Dfreedreno-kgsl=false \ + -Dinstall-test-programs=false \ + -Dudev=false" From e1969fcf1b867d7674332f164df028570df4afff Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 28 May 2018 23:33:15 -0700 Subject: [PATCH 3/4] libdrm: update to 2.4.92 --- packages/graphics/libdrm/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index dfd1141360..21147cff67 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -18,8 +18,8 @@ ################################################################################ PKG_NAME="libdrm" -PKG_VERSION="2.4.91" -PKG_SHA256="634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800" +PKG_VERSION="2.4.92" +PKG_SHA256="e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51ff39fa" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://dri.freedesktop.org" From bdeecdee10e82f897f9ea5ebbc1889726e4ebc4a Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 29 May 2018 00:09:10 -0700 Subject: [PATCH 4/4] libdrm: add modetest to builds --- packages/graphics/libdrm/package.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index 21147cff67..ef6e61cf42 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -62,3 +62,8 @@ PKG_MESON_OPTS_TARGET="-Dlibkms=false \ -Dfreedreno-kgsl=false \ -Dinstall-test-programs=false \ -Dudev=false" + +post_makeinstall_target() { + mkdir -p $INSTALL/usr/bin + cp -a $PKG_BUILD/.$TARGET_NAME/tests/modetest/modetest $INSTALL/usr/bin/ +}