From 2a8d2f71d1d9963368e0ef3d641d75979a689d12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Jul 2024 08:06:08 +0100 Subject: gentoo auto-resync : 04:07:2024 - 08:06:07 --- gui-wm/Manifest.gz | Bin 1384 -> 1378 bytes gui-wm/dwl/Manifest | 7 +- gui-wm/dwl/dwl-0.5-r1.ebuild | 86 +++++++++++++++++++++ gui-wm/dwl/dwl-9999-r1.ebuild | 28 ++++--- gui-wm/dwl/dwl-9999.ebuild | 26 +++++-- gui-wm/dwl/metadata.xml | 7 +- gui-wm/tinywl/Manifest | 3 + .../files/tinywl-0.17.4-improve-makefile.patch | 84 ++++++++++++++++++++ gui-wm/tinywl/tinywl-0.17.4.ebuild | 53 +++++++++++++ 9 files changed, 272 insertions(+), 22 deletions(-) create mode 100644 gui-wm/dwl/dwl-0.5-r1.ebuild create mode 100644 gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch create mode 100644 gui-wm/tinywl/tinywl-0.17.4.ebuild (limited to 'gui-wm') diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index 7eae478172cf..65856dc74a56 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest index 67cef888a453..a8360c9ce599 100644 --- a/gui-wm/dwl/Manifest +++ b/gui-wm/dwl/Manifest @@ -1,5 +1,6 @@ DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8 +EBUILD dwl-0.5-r1.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f EBUILD dwl-0.5.ebuild 1465 BLAKE2B eca80af80978fe2d80de59f39daec8a923b6ec5d9bce6e19b08e453885e80c3852b3de3ab4f2612b8a8cd2d453adf4a312fb69a00c19414ff40690617d148f81 SHA512 efe1d7a11f10b4779aa87167f2422ef4c878c8546b1ed3557f0bc9ce61f0b1d6e56d784bbe6f646e6a885fdf85ddf7d959b4b37e7820e112af27f53f00211c89 -EBUILD dwl-9999-r1.ebuild 1451 BLAKE2B 7da77261c947a648319091376d23308d38887d502880a112766d34649e3788027eb548484ef7510b4511ceeef04a25733677bbe03fd39b26dff2ff3c79de6434 SHA512 a0737102d2484a1ed8cb8e83ddf450a47a3a4bbba379713d6ce5270c8fc08398022466f34323c3c9ec3a86862fc41a7f15ae240041f86cb86c1c654b62818f55 -EBUILD dwl-9999.ebuild 1451 BLAKE2B 90d98dbcbbfb432ab542a8ce130bd8646096a6a47454fd2b9eb281c0880754ab5afa6bd8034c5548ead7cb3b6fd7478e5bb75f3a41101ddc8b7f091acf615023 SHA512 d170795f1651f9fa4c8e5b4db6ab261203f44a0d510b5b71c4312bb3a5dcb605eb9933e8164041186aa53c6b0a3ba4803043c598d2b9b9adb41d04e0f2a6e5e2 -MISC metadata.xml 517 BLAKE2B 6705dda9af1df60cdfa76bd74ec7334354aaa56d701c86ab79e7fd21d2896f50498d71dd4d3349fa14874d2eb4e0a81e1b077db13a22e98791a55cd90b00cac7 SHA512 be8dad40e1c0441375b2c7233c3bb5db4e2bdb995eee13d116f437de1e646fd58185b4e36c783c02db79fd84e94a90b766802736187ac307c2e614c7b376eb04 +EBUILD dwl-9999-r1.ebuild 1595 BLAKE2B f3236da4e40f84d3bd772cfbcbfab966653b8b918b14e0fbd5e953d0dfcd28c2a36119579456946b92d513d210db7125ac1a14f73f940d7a79977628aba5ad6b SHA512 a07c5c101b8470c2a27c822aab001fd0670e25c3557c48c1af4fd7ac553641c26dd6967da9b584b8d52c202df27535ca00fb7a176317c24ca4f4e7e53ba6b833 +EBUILD dwl-9999.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f +MISC metadata.xml 607 BLAKE2B 05185e10615acd19020f558e6d05305ea1df831ddb9703516bf8789108c2d5bc5d90ca75fd261674aa15f41be6518b49d45898866faa10848dafb0a28fada899 SHA512 c70b7a100380b1771385a7e398f256be391a2650df620499e43ead3acec46765c646c55671885a6bbfef7f3a87c488c135ec5f34c87bb4f2dfdb8f6c7a8f2ed8 diff --git a/gui-wm/dwl/dwl-0.5-r1.ebuild b/gui-wm/dwl/dwl-0.5-r1.ebuild new file mode 100644 index 000000000000..f94a2aa83609 --- /dev/null +++ b/gui-wm/dwl/dwl-0.5-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit savedconfig toolchain-funcs + +MY_P="${PN}-v${PV}" + +WLROOTS_DEP=" + >=gui-libs/wlroots-0.17:=[libinput,session,X?] + +DEPEND=" + ${CDEPEND} + sys-kernel/linux-headers +" +BDEPEND=" + >=dev-libs/wayland-protocols-1.32 + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_prepare() { + restore_config config.h + + default +} + +src_compile() { + emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \ + XWAYLAND="$(usev X -DXWAYLAND)" XLIBS="$(usev X "xcb xcb-icccm")" dwl +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc CHANGELOG.md README.md + + save_config config.h +} diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild index 4c1020cf5d30..631ff290e732 100644 --- a/gui-wm/dwl/dwl-9999-r1.ebuild +++ b/gui-wm/dwl/dwl-9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,12 @@ EAPI=8 inherit savedconfig toolchain-funcs MY_P="${PN}-v${PV}" -WLROOTS_SLOT="0/18" + +WLROOTS_DEP=" + >=gui-libs/wlroots-0.18:=[libinput,session,X?] + DEPEND=" - ${RDEPEND} + ${CDEPEND} sys-kernel/linux-headers " BDEPEND=" >=dev-libs/wayland-protocols-1.32 - dev-util/wayland-scanner + >=dev-util/wayland-scanner-1.23 virtual/pkgconfig " diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild index f54f72310522..f94a2aa83609 100644 --- a/gui-wm/dwl/dwl-9999.ebuild +++ b/gui-wm/dwl/dwl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,12 @@ EAPI=8 inherit savedconfig toolchain-funcs MY_P="${PN}-v${PV}" -WLROOTS_SLOT="0/17" + +WLROOTS_DEP=" + >=gui-libs/wlroots-0.17:=[libinput,session,X?] + DEPEND=" - ${RDEPEND} + ${CDEPEND} sys-kernel/linux-headers " BDEPEND=" diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml index 3d26f0e133bf..52a2184de8fb 100644 --- a/gui-wm/dwl/metadata.xml +++ b/gui-wm/dwl/metadata.xml @@ -7,7 +7,10 @@ Additionally the upstream maintainer - proxy-maint@gentoo.org - Proxy Maintainers + proxy-maint@gentoo.org + Proxy Maintainers + + dwl/dwl + diff --git a/gui-wm/tinywl/Manifest b/gui-wm/tinywl/Manifest index ae2b5172ce3f..85559d8ae02f 100644 --- a/gui-wm/tinywl/Manifest +++ b/gui-wm/tinywl/Manifest @@ -1,4 +1,7 @@ +AUX tinywl-0.17.4-improve-makefile.patch 3033 BLAKE2B 8a269dfc866a72d57d028dc42296228c244d9388c20f3c20ca3e7f3f13bdfe1ed212a342fa5418954c3763f7233a1fca7ec5614571d03a15b579635e451fa104 SHA512 18a3aca714781615355acf97f2bbcd0d223a7facee2c4444b785c16dd185010f899dde7a3763c8d9e55f2dc1ab6d0b949523c05f7fe18b7e349c61f64cf3be52 DIST wlroots-0.17.3.tar.gz 608292 BLAKE2B 7caab3c3a58595d3a745c0b20a5db2193c54931cdd7bc1b9de11c151af82503a03a6a3166a86f42486cc69c6ac18ca2a5596809a5c5e6d7b44c9845f509c1093 SHA512 b88747daba304db6dc302acdebb8764e719d84134118963c019d5f0d0d38552e0ffd2a50bf560b3b84549c5a0f2d11a6187ac8ddcd9faa28c5b42f86c585b555 +DIST wlroots-0.17.4.tar.gz 609179 BLAKE2B dc5a7749533ab54631d4a26be554b86e5b08b2472cf8f22ccebddb319d571cbd98a5c56e64e7bc762a5918d4272eb6b4261050288f3053c18c824c6a9c32b96b SHA512 35803df9fe68cadb0b9b5e522863535407ba2354ed1ca8f824a9c40b64698a97c579fec0afeb444b05d429adc1e3dfc45b20c3a1b7a2004e4f5a10d2305c9116 EBUILD tinywl-0.17.3.ebuild 983 BLAKE2B aed9211a01589fa6af1ce05a3aa3439cfd18e71e7e646d1e847e30623444ad66014b0707f0eeba14dd5c69999ea7771ec1d46fc71cdf64e869a66df40c008548 SHA512 7bca5e23bd4a0499806f764591655fad090c47f84666e5cb00f54f37bb2e785fb9ddc1665f429eb95e030d139d227e636454b0888bbaf39654b328ff9f5b9fe8 +EBUILD tinywl-0.17.4.ebuild 1129 BLAKE2B 8c319281d82fe46c37b80aa1fa6b18111d756a5ccfe115b05a86ba0baf0492be813a93bf451552d57d1f6ab5a4b8a9b80db085ab7d05e6bb255c97b377cc9924 SHA512 e1a06d64ede3c16c3b55aebace9a93dfe3357caeebb3e7ca4b962b086531cff5a75fc01892dca5d48ae3676c6d49e2b0a4f971142f638f9f85795ae0ce6d5339 EBUILD tinywl-9999.ebuild 957 BLAKE2B aa39010c6890743a632847da721202ba37ec86d2065ee6c203a9ae429a6ef2ea99e244b23983c5208932c594ab1b16120a4069958fb5e4b118979e325ac89aab SHA512 ba9991205ebbf941516bac0dd46aaeabd5c07d660cb80c8c01f9418060e98f0e0cf7bd195d4ea505d760f31665b05d5e97957db5c082981ee2b487545eddd217 MISC metadata.xml 505 BLAKE2B dceb764d020ca749f5f5c82b310b2357ec234b93afe377b1b8bcff210c9cc85300bcae834d0a7b772a76378f28edae24d6b5c12eaaa00795ff0ffb4c486ae2e4 SHA512 c142b3f1637209f1f43fcb4123435cf10e643fabff9473f98aa754bca3fe6dc8cec66851d2086658e56191919455eae3ed7d5ef3fa0d85391d1c7b82045b2787 diff --git a/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch b/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch new file mode 100644 index 000000000000..2537955f7b12 --- /dev/null +++ b/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch @@ -0,0 +1,84 @@ +https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4710 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + +Date: Wed, 12 Jun 2024 10:01:52 -0600 +Subject: [PATCH 1/2] tinywl: split compilation into two steps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While we are at it also respect LDFLAGS and optimize pkg-config usage + +Signed-off-by: Leonardo Hernández Hernández +--- a/tinywl/Makefile ++++ b/tinywl/Makefile +@@ -1,9 +1,9 @@ + WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) + WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) +-LIBS=\ +- $(shell pkg-config --cflags --libs "wlroots >= 0.17.0") \ +- $(shell pkg-config --cflags --libs wayland-server) \ +- $(shell pkg-config --cflags --libs xkbcommon) ++ ++PKGS="wlroots" wayland-server xkbcommon ++CFLAGS+=$(shell pkg-config --cflags $(PKGS)) ++LIBS=$(shell pkg-config --libs $(PKGS)) + + # wayland-scanner is a tool which generates C headers and rigging for Wayland + # protocols, which are specified in XML. wlroots requires you to rig these up +@@ -12,15 +12,13 @@ xdg-shell-protocol.h: + $(WAYLAND_SCANNER) server-header \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +-tinywl: tinywl.c xdg-shell-protocol.h +- $(CC) $(CFLAGS) \ +- -g -Werror -I. \ +- -DWLR_USE_UNSTABLE \ +- -o $@ $< \ +- $(LIBS) ++tinywl.o: tinywl.c xdg-shell-protocol.h ++ $(CC) -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@ -c $< ++tinywl: tinywl.o ++ $(CC) $< -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ + + clean: +- rm -f tinywl xdg-shell-protocol.h xdg-shell-protocol.c ++ rm -f tinywl tinywl.o xdg-shell-protocol.h + + .DEFAULT_GOAL=tinywl + .PHONY: clean +-- +2.45.2 + + +From 29451c3dd28ffd52eb3dcf20e47399a26ecafb3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + +Date: Wed, 12 Jun 2024 17:58:54 -0600 +Subject: [PATCH 2/2] tinywl: allow specify pkg-config binary +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Leonardo Hernández Hernández +--- a/tinywl/Makefile ++++ b/tinywl/Makefile +@@ -1,9 +1,10 @@ +-WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) +-WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) ++PKG_CONFIG?=pkg-config ++WAYLAND_PROTOCOLS=$(shell $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols) ++WAYLAND_SCANNER=$(shell $(PKG_CONFIG) --variable=wayland_scanner wayland-scanner) + +-PKGS="wlroots" wayland-server xkbcommon +-CFLAGS+=$(shell pkg-config --cflags $(PKGS)) +-LIBS=$(shell pkg-config --libs $(PKGS)) ++PKGS=wlroots wayland-server xkbcommon ++CFLAGS+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) ++LIBS=$(shell $(PKG_CONFIG) --libs $(PKGS)) + + # wayland-scanner is a tool which generates C headers and rigging for Wayland + # protocols, which are specified in XML. wlroots requires you to rig these up +-- +2.45.2 + diff --git a/gui-wm/tinywl/tinywl-0.17.4.ebuild b/gui-wm/tinywl/tinywl-0.17.4.ebuild new file mode 100644 index 000000000000..c8f32923fd24 --- /dev/null +++ b/gui-wm/tinywl/tinywl-0.17.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="\"minimum viable product\" Wayland compositor based on wlroots" +HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + S="${WORKDIR}/wlroots-${PV}" +fi + +LICENSE="CC0-1.0" +SLOT="0" +DEPEND=" + dev-libs/wayland + x11-libs/libxkbcommon + =gui-libs/wlroots-$(ver_cut 1-2)*:= +" +RDEPEND=" + ${DEPEND} + !gui-libs/wlroots[tinywl(-)] +" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}"-improve-makefile.patch ) + +src_prepare() { + default + sed -i -e "s/-Werror //" tinywl/Makefile || die +} + +src_compile() { + local -x CFLAGS="${CFLAGS} ${CPPFLAGS}" + tc-export CC PKG_CONFIG + emake -C tinywl +} + +src_install() { + dodoc tinywl/README.md + dobin tinywl/tinywl +} -- cgit v1.2.3