diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-09-11 14:25:21 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-09-29 11:24:33 +0200 |
| commit | 3e67c7aaa778b0d9e0408212f42bb623cb7b999c (patch) | |
| tree | db37a5b88a28517211fe08b6f05e88e16120ab48 | |
| parent | afbd50fb72f0661a5f6a3b0f5b0b0d5f82c744b4 (diff) | |
| download | ptxdist-3e67c7aaa778b0d9e0408212f42bb623cb7b999c.tar.gz ptxdist-3e67c7aaa778b0d9e0408212f42bb623cb7b999c.tar.xz | |
libdrm: version bump 2.4.35 -> 2.4.46
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/libdrm.in | 28 | ||||
| -rw-r--r-- | rules/libdrm.make | 42 |
2 files changed, 61 insertions, 9 deletions
diff --git a/rules/libdrm.in b/rules/libdrm.in index c4cf5f474..2710722f4 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -21,5 +21,33 @@ config LIBDRM_INTEL bool prompt "intel KMS support" +config LIBDRM_RADEON + bool + prompt "radeon KMS support" + +config LIBDRM_NOUVEAU + bool + prompt "nouveau KMS support" + +config LIBDRM_VMWGFX + bool + prompt "vmwgfx KMS support" + +config LIBDRM_OMAP + bool + prompt "omap KMS support" + +config LIBDRM_EXYNOS + bool + prompt "exynos KMS support" + +config LIBDRM_FREEDRENO + bool + prompt "freedreno KMS support" + +config LIBDRM_TESTS + bool + prompt "install test programs" + endif diff --git a/rules/libdrm.make b/rules/libdrm.make index d029d5641..e6e782000 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.35 -LIBDRM_MD5 := 77992a226118a55e214f315bf23d4273 +LIBDRM_VERSION := 2.4.46 +LIBDRM_MD5 := b454a43366eb386294f87a5cd16699e6 LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -29,6 +29,23 @@ LIBDRM_DIR := $(BUILDDIR)/$(LIBDRM) # Prepare # ---------------------------------------------------------------------------- +ifdef PTXCONF_ARCH_X86 +LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_INTEL) += intel +endif +LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_RADEON) += radeon +LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_NOUVEAU) += nouveau +LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_VMWGFX) += vmwgfx +LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_OMAP) += omap-experimental-api +LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_OMAP) += omap +LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_EXYNOS) += exynos-experimental-api +LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_EXYNOS) += exynos +LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno-experimental-api +LIBDRM_BACKENDSL-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno + +LIBDRM_BACKENDSC-y += $(LIBDRM_BACKENDS-y) +LIBDRM_BACKENDSC- += $(LIBDRM_BACKENDS-) +LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) + # # autoconf # @@ -37,9 +54,12 @@ LIBDRM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --enable-udev \ --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ - --$(call ptx/endis, PTXCONF_LIBDRM_INTEL)-intel \ - --disable-radeon \ - --disable-nouveau + $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ + $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ + --$(call ptx/endis, PTXCONF_LIBDRM_TESTS)-install-test-programs \ + --disable-cairo-tests \ + --disable-manpages + # ---------------------------------------------------------------------------- # Target-Install @@ -59,10 +79,14 @@ $(STATEDIR)/libdrm.targetinstall: ifdef PTXCONF_LIBDRM_LIBKMS @$(call install_lib, libdrm, 0, 0, 0644, libkms) endif -ifdef PTXCONF_ARCH_X86 -ifdef PTXCONF_LIBDRM_INTEL - @$(call install_lib, libdrm, 0, 0, 0644, libdrm_intel) -endif + @$(foreach backend,$(LIBDRM_BACKENDSL-y), \ + $(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));) + +ifdef PTXCONF_LIBDRM_TESTS + @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/kmstest) + @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modeprint) + @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest) + @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/vbltest) endif @$(call install_finish, libdrm) |