From c267d4087ebd2ed3c4b2986d5ae64e58abeceeab Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Tue, 6 Aug 2024 19:22:00 +0500 Subject: [PATCH 1/4] app-containers/waydroid: Added more kernel checks * CONFIG_NETFILTER_XT_TARGET_MASQUERADE * CONFIG_NETFILTER_XT_NAT Closes: https://bugs.gentoo.org/937106 Signed-off-by: Denis Reva --- .../waydroid/waydroid-1.4.2-r2.ebuild | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 app-containers/waydroid/waydroid-1.4.2-r2.ebuild diff --git a/app-containers/waydroid/waydroid-1.4.2-r2.ebuild b/app-containers/waydroid/waydroid-1.4.2-r2.ebuild new file mode 100644 index 0000000000..89c34aaa8e --- /dev/null +++ b/app-containers/waydroid/waydroid-1.4.2-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit linux-info xdg python-single-r1 + +DESCRIPTION="Container-based approach to boot a full Android system on Linux systems" +HOMEPAGE="https://waydro.id" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="apparmor +clipboard systemd" + +DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )" +RDEPEND=" + systemd? ( sys-apps/systemd ) + app-containers/lxc[systemd?,apparmor?,seccomp] + $(python_gen_cond_dep ' + clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] ) + dev-python/pygobject[${PYTHON_USEDEP}] + >=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + ') + net-firewall/nftables + net-dns/dnsmasq + >=dev-libs/libglibutil-1.0.67 + >=dev-libs/gbinder-1.1.21 + ${PYTHON_DEPS} +" + +CONFIG_CHECK=" + ~ANDROID_BINDER_IPC + ~ANDROID_BINDERFS + ~MEMFD_CREATE + ~NETFILTER_XT_TARGET_MASQUERADE + ~NETFILTER_XT_NAT +" +ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels" +ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels" +ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, + therefore it's vital for android-specific memory management" +ERROR_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106" +ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106" + + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + if ! use apparmor; then + # https://github.com/waydroid/waydroid/issues/652 + sed -e '/^lxc\.apparmor\.profile =/d' \ + -i data/configs/config_3 || die + fi + default +} + +src_install() { + python_fix_shebang waydroid.py + emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0) + if ! use systemd; then + elog "Installing waydroid OpenRC daemon" + doinitd "${FILESDIR}"/waydroid + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "After package installation run either 'emerge --config app-containers/waydroid'" + elog "or 'waydroid init' from root shell to install android container runtime" + elog "To run waydroid, 1. Start container: 'rc-service waydroid start'" + elog "2. start wayland channel (from user shell) 'waydroid session start'" + elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides" + elog "(does not cover Gentoo-specific things sadly)" + elog + + ewarn "Make sure you have NFTABLES up and running in your kernel. See" + ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details" + ewarn + + if use apparmor; then + ewarn "Apparmor support has not been tested by package maintainer yet" + fi +} + +pkg_config() { + "${EROOT}"/usr/bin/waydroid init +} From 0108c2ddf4c1c72a882c0731731e5c31025ddc8e Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Tue, 6 Aug 2024 23:25:41 +0900 Subject: [PATCH 2/4] gui-wm/cage: fix wlroots dep version Closes: https://bugs.gentoo.org/937431 Signed-off-by: Daichi Yamamoto --- gui-wm/cage/cage-0.1.5_p20240227.ebuild | 2 +- gui-wm/cage/cage-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/cage/cage-0.1.5_p20240227.ebuild b/gui-wm/cage/cage-0.1.5_p20240227.ebuild index b9c93dac78..096be5c1ce 100644 --- a/gui-wm/cage/cage-0.1.5_p20240227.ebuild +++ b/gui-wm/cage/cage-0.1.5_p20240227.ebuild @@ -26,7 +26,7 @@ IUSE="X" RDEPEND=" dev-libs/wayland - >=gui-libs/wlroots-0.17.0[X?] + >=gui-libs/wlroots-0.17.0:0[X?] x11-libs/libxkbcommon[X?] " DEPEND="${RDEPEND}" diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild index 7fe6e07869..00123e3372 100644 --- a/gui-wm/cage/cage-9999.ebuild +++ b/gui-wm/cage/cage-9999.ebuild @@ -23,7 +23,7 @@ IUSE="X" RDEPEND=" dev-libs/wayland - >=gui-libs/wlroots-0.17.0[X?] + >=gui-libs/wlroots-0.17.0:0[X?] x11-libs/libxkbcommon[X?] " DEPEND="${RDEPEND}" From f51b4ed60c0d5d8a2fe2737a98577cd8064ffec8 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 6 Aug 2024 23:55:07 +0900 Subject: [PATCH 3/4] gui-apps/mpvpaper: add 1.7 Signed-off-by: Takuya Wakazono --- gui-apps/mpvpaper/Manifest | 1 + gui-apps/mpvpaper/mpvpaper-1.7.ebuild | 38 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 gui-apps/mpvpaper/mpvpaper-1.7.ebuild diff --git a/gui-apps/mpvpaper/Manifest b/gui-apps/mpvpaper/Manifest index e22a4311d5..cb261b9203 100644 --- a/gui-apps/mpvpaper/Manifest +++ b/gui-apps/mpvpaper/Manifest @@ -1 +1,2 @@ DIST mpvpaper-1.6.tar.gz 89132 BLAKE2B 3d60e7f320375daedeed83c0776d34257d11ab70ad8b97f29a764ba02254b8e2e2ab24e74dea232bb4a0b442ec4a48237aae0d53691892d3b4703b576fd15d4b SHA512 01aa087e646f36118cfd21de849d0fe7eb7aba4a2efcd24762245d8619c84590eaf8d6f3a1e78c2ade0c55481ab2b2d93698e517cb95ef7bf6def00d8f9d8147 +DIST mpvpaper-1.7.tar.gz 89594 BLAKE2B 103582b7e5cce6293572c21299c125ef112441d1cec355e133bf54cb299123cde77deb92cd19f819102a0e6389018d4027965bb66070098a01c06f11c30b64c4 SHA512 1087d86e1586e5f5c36494787f4b981ddfd48c576add9b2758df7ed05fd219078e3fce2b135cb744d93211db254fe2e1a8b3ce2f107358fc6af3d25045ad43b6 diff --git a/gui-apps/mpvpaper/mpvpaper-1.7.ebuild b/gui-apps/mpvpaper/mpvpaper-1.7.ebuild new file mode 100644 index 0000000000..79f997313d --- /dev/null +++ b/gui-apps/mpvpaper/mpvpaper-1.7.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A video wallpaper program for wlroots based wayland compositors" +HOMEPAGE="https://github.com/GhostNaN/mpvpaper" + +inherit meson + +case "${PV}" in + 9999) + inherit git-r3 + EGIT_REPO_URI="https://github.com/GhostNaN/mpvpaper.git" + ;; + *) + SRC_URI="https://github.com/GhostNaN/mpvpaper/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +esac + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + dev-libs/wayland + media-libs/libglvnd + media-video/mpv:=[libmpv] +" +DEPEND=" + ${RDEPEND} + dev-libs/wayland-protocols +" +BDEPEND="dev-util/wayland-scanner" + +src_install() { + meson_src_install + newman mpvpaper.man mpvpaper.1 +} From c6dea1db7e01f2d9977f853b5e4eb9fe8b051992 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 6 Aug 2024 23:55:17 +0900 Subject: [PATCH 4/4] gui-apps/mpvpaper: drop 1.6 Signed-off-by: Takuya Wakazono --- gui-apps/mpvpaper/Manifest | 1 - gui-apps/mpvpaper/mpvpaper-1.6.ebuild | 38 --------------------------- 2 files changed, 39 deletions(-) delete mode 100644 gui-apps/mpvpaper/mpvpaper-1.6.ebuild diff --git a/gui-apps/mpvpaper/Manifest b/gui-apps/mpvpaper/Manifest index cb261b9203..047759ab71 100644 --- a/gui-apps/mpvpaper/Manifest +++ b/gui-apps/mpvpaper/Manifest @@ -1,2 +1 @@ -DIST mpvpaper-1.6.tar.gz 89132 BLAKE2B 3d60e7f320375daedeed83c0776d34257d11ab70ad8b97f29a764ba02254b8e2e2ab24e74dea232bb4a0b442ec4a48237aae0d53691892d3b4703b576fd15d4b SHA512 01aa087e646f36118cfd21de849d0fe7eb7aba4a2efcd24762245d8619c84590eaf8d6f3a1e78c2ade0c55481ab2b2d93698e517cb95ef7bf6def00d8f9d8147 DIST mpvpaper-1.7.tar.gz 89594 BLAKE2B 103582b7e5cce6293572c21299c125ef112441d1cec355e133bf54cb299123cde77deb92cd19f819102a0e6389018d4027965bb66070098a01c06f11c30b64c4 SHA512 1087d86e1586e5f5c36494787f4b981ddfd48c576add9b2758df7ed05fd219078e3fce2b135cb744d93211db254fe2e1a8b3ce2f107358fc6af3d25045ad43b6 diff --git a/gui-apps/mpvpaper/mpvpaper-1.6.ebuild b/gui-apps/mpvpaper/mpvpaper-1.6.ebuild deleted file mode 100644 index 79f997313d..0000000000 --- a/gui-apps/mpvpaper/mpvpaper-1.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A video wallpaper program for wlroots based wayland compositors" -HOMEPAGE="https://github.com/GhostNaN/mpvpaper" - -inherit meson - -case "${PV}" in - 9999) - inherit git-r3 - EGIT_REPO_URI="https://github.com/GhostNaN/mpvpaper.git" - ;; - *) - SRC_URI="https://github.com/GhostNaN/mpvpaper/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -esac - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - dev-libs/wayland - media-libs/libglvnd - media-video/mpv:=[libmpv] -" -DEPEND=" - ${RDEPEND} - dev-libs/wayland-protocols -" -BDEPEND="dev-util/wayland-scanner" - -src_install() { - meson_src_install - newman mpvpaper.man mpvpaper.1 -}