Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src updates for libdrm 2.4.70. build libdrm_amdgpu on x86.



details:   https://anonhg.NetBSD.org/src/rev/be1f1ce4256d
branches:  trunk
changeset: 347188:be1f1ce4256d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Aug 17 03:10:22 2016 +0000

description:
updates for libdrm 2.4.70.  build libdrm_amdgpu on x86.

diffstat:

 distrib/sets/lists/xbase/md.amd64                  |  11 +++++--
 distrib/sets/lists/xbase/md.i386                   |  11 +++++--
 distrib/sets/lists/xbase/shl.mi                    |   4 +-
 distrib/sets/lists/xcomp/md.amd64                  |   6 +++-
 distrib/sets/lists/xcomp/md.i386                   |   6 +++-
 distrib/sets/lists/xcomp/mi                        |   5 ++-
 distrib/sets/lists/xdebug/md.amd64                 |   6 ++-
 distrib/sets/lists/xdebug/md.i386                  |   6 ++-
 distrib/sets/lists/xdebug/shl.mi                   |   4 +-
 external/mit/xorg/lib/Makefile                     |   4 +-
 external/mit/xorg/lib/libdrm/Makefile              |   6 +++-
 external/mit/xorg/lib/libdrm/drm/Makefile          |   8 ++++-
 external/mit/xorg/lib/libdrm/shlib_version         |   4 +-
 external/mit/xorg/lib/libdrm_amdgpu/Makefile       |  30 ++++++++++++++++++++++
 external/mit/xorg/lib/libdrm_amdgpu/shlib_version  |   4 ++
 external/mit/xorg/lib/libdrm_intel/shlib_version   |   4 +-
 external/mit/xorg/lib/libdrm_nouveau/shlib_version |   4 +-
 17 files changed, 93 insertions(+), 30 deletions(-)

diffs (truncated from 365 to 300 lines):

diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xbase/md.amd64
--- a/distrib/sets/lists/xbase/md.amd64 Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xbase/md.amd64 Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.15 2015/10/13 04:33:22 mrg Exp $
+# $NetBSD: md.amd64,v 1.16 2016/08/17 03:10:22 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC.so                 -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC.so.1               -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC.so.1.0             -unknown-               xorg,compatx11file
@@ -11,10 +11,13 @@
 ./usr/X11R7/lib/libchromeXvMCPro.so            -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro.so.1          -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro.so.1.0                -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so               -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1             -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1.0           -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel.so                        -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel.so.0              -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libdrm_intel.so.0.1            -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel.so.0.2            -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.so              -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libdrm_nouveau.so.2            -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libdrm_nouveau.so.2.0          -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3            -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3.0          -unknown-               xorg,compatx11file
 ./usr/X11R7/share/pciids/pci.ids               -unknown-               obsolete
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xbase/md.i386
--- a/distrib/sets/lists/xbase/md.i386  Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xbase/md.i386  Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.29 2015/10/13 04:33:22 mrg Exp $
+# $NetBSD: md.i386,v 1.30 2016/08/17 03:10:22 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC.so                 -unknown-               xorg
 ./usr/X11R7/lib/libI810XvMC.so.1               -unknown-               xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0             -unknown-               xorg
@@ -11,10 +11,13 @@
 ./usr/X11R7/lib/libchromeXvMCPro.so            -unknown-               xorg
 ./usr/X11R7/lib/libchromeXvMCPro.so.1          -unknown-               xorg
 ./usr/X11R7/lib/libchromeXvMCPro.so.1.0                -unknown-               xorg
+./usr/X11R7/lib/libdrm_amdgpu.so               -unknown-               xorg
+./usr/X11R7/lib/libdrm_amdgpu.so.1             -unknown-               xorg
+./usr/X11R7/lib/libdrm_amdgpu.so.1.0           -unknown-               xorg
 ./usr/X11R7/lib/libdrm_intel.so                        -unknown-               xorg
 ./usr/X11R7/lib/libdrm_intel.so.0              -unknown-               xorg
-./usr/X11R7/lib/libdrm_intel.so.0.1            -unknown-               xorg
+./usr/X11R7/lib/libdrm_intel.so.0.2            -unknown-               xorg
 ./usr/X11R7/lib/libdrm_nouveau.so              -unknown-               xorg
-./usr/X11R7/lib/libdrm_nouveau.so.2            -unknown-               xorg
-./usr/X11R7/lib/libdrm_nouveau.so.2.0          -unknown-               xorg
+./usr/X11R7/lib/libdrm_nouveau.so.3            -unknown-               xorg
+./usr/X11R7/lib/libdrm_nouveau.so.3.0          -unknown-               xorg
 ./usr/X11R7/share/pciids/pci.ids               -unknown-               obsolete
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.70 2016/08/16 00:55:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.71 2016/08/17 03:10:22 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -311,7 +311,7 @@
 ./usr/X11R7/lib/libXxf86vm.so.2.0              -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so                      -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so.3                    -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libdrm.so.3.3                  -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3.4                  -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so               -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0             -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0.0           -unknown-               xorg,compatx11file
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xcomp/md.amd64
--- a/distrib/sets/lists/xcomp/md.amd64 Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xcomp/md.amd64 Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.46 2016/01/26 21:18:43 christos Exp $
+# $NetBSD: md.amd64,v 1.47 2016/08/17 03:10:22 mrg Exp $
 ./usr/X11R6/include/xf86Optrec.h                       -unknown-       x11
 ./usr/X11R6/include/xf86Parser.h                       -unknown-       x11
 ./usr/X11R6/man/cat3/XF86VidMode.0                     -unknown-       .cat,x11
@@ -83,12 +83,16 @@
 ./usr/X11R7/lib/libchromeXvMCPro_pic.a                 -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libchromeXvMC_p.a                      -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMC_pic.a                    -unknown-       xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.a                                -unknown-       xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_p.a                      -unknown-       profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_pic.a                    -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libdrm_intel.a                         -unknown-       xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel_p.a                       -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel_pic.a                     -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.a                       -unknown-       xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_p.a                     -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_pic.a                   -unknown-       xorg,picinstall,compatx11file
+./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc             -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/libdrm_intel.pc              -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc            -unknown-       xorg
 ./usr/libdata/lint/llib-lI810XvMC.ln                   -unknown-       lint,xorg
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xcomp/md.i386
--- a/distrib/sets/lists/xcomp/md.i386  Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xcomp/md.i386  Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.51 2016/01/27 15:55:18 christos Exp $
+# $NetBSD: md.i386,v 1.52 2016/08/17 03:10:22 mrg Exp $
 #./usr/libdata/lint/llib-lIntelXvMC.ln                 -unknown-       lint,xorg
 ./usr/X11R6/include/xf86Optrec.h                       -unknown-       x11
 ./usr/X11R6/include/xf86Parser.h                       -unknown-       x11
@@ -84,12 +84,16 @@
 ./usr/X11R7/lib/libchromeXvMCPro_pic.a                 -unknown-       xorg,picinstall
 ./usr/X11R7/lib/libchromeXvMC_p.a                      -unknown-       profile,xorg
 ./usr/X11R7/lib/libchromeXvMC_pic.a                    -unknown-       xorg,picinstall
+./usr/X11R7/lib/libdrm_amdgpu.a                                -unknown-       xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_p.a                      -unknown-       profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_pic.a                    -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libdrm_intel.a                         -unknown-       xorg
 ./usr/X11R7/lib/libdrm_intel_p.a                       -unknown-       profile,xorg
 ./usr/X11R7/lib/libdrm_intel_pic.a                     -unknown-       xorg,picinstall
 ./usr/X11R7/lib/libdrm_nouveau.a                       -unknown-       xorg
 ./usr/X11R7/lib/libdrm_nouveau_p.a                     -unknown-       profile,xorg
 ./usr/X11R7/lib/libdrm_nouveau_pic.a                   -unknown-       xorg,picinstall
