GitLab

(cherry picked from commit 99ef2060)

(cherry picked from commit 08bac276)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 464d1a60)

GIT_SILENT

When we allocate the locally mapped texture size, use the announced
stride (aka bytes per line) instead of the texture width. Otherwise we
might overflow and crash eventually.

BUG: 438815

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit d04a3602)

Task: https://phabricator.kde.org/T14483

These files already have a JSON equivalent in the source dir.

The service types are deprecated and not needed anymore when using the
JSON metadata. Instead install the different plugin types into dedicated
dirs, this way there is not additional filtering needed.

This reverts commit eb1dc503.

Revert "Add dma-buf defines to build dma-buf support everywhere"

This reverts commit 8f0de624.

Revert "Drop support for PipeWire 0.2"

This reverts commit 028ac099.

These were accidentally pushed without review. They were meant
to be pushed to my fork instead.

- add support for VideoCrop metadata
- add support for memptr buffer type

(cherry picked from commit 4a36c727)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 5959b469)