7692 libdrm.pc is incorrect

Reviewed by: Toomas Soome <tsoome@me.com>

11 files changed, 158 insertions, 56 deletions

diff --git a/usr/src/common/libdrm/patches/includedir-pc.in.patch b/usr/src/common/libdrm/patches/includedir-pc.in.patch
new file mode 100644
index 0000000..c619de4
--- /dev/null
+++ b/usr/src/common/libdrm/patches/includedir-pc.in.patch
@@ -0,0 +1,97 @@
+--- libdrm-2.4.73-1/libdrm.pc.in	Tue Dec 27 16:59:16 2016
++++ libdrm-2.4.73/libdrm.pc.in	Tue Dec 27 16:59:50 2016
+@@ -7,4 +7,4 @@
+ Description: Userspace interface to kernel DRM services
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+diff -ur libdrm-2.4.73-1/amdgpu/libdrm_amdgpu.pc.in libdrm-2.4.73/amdgpu/libdrm_amdgpu.pc.in
+--- libdrm-2.4.73-1/amdgpu/libdrm_amdgpu.pc.in	2016-12-27 17:09:11.730815329 +0300
++++ libdrm-2.4.73/amdgpu/libdrm_amdgpu.pc.in	2016-12-27 17:55:20.325354029 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to kernel DRM services for amdgpu
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_amdgpu
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/etnaviv/libdrm_etnaviv.pc.in libdrm-2.4.73/etnaviv/libdrm_etnaviv.pc.in
+--- libdrm-2.4.73-1/etnaviv/libdrm_etnaviv.pc.in	2016-11-14 20:55:20.000000000 +0300
++++ libdrm-2.4.73/etnaviv/libdrm_etnaviv.pc.in	2016-12-27 17:55:20.328666152 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to etnaviv kernel DRM services
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_etnaviv
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/exynos/libdrm_exynos.pc.in libdrm-2.4.73/exynos/libdrm_exynos.pc.in
+--- libdrm-2.4.73-1/exynos/libdrm_exynos.pc.in	2016-12-27 17:09:11.731173266 +0300
++++ libdrm-2.4.73/exynos/libdrm_exynos.pc.in	2016-12-27 17:55:20.326625001 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to exynos kernel DRM services
+ Version: 0.7
+ Libs: -L${libdir} -ldrm_exynos
+-Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/exynos
++Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/exynos
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/freedreno/libdrm_freedreno.pc.in libdrm-2.4.73/freedreno/libdrm_freedreno.pc.in
+--- libdrm-2.4.73-1/freedreno/libdrm_freedreno.pc.in	2016-12-27 17:09:11.731477053 +0300
++++ libdrm-2.4.73/freedreno/libdrm_freedreno.pc.in	2016-12-27 17:55:20.324167348 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to freedreno kernel DRM services
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_freedreno
+-Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/freedreno
++Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/freedreno
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/intel/libdrm_intel.pc.in libdrm-2.4.73/intel/libdrm_intel.pc.in
+--- libdrm-2.4.73-1/intel/libdrm_intel.pc.in	2016-12-27 17:09:11.731784746 +0300
++++ libdrm-2.4.73/intel/libdrm_intel.pc.in	2016-12-27 17:55:20.324762872 +0300
+@@ -8,4 +8,4 @@
+ Version: @PACKAGE_VERSION@
+ Requires: libdrm
+ Libs: -L${libdir} -ldrm_intel
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+diff -ur libdrm-2.4.73-1/nouveau/libdrm_nouveau.pc.in libdrm-2.4.73/nouveau/libdrm_nouveau.pc.in
+--- libdrm-2.4.73-1/nouveau/libdrm_nouveau.pc.in	2016-12-27 17:09:11.732787352 +0300
++++ libdrm-2.4.73/nouveau/libdrm_nouveau.pc.in	2016-12-27 17:55:20.326031658 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to nouveau kernel DRM services
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_nouveau
+-Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/libdrm/nouveau
++Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/drm/nouveau
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/omap/libdrm_omap.pc.in libdrm-2.4.73/omap/libdrm_omap.pc.in
+--- libdrm-2.4.73-1/omap/libdrm_omap.pc.in	2016-12-27 17:09:11.733077210 +0300
++++ libdrm-2.4.73/omap/libdrm_omap.pc.in	2016-12-27 17:55:20.327481008 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to omap kernel DRM services
+ Version: 0.6
+ Libs: -L${libdir} -ldrm_omap
+-Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/omap
++Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/omap
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/radeon/libdrm_radeon.pc.in libdrm-2.4.73/radeon/libdrm_radeon.pc.in
+--- libdrm-2.4.73-1/radeon/libdrm_radeon.pc.in	2016-12-27 17:09:11.733377696 +0300
++++ libdrm-2.4.73/radeon/libdrm_radeon.pc.in	2016-12-27 17:55:20.328067455 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to kernel DRM services for radeon
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_radeon
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+ Requires.private: libdrm
+diff -ur libdrm-2.4.73-1/tegra/libdrm_tegra.pc.in libdrm-2.4.73/tegra/libdrm_tegra.pc.in
+--- libdrm-2.4.73-1/tegra/libdrm_tegra.pc.in	2016-12-27 17:09:11.733694570 +0300
++++ libdrm-2.4.73/tegra/libdrm_tegra.pc.in	2016-12-27 17:55:20.323446018 +0300
+@@ -7,5 +7,5 @@
+ Description: Userspace interface to Tegra kernel DRM services
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldrm_tegra
+-Cflags: -I${includedir} -I${includedir}/libdrm
++Cflags: -I${includedir} -I${includedir}/drm
+ Requires.private: libdrm
diff --git a/usr/src/common/libdrm/patches/rpath-pc.in.patch b/usr/src/common/libdrm/patches/rpath-pc.in.patch
index 5042cde..be0d42d 100644
--- a/usr/src/common/libdrm/patches/rpath-pc.in.patch
+++ b/usr/src/common/libdrm/patches/rpath-pc.in.patch
@@ -7,7 +7,7 @@ diff -ru libdrm-2.4.64-pc/amdgpu/libdrm_amdgpu.pc.in libdrm-2.4.64/amdgpu/libdrm
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm_amdgpu
 +Libs: -L${libdir} -R${libdir} -ldrm_amdgpu
