hyprwm
/
xdg-desktop-portal-hyprland
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: bump version and replace deprecated functions

This commit is contained in:
columbarius 2022-05-05 22:07:32 +02:00
parent 4516d8b79e
commit 3591fd2a6c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -3,7 +3,7 @@ project(
'c', 'c',
version: '0.5.0', version: '0.5.0',
license: 'MIT', license: 'MIT',
meson_version: '>=0.50.0', meson_version: '>=0.58.0',
default_options: ['c_std=c11', 'warning_level=2', 'werror=true'], default_options: ['c_std=c11', 'warning_level=2', 'werror=true'],
) )
@ -25,7 +25,7 @@ inc = include_directories('include')
rt = cc.find_library('rt') rt = cc.find_library('rt')
pipewire = dependency('libpipewire-0.3', version: '>= 0.3.41') pipewire = dependency('libpipewire-0.3', version: '>= 0.3.41')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_protos = dependency('wayland-protocols', version: '>=1.24')
iniparser = dependency('inih') iniparser = dependency('inih')
gbm = dependency('gbm') gbm = dependency('gbm')
drm = dependency('libdrm') drm = dependency('libdrm')
@ -112,8 +112,8 @@ systemd = dependency('systemd', required: get_option('systemd'))
if systemd.found() if systemd.found()
systemd_service_file = 'xdg-desktop-portal-wlr.service' systemd_service_file = 'xdg-desktop-portal-wlr.service'
user_unit_dir = systemd.get_pkgconfig_variable('systemduserunitdir', user_unit_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir',
define_variable: ['prefix', get_option('prefix')]) pkgconfig_define: ['prefix', get_option('prefix')])
conf_data.set('systemd_service', 'SystemdService=' + systemd_service_file) conf_data.set('systemd_service', 'SystemdService=' + systemd_service_file)
configure_file( configure_file(
@ -149,7 +149,7 @@ if scdoc.found()
input: files(src), input: files(src),
output: output, output: output,
command: [ command: [
'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output) 'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_variable(pkgconfig: 'scdoc'), output)
], ],
install: true, install: true,
install_dir: join_paths(get_option('mandir'), 'man' + section), install_dir: join_paths(get_option('mandir'), 'man' + section),

2
protocols/meson.build
View File

@ -3,7 +3,7 @@ wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
if wayland_scanner_dep.found() if wayland_scanner_dep.found()
wayland_scanner = find_program( wayland_scanner = find_program(
wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'), wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
native: true, native: true,
) )
else else