oasis

commit: c4e9c53cdc8c7e176097222d7c3da9124d0b8871
parent 7e693e5ca5ac53146b6e3f250810942a64690b66
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 10 Mar 2018 17:29:34 -0800

libdrm: Update to 2.4.91

Diffstat:
A
pkg/libdrm/README.md
14
++++++++++++++
M
pkg/libdrm/config.h
31
+++++++++++--------------------
M
pkg/libdrm/gen.lua
16
++++++++++------
M
pkg/libdrm/rev
2
+-

4 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/pkg/libdrm/README.md b/pkg/libdrm/README.md
@@ -0,0 +1,14 @@
+# libdrm
+
+# `config.h`
+Generated with
+
+	./configure \
+		--disable-amdgpu \
+		--disable-intel \
+		--disable-nouveau \
+		--disable-radeon \
+		--disable-vmwgfx
+
+`HAVE_INTEL`, `HAVE_NOUVEAU`, and `HAVE_AMDGPU` were removed since they get
+defined in `gen.lua` based on the keys in `config.video_drivers`.
diff --git a/pkg/libdrm/config.h b/pkg/libdrm/config.h
@@ -2,25 +2,17 @@
 /* #undef C_ALLOCA */
 #define HAVE_ALLOCA 1
 #define HAVE_ALLOCA_H 1
-/* #undef HAVE_AMDGPU */
-/* #undef HAVE_CAIRO */
+#define HAVE_CAIRO 0
 #define HAVE_CLOCK_GETTIME 1
-/* #undef HAVE_CUNIT */
 #define HAVE_DLFCN_H 1
-/* #undef HAVE_ETNAVIV */
-/* #undef HAVE_EXYNOS */
-/* #undef HAVE_FREEDRENO */
-/* #undef HAVE_FREEDRENO_KGSL */
-/* #undef HAVE_INSTALL_TESTS */
-/* #undef HAVE_INTEL */
+#define HAVE_EXYNOS 0
+#define HAVE_FREEDRENO_KGSL 0
 #define HAVE_INTTYPES_H 1
 #define HAVE_LIBDRM_ATOMIC_PRIMITIVES 1
-/* #undef HAVE_LIB_ATOMIC_OPS */
+#define HAVE_LIB_ATOMIC_OPS 0
 #define HAVE_MEMORY_H 1
-/* #undef HAVE_NOUVEAU */
-/* #undef HAVE_OMAP */
 #define HAVE_OPEN_MEMSTREAM 1
-/* #undef HAVE_RADEON */
+#define HAVE_RADEON 0
 #define HAVE_STDINT_H 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRINGS_H 1
@@ -29,22 +21,21 @@
 #define HAVE_SYS_STAT_H 1
 /* #undef HAVE_SYS_SYSCTL_H */
 #define HAVE_SYS_TYPES_H 1
-/* #undef HAVE_TEGRA */
 #define HAVE_UNISTD_H 1
-/* #undef HAVE_VALGRIND */
-/* #undef HAVE_VC4 */
+#define HAVE_VALGRIND 0
+#define HAVE_VC4 0
 #define HAVE_VISIBILITY 1
-/* #undef HAVE_VMWGFX */
+#define HAVE_VMWGFX 0
 #define LT_OBJDIR ".libs/"
 /* #undef MAJOR_IN_MKDEV */
 /* #undef MAJOR_IN_SYSMACROS */
 #define PACKAGE "libdrm"
 #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
 #define PACKAGE_NAME "libdrm"
-#define PACKAGE_STRING "libdrm 2.4.89"
+#define PACKAGE_STRING "libdrm 2.4.91"
 #define PACKAGE_TARNAME "libdrm"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "2.4.89"
+#define PACKAGE_VERSION "2.4.91"
 /* #undef STACK_DIRECTION */
 #define STDC_HEADERS 1
 /* #undef UDEV */
@@ -63,7 +54,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "2.4.89"
+#define VERSION "2.4.91"
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua
@@ -1,5 +1,13 @@
+local function havedriver(name)
+	local enabled = config.video_drivers[name]
+	return '-D HAVE_'..name:upper()..'='..(enabled and '1' or '0')
+end
+
 cflags{
 	'-D HAVE_CONFIG_H',
+	havedriver('intel'),
+	havedriver('nouveau'),
+	havedriver('amdgpu'),
 	'-I $dir',
 	'-I $srcdir',
 	'-I $srcdir/include/drm',
@@ -14,7 +22,7 @@ lib('libdrm.a', {
 })
 
 if config.video_drivers and config.video_drivers['intel'] then
-	cflags{'-D HAVE_INTEL=1', '-I pkg/libpciaccess/src/include'}
+	cflags{'-I pkg/libpciaccess/src/include'}
 	pkg.deps = {'pkg/libpciaccess/fetch'}
 	lib('libdrm_intel.a', [[
 		intel/(
@@ -29,7 +37,6 @@ if config.video_drivers and config.video_drivers['intel'] then
 end
 
 if config.video_drivers and config.video_drivers['nouveau'] then
-	cflags{'-D HAVE_NOUVEAU=1'}
 	lib('libdrm_nouveau.a', [[
 		nouveau/(
 			nouveau.c
@@ -41,10 +48,7 @@ if config.video_drivers and config.video_drivers['nouveau'] then
 end
 
 if config.video_drivers and config.video_drivers['amdgpu'] then
-	cflags{
-		'-D HAVE_AMDGPU=1',
-		[[-D 'AMDGPU_ASIC_ID_TABLE="/share/libdrm/amdgpu.ids"']],
-	}
+	cflags{[[-D 'AMDGPU_ASIC_ID_TABLE="/share/libdrm/amdgpu.ids"']]}
 	lib('libdrm_amdgpu.a', [[
 		amdgpu/(
 			amdgpu_asic_id.c
diff --git a/pkg/libdrm/rev b/pkg/libdrm/rev
@@ -1 +1 @@
-16
+17