- Cflags: -I${includedir} -I${includedir}/libdrm
+ Cflags: -I${includedir} -I${includedir}/drm
  Requires.private: libdrm
 diff -ur libdrm-2.4.58-pc/exynos/libdrm_exynos.pc.in libdrm-2.4.58/exynos/libdrm_exynos.pc.in
 --- libdrm-2.4.58-pc/exynos/libdrm_exynos.pc.in	2013-02-14 19:14:08.000000000 +0400
@@ -18,7 +18,7 @@ diff -ur libdrm-2.4.58-pc/exynos/libdrm_exynos.pc.in libdrm-2.4.58/exynos/libdrm
  Version: 0.7
 -Libs: -L${libdir} -ldrm_exynos
 +Libs: -L${libdir} -R${libdir} -ldrm_exynos
- Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/exynos
+ Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/exynos
  Requires.private: libdrm
 diff -ur libdrm-2.4.58-pc/freedreno/libdrm_freedreno.pc.in libdrm-2.4.58/freedreno/libdrm_freedreno.pc.in
 --- libdrm-2.4.58-pc/freedreno/libdrm_freedreno.pc.in	2013-10-09 20:03:23.000000000 +0400
@@ -29,7 +29,7 @@ diff -ur libdrm-2.4.58-pc/freedreno/libdrm_freedreno.pc.in libdrm-2.4.58/freedre
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm_freedreno
 +Libs: -L${libdir} -R${libdir} -ldrm_freedreno
- Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/freedreno
+ Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/freedreno
  Requires.private: libdrm
 diff -ur libdrm-2.4.58-pc/intel/libdrm_intel.pc.in libdrm-2.4.58/intel/libdrm_intel.pc.in
 --- libdrm-2.4.58-pc/intel/libdrm_intel.pc.in	2013-10-09 20:03:25.000000000 +0400
@@ -40,7 +40,7 @@ diff -ur libdrm-2.4.58-pc/intel/libdrm_intel.pc.in libdrm-2.4.58/intel/libdrm_in
  Requires: libdrm
 -Libs: -L${libdir} -ldrm_intel
 +Libs: -L${libdir} -R${libdir} -ldrm_intel
- Cflags: -I${includedir} -I${includedir}/libdrm
+ Cflags: -I${includedir} -I${includedir}/drm
 diff -ur libdrm-2.4.58-pc/libdrm.pc.in libdrm-2.4.58/libdrm.pc.in
 --- libdrm-2.4.58-pc/libdrm.pc.in	2013-02-14 19:14:08.000000000 +0400
 +++ libdrm-2.4.58/libdrm.pc.in	2015-01-16 11:06:53.919163639 +0300
@@ -50,7 +50,7 @@ diff -ur libdrm-2.4.58-pc/libdrm.pc.in libdrm-2.4.58/libdrm.pc.in
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm
 +Libs: -L${libdir} -R${libdir} -ldrm
