packaging: Bump up to 1.16.1

Change-Id: Iae16b868b7d372db197e3e4197d7d6f22f37b345

diff --git a/meson.build b/meson.build
index 107cc88..438bb36 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -330,54 +330,23 @@ config_h.set_quoted('LIBINPUT_QUIRKS_DIR', dir_data)
 config_h.set_quoted('LIBINPUT_QUIRKS_OVERRIDE_FILE', libinput_data_override_path)
 
 if get_option('quirks-enable')
-quirks_data = [
-       'quirks/10-generic-keyboard.quirks',
-       'quirks/10-generic-lid.quirks',
-       'quirks/10-generic-trackball.quirks',
-       'quirks/30-vendor-aiptek.quirks',
-       'quirks/30-vendor-alps.quirks',
-       'quirks/30-vendor-contour.quirks',
-       'quirks/30-vendor-cypress.quirks',
-       'quirks/30-vendor-elantech.quirks',
-       'quirks/30-vendor-ibm.quirks',
-       'quirks/30-vendor-kensington.quirks',
-       'quirks/30-vendor-logitech.quirks',
-       'quirks/30-vendor-madcatz.quirks',
-       'quirks/30-vendor-microsoft.quirks',
-       'quirks/30-vendor-razer.quirks',
-       'quirks/30-vendor-synaptics.quirks',
-       'quirks/30-vendor-vmware.quirks',
-       'quirks/30-vendor-wacom.quirks',
-       'quirks/50-system-acer.quirks',
-       'quirks/50-system-apple.quirks',
-       'quirks/50-system-asus.quirks',
-       'quirks/50-system-chicony.quirks',
-       'quirks/50-system-cyborg.quirks',
-       'quirks/50-system-dell.quirks',
-       'quirks/50-system-google.quirks',
-       'quirks/50-system-hp.quirks',
-       'quirks/50-system-lenovo.quirks',
-       'quirks/50-system-system76.quirks',
-       'quirks/50-system-toshiba.quirks',
-]
-config_h.set10('ENABLE_QUIRKS', 1)
-else
-quirks_data = []
-endif
 
-test('quirks-in-meson.build',
-     find_program('quirks/test-quirks-in-meson.build.sh'),
-     args : [meson.current_source_dir()],
-     suite : ['all']
-     )
-
-config_h.set_quoted('LIBINPUT_QUIRKS_FILES', ':'.join(quirks_data))
 config_h.set_quoted('LIBINPUT_QUIRKS_SRCDIR', dir_src_quirks)
 install_subdir('quirks',
               exclude_files: ['README.md'],
               install_dir : dir_data,
               strip_directory : true)
 
+config_h.set10('ENABLE_QUIRKS', 1)
+else
+quirks = []
+endif
+
+libinput_data_path = dir_data
+libinput_data_override_path = join_paths(dir_overrides, 'local-overrides.quirks')
+config_h.set_quoted('LIBINPUT_QUIRKS_DIR', dir_data)
+config_h.set_quoted('LIBINPUT_QUIRKS_OVERRIDE_FILE', libinput_data_override_path)
+
 src_libquirks = [
        'src/quirks.c',
 ]

diff --git a/packaging/libinput.spec b/packaging/libinput.spec
index e4968e5..091c75f 100644 (file)
--- a/packaging/libinput.spec
+++ b/packaging/libinput.spec
@@ -1,7 +1,7 @@
 %define udev_dir %{_prefix}/lib/udev
 
 Name:           libinput
-Version:        1.15.0
+Version:        1.16.1
 Release:        0
 License:        MIT
 Summary:        Input devices for display servers and other applications