Module Name: src
Committed By: mrg
Date: Thu Jan 10 09:10:31 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile.defines
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile
Log Message:
build fixes for libdrm 2.4.96.
XXX: may still have build issues, and cleandir before
XXX: update builds is likely needed
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile.defines
diff -u src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3 src/external/mit/xorg/lib/libdrm/Makefile.defines:1.4
--- src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3 Wed Mar 14 07:23:00 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines Thu Jan 10 09:10:31 2019
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.defines,v 1.3 2018/03/14 07:23:00 mrg Exp $
+# $NetBSD: Makefile.defines,v 1.4 2019/01/10 09:10:31 mrg Exp $
# common defiles for libdrm components
-CPPFLAGS+= -DHAVE_INTTYPES_H \
+CPPFLAGS+= \
+ -DHAVE_INTTYPES_H \
+ -DHAVE_OPEN_MEMSTREAM \
+ -DHAVE_VISIBILITY \
+ -DHAVE_SETENV \
-DHAVE_STDINT_H \
-DHAVE_STRINGS_H \
-DHAVE_STRING_H \
@@ -10,10 +14,12 @@ CPPFLAGS+= -DHAVE_INTTYPES_H \
-DHAVE_SYS_SYSCTL_H \
-DHAVE_SYS_TYPES_H \
-DHAVE_UNISTD_H
-CPPFLAGS+= -DHAVE_SETENV
# NetBSD has __sync_*().
CPPFLAGS+= -DHAVE_LIBDRM_ATOMIC_PRIMITIVES \
CPPFLAGS+= -DHAVE_NOUVEAU \
+ -DHAVE_AMDGPU \
-DHAVE_RADEON
+
+COPTS+= -fvisibility=hidden
Index: src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.5
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4 Wed Mar 14 07:23:00 2018
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile Thu Jan 10 09:10:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/03/14 07:23:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/10 09:10:31 mrg Exp $
.include <bsd.own.mk>
@@ -14,8 +14,7 @@ SRCS= \
amdgpu_gpu_info.c \
amdgpu_vamgr.c \
amdgpu_vm.c \
- util_hash.c \
- util_hash_table.c
+ handle_table.c
LIBDRMDATADIR= ${X11ROOTDIR}/share/libdrm
# XXX goes away in new libdrm.
