From 07164cd9ceb04d74ba5338431bbe8f927622430c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 3 Aug 2023 13:58:39 +0700 Subject: [PATCH 1/5] New package: python3-pywayland-0.4.16 Close: #45430 --- srcpkgs/python3-pywayland/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-pywayland/template diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template new file mode 100644 index 0000000000000..103360eaf37ff --- /dev/null +++ b/srcpkgs/python3-pywayland/template @@ -0,0 +1,16 @@ +# Template file for 'python3-pywayland' +pkgname=python3-pywayland +version=0.4.16 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools wayland-protocols pkg-config + python3-wheel python3-cffi wayland-devel" +makedepends="python3-devel wayland-devel" +depends="python3-cffi" +short_desc="Python bindings for the libwayland library" +maintainer="Đoàn Trần Công Danh " +license="Apache-2.0" +homepage="https://github.com/flacjacket/pywayland" +distfiles="${PYPI_SITE}/p/pywayland/pywayland-${version}.tar.gz" +checksum=aaa70c870b0ab365215f8e71505f73683c4ed15b1f3638433b1dc7344fe5b5dd +make_check=no From fa2f7fda01c4c5ffd42b7ed14d4f6027ece8ce0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 3 Aug 2023 14:09:35 +0700 Subject: [PATCH 2/5] New package: python3-xkbcommon-0.8 Close #45431 --- srcpkgs/python3-xkbcommon/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-xkbcommon/template diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template new file mode 100644 index 0000000000000..fa0f294c72fed --- /dev/null +++ b/srcpkgs/python3-xkbcommon/template @@ -0,0 +1,18 @@ +# Template file for 'python3-xkbcommon' +pkgname=python3-xkbcommon +version=0.8 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-cffi python3-setuptools python3-wheel" +makedepends="libxkbcommon-devel python3-devel" +depends="python3 python3-cffi" +short_desc="Python bindings for libxkbcommon using cffi" +maintainer="Đoàn Trần Công Danh " +license="MIT" +homepage="https://github.com/sde1000/python-xkbcommon" +distfiles="${PYPI_SITE}/x/xkbcommon/xkbcommon-${version}.tar.gz" +checksum=5be5973bf5b7525687a4df6c84789b421590d7f7cf92ae56f2aab177b795d516 + +post_install() { + vlicense LICENSE +} From 3c19fcba035691341ec1ee423d75a9ad85baba04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 3 Aug 2023 14:11:37 +0700 Subject: [PATCH 3/5] New package: python3-pywlroots-0.15-0.15.24 Close #45429 --- srcpkgs/python3-pywlroots-0.15/template | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/python3-pywlroots-0.15/template diff --git a/srcpkgs/python3-pywlroots-0.15/template b/srcpkgs/python3-pywlroots-0.15/template new file mode 100644 index 0000000000000..f1d652f3f360a --- /dev/null +++ b/srcpkgs/python3-pywlroots-0.15/template @@ -0,0 +1,36 @@ +# Template file for 'python3-pywlroots-0.15' +pkgname=python3-pywlroots-0.15 +version=0.15.24 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon + python3-wheel python3-devel wlroots${pkgname##*-}-devel" +makedepends="python3-devel python3-cffi wlroots${pkgname##*-}-devel" +depends="python3-pywayland python3-xkbcommon python3-cffi" +short_desc="Python binding to the wlroots ${pkgname##*-} using cffi" +maintainer="Đoàn Trần Công Danh " +license="MIT" +homepage="https://github.com/flacjacket/pywlroots" +distfiles="${PYPI_SITE}/p/pywlroots/pywlroots-${version}.tar.gz" +checksum=4ef621c6201b2be9a970413dcbbf561fde9dcde0e7bc8d313da53149842ac871 + +pre_build() { + [ "$CROSS_BUILD" ] || return 0 + ( + rm -rf wlroots/__pycache__ + CC="$BUILD_CC" + CFLAGS="$BUILD_CFLAGS" + LDFLAGS="$BUILD_LDFLAGS" + unset LDSHARED + unset PYTHON_CONFIG + unset PYTHONPATH + unset PYPREFIX + unset _PYTHON_SYSCONFIGDATA_NAME + python3 wlroots/ffi_build.py + rm -f wlroots/_ffi.o wlroots/_ffi.cpython.*.so + ) +} + +post_install() { + vlicense LICENSE +} From 4f190bd9acc39d0914b81a41ca17db4eb2292ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 7 Aug 2023 14:33:53 +0700 Subject: [PATCH 4/5] qtile: add subpkg for wayland dependencies --- srcpkgs/qtile-wayland | 1 + srcpkgs/qtile/template | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/qtile-wayland diff --git a/srcpkgs/qtile-wayland b/srcpkgs/qtile-wayland new file mode 120000 index 0000000000000..37d4345d5336d --- /dev/null +++ b/srcpkgs/qtile-wayland @@ -0,0 +1 @@ +qtile \ No newline at end of file diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template index 3f16eada0cda7..7b466061079e4 100644 --- a/srcpkgs/qtile/template +++ b/srcpkgs/qtile/template @@ -1,10 +1,12 @@ # Template file for 'qtile' pkgname=qtile version=0.22.0 -revision=2 +revision=3 build_style=python3-pep517 -hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel pkg-config" -makedepends="python3-devel libffi-devel pulseaudio-devel" +_wlroots=0.15 +hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel + pkg-config python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon" +makedepends="python3-devel libffi-devel pulseaudio-devel wlroots${_wlroots}-devel" depends="python3-cairocffi python3-xcffib pango gdk-pixbuf" short_desc="Full-featured tiling window manager written and configured in Python" maintainer="Kai Stian Olstad " @@ -18,3 +20,11 @@ post_install() { vinstall resources/qtile.desktop 644 usr/share/xsessions vlicense LICENSE } + +qtile-wayland_package() { + depends="${sourcepkg}>=${version}_${revision} + python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon" + pkg_install() { + vmove ${py3_sitelib}/libqtile/backend/wayland + } +} From 5d84b27c3a6104cdc8154594ec66aa7f3348f6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 7 Aug 2023 15:00:06 +0700 Subject: [PATCH 5/5] wlroots: change to meta version package Each compositor choose a different version, use this scheme for ease of packaging other rev-deps. --- srcpkgs/wlroots/template | 40 +++++++++--------------------------- srcpkgs/wlroots0.16-devel | 1 + srcpkgs/wlroots0.16/template | 38 ++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 30 deletions(-) create mode 120000 srcpkgs/wlroots0.16-devel create mode 100644 srcpkgs/wlroots0.16/template diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index c015f8529fc2e..1f7e668303eaf 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,38 +1,18 @@ # Template file for 'wlroots' +# +# On next bump, remove the .99 part pkgname=wlroots -version=0.16.2 +version=0.16.99 revision=1 -build_style=meson -# Follow upstream packaging recommendations: -# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations -configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false - -Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel glslang hwids" -_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel - libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel - xcb-util-wm-devel xcb-util-renderutil-devel " -makedepends="${_devel_depends} - libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" +build_style=meta +depends="wlroots${version%.99}" short_desc="Modular Wayland compositor library" -maintainer="Isaac Freund " -license="MIT" -homepage="https://gitlab.freedesktop.org/wlroots/wlroots" -distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz" -checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa - -post_install() { - vlicense LICENSE -} +maintainer="Đoàn Trần Công Danh " +license="BSD-2-Clause" # no vlicense +homepage="https://github.com/swaywm/wlroots" wlroots-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" - conflicts="wlroots0.15-devel" + depends="wlroots${version%.99}-devel" + build_style=meta short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } } diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel new file mode 120000 index 0000000000000..8fe7760ebc0f0 --- /dev/null +++ b/srcpkgs/wlroots0.16-devel @@ -0,0 +1 @@ +wlroots0.16 \ No newline at end of file diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template new file mode 100644 index 0000000000000..ad4e17072172b --- /dev/null +++ b/srcpkgs/wlroots0.16/template @@ -0,0 +1,38 @@ +# Template file for 'wlroots0.16' +pkgname=wlroots0.16 +version=0.16.2 +revision=1 +build_style=meson +# Follow upstream packaging recommendations: +# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations +configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false + -Db_ndebug=false" +hostmakedepends="pkg-config wayland-devel glslang hwids" +_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel + libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel + wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel + xcb-util-wm-devel xcb-util-renderutil-devel " +makedepends="${_devel_depends} + libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel + xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" +short_desc="Modular Wayland compositor library ${pkgname#wlroots}" +maintainer="Isaac Freund " +license="MIT" +homepage="https://gitlab.freedesktop.org/wlroots/wlroots" +distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz" +checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa + +post_install() { + vlicense LICENSE +} + +wlroots0.16-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + conflicts="wlroots0.15-devel wlroots0.14-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +}