Merge branch 'master' into hotfix

2026-08-09 15:19:11 +02:00 · 2023-08-21 09:40:02 +02:00 · 2023-08-21 09:40:02 +02:00 · aef097a537
commit aef097a537
parent 4595b9c2bb 61e7f8aeff
26 changed files with 69 additions and 28 deletions
--- a/Bugs.md
+++ b/Bugs.md
@ -1223,3 +1223,15 @@ Steps to reproduce:
  * Observe that the element in the previously focussed window was
    clicked.

+## Issue 65
+
+  * github issue number: N/A
+  * Fixed: 2.2.1
+
+Up until cagebreak 2.2.0, the configuration for the calibration matrix of
+a libinput device was not propagated correctly when internally copying
+the configuration. This meant that effectively, the calibration matrix
+configuration was a NoOp. Starting with version 2.2.1, the calibration
+matrix can be set as documented.
+
+Thanks to Oliver Friedmann for providing a pull request.
--- a/Hashes.md
+++ b/Hashes.md
@ -1,5 +1,25 @@
 # Hashes

+2.2.1 cagebreak
+
+  * sha 256: 96469a78eeaddf9476c82e0ab8a0e35a95b3119bf83633a54feb8f3f5780df2f
+  * sha 512: 41135e9d81c79519a1db4955c742f50a375c4e4db80b51a02d618eb1520452c059a3df48013d11f17410a590ac43634da606daf6e95d0987af19284964bbcb5e
+
+2.2.1 cagebreak.1
+
+  * sha 256: 458259b066def0571b7604f4a87105f0ce608106abd7946e4697aa5ec5028ccf
+  * sha 512: aeed13e27e78ea8b30ee21f6ef41725f2808f484f0a3e6125cf70c601705954eb4a4a67ba9d6898ff994a79c20a0213557332d7f06a42098084aff3fe47ca21a
+
+2.2.1 cagebreak-config.5
+
+  * sha 256: 4ec5a18fae8d1170ff9d67126133a12ca7b1f7adae318d77f6fca8092c138761
+  * sha 512: 9b35fde46191979dee5839873eaab4a673256f75dce533df141f43f7d8282381e1e3820d1cf97403c50846b1f4ddf1924271e961d519029ed58e76e31aef4c04
+
+2.2.1 cagebreak-socket.7
+
+  * sha 256: 51911ee02637261e46164d861c4327ec338904221795a03895684582c361ef81
+  * sha 512: db848faefbf5f1eff6d4f0ad1fc4e2169beb7fd0ada620b39fe64a319376e4c7e672c48a3e446943af40d23055467b001b8e1c38b4b72648258b6f7b14c1034d
+
 2.2.0 cagebreak

  * sha 256: 67660297290a18b7822a818d1d43343e4e6f4dc27427ed9099ff803f218aa9b4
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Cagebreak: A Wayland Tiling Compositor

