udev-rules: Permission changes for /dev/dri/renderD*

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index da0f015b762aebd40a48b4cd02359837ad9c51c1..e935a093743d703ae65df1d609dbf17ed3e0e7cf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -10,8 +10,8 @@ project('systemd', 'c',
         meson_version : '>= 0.40',
        )
 
-libsystemd_version = '0.19.0'
-libudev_version = '1.6.6'
+libsystemd_version = '0.19.1'
+libudev_version = '1.6.7'
 
 # We need the same data in three different formats, ugh!
 # Also, for hysterical reasons, we use different variable
@@ -83,7 +83,7 @@ polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor
 varlogdir = join_paths(localstatedir, 'log')
 xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
 rpmmacrosdir = get_option('rpmmacrosdir')
-modprobedir = join_paths(prefixdir, 'lib/modprobe.d')
+modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 
 # Our own paths
 pkgdatadir = join_paths(datadir, 'systemd')
@@ -462,7 +462,6 @@ endif
 #####################################################################
 
 sed = find_program('sed')
-grep = find_program('grep')
 awk = find_program('awk')
 m4 = find_program('m4')
 stat = find_program('stat')
@@ -615,6 +614,7 @@ if get_option('wheel-group')
 endif
 
 substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
+substs.set('GROUP_RENDER_MODE', get_option('group-render-mode'))
 
 kill_user_processes = get_option('default-kill-user-processes')
 conf.set10('KILL_USER_PROCESSES', kill_user_processes)
@@ -1036,42 +1036,41 @@ else
 endif
 conf.set10('ENABLE_REMOTE', have)
 
-foreach pair : [['utmp',          'HAVE_UTMP'],
-                ['hibernate',     'ENABLE_HIBERNATE'],
-                ['environment-d', 'ENABLE_ENVIRONMENT_D'],
-                ['binfmt',        'ENABLE_BINFMT'],
-                ['coredump',      'ENABLE_COREDUMP'],
-                ['resolve',       'ENABLE_RESOLVED'],
-                ['logind',        'ENABLE_LOGIND'],
-                ['hostnamed',     'ENABLE_HOSTNAMED'],
-                ['localed',       'ENABLE_LOCALED'],
-                ['machined',      'ENABLE_MACHINED'],
-                ['networkd',      'ENABLE_NETWORKD'],
-                ['timedated',     'ENABLE_TIMEDATED'],
-                ['timesyncd',     'ENABLE_TIMESYNCD'],
-                ['myhostname',    'HAVE_MYHOSTNAME'],
-                ['firstboot',     'ENABLE_FIRSTBOOT'],
-                ['randomseed',    'ENABLE_RANDOMSEED'],
-                ['backlight',     'ENABLE_BACKLIGHT'],
-                ['vconsole',      'ENABLE_VCONSOLE'],
-                ['quotacheck',    'ENABLE_QUOTACHECK'],
-                ['sysusers',      'ENABLE_SYSUSERS'],
-                ['tmpfiles',      'ENABLE_TMPFILES'],
-                ['hwdb',          'ENABLE_HWDB'],
-                ['rfkill',        'ENABLE_RFKILL'],
-                ['ldconfig',      'ENABLE_LDCONFIG'],
-                ['efi',           'ENABLE_EFI'],
-                ['tpm',           'ENABLE_TPM'],
-                ['ima',           'HAVE_IMA'],
-                ['smack',         'HAVE_SMACK'],
-                ['gshadow',       'ENABLE_GSHADOW'],
-                ['idn',           'ENABLE_IDN'],
-                ['nss-systemd',   'ENABLE_NSS_SYSTEMD'],
-               ]
-
-        have = get_option(pair[0])
-        conf.set10(pair[1], have)
-        m4_defines += have ? ['-D' + pair[1]] : []
+foreach term : ['utmp',
+                'hibernate',
+                'environment-d',
+                'binfmt',
+                'coredump',
+                'resolve',
+                'logind',
+                'hostnamed',
+                'localed',
+                'machined',
+                'networkd',
+                'timedated',
+                'timesyncd',
+                'myhostname',
+                'firstboot',
+                'randomseed',
+                'backlight',
+                'vconsole',
+                'quotacheck',
+                'sysusers',
+                'tmpfiles',
+                'hwdb',
+                'rfkill',
+                'ldconfig',
+                'efi',
+                'tpm',
+                'ima',
+                'smack',
+                'gshadow',
+                'idn',
+                'nss-systemd']
+        have = get_option(term)
+        name = 'ENABLE_' + term.underscorify().to_upper()
+        conf.set10(name, have)
+        m4_defines += have ? ['-D' + name] : []
 endforeach
 
 want_tests = get_option('tests')
@@ -1219,10 +1218,10 @@ test_dlopen = executable(
         link_with : [libbasic],
         dependencies : [libdl])
 
-foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME'],
+foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'],
                  ['systemd',    'ENABLE_NSS_SYSTEMD'],
                  ['mymachines', 'ENABLE_MACHINED'],
-                 ['resolve',    'ENABLE_RESOLVED']]
+                 ['resolve',    'ENABLE_RESOLVE']]
 
         condition = tuple[1] == '' or conf.get(tuple[1]) == 1
         if condition
@@ -1405,7 +1404,7 @@ if conf.get('HAVE_BLKID') == 1
         public_programs += [exe]
 endif
 
-if conf.get('ENABLE_RESOLVED') == 1
+if conf.get('ENABLE_RESOLVE') == 1
         executable('systemd-resolved',
                    systemd_resolved_sources,
                    gcrypt_util_sources,
@@ -2454,6 +2453,7 @@ status = [
         'maximum system UID:                @0@'.format(system_uid_max),
         'maximum system GID:                @0@'.format(system_gid_max),
         '/dev/kvm access mode:              @0@'.format(get_option('dev-kvm-mode')),
+        'render group access mode:          @0@'.format(get_option('group-render-mode')),
         'certificate root:                  @0@'.format(get_option('certificate-root')),
         'support URL:                       @0@'.format(support_url),
         'nobody user name:                  @0@'.format(get_option('nobody-user')),
@@ -2541,7 +2541,7 @@ foreach tuple : [
         ['timesyncd'],
         ['localed'],
         ['networkd'],
-        ['resolved'],
+        ['resolve'],
         ['coredump'],
         ['polkit'],
         ['legacy pkla',      install_polkit_pkla],
@@ -2552,7 +2552,7 @@ foreach tuple : [
         ['blkid'],
         ['dbus'],
         ['glib'],
-        ['nss-myhostname',   conf.get('HAVE_MYHOSTNAME') == 1],
+        ['nss-myhostname',   conf.get('ENABLE_MYHOSTNAME') == 1],
         ['hwdb'],
         ['tpm'],
         ['man pages',        want_man],