Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libdrm/dist merge libdrm 2.4.102.
details: https://anonhg.NetBSD.org/xsrc/rev/a2bd06c48b86
branches: trunk
changeset: 10589:a2bd06c48b86
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Nov 01 09:57:37 2020 +0000
description:
merge libdrm 2.4.102.
diffstat:
external/mit/libdrm/dist/Android.mk | 74 +
external/mit/libdrm/dist/Makefile.am | 176 -
external/mit/libdrm/dist/Makefile.in | 1297 -
external/mit/libdrm/dist/aclocal.m4 | 3339 --
external/mit/libdrm/dist/amdgpu/Makefile.am | 53 -
external/mit/libdrm/dist/amdgpu/Makefile.in | 1148 -
external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check | 92 -
external/mit/libdrm/dist/build-aux/compile | 347 -
external/mit/libdrm/dist/build-aux/config.guess | 1480 -
external/mit/libdrm/dist/build-aux/config.sub | 1801 -
external/mit/libdrm/dist/build-aux/depcomp | 791 -
external/mit/libdrm/dist/build-aux/install-sh | 508 -
external/mit/libdrm/dist/build-aux/ltmain.sh | 11369 -------
external/mit/libdrm/dist/build-aux/missing | 215 -
external/mit/libdrm/dist/build-aux/test-driver | 148 -
external/mit/libdrm/dist/config.h.in | 192 -
external/mit/libdrm/dist/configure | 17126 -----------
external/mit/libdrm/dist/configure.ac | 605 -
external/mit/libdrm/dist/data/Makefile.am | 25 -
external/mit/libdrm/dist/data/Makefile.in | 549 -
external/mit/libdrm/dist/etnaviv/Makefile.am | 28 -
external/mit/libdrm/dist/etnaviv/Makefile.in | 1124 -
external/mit/libdrm/dist/etnaviv/etnaviv-symbol-check | 55 -
external/mit/libdrm/dist/exynos/Makefile.am | 29 -
external/mit/libdrm/dist/exynos/Makefile.in | 1131 -
external/mit/libdrm/dist/exynos/exynos-symbol-check | 42 -
external/mit/libdrm/dist/freedreno/Android.mk | 14 +
external/mit/libdrm/dist/freedreno/Makefile.am | 33 -
external/mit/libdrm/dist/freedreno/Makefile.in | 1199 -
external/mit/libdrm/dist/freedreno/freedreno-symbol-check | 65 -
external/mit/libdrm/dist/include/drm/drm.h | 5 +-
external/mit/libdrm/dist/intel/Android.mk | 38 +
external/mit/libdrm/dist/intel/Makefile.am | 75 -
external/mit/libdrm/dist/intel/Makefile.in | 1233 -
external/mit/libdrm/dist/intel/intel-symbol-check | 102 -
external/mit/libdrm/dist/intel/intel_bufmgr_gem.c | 45 +-
external/mit/libdrm/dist/intel/tests/gen4-3d.batch.sh | 20 -
external/mit/libdrm/dist/intel/tests/gen5-3d.batch.sh | 20 -
external/mit/libdrm/dist/intel/tests/gen6-3d.batch.sh | 20 -
external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch.sh | 20 -
external/mit/libdrm/dist/intel/tests/gen7-3d.batch.sh | 20 -
external/mit/libdrm/dist/intel/tests/gm45-3d.batch.sh | 20 -
external/mit/libdrm/dist/libkms/Android.mk | 51 +
external/mit/libdrm/dist/libkms/Makefile.am | 45 -
external/mit/libdrm/dist/libkms/Makefile.in | 1142 -
external/mit/libdrm/dist/libkms/kms-symbol-check | 27 -
external/mit/libdrm/dist/m4/libtool.m4 | 8394 -----
external/mit/libdrm/dist/m4/ltoptions.m4 | 437 -
external/mit/libdrm/dist/m4/ltsugar.m4 | 124 -
external/mit/libdrm/dist/m4/ltversion.m4 | 23 -
external/mit/libdrm/dist/m4/lt~obsolete.m4 | 99 -
external/mit/libdrm/dist/man/Makefile.am | 62 -
external/mit/libdrm/dist/man/Makefile.in | 633 -
external/mit/libdrm/dist/nouveau/Android.mk | 14 +
external/mit/libdrm/dist/nouveau/Makefile.am | 35 -
external/mit/libdrm/dist/nouveau/Makefile.in | 1150 -
external/mit/libdrm/dist/nouveau/nouveau-symbol-check | 60 -
external/mit/libdrm/dist/omap/Makefile.am | 26 -
external/mit/libdrm/dist/omap/Makefile.in | 1125 -
external/mit/libdrm/dist/omap/omap-symbol-check | 37 -
external/mit/libdrm/dist/radeon/Android.mk | 14 +
external/mit/libdrm/dist/radeon/Makefile.am | 49 -
external/mit/libdrm/dist/radeon/Makefile.in | 1150 -
external/mit/libdrm/dist/radeon/radeon-symbol-check | 63 -
external/mit/libdrm/dist/tegra/Makefile.am | 27 -
external/mit/libdrm/dist/tegra/Makefile.in | 1101 -
external/mit/libdrm/dist/tegra/tegra-symbol-check | 35 -
external/mit/libdrm/dist/tests/Makefile.am | 53 -
external/mit/libdrm/dist/tests/Makefile.in | 1224 -
external/mit/libdrm/dist/tests/amdgpu/Makefile.am | 38 -
external/mit/libdrm/dist/tests/amdgpu/Makefile.in | 877 -
external/mit/libdrm/dist/tests/etnaviv/Makefile.am | 43 -
external/mit/libdrm/dist/tests/etnaviv/Makefile.in | 734 -
external/mit/libdrm/dist/tests/exynos/Makefile.am | 48 -
external/mit/libdrm/dist/tests/exynos/Makefile.in | 739 -
external/mit/libdrm/dist/tests/kms/Makefile.am | 37 -
external/mit/libdrm/dist/tests/kms/Makefile.in | 738 -
external/mit/libdrm/dist/tests/kmstest/Makefile.am | 26 -
external/mit/libdrm/dist/tests/kmstest/Makefile.in | 692 -
external/mit/libdrm/dist/tests/modeprint/Makefile.am | 20 -
external/mit/libdrm/dist/tests/modeprint/Makefile.in | 687 -
external/mit/libdrm/dist/tests/modetest/Android.mk | 14 +
external/mit/libdrm/dist/tests/modetest/Makefile.am | 25 -
external/mit/libdrm/dist/tests/modetest/Makefile.in | 694 -
external/mit/libdrm/dist/tests/modetest/modetest.c | 890 +-
external/mit/libdrm/dist/tests/nouveau/Makefile.am | 17 -
external/mit/libdrm/dist/tests/nouveau/Makefile.in | 1005 -
external/mit/libdrm/dist/tests/proptest/Makefile.am | 22 -
external/mit/libdrm/dist/tests/proptest/Makefile.in | 690 -
external/mit/libdrm/dist/tests/radeon/Makefile.am | 15 -
external/mit/libdrm/dist/tests/radeon/Makefile.in | 631 -
external/mit/libdrm/dist/tests/random.c | 120 -
external/mit/libdrm/dist/tests/tegra/Makefile.am | 15 -
external/mit/libdrm/dist/tests/tegra/Makefile.in | 631 -
external/mit/libdrm/dist/tests/util/Makefile.am | 13 -
external/mit/libdrm/dist/tests/util/Makefile.in | 666 -
external/mit/libdrm/dist/tests/vbltest/Makefile.am | 20 -
external/mit/libdrm/dist/tests/vbltest/Makefile.in | 687 -
external/mit/libdrm/dist/vc4/Makefile.am | 35 -
external/mit/libdrm/dist/vc4/Makefile.in | 658 -
external/mit/libdrm/dist/xf86atomic.h | 1 +
external/mit/libdrm/dist/xf86drm.c | 316 +-
external/mit/libdrm/dist/xf86drm.h | 25 +
external/mit/libdrm/dist/xf86drmMode.c | 52 +-
external/mit/libdrm/dist/xf86drmMode.h | 18 +
105 files changed, 1145 insertions(+), 74667 deletions(-)
diffs (truncated from 77144 to 300 lines):
diff -r 4c4003a42ccf -r a2bd06c48b86 external/mit/libdrm/dist/Android.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libdrm/dist/Android.mk Sun Nov 01 09:57:37 2020 +0000
@@ -0,0 +1,74 @@
+#
+# Copyright © 2011-2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+
+LIBDRM_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+ifneq ($(filter 2 4, $(LIBDRM_ANDROID_MAJOR_VERSION)),)
+$(error "Android 4.4 and earlier not supported")
+endif
+
+LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
+
+LOCAL_PATH := $(call my-dir)
+LIBDRM_TOP := $(LOCAL_PATH)
+
+include $(CLEAR_VARS)
+
+# Import variables LIBDRM_{,H,INCLUDE_H,INCLUDE_ANDROID_H,INCLUDE_VMWGFX_H}_FILES
+include $(LOCAL_PATH)/Makefile.sources
+
+#static library for the device (recovery)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libdrm
+
+LOCAL_SRC_FILES := $(LIBDRM_FILES)
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/include/drm \
+ $(LOCAL_PATH)/android
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/include/drm
+
+include $(LIBDRM_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# Shared library for the device
+include $(CLEAR_VARS)
+LOCAL_MODULE := libdrm
+
+LOCAL_SRC_FILES := $(LIBDRM_FILES)
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/include/drm \
+ $(LOCAL_PATH)/android
+
+LOCAL_SHARED_LIBRARIES := \
+ libcutils
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/include/drm
+
+include $(LIBDRM_COMMON_MK)
+include $(BUILD_SHARED_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff -r 4c4003a42ccf -r a2bd06c48b86 external/mit/libdrm/dist/Makefile.am
--- a/external/mit/libdrm/dist/Makefile.am Sun Nov 01 09:51:24 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-# Copyright 2005 Adam Jackson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-include Makefile.sources
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-AM_MAKEFLAGS = -s
-AM_DISTCHECK_CONFIGURE_FLAGS = \
- --enable-udev \
- --enable-libkms \
- --enable-intel \
- --enable-radeon \
- --enable-amdgpu \
- --enable-nouveau \
- --enable-vc4 \
- --enable-vmwgfx \
- --enable-omap-experimental-api \
- --enable-exynos-experimental-api \
- --enable-freedreno \
- --enable-freedreno-kgsl\
- --enable-tegra-experimental-api \
- --enable-etnaviv-experimental-api \
- --enable-install-test-programs \
- --enable-cairo-tests \
- --enable-manpages \
- --enable-valgrind
-
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libdrm.pc
-
-if HAVE_LIBKMS
-LIBKMS_SUBDIR = libkms
-endif
-
-if HAVE_INTEL
-INTEL_SUBDIR = intel
-endif
-
-if HAVE_NOUVEAU
-NOUVEAU_SUBDIR = nouveau
-endif
-
-if HAVE_RADEON
-RADEON_SUBDIR = radeon
-endif
-
-if HAVE_AMDGPU
-AMDGPU_SUBDIR = amdgpu
-endif
-
-if HAVE_OMAP
-OMAP_SUBDIR = omap
-endif
-
-if HAVE_EXYNOS
-EXYNOS_SUBDIR = exynos
-endif
-
-if HAVE_FREEDRENO
-FREEDRENO_SUBDIR = freedreno
-endif
-
-if HAVE_TEGRA
-TEGRA_SUBDIR = tegra
-endif
-
-if HAVE_VC4
-VC4_SUBDIR = vc4
-endif
-
-if HAVE_ETNAVIV
-ETNAVIV_SUBDIR = etnaviv
-endif
-
-if BUILD_MANPAGES
-if HAVE_MANPAGES_STYLESHEET
-MAN_SUBDIR = man
-endif
-endif
-
-SUBDIRS = \
- . \
- $(LIBKMS_SUBDIR) \
- $(INTEL_SUBDIR) \
- $(NOUVEAU_SUBDIR) \
- $(RADEON_SUBDIR) \
- $(AMDGPU_SUBDIR) \
- $(OMAP_SUBDIR) \
- $(EXYNOS_SUBDIR) \
- $(FREEDRENO_SUBDIR) \
- $(TEGRA_SUBDIR) \
- $(VC4_SUBDIR) \
- $(ETNAVIV_SUBDIR) \
- data \
- tests \
- $(MAN_SUBDIR)
-
-libdrm_la_LTLIBRARIES = libdrm.la
-libdrm_ladir = $(libdir)
-libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
-libdrm_la_LIBADD = @CLOCK_LIB@ -lm
-
-libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
-AM_CFLAGS = \
- $(WARN_CFLAGS) \
- -fvisibility=hidden \
- $(VALGRIND_CFLAGS)
-
-libdrm_la_SOURCES = $(LIBDRM_FILES)
-
-libdrmincludedir = ${includedir}
-libdrminclude_HEADERS = $(LIBDRM_H_FILES)
-
-klibdrmincludedir = ${includedir}/libdrm
-klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
-
-if HAVE_VMWGFX
-klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
-endif
-
-EXTRA_DIST = \
- include/drm/README \
- amdgpu/meson.build \
- data/meson.build \
- etnaviv/meson.build \
- exynos/meson.build \
- freedreno/meson.build \
- intel/meson.build \
- libkms/meson.build \
- man/meson.build \
- nouveau/meson.build \
- omap/meson.build \
- radeon/meson.build \
- tegra/meson.build \
- tests/amdgpu/meson.build \
- tests/etnaviv/meson.build \
- tests/exynos/meson.build \
- tests/kms/meson.build \
- tests/kmstest/meson.build \
- tests/meson.build \
- tests/modeprint/meson.build \
- tests/modetest/meson.build \
- tests/nouveau/meson.build \
- tests/proptest/meson.build \
- tests/radeon/meson.build \
- tests/tegra/meson.build \
- tests/util/meson.build \
- tests/vbltest/meson.build \
- vc4/meson.build \
- meson.build \
- meson_options.txt
-
-copy-headers :
- cp -r $(kernel_source)/include/uapi/drm/*.h $(top_srcdir)/include/drm/
-
-commit-headers : copy-headers
- git add include/drm/*.h
- git commit -am "Copy headers from kernel $$(GIT_DIR=$(kernel_source)/.git git describe)"
diff -r 4c4003a42ccf -r a2bd06c48b86 external/mit/libdrm/dist/Makefile.in
--- a/external/mit/libdrm/dist/Makefile.in Sun Nov 01 09:51:24 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1297 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright 2005 Adam Jackson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
Home |
Main Index |
Thread Index |
Old Index