+./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc             -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/libdrm_intel.pc              -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc            -unknown-       xorg
 ./usr/libdata/lint/llib-lI810XvMC.ln                   -unknown-       lint,xorg
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xcomp/mi       Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.179 2016/08/16 01:10:19 mrg Exp $
+#       $NetBSD: mi,v 1.180 2016/08/17 03:10:22 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5796,6 +5796,8 @@
 ./usr/X11R7/include/freetype2/ttunpat.h                        -unknown-       obsolete
 ./usr/X11R7/include/ft2build.h                         xcomp-obsolete  obsolete
 ./usr/X11R7/include/gbm.h                              -unknown-       xorg
+./usr/X11R7/include/libdrm/amdgpu.h                    -unknown-       xorg
+./usr/X11R7/include/libdrm/amdgpu_drm.h                        -unknown-       xorg
 ./usr/X11R7/include/libdrm/drm.h                       -unknown-       xorg
 ./usr/X11R7/include/libdrm/drm_fourcc.h                        -unknown-       xorg
 ./usr/X11R7/include/libdrm/drm_mode.h                  -unknown-       xorg
@@ -5822,6 +5824,7 @@
 ./usr/X11R7/include/libdrm/savage_drm.h                        -unknown-       xorg
 ./usr/X11R7/include/libdrm/sis_drm.h                   -unknown-       xorg
 ./usr/X11R7/include/libdrm/via_drm.h                   -unknown-       xorg
+./usr/X11R7/include/libdrm/virtgpu_drm.h               -unknown-       xorg
 ./usr/X11R7/include/libkms/libkms.h                    -unknown-       xorg
 ./usr/X11R7/include/pciaccess.h                                -unknown-       xorg
 ./usr/X11R7/include/pixman-1/pixman-version.h          -unknown-       xorg
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64        Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64        Wed Aug 17 03:10:22 2016 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: md.amd64,v 1.25 2016/01/27 11:54:07 wiz Exp $
+# $NetBSD: md.amd64,v 1.26 2016/08/17 03:10:23 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a                                -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a                       -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a                   -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMC_g.a                      -unknown-       debuglib,xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_g.a                      -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel_g.a                       -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_g.a                     -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a          -unknown-       xorg,debuglib,obsolete
@@ -46,7 +47,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug    -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug   -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug        -unknown-               xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.1.debug    -unknown-               xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.0.debug   -unknown-               xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.2.debug    -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug  -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug      -unknown-               obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug      -unknown-               xorg,debug
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xdebug/md.i386
--- a/distrib/sets/lists/xdebug/md.i386 Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xdebug/md.i386 Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.22 2016/01/27 15:55:18 christos Exp $
+# $NetBSD: md.i386,v 1.23 2016/08/17 03:10:23 mrg Exp $
 ./usr/X11R6/lib/modules/extensions/libGLcore_g.a       -unknown-       debuglib,x11
 ./usr/X11R6/lib/modules/extensions/libdbe_g.a          -unknown-       debuglib,x11
 ./usr/X11R6/lib/modules/extensions/libextmod_g.a       -unknown-       debuglib,x11
@@ -39,6 +39,7 @@
 ./usr/X11R7/lib/libIntelXvMC_g.a                       -unknown-       debuglib,xorg
 ./usr/X11R7/lib/libchromeXvMCPro_g.a                   -unknown-       debuglib,xorg
 ./usr/X11R7/lib/libchromeXvMC_g.a                      -unknown-       debuglib,xorg
+./usr/X11R7/lib/libdrm_amdgpu_g.a                      -unknown-       debuglib,xorg
 ./usr/X11R7/lib/libdrm_intel_g.a                       -unknown-       debuglib,xorg
 ./usr/X11R7/lib/libdrm_nouveau_g.a                     -unknown-       debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libGLcore_g.a       -unknown-       obsolete
@@ -92,7 +93,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug    -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug   -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug        -unknown-               xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.1.debug    -unknown-               xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.0.1.debug   -unknown-               xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.2.debug    -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug  -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug      -unknown-               obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug      -unknown-               xorg,debug
diff -r 020baaea59cd -r be1f1ce4256d distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Wed Aug 17 00:22:56 2016 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.33 2016/08/16 00:55:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.34 2016/08/17 03:10:23 mrg Exp $
 ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug                   -unknown-               x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug                   -unknown-               x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug                  -unknown-               x11,debug
