packaging: Bump up to 1.15.0

diff --git a/meson.build b/meson.build
index 98c05623d92595b9f904ab707522ee6990fda832..f132a17cbf066d0ad97b010c0d733c980b3a4130 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -165,6 +165,7 @@ endif
 
 ############ udev bits ############
 
+if get_option('udev-enable')
 executable('libinput-device-group',
           'udev/libinput-device-group.c',
           dependencies : [dep_udev, dep_libwacom],
@@ -206,6 +207,7 @@ litest_groups_rules_file = configure_file(input : 'udev/80-libinput-device-group
 litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
                                           output : '90-libinput-fuzz-override-litest.rules',
                                           configuration : litest_udev_rules_config)
+endif
 
 ############ Check for leftover udev rules ########
 
@@ -320,6 +322,7 @@ libinput_data_override_path = join_paths(dir_sysconf, 'local-overrides.quirks')
 config_h.set_quoted('LIBINPUT_QUIRKS_DIR', dir_data)
 config_h.set_quoted('LIBINPUT_QUIRKS_OVERRIDE_FILE', libinput_data_override_path)
 
+if get_option('install-quirks-data')
 quirks_data = [
        'quirks/10-generic-keyboard.quirks',
        'quirks/10-generic-lid.quirks',
@@ -350,6 +353,9 @@ quirks_data = [
        'quirks/50-system-system76.quirks',
        'quirks/50-system-toshiba.quirks',
 ]
+else
+quirks_data = []
+endif
 
 test('quirks-in-meson.build',
      find_program('quirks/test-quirks-in-meson.build.sh'),
@@ -480,6 +486,8 @@ endif
 subdir('completion/zsh')
 
 ############ tools ############
+
+if get_option('tools-enable')
 libinput_tool_path = dir_libexec
 config_h.set_quoted('LIBINPUT_TOOL_PATH', libinput_tool_path)
 tools_shared_sources = [ 'tools/shared.c',
@@ -730,6 +738,7 @@ test('tools-builddir-lookup-installed',
      env : ['LD_LIBRARY_PATH=@0@'.format(meson.current_build_dir())],
      suite : ['all'],
      workdir : '/tmp')
+endif
 
 ############ tests ############
 

diff --git a/meson_options.txt b/meson_options.txt
index 7819449c9d6f8e79eb469ede20a96afab966b856..c02a45fc9f5172d0db7e7f7b8606aff6b8c96e95 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,3 +34,15 @@ option('zshcompletiondir',
        type: 'string',
        value: '',
        description: 'Directory for zsh completion scripts ["no" disables]')
+option('tools-enable',
+       type: 'boolean',
+       value: true,
+       description: 'Enable libinput tools [default=true]')
+option('udev-enable',
+       type: 'boolean',
+       value: true,
+       description: 'Enable to build udev files [default=true]')
+option('install-quirks-data',
+       type: 'boolean',
+       value: true,
+       description: 'Install data files for quirks [default=true]')

diff --git a/packaging/libinput.spec b/packaging/libinput.spec
index 17b20a355178aa654b140495244835f501db47f6..3b45995d3a0149c30659c13ff1fcdece96a8d5d1 100644 (file)
--- a/packaging/libinput.spec
+++ b/packaging/libinput.spec
@@ -1,7 +1,7 @@
 %define udev_dir %{_prefix}/lib/udev
 
 Name:           libinput
-Version:        1.8.0
+Version:        1.15.0
 Release:        0
 License:        MIT
 Summary:        Input devices for display servers and other applications
@@ -11,7 +11,7 @@ Source:         %{name}-%{version}.tar.gz
 Source1001:            %name.manifest
 #X-Vcs-Url:      git://anongit.freedesktop.org/wayland/libinput
 
-BuildRequires:  make
+BuildRequires:  meson
 BuildRequires:  pkgconfig(libevdev)
 BuildRequires:  pkgconfig(libevent)
 BuildRequires:  pkgconfig(libudev)
@@ -50,13 +50,26 @@ functionality that users expect.
 %setup -q
 cp %{SOURCE1001} .
 
-%autogen --with-udev-dir=%{udev_dir} --disable-documentation --disable-debug-gui --disable-tests --disable-libwacom
-
 %build
-%__make %{?_smp_mflags}
+meson setup \
+    -Dlibwacom=false \
+    -Ddocumentation=false \
+    -Ddebug-gui=false \
+    -Dtests=false \
+    -Dudev-dir=%{udev_dir} \
+    -Dzshcompletiondir=no \
+    -Dtools-enable=false \
+    -Dudev-enable=false \
+    -Dinstall-quirks-data=false \
+    --prefix /usr \
+    --libdir %{_libdir} \
+    --bindir %{_bindir} \
+    builddir
+ninja -C builddir all
 
 %install
-%make_install
+export DESTDIR=%{buildroot}
+ninja -C builddir install
 
 %post -p /sbin/ldconfig
 
@@ -69,6 +82,18 @@ cp %{SOURCE1001} .
 %license COPYING
 %{_libdir}/*.so.*
 
+## disable udev ##
+#%{udev_dir}/%{name}*
+#%{udev_dir}/rules.d/*%{name}*
+
+## disable tools ##
+#%{_bindir}/libinput
+#/usr/libexec/libinput/*
+#%doc %{_mandir}/man?/*
+
+## disable quirks data ##
+#%{TZ_SYS_RO_SHARE}/libinput/*
+
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)