Skip to content

Commit

Permalink
kde-plasma/kwin: Backport various 5.27.5 fixes
Browse files Browse the repository at this point in the history
Aleix Pol (2):
      screencast: Offer the real framerate range we have available
      screencast: Ensure we respect the negotiated framerate

Bharadwaj Raju (1):
      Don't create Plasma activation feedback if StartupNotify is false

Marco Martin (1):
      screencast: Base the frame skippin on max_framerate

Markus Ebner (1):
      plugins/screencast: Provide absolute timestamps

Vlad Zahorodnii (4):
      effects/screenshot: Introduce CaptureWorkspace
      effects/screenshot: Provide information about captured window or screen
      effects/screenshot: Provide screenshot scale information
      effects/screenshot: Fix potentially leaking screenshot fds to child processes

Xaver Hugl (1):
      backends/drm: fix buffer orientation check for direct scanout

Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Apr 25, 2023
1 parent 0367928 commit 0ff1a88
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 0 deletions.
1 change: 1 addition & 0 deletions kde-plasma/kwin/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DIST kwin-5.26.5.tar.xz 6658216 BLAKE2B 8e49136fb1b38a6fad3ef6f71f130236e121f54e98519133e615a83dad9a6fe620e279d6e769d70aff393b07c541bb70779eb974bf0c1dacb29e61e3b1ac69f0 SHA512 ef374b18fdedbb5322e0abba9f5dcd023391d96c7564c22e3a73a8fc030ef682f892f68fc618175da17527ec5fbd786e0efb452f5e52f29ffb1237eee912b5d8
DIST kwin-5.27.4.1-patchset-1.tar.xz 8736 BLAKE2B 26fa987b087c9f7687cb30b4c3d66d1d3cdac855bfa0c59af10429b67f9a75c7f2a9cf76ee0a0125afc31b70097cdc25fcd3a482496cf6fb2dae4c929695098e SHA512 2c2bc1756064f4c772172aad58533412b7ac534d25c1a81bb4b65671a2ce9747e9dbd201826bd0e79d2eb31b8df9473a1dcee7f284f7eb352844c0c8f5ed9049
DIST kwin-5.27.4.1.tar.xz 7621340 BLAKE2B 53f8001542f03be032fcf09d214e5e1d8be56bfcb506c5440aba7ea2b37515770b4c865e10d11a76722ee0fe2a8376c7a07311ff44d5adacca0c5969425f5cc3 SHA512 b686fce07d48b52f987e459ff42dd29da3cbd80beea1f4f1a7cb52f49a6cce9ad167e549ac876697bc820d158fd7fdbaa39fb1261b3573cb374e058ea09e1bbf
142 changes: 142 additions & 0 deletions kde-plasma/kwin/kwin-5.27.4.1-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

ECM_HANDBOOK="optional"
ECM_TEST="optional"
KFMIN=5.102.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.7
VIRTUALX_REQUIRED="test"
inherit ecm plasma.kde.org optfeature

DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"

LICENSE="GPL-2+"
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="accessibility caps gles2-only lock multimedia plasma screencast"

RESTRICT="test"

COMMON_DEPEND="
>=dev-libs/libinput-1.19
>=dev-libs/wayland-1.21.0
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
>=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/kauth-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5[qml]
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5=
>=kde-frameworks/kitemviews-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/breeze-${PVCUT}:5
>=kde-plasma/kdecoration-${PVCUT}:5
media-libs/fontconfig
media-libs/freetype
media-libs/lcms:2
media-libs/libepoxy
media-libs/libglvnd
>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
virtual/libudev:=
x11-libs/libX11
x11-libs/libXi
>=x11-libs/libdrm-2.4.112
>=x11-libs/libxcb-1.10
>=x11-libs/libxcvt-0.1.1
>=x11-libs/libxkbcommon-1.5.0
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
accessibility? ( media-libs/libqaccessibilityclient:5 )
caps? ( sys-libs/libcap )
gles2-only? ( media-libs/mesa[gles2] )
lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
screencast? ( >=media-video/pipewire-0.3:= )
"
RDEPEND="${COMMON_DEPEND}
!kde-plasma/kwayland-server
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
sys-apps/hwdata
x11-base/xwayland
multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.9
>=dev-libs/wayland-protocols-1.31
>=dev-qt/designer-${QTMIN}:5
>=dev-qt/qtconcurrent-${QTMIN}:5
x11-base/xorg-proto
"
BDEPEND="
>=dev-qt/qtwaylandscanner-${QTMIN}:5
dev-util/wayland-scanner
>=kde-frameworks/kcmutils-${KFMIN}:5
"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"

PATCHES=( "${WORKDIR}/${P}-patchset-1" ) # KDE-bug 467138, better screencast scalability

src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"

# TODO: try to get a build switch upstreamed
if ! use screencast; then
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
}

src_configure() {
local mycmakeargs=(
# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
$(cmake_use_find_package accessibility QAccessibilityClient)
$(cmake_use_find_package caps Libcap)
-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
$(cmake_use_find_package plasma KF5Runner)
)

ecm_src_configure
}

pkg_postinst() {
ecm_pkg_postinst
optfeature "color management support" x11-misc/colord
elog
elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
elog "windows to the end of the list was changed so that it remains in the"
elog "original order. To revert to the well established behavior:"
elog
elog " - Edit ~/.config/kwinrc"
elog " - Find [TabBox] section"
elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
}

0 comments on commit 0ff1a88

Please sign in to comment.