Fix libdrm includes
This removes any assumptions about how the libdrm headers are installed, and uses the pkg-config include directories as we're "supposed to". This only adds a partial dependency, since we don't actually need to link against libdrm.
This commit is contained in:
		
							parent
							
								
									7daca85bcf
								
							
						
					
					
						commit
						7ca3bc1d6f
					
				| 
						 | 
					@ -12,7 +12,7 @@
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
#include <pthread.h>
 | 
					#include <pthread.h>
 | 
				
			||||||
#include <stdbool.h>
 | 
					#include <stdbool.h>
 | 
				
			||||||
#include <libdrm/drm_fourcc.h>
 | 
					#include <drm_fourcc.h>
 | 
				
			||||||
#include "wlr-export-dmabuf-unstable-v1-client-protocol.h"
 | 
					#include "wlr-export-dmabuf-unstable-v1-client-protocol.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct wayland_output {
 | 
					struct wayland_output {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -80,6 +80,7 @@ examples = {
 | 
				
			||||||
			libavcodec,
 | 
								libavcodec,
 | 
				
			||||||
			libavformat,
 | 
								libavformat,
 | 
				
			||||||
			libavutil,
 | 
								libavutil,
 | 
				
			||||||
 | 
								drm.partial_dependency(includes: true), # <drm_fourcc.h>
 | 
				
			||||||
			threads,
 | 
								threads,
 | 
				
			||||||
			wayland_client,
 | 
								wayland_client,
 | 
				
			||||||
			wlr_protos,
 | 
								wlr_protos,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
#include <EGL/egl.h>
 | 
					#include <EGL/egl.h>
 | 
				
			||||||
#include <EGL/eglext.h>
 | 
					#include <EGL/eglext.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
#include <libdrm/drm_fourcc.h>
 | 
					#include <drm_fourcc.h>
 | 
				
			||||||
#include <wlr/render/egl.h>
 | 
					#include <wlr/render/egl.h>
 | 
				
			||||||
#include <wlr/util/log.h>
 | 
					#include <wlr/util/log.h>
 | 
				
			||||||
#include "glapi.h"
 | 
					#include "glapi.h"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,7 +22,13 @@ lib_wlr_render = static_library(
 | 
				
			||||||
	),
 | 
						),
 | 
				
			||||||
	glapi,
 | 
						glapi,
 | 
				
			||||||
	include_directories: wlr_inc,
 | 
						include_directories: wlr_inc,
 | 
				
			||||||
	dependencies: [egl, glesv2, pixman, wayland_server],
 | 
						dependencies: [
 | 
				
			||||||
 | 
							egl,
 | 
				
			||||||
 | 
							drm.partial_dependency(includes: true), # <drm_fourcc.h>
 | 
				
			||||||
 | 
							glesv2,
 | 
				
			||||||
 | 
							pixman,
 | 
				
			||||||
 | 
							wayland_server
 | 
				
			||||||
 | 
						],
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wlr_render = declare_dependency(
 | 
					wlr_render = declare_dependency(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue