Thanks, applied as 518208393b24ec14f2d55ae4be49dcf482f7aebc. Michael
[sent from post-receive hook] On Mon, 20 Jun 2022 08:19:36 +0200, Christian Melki <[email protected]> wrote: > Minor fixes. > > Notable changes: libkms is now gone. It's use was discouraged > from the beginning and I don't think others should require it. > Although there might still be strict requirements without actual > use left in the wild. > > * Remove LIBKMS option. > * Remove kmstest program, but keep modetest. It should not be dependent > on libkms. > * Remove repetitive KMS help text, it might mislead user to thinking this > is related to libkms. I think it's sufficient to say that libdrm > has support for various underlying hardware. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/libdrm.in b/rules/libdrm.in > index 85f462e8da08..1b43551f7c70 100644 > --- a/rules/libdrm.in > +++ b/rules/libdrm.in > @@ -14,53 +14,49 @@ menuconfig LIBDRM > > if LIBDRM > > -config LIBDRM_LIBKMS > - bool > - prompt "build libkms" > - > config LIBDRM_INTEL > bool > - prompt "intel KMS support" > + prompt "intel support" > > config LIBDRM_RADEON > bool > - prompt "radeon KMS support" > + prompt "radeon support" > > config LIBDRM_AMDGPU > bool > - prompt "amdgpu KMS support" > + prompt "amdgpu support" > > config LIBDRM_NOUVEAU > bool > - prompt "nouveau KMS support" > + prompt "nouveau support" > > config LIBDRM_VMWGFX > bool > - prompt "vmwgfx KMS support" > + prompt "vmwgfx support" > > config LIBDRM_OMAP > bool > - prompt "omap KMS support" > + prompt "omap support" > > config LIBDRM_EXYNOS > bool > - prompt "exynos KMS support" > + prompt "exynos support" > > config LIBDRM_FREEDRENO > bool > - prompt "freedreno KMS support" > + prompt "freedreno support" > > config LIBDRM_TEGRA > bool > - prompt "tegra KMS support" > + prompt "tegra support" > > config LIBDRM_VC4 > bool > - prompt "vc4 KMS support" > + prompt "vc4 support" > > config LIBDRM_ETNAVIV > bool > - prompt "etnaviv KMS support" > + prompt "etnaviv support" > > config LIBDRM_TESTS > bool > diff --git a/rules/libdrm.make b/rules/libdrm.make > index 033192468489..175d7169f2c2 100644 > --- a/rules/libdrm.make > +++ b/rules/libdrm.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm > # > # Paths and names > # > -LIBDRM_VERSION := 2.4.110 > -LIBDRM_MD5 := ef6449de30a41ecdf69dc7ae78e676a9 > +LIBDRM_VERSION := 2.4.111 > +LIBDRM_MD5 := 6fc1c5b01d8568d10c7d4d84ddd8efa3 > LIBDRM := libdrm-$(LIBDRM_VERSION) > LIBDRM_SUFFIX := tar.xz > LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) > @@ -58,7 +58,6 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) > LIBDRM_CONF_TOOL := meson > LIBDRM_CONF_OPT := \ > $(CROSS_MESON_USR) \ > - -Dlibkms=$(call ptx/truefalse, PTXCONF_LIBDRM_LIBKMS) \ > $(patsubst %,-D%=true,$(LIBDRM_BACKENDSC-y)) \ > $(patsubst %,-D%=false,$(LIBDRM_BACKENDSC-)) \ > -Dcairo-tests=false \ > @@ -83,17 +82,11 @@ $(STATEDIR)/libdrm.targetinstall: > > @$(call install_lib, libdrm, 0, 0, 0644, libdrm) > > -ifdef PTXCONF_LIBDRM_LIBKMS > - @$(call install_lib, libdrm, 0, 0, 0644, libkms) > -endif > @$(foreach backend,$(LIBDRM_BACKENDSL-y), \ > $(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));) > > ifdef PTXCONF_LIBDRM_TESTS > -ifdef PTXCONF_LIBDRM_LIBKMS > - @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/kmstest) > @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest) > -endif > @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modeprint) > @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/vbltest) > ifdef PTXCONF_LIBDRM_ETNAVIV