@@ -101,7 +101,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug     -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug    -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug      -unknown-               xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.3.debug  -unknown-               xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.4.debug  -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug   -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug        -obsolete-              obsolete,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug   -unknown-               xorg,debug,compatx11file
diff -r 020baaea59cd -r be1f1ce4256d external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Wed Aug 17 00:22:56 2016 +0000
+++ b/external/mit/xorg/lib/Makefile    Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2016/08/16 00:55:09 mrg Exp $
+#      $NetBSD: Makefile,v 1.39 2016/08/17 03:10:23 mrg Exp $
 
 # build libraries for xorg
 
@@ -7,7 +7,7 @@
 SUBDIR=        libfontenc freetype libFS libICE libglapi \
        libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel
+SUBDIR+=libdrm_intel libdrm_amdgpu
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 SUBDIR+=libdrm_nouveau
diff -r 020baaea59cd -r be1f1ce4256d external/mit/xorg/lib/libdrm/Makefile
--- a/external/mit/xorg/lib/libdrm/Makefile     Wed Aug 17 00:22:56 2016 +0000
+++ b/external/mit/xorg/lib/libdrm/Makefile     Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2014/03/21 18:14:20 riastradh Exp $
+#      $NetBSD: Makefile,v 1.11 2016/08/17 03:10:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -17,8 +17,12 @@
 PKGCONFIG=     libdrm
 PKGDIST=       ${LIB}
 
+COPTS.xf86drm.c+=      -Wno-error=cpp  # #warnings needing porting
+
 CWARNFLAGS.clang+=     -Wno-conversion -Wno-tautological-compare
 
+LIBDPLIBS=     m       ${.CURDIR}/../../../../../lib/libm
+
 .if 0
 MAN=           drm.7 \
                drm-kms.7 \
diff -r 020baaea59cd -r be1f1ce4256d external/mit/xorg/lib/libdrm/drm/Makefile
--- a/external/mit/xorg/lib/libdrm/drm/Makefile Wed Aug 17 00:22:56 2016 +0000
+++ b/external/mit/xorg/lib/libdrm/drm/Makefile Wed Aug 17 03:10:22 2016 +0000
@@ -1,19 +1,22 @@
-#      $NetBSD: Makefile,v 1.7 2015/10/13 03:32:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/17 03:10:23 mrg Exp $
 
 # install include/libdrm files
 
 .include <bsd.own.mk>
 
 .PATH: ${X11SRCDIR.drm}/include/drm
+.PATH: ${X11SRCDIR.drm}/amdgpu
 .PATH: ${X11SRCDIR.drm}/intel
+.PATH: ${X11SRCDIR.drm}/nouveau
 .PATH: ${X11SRCDIR.drm}/radeon
-.PATH: ${X11SRCDIR.drm}/nouveau
 
 INCS=  drm.h \
        drm_fourcc.h \
        drm_mode.h \
        drm_sarea.h \
        i915_drm.h \
+       amdgpu.h \
+       amdgpu_drm.h \
        intel_aub.h \
        intel_bufmgr.h \
        intel_debug.h \
@@ -34,6 +37,7 @@
        savage_drm.h \
        sis_drm.h \
        via_drm.h \
+       virtgpu_drm.h \
        qxl_drm.h
 
 INCSDIR=${X11INCDIR}/libdrm
diff -r 020baaea59cd -r be1f1ce4256d external/mit/xorg/lib/libdrm/shlib_version
--- a/external/mit/xorg/lib/libdrm/shlib_version        Wed Aug 17 00:22:56 2016 +0000
+++ b/external/mit/xorg/lib/libdrm/shlib_version        Wed Aug 17 03:10:22 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.5 2015/07/20 02:51:33 mrg Exp $
+#      $NetBSD: shlib_version,v 1.6 2016/08/17 03:10:23 mrg Exp $
 #



Home | Main Index | Thread Index | Old Index