- Cflags: -I${includedir} -I${includedir}/libdrm
+ Cflags: -I${includedir} -I${includedir}/drm
 diff -ur libdrm-2.4.58-pc/libkms/libkms.pc.in libdrm-2.4.58/libkms/libkms.pc.in
 --- libdrm-2.4.58-pc/libkms/libkms.pc.in	2013-02-14 19:14:08.000000000 +0400
 +++ libdrm-2.4.58/libkms/libkms.pc.in	2015-01-16 11:06:53.916371045 +0300
@@ -71,7 +71,7 @@ diff -ur libdrm-2.4.58-pc/nouveau/libdrm_nouveau.pc.in libdrm-2.4.58/nouveau/lib
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm_nouveau
 +Libs: -L${libdir} -R${libdir} -ldrm_nouveau
- Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/libdrm/nouveau
+ Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/drm/nouveau
  Requires.private: libdrm
 diff -ur libdrm-2.4.58-pc/omap/libdrm_omap.pc.in libdrm-2.4.58/omap/libdrm_omap.pc.in
 --- libdrm-2.4.58-pc/omap/libdrm_omap.pc.in	2013-02-14 19:14:08.000000000 +0400
@@ -82,7 +82,7 @@ diff -ur libdrm-2.4.58-pc/omap/libdrm_omap.pc.in libdrm-2.4.58/omap/libdrm_omap.
  Version: 0.6
 -Libs: -L${libdir} -ldrm_omap
 +Libs: -L${libdir} -R${libdir} -ldrm_omap
- Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/omap
+ Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/omap
  Requires.private: libdrm
 diff -ur libdrm-2.4.58-pc/radeon/libdrm_radeon.pc.in libdrm-2.4.58/radeon/libdrm_radeon.pc.in
 --- libdrm-2.4.58-pc/radeon/libdrm_radeon.pc.in	2013-02-14 19:14:08.000000000 +0400
@@ -93,7 +93,7 @@ diff -ur libdrm-2.4.58-pc/radeon/libdrm_radeon.pc.in libdrm-2.4.58/radeon/libdrm
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm_radeon
 +Libs: -L${libdir} -R${libdir} -ldrm_radeon
- Cflags: -I${includedir} -I${includedir}/libdrm
+ Cflags: -I${includedir} -I${includedir}/drm
  Requires.private: libdrm
 --- libdrm-2.4.64/tegra/libdrm_tegra.pc.in.~1~	2015-09-14 15:55:25.984198527 +0300
 +++ libdrm-2.4.64/tegra/libdrm_tegra.pc.in	2015-09-14 15:55:39.369838244 +0300
@@ -103,5 +103,5 @@ diff -ur libdrm-2.4.58-pc/radeon/libdrm_radeon.pc.in libdrm-2.4.58/radeon/libdrm
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -ldrm_tegra
 +Libs: -L${libdir} -R${libdir} -ldrm_tegra
- Cflags: -I${includedir} -I${includedir}/libdrm
+ Cflags: -I${includedir} -I${includedir}/drm
  Requires.private: libdrm
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 8009c99..173d877 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -55,6 +55,8 @@ SRCDIR =	..
 MAPFILEDIR =	$(SRCDIR)
 MAPFILES =	$(MAPFILEDIR)/mapfile-vers
 
+PCLIBDIR=/usr/lib/xorg
+
 #
 # If HDRDIR is left unset, then it's possible for the $(ROOTHDRDIR)/%
 # install rule in lib/Makefile.targ to generate false matches if there
diff --git a/usr/src/lib/Makefile.lib.64 b/usr/src/lib/Makefile.lib.64
index 7d3b977..ab7245a 100644
--- a/usr/src/lib/Makefile.lib.64
+++ b/usr/src/lib/Makefile.lib.64
@@ -30,6 +30,8 @@
 #
 include	$(SRC)/Makefile.master.64
 
+PCLIBDIR=/usr/lib/xorg/$(MACH64)
+
 #
 # Target Architecture
 #
diff --git a/usr/src/lib/libdrm/Makefile b/usr/src/lib/libdrm/Makefile
index 3863fff..04621c3 100644
--- a/usr/src/lib/libdrm/Makefile
+++ b/usr/src/lib/libdrm/Makefile
@@ -62,7 +62,7 @@ DRM_HDRS= \
 	via_drm.h \
 	vmwgfx_drm.h
 
-ROOT_DRM_HDRS=	$(DRM_HDRS:%=$(ROOTHDRDIR)/libdrm/%)
+ROOT_DRM_HDRS=	$(DRM_HDRS:%=$(ROOTHDRDIR)/drm/%)
 
 .KEEP_STATE:
 
@@ -70,13 +70,16 @@ install: all .WAIT $(SUBDIRS)
 
 all clean clobber lint: $(SUBDIRS)
 
-install_h: $(ROOTHDRS) $(ROOT_DRM_HDRS)
+install_h: $(ROOTHDRS) $(ROOT_DRM_HDRS) $(ROOTHDRDIR)/libdrm
 
 # need to mkdir...
-$(ROOT_DRM_HDRS) : $(ROOTHDRDIR)/libdrm
-$(ROOTHDRDIR)/libdrm :
+$(ROOT_DRM_HDRS) : $(ROOTHDRDIR)/drm
+$(ROOTHDRDIR)/drm :
 	$(INS.dir) $@
 
+$(ROOTHDRDIR)/libdrm: FRC
+	$(RM) -r $@; $(LN) -s drm $@
+
 check:	$(CHECKHDRS)
 
 _msg: # no msgfiles here
@@ -84,7 +87,7 @@ _msg: # no msgfiles here
 $(POFILE):      pofile_MSGFILES
 
 # install rules for install_h target
-$(ROOTHDRDIR)/libdrm/%: $(LIBDRM_CMN_DIR)/include/drm/%
+$(ROOTHDRDIR)/drm/%: $(LIBDRM_CMN_DIR)/include/drm/%
 	$(INS.file)
 
 # HDRS=...
diff --git a/usr/src/lib/libdrm/Makefile.pc b/usr/src/lib/libdrm/Makefile.pc
index a01589c..c628995 100644
--- a/usr/src/lib/libdrm/Makefile.pc
+++ b/usr/src/lib/libdrm/Makefile.pc
@@ -21,9 +21,6 @@ ROOTPCDIR64=	$(ROOT)/usr/lib/$(MACH64)/pkgconfig
 ROOTPCS=	$(PCS:%=$(ROOTPCDIR)/%)
 ROOTPCS64=	$(PCS:%=$(ROOTPCDIR64)/%)
 
-PCLIBDIR=/usr/lib/xorg
-$(BUILD64)PCLIBDIR=/usr/lib/xorg/$(MACH64)
-
 # Need ${prefix} as a literal
 PREFIX=$$\{prefix\}
 
diff --git a/usr/src/lib/libdrm_amdgpu/Makefile b/usr/src/lib/libdrm_amdgpu/Makefile
index 010a384..2eadd7c 100644
--- a/usr/src/lib/libdrm_amdgpu/Makefile
+++ b/usr/src/lib/libdrm_amdgpu/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= 	amdgpu.h
 
diff --git a/usr/src/lib/libdrm_intel/Makefile b/usr/src/lib/libdrm_intel/Makefile
index eef8079..00441d4 100644
--- a/usr/src/lib/libdrm_intel/Makefile
+++ b/usr/src/lib/libdrm_intel/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= \
 	intel_aub.h \
diff --git a/usr/src/lib/libdrm_radeon/Makefile b/usr/src/lib/libdrm_radeon/Makefile
index c8ee855..a0b686e 100644
--- a/usr/src/lib/libdrm_radeon/Makefile
+++ b/usr/src/lib/libdrm_radeon/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= \
 	r600_pci_ids.h \
diff --git a/usr/src/lib/libdrm_tegra/Makefile b/usr/src/lib/libdrm_tegra/Makefile
index e690481..ae277b6 100644
--- a/usr/src/lib/libdrm_tegra/Makefile
+++ b/usr/src/lib/libdrm_tegra/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= 	tegra.h
 
diff --git a/usr/src/pkg/manifests/x11-library-libdrm.mf b/usr/src/pkg/manifests/x11-library-libdrm.mf
index 7abbf93..865429d 100644
--- a/usr/src/pkg/manifests/x11-library-libdrm.mf
+++ b/usr/src/pkg/manifests/x11-library-libdrm.mf
@@ -24,9 +24,9 @@ set name=info.upstream-url value=http://dri.freedesktop.org
 #
 dir path=usr group=sys
 dir path=usr/include
+dir path=usr/include/drm
 dir path=usr/include/exynos
 dir path=usr/include/freedreno
-dir path=usr/include/libdrm
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/$(ARCH64)/pkgconfig group=other
@@ -34,44 +34,44 @@ dir path=usr/lib/pkgconfig group=other
 dir path=usr/lib/xorg
 dir path=usr/lib/xorg/$(ARCH64)
 #