-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.2.0)](https://repology.org/project/cagebreak/versions)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.2.1)](https://repology.org/project/cagebreak/versions)

 ## Quick Introduction

@ -582,8 +582,8 @@ by at least one of the above collection.

 We registered project-repo.co and added mail addresses after release `1.3.0`.

-We now have a mail address and its key is signed by signing keys. See Security
-Bugs for details.
+We now have a mail address and its key is signed by signing keys. See [SECURITY.md](SECURITY.md)
+for details.

 The full public keys can be found in `keys/` along with any revocation certificates.

@ -747,6 +747,8 @@ see [SECURITY.md](SECURITY.md).
  * Oliver Friedmann
    * [Add output scaling](https://github.com/project-repo/cagebreak/pull/34), released
      in 2.0.0 with slight modifications
+    * [Fix: calibration matrix](https://github.com/project-repo/cagebreak/pull/49),
+      released in 2.2.1 with slight modifications
  * Tom Greig
    * Fix bug in merge_output_configs in 2.1.2

--- a/input_manager.c
+++ b/input_manager.c
@ -229,6 +229,11 @@ input_manager_merge_input_configs(struct cg_input_config *cfg1,
 	} else {
 		out_cfg->repeat_rate = cfg1->repeat_rate;
 	}
+	if(cfg1->calibration_matrix.configured == false) {
+		out_cfg->calibration_matrix = cfg2->calibration_matrix;
+	} else {
+		out_cfg->calibration_matrix = cfg1->calibration_matrix;
+	}
 	return out_cfg;
 }

--- a/man/cagebreak-config.5.md
+++ b/man/cagebreak-config.5.md
@ -1,4 +1,4 @@
-cagebreak-config(5) "Version 2.2.0" "Cagebreak Manual"
+cagebreak-config(5) "Version 2.2.1" "Cagebreak Manual"

 # NAME

--- a/man/cagebreak-socket.7.md
+++ b/man/cagebreak-socket.7.md
@ -1,4 +1,4 @@
-cagebreak-socket(7) "Version 2.2.0" "Cagebreak Manual"
+cagebreak-socket(7) "Version 2.2.1" "Cagebreak Manual"

 # NAME

--- a/man/cagebreak.1.md
+++ b/man/cagebreak.1.md
@ -1,4 +1,4 @@
-cagebreak(1) "Version 2.2.0" "Cagebreak Manual"
+cagebreak(1) "Version 2.2.1" "Cagebreak Manual"

 # NAME

--- a/meson.build
+++ b/meson.build
@ -3,7 +3,7 @@
 project(
  'cagebreak',
  'c',
-version : '2.2.0',
+version : '2.2.1',
 license : 'MIT',
 default_options : ['c_std=c11', 'warning_level=3']
 )
@ -209,7 +209,7 @@ reproducible_build_versions = {
  'fontconfig': '2.14.2',
  'libinput': '1.23.0',
  'libevdev': '1.13.1',
-  'libudev': '253',
+  'libudev': '254',
  'pango': '1.50.14',
  'cairo': '1.17.8',
  'pangocairo': '1.50.14',
@ -238,7 +238,7 @@ foreach name, dep : cagebreak_dependencies_dict
 endforeach

 reproducible_build_compiler = 'gcc'
-reproducible_build_compiler_version = '13.1.1'
+reproducible_build_compiler_version = '13.2.1'

 if cc.get_id() != reproducible_build_compiler
  warning('The compiler "' + cc.get_id() + '" differs from the one used to generate to binary specified in Hashes.md (' + reproducible_build_compiler + ').')
@ -260,7 +260,7 @@ install_data('LICENSE', install_dir : '/usr/share/licenses/' + meson.project_nam

 if get_option('man-pages')
  scdoc = find_program('scdoc')
-  secssinceepoch = 1685543842
+  secssinceepoch = 1692353837
  shcommand = 'export SOURCE_DATE_EPOCH=' + secssinceepoch.to_string() + ' ; @0@ < @INPUT@'.format(scdoc.path())
  sh = find_program('sh')
  mandir1 = join_paths(get_option('mandir'), 'man1')
--- a/release-non-auto-checks/Bugs.md
+++ b/release-non-auto-checks/Bugs.md
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/FAQ.md
+++ b/release-non-auto-checks/FAQ.md
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/SECURITY.md
+++ b/release-non-auto-checks/SECURITY.md
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/WLR_XDG_VERSION
+++ b/release-non-auto-checks/WLR_XDG_VERSION
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/acknowledge-contributors
+++ b/release-non-auto-checks/acknowledge-contributors
@ -0,0 +1,2 @@
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/changelog-major-minor
+++ b/release-non-auto-checks/changelog-major-minor
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/internal-wiki
+++ b/release-non-auto-checks/internal-wiki
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/release-note
+++ b/release-non-auto-checks/release-note
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/reproducibility-checked
+++ b/release-non-auto-checks/reproducibility-checked
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/release-non-auto-checks/security-to-man-page-info-transfer
+++ b/release-non-auto-checks/security-to-man-page-info-transfer
@ -1,2 +1,2 @@
-2.2.0
-2023-05-31
+2.2.1
+2023-08-21
--- a/signatures/2.1.2-cagebreak-config.5.sig
+++ b/signatures/2.1.2-cagebreak-config.5.sig
--- a/signatures/2.1.2-cagebreak-socket.7.sig
+++ b/signatures/2.1.2-cagebreak-socket.7.sig
--- a/signatures/2.1.2-cagebreak.1.sig
+++ b/signatures/2.1.2-cagebreak.1.sig
--- a/signatures/2.1.2-cagebreak.sig
+++ b/signatures/2.1.2-cagebreak.sig
--- a/signatures/cagebreak-config.5.sig
+++ b/signatures/cagebreak-config.5.sig
--- a/signatures/cagebreak-socket.7.sig
+++ b/signatures/cagebreak-socket.7.sig
--- a/signatures/cagebreak.1.sig
+++ b/signatures/cagebreak.1.sig
--- a/signatures/cagebreak.sig
+++ b/signatures/cagebreak.sig