oasis

commit: 13876852ca0f20253118cac61d0b09b56ac1c132
parent 572f2b7f8e338dfc94c42cc8152c258b05b12179
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 28 Jan 2020 22:33:33 -0800

libdrm: Use header directory

Diffstat:
M
pkg/libdrm/gen.lua
13
+++++++++++++
M
pkg/libliftoff/gen.lua
5
++---
M
pkg/mpv/gen.lua
7
++-----
M
pkg/swc/gen.lua
5
++---
M
pkg/wld/gen.lua
5
++---

5 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua
@@ -13,6 +13,19 @@ cflags{
 	'-I $srcdir/include/drm',
 }
 
+pkg.hdrs = {
+	copy('$outdir/include', '$srcdir', {'xf86drm.h', 'xf86drmMode.h'}),
+	copy('$outdir/include', '$srcdir/amdgpu', {'amdgpu.h'}),
+	copy('$outdir/include', '$srcdir/include/drm', {
+		'drm.h',
+		'drm_fourcc.h',
+		'drm_mode.h',
+		'drm_sarea.h',
+		'i915_drm.h',
+		'amdgpu_drm.h',
+	}),
+}
+
 lib('libdrm.a', {
 	'xf86drm.c',
 	'xf86drmHash.c',
diff --git a/pkg/libliftoff/gen.lua b/pkg/libliftoff/gen.lua
@@ -1,12 +1,11 @@
 cflags{
 	'-std=c99', '-Wall', '-Wpedantic',
-	'-I $basedir/pkg/libdrm/src',
-	'-I $basedir/pkg/libdrm/src/include/drm',
+	'-I $builddir/pkg/libdrm/include',
 	'-I $srcdir/include',
 }
 
 pkg.deps = {
-	'$basedir/pkg/libdrm/fetch',
+	'pkg/libdrm/headers',
 }
 
 lib('libliftoff.a', {
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -127,12 +127,9 @@ if options['HAVE_ALSA'] then
 	table.insert(pkg.deps, 'pkg/alsa-lib/headers')
 end
 if options['HAVE_DRM'] then
-	cflags{
-		'-I $basedir/pkg/libdrm/src',
-		'-I $basedir/pkg/libdrm/src/include/drm',
-	}
+	cflags{'-I $builddir/pkg/libdrm/include'}
 	table.insert(libs, 'libdrm/libdrm.a')
-	table.insert(pkg.deps, 'pkg/libdrm/fetch')
+	table.insert(pkg.deps, 'pkg/libdrm/headers')
 end
 if options['HAVE_LIBASS'] then
 	cflags{'-I $builddir/pkg/libass/include'}
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
@@ -7,10 +7,9 @@ cflags{
 	'-I $outdir/include',
 	'-I $srcdir',
 	'-I $basedir/pkg/fontconfig/src',
-	'-I $basedir/pkg/libdrm/src/include/drm',
-	'-I $basedir/pkg/libdrm/src',
 	'-I $basedir/pkg/libinput/src/src',
 	'-I $basedir/pkg/libxkbcommon/src',
+	'-I $builddir/pkg/libdrm/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/wayland-protocols/include',
 	'-I $builddir/pkg/wayland/include',
@@ -53,7 +52,7 @@ pkg.deps = {
 	'$outdir/include/swc-server-protocol.h',
 	'$outdir/cursor/cursor_data.h',
 	'pkg/fontconfig/fetch',
-	'pkg/libdrm/fetch',
+	'pkg/libdrm/headers',
 	'pkg/libinput/fetch',
 	'pkg/libxkbcommon/fetch',
 	'pkg/pixman/headers',
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
@@ -4,8 +4,7 @@ cflags{
 	'-I $outdir',
 	'-I $basedir/pkg/fontconfig/src',
 	'-I $basedir/pkg/freetype/src/include',
-	'-I $basedir/pkg/libdrm/src',
-	'-I $basedir/pkg/libdrm/src/include/drm',
+	'-I $builddir/pkg/libdrm/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/wayland/include',
 }
@@ -58,7 +57,7 @@ pkg.deps = {
 	'$outdir/protocol/wayland-drm-client-protocol.h',
 	'pkg/fontconfig/fetch',
 	'pkg/freetype/fetch',
-	'pkg/libdrm/fetch',
+	'pkg/libdrm/headers',
 	'pkg/pixman/headers',
 	'pkg/wayland/headers',
 }