+file path=usr/include/drm/amdgpu.h
+file path=usr/include/drm/amdgpu_drm.h
+#file path=usr/include/drm/drm.h
+#file path=usr/include/drm/drm_fourcc.h
+#file path=usr/include/drm/drm_mode.h
+#file path=usr/include/drm/drm_sarea.h
+file path=usr/include/drm/exynos_drmif.h
+#file path=usr/include/drm/i915_drm.h
+file path=usr/include/drm/intel_aub.h
+file path=usr/include/drm/intel_bufmgr.h
+file path=usr/include/drm/intel_debug.h
+file path=usr/include/drm/mach64_drm.h
+file path=usr/include/drm/mga_drm.h
+file path=usr/include/drm/nouveau_drm.h
+file path=usr/include/drm/omap_drmif.h
+file path=usr/include/drm/qxl_drm.h
+file path=usr/include/drm/r128_drm.h
+file path=usr/include/drm/r600_pci_ids.h
+file path=usr/include/drm/radeon_bo.h
+file path=usr/include/drm/radeon_bo_gem.h
+file path=usr/include/drm/radeon_bo_int.h
+file path=usr/include/drm/radeon_cs.h
+file path=usr/include/drm/radeon_cs_gem.h
+file path=usr/include/drm/radeon_cs_int.h
+file path=usr/include/drm/radeon_drm.h
+file path=usr/include/drm/radeon_surface.h
+file path=usr/include/drm/savage_drm.h
+file path=usr/include/drm/sis_drm.h
+file path=usr/include/drm/tegra.h
+file path=usr/include/drm/tegra_drm.h
+file path=usr/include/drm/vc4_drm.h
+file path=usr/include/drm/via_drm.h
+#file path=usr/include/drm/virtgpu_drm.h
+file path=usr/include/drm/vmwgfx_drm.h
 file path=usr/include/exynos/exynos_drm.h
 file path=usr/include/exynos/exynos_fimg2d.h
 file path=usr/include/freedreno/freedreno_drmif.h
 file path=usr/include/freedreno/freedreno_ringbuffer.h
-file path=usr/include/libdrm/amdgpu.h
-file path=usr/include/libdrm/amdgpu_drm.h
-#file path=usr/include/libdrm/drm.h
-#file path=usr/include/libdrm/drm_fourcc.h
-#file path=usr/include/libdrm/drm_mode.h
-#file path=usr/include/libdrm/drm_sarea.h
-file path=usr/include/libdrm/exynos_drmif.h
-#file path=usr/include/libdrm/i915_drm.h
-file path=usr/include/libdrm/intel_aub.h
-file path=usr/include/libdrm/intel_bufmgr.h
-file path=usr/include/libdrm/intel_debug.h
-file path=usr/include/libdrm/mach64_drm.h
-file path=usr/include/libdrm/mga_drm.h
-file path=usr/include/libdrm/nouveau_drm.h
-file path=usr/include/libdrm/omap_drmif.h
-file path=usr/include/libdrm/qxl_drm.h
-file path=usr/include/libdrm/r128_drm.h
-file path=usr/include/libdrm/r600_pci_ids.h
-file path=usr/include/libdrm/radeon_bo.h
-file path=usr/include/libdrm/radeon_bo_gem.h
-file path=usr/include/libdrm/radeon_bo_int.h
-file path=usr/include/libdrm/radeon_cs.h
-file path=usr/include/libdrm/radeon_cs_gem.h
-file path=usr/include/libdrm/radeon_cs_int.h
-file path=usr/include/libdrm/radeon_drm.h
-file path=usr/include/libdrm/radeon_surface.h
-file path=usr/include/libdrm/savage_drm.h
-file path=usr/include/libdrm/sis_drm.h
-file path=usr/include/libdrm/tegra.h
-file path=usr/include/libdrm/tegra_drm.h
-file path=usr/include/libdrm/vc4_drm.h
-file path=usr/include/libdrm/via_drm.h
-#file path=usr/include/libdrm/virtgpu_drm.h
-file path=usr/include/libdrm/vmwgfx_drm.h
 file path=usr/include/libkms/libkms.h
 file path=usr/include/omap/omap_drm.h
 file path=usr/include/xf86drm.h
@@ -118,6 +118,7 @@ file path=usr/lib/xorg/libkms.so.1
 license usr/src/common/libdrm/LICENSE_LIBDRM \
     license=usr/src/common/libdrm/LICENSE_LIBDRM
 #
+link path=usr/include/libdrm target=drm
 link path=usr/lib/xorg/$(ARCH64)/libdrm.so target=libdrm.so.2
 link path=usr/lib/xorg/$(ARCH64)/libdrm_amdgpu.so target=libdrm_amdgpu.so.1
 link path=usr/lib/xorg/$(ARCH64)/libdrm_exynos.so target=libdrm_exynos.so.1