2023-11-18 10:34:32 +00:00
|
|
|
From 6e684612c648275c532b374e917c60388513c35c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
Date: Sat, 18 Nov 2023 10:51:11 +0100
|
|
|
|
|
Subject: [PATCH] build: heed results from pkg-config
|
2023-11-18 11:07:07 +00:00
|
|
|
References: https://github.com/CuarzoSoftware/SRM/pull/7
|
2023-11-18 10:34:32 +00:00
|
|
|
|
|
|
|
|
The .pc files can have extra required flags or locations (e.g. if
|
|
|
|
|
libraries are installed outside the standard search paths).
|
|
|
|
|
---
|
|
|
|
|
doxygen/md/Tutorial.md | 4 ++--
|
|
|
|
|
src/meson.build | 17 +++++++++--------
|
|
|
|
|
2 files changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/doxygen/md/Tutorial.md b/doxygen/md/Tutorial.md
|
|
|
|
|
index b25fe71..88c49bb 100644
|
|
|
|
|
--- a/doxygen/md/Tutorial.md
|
|
|
|
|
+++ b/doxygen/md/Tutorial.md
|
|
|
|
|
@@ -21,8 +21,8 @@ project('srm-example',
|
|
|
|
|
version : '0.1.0')
|
|
|
|
|
|
|
|
|
|
c = meson.get_compiler('c')
|
|
|
|
|
-
|
|
|
|
|
-glesv2_dep = c.find_library('GLESv2')
|
|
|
|
|
+pkg = import('pkgconfig')
|
|
|
|
|
+glesv2_dep = dependency('glesv2')
|
|
|
|
|
srm_dep = c.find_library('SRM')
|
|
|
|
|
|
|
|
|
|
include_directories_filtered = []
|
|
|
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
|
|
|
index c734fbe..e3cc862 100644
|
|
|
|
|
--- a/src/meson.build
|
|
|
|
|
+++ b/src/meson.build
|
|
|
|
|
@@ -56,13 +56,14 @@ endforeach
|
|
|
|
|
|
|
|
|
|
# ------------ DEPENDENCIES ------------
|
|
|
|
|
|
|
|
|
|
-egl_dep = c.find_library('EGL')
|
|
|
|
|
-glesv2_dep = c.find_library('GLESv2')
|
|
|
|
|
-udev_dep = c.find_library('udev')
|
|
|
|
|
+pkg = import('pkgconfig')
|
|
|
|
|
+egl_dep = dependency('egl')
|
|
|
|
|
+glesv2_dep = dependency('glesv2')
|
|
|
|
|
+udev_dep = dependency('libudev')
|
|
|
|
|
pthread_dep = c.find_library('pthread')
|
|
|
|
|
-drm_dep = c.find_library('drm')
|
|
|
|
|
-gbm_dep = c.find_library('gbm')
|
|
|
|
|
-display_info_dep = c.find_library('display-info')
|
|
|
|
|
+drm_dep = dependency('libdrm')
|
|
|
|
|
+gbm_dep = dependency('gbm')
|
|
|
|
|
+display_info_dep = dependency('libdisplay-info')
|
|
|
|
|
|
|
|
|
|
# ------------ SOURCE CODE FILES ------------
|
|
|
|
|
|
|
|
|
|
@@ -95,8 +96,8 @@ endif
|
|
|
|
|
|
|
|
|
|
if get_option('build_examples')
|
|
|
|
|
m_dep = c.find_library('m')
|
|
|
|
|
- libinput_dep = c.find_library('input')
|
|
|
|
|
- libseat_dep = c.find_library('seat')
|
|
|
|
|
+ libinput_dep = dependency('libinput')
|
|
|
|
|
+ libseat_dep = dependency('libseat')
|
|
|
|
|
|
|
|
|
|
subdir('examples/srm-basic')
|
|
|
|
|
subdir('examples/srm-display-info')
|
|
|
|
|
--
|
|
|
|
|
2.42.1
|
|
|
|
|
|
