commit: 07e420ac77c02269bc0dc6a296de7d9fb68dfa25 Author: Sam Wilson <sam <AT> binarycake <DOT> ca> AuthorDate: Thu Jan 16 23:15:34 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Thu Jan 16 23:18:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=07e420ac
app-misc/wlx-overlay-s: devendor openvr Closes: https://bugs.gentoo.org/947478 Closes: https://bugs.gentoo.org/947477 Closes: https://bugs.gentoo.org/947476 Signed-off-by: Sam Wilson <sam <AT> binarycake.ca> app-misc/wlx-overlay-s/Manifest | 5 +- .../wlx-overlay-s-0.6.0-devendor-openvr.patch | 53 ++++++++++++++++++++++ ...-0.6.0.ebuild => wlx-overlay-s-0.6.0-r1.ebuild} | 45 ++++-------------- 3 files changed, 63 insertions(+), 40 deletions(-) diff --git a/app-misc/wlx-overlay-s/Manifest b/app-misc/wlx-overlay-s/Manifest index cfe28b8fc..034fd759c 100644 --- a/app-misc/wlx-overlay-s/Manifest +++ b/app-misc/wlx-overlay-s/Manifest @@ -1,4 +1,3 @@ -DIST ValveSoftware-openvr-08de3821dfd3aa46f778376680c68f33b9fdcb6c.tar.gz 153423453 BLAKE2B 341212e4f4072daa40fb7559efa9217b9dd1fb1f600614b85f043a62f75bdf9f7a20829e91a0e94dbfc704740d01347211838cc77cf6a6b61b58b2520372c56d SHA512 a6316d90fd66bdccac3e84787445dc540e9a10c18796f6d3222f9e2725f85b0649c3e16697d04eb8003d404189fc268377f707a784adf0db525b46862fec050f DIST ab_glyph-0.2.28.crate 19965 BLAKE2B 3cebcf213bd99da72e59dcd7b23611a9472065f2da5bdece92540977888b8dfadb8ea7b1cc341dc37b05171512a60e102a0b46e6597914b168349509bf463cd6 SHA512 ab2e4c2ddbb5a93bc049892e2703086a66eced9bfd267f4ea161ca68b5906d41c1cff1c9d75e4beb8f5cd8674f8e6bcec7eb0278f37285a1beef24015444a3f5 DIST ab_glyph_rasterizer-0.1.8.crate 11010 BLAKE2B 2a20fd3ff646559d704e214ae7c4e5b8297e20be0909c403c140edb67002665447a6a796e5ca5d71f5c8c55000489a14a101ec43dd90101be9c246d1a0138dc4 SHA512 6fd5ff2d068da84c4ac2e6e2c5ad6ab2f4926f1664afb8ba701b60a35c3bd7bf00b200b22c455ca15dfc7d4303c8caa0bb150c18dcce01ce107deaf323cde17f DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e @@ -273,7 +272,7 @@ DIST openxrs-af4a55df60125491c80c61464c824219c6019b76.gh.tar.gz 169832 BLAKE2B 2 DIST orbclient-0.3.47.crate 1324509 BLAKE2B 6596cba24e840b64db31ad9791cbfb60d82d46695fa15718918947040d9b8076d3134ad0959e1b7499c457dfe75b270e7feae9fc4474db5ae1a33c21e4de4009 SHA512 dd232376bef63b9d422949eaf2a210625c4b644faed72d58621ac8693ba6095c8f7a4df1a5d1743fca8d6d68e5aa44ccc0f4cd3dd2b2f18e7b10c263edeedb8a DIST ordered-multimap-0.6.0.crate 23158 BLAKE2B c345ed6b935fd4d145fe88bad2e0d5ec5d73dccc242a8d5eb7f8caa01eadea71f1470a25b17642475d9e4cba1e4abce79ad3b1c1d6b3f05cb793e286e0d146a8 SHA512 94d0202efe1d4b6ead1804b893e303e6688893d78cea0899346f3aa2790c9296239f3408364f9d499c2ac7a981a908bc80b45d6245ac985787649055f87cc2e0 DIST ordered-stream-0.2.0.crate 19077 BLAKE2B 581285d32136bb9c2134f405c5a2d67c952a36eb3613912be029f2826b847919188e1b479506b46f20e0b63d371f476b99d9e7e1ee8d47ddef7b4f48451b0e3e SHA512 99976f90637f0daedeae05d4270d33bc03fad1c06a85bcf2cd7140b149f76c7560d5e60becf05a633a62dc82f7f65900eb8f510c62aea4e630b78c45dc76d83e -DIST ovr_overlay_oyasumi-bd03e5bf886f84d438aad95da5c5cc28725013a8.gh.tar.gz 22365 BLAKE2B e2fadc1473654644fc2d339795fa3444e9dd5e89655b6e48e134f2585f8c38f8be209f184731846e37fdc60ff33e2b6a17817c83211e091fe9136416873367f0 SHA512 943ea53d18c268993440d02069c3fc05a327b54dbe1b67e095bd4cc676dee52a64b60a1649bf171bda3316e344e277564c098f862daf329fcb663012e713ed73 +DIST ovr_overlay_oyasumi-5b5b8bbfdd6d9059f79b2847d8f657e093f2b120.gh.tar.gz 22988 BLAKE2B 4b26d7cb9d3dcc4a6e66c73ef1dc3ee4ba72e1afb1c0351007ca043fb5dc5e9fe93389a92979f0fdf6b2a48d6e24941da710e3687a1c18e8a239310f8667c75b SHA512 a26d50f1d2a99373986ab44e6616067b73ab4427d09700ba056cf8f58aeb6d1f5e18026078efac5c772c21bd8751f672ab1f331000ce29c08f1076f0b84008c5 DIST owned_ttf_parser-0.24.0.crate 151052 BLAKE2B 4c2b83750a2ecdbb2431a18d44b6aab9043068abadb58c5d210258c99ad7bbb2a7792619a83757fd3ea5b310aa01d67a8622c6edcb1a93c32960f1c85b45ff20 SHA512 d2f57c7e5d99ad1ce08068759d0076dbb4e27247cdb07638e5e02f34c395f0ec6fe655148f59902be07512b6faf2f4a5968933daf8d44d65e8c3b432079c82ce DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 @@ -296,7 +295,7 @@ DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c DIST piper-0.2.3.crate 15924 BLAKE2B 13263d38692f954b321568d999c92640040b4a411ceb82fa68ad84e32c40f56d62db49a0611f4afc24825fd8aa7252422120581e173d9adc236e0294cd11e759 SHA512 18867a2ca43c3224c3c749debdcfb65c07e0fe28759973140320712ec0d6a86125635665aceb4feae0c3aca9667048b6754121b7667a2c8caa1ecd2e3b3af7c9 DIST pipewire-0.8.0.crate 52103 BLAKE2B b8a475da25d845bc724baae83b010cd3ac933a629ed331634e4f55ce9c39c67b9cc1edcb4197a7f6357eb4defa9ef705a93b15892ccae3fd8e8137a2185d3249 SHA512 74e6c80867ae2b34ebfb7e731dfeea22abf3ba7e5058d751fedeb5d92d5095d7eaf32170228c406aba97cb5607d01fa6c2e1b850f3a3c57feaf33620af7eb6b6 DIST pipewire-sys-0.8.0.crate 3038 BLAKE2B af5fa8578906a901aa334bef68374043dde54970331352593954920fa4fc3fa773473c72ec322e4fd11e78e5be357bfc259121695bf61a824747964518b3ddfd SHA512 90c24fb7878d95b6632bff0faf30edd3731480984f65a69773f4cefa290e078290e53e6cbe28a7319ad48c5cf408984be2297b5feeccc807f7244804e7427216 -DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d +DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 DIST polling-3.7.2.crate 57988 BLAKE2B 4a957ac93d2d4b1d1cda0525b42b6f5b9a3a93b115fd107339e7cdadeb7344833749467ee99cd7c77de0a065378faf89dbf85520fa1a71b67f71e7f9dd5eaa53 SHA512 d98ead0c929458f65ff75b9712ef9665878ad2656c729333eaea4340a236f67876b1c665eb683f695c9f12a89420401e1461c39ae8297081f4789dd5d2a7562b DIST ppv-lite86-0.2.18.crate 22400 BLAKE2B 18f49aa9badfabccc5e0a48c0df3e02847e340867264935e4fb3c581fe2c515e3ead5d92b007f8e0db057eca42e0f02cde94aae920b25291b558a14de45d34da SHA512 7de43cdc24451306df00d8f034755f12194d0738702b020c6712e349bdbea3136bc10653d9f1892c5710ece133a8049e5db07213f94ffcf16edf7b6626dff3a8 DIST prettyplease-0.2.20.crate 57809 BLAKE2B 7c0b96177508fb61f76e45cb1df901f09a48611494d807acde17fede4c62f79053a09737ab6d31562bb60edfb2edc43028e62a2c4136ed799ab247086531db46 SHA512 fd6aa2cfbbb953227653eb5cc9f48d8ae6a7120026144578a9250397511416af461fff9b3f4a0fcf565d9ae589d4c0ed7523951ef36c491270d740efb61427ec diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch b/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch new file mode 100644 index 000000000..ba4540ba6 --- /dev/null +++ b/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch @@ -0,0 +1,53 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ed12ab5..df44d5f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2727,7 +2727,7 @@ dependencies = [ + [[package]] + name = "ovr_overlay" + version = "0.0.0" +-source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"; ++source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"; + dependencies = [ + "byteorder", + "derive_more", +@@ -2742,12 +2742,13 @@ dependencies = [ + [[package]] + name = "ovr_overlay_sys" + version = "0.0.0" +-source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"; ++source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"; + dependencies = [ + "autocxx", + "autocxx-build", + "cxx", + "normpath", ++ "pkg-config", + ] + + [[package]] +@@ -2965,9 +2966,9 @@ dependencies = [ + + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + + [[package]] + name = "polling" +diff --git a/Cargo.toml b/Cargo.toml +index d0690b7..721861c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -39,7 +39,7 @@ openxr = { git = "https://github.com/galister/openxrs";, rev = "af4a55d", feature + ovr_overlay = { features = [ + "ovr_input", + "ovr_system", +-], git = "https://github.com/galister/ovr_overlay_oyasumi";, optional = true } ++], git = "https://github.com/galister/ovr_overlay_oyasumi";, rev = "5b5b8bbfdd6d9059f79b2847d8f657e093f2b120", optional = true } + regex = "1.10.4" + rodio = { version = "0.19.0", default-features = false, features = [ + "wav", diff --git a/app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0.ebuild b/app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0-r1.ebuild similarity index 93% rename from app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0.ebuild rename to app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0-r1.ebuild index 5614bd5a4..36f8877d2 100644 --- a/app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0.ebuild +++ b/app-misc/wlx-overlay-s/wlx-overlay-s-0.6.0-r1.ebuild @@ -300,7 +300,7 @@ CRATES=" [email protected] [email protected] [email protected] - [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -494,8 +494,8 @@ declare -A GIT_CRATES=( [libmonado-rs]='https://github.com/technobaboo/libmonado-rs;a495f6d162fce47ae5aafeb7ec38e774cb731c29;libmonado-rs-%commit%' [openxr-sys]='https://github.com/galister/openxrs;af4a55df60125491c80c61464c824219c6019b76;openxrs-%commit%/sys' [openxr]='https://github.com/galister/openxrs;af4a55df60125491c80c61464c824219c6019b76;openxrs-%commit%/openxr' - [ovr_overlay]='https://github.com/galister/ovr_overlay_oyasumi;bd03e5bf886f84d438aad95da5c5cc28725013a8;ovr_overlay_oyasumi-%commit%' - [ovr_overlay_sys]='https://github.com/galister/ovr_overlay_oyasumi;bd03e5bf886f84d438aad95da5c5cc28725013a8;ovr_overlay_oyasumi-%commit%/sys' + [ovr_overlay]='https://github.com/galister/ovr_overlay_oyasumi;5b5b8bbfdd6d9059f79b2847d8f657e093f2b120;ovr_overlay_oyasumi-%commit%' + [ovr_overlay_sys]='https://github.com/galister/ovr_overlay_oyasumi;5b5b8bbfdd6d9059f79b2847d8f657e093f2b120;ovr_overlay_oyasumi-%commit%/sys' [vulkano-macros]='https://github.com/vulkano-rs/vulkano;94f50f18bd25971ea123adb8b5782ad65a8f085c;vulkano-%commit%/vulkano-macros' [vulkano-shaders]='https://github.com/vulkano-rs/vulkano;94f50f18bd25971ea123adb8b5782ad65a8f085c;vulkano-%commit%/vulkano-shaders' [vulkano]='https://github.com/vulkano-rs/vulkano;94f50f18bd25971ea123adb8b5782ad65a8f085c;vulkano-%commit%/vulkano' @@ -514,9 +514,6 @@ OPENVR_PATH="${WORKDIR}/ovr_overlay_oyasumi-bd03e5bf886f84d438aad95da5c5cc287250 SRC_URI=" ${CARGO_CRATE_URIS} - openvr? ( - https://github.com/ValveSoftware/openvr/archive/${OPENVR_REV}.tar.gz -> ValveSoftware-openvr-${OPENVR_REV}.tar.gz - ) https://github.com/galister/wlx-overlay-s/archive/refs/tags/v$(ver_cut 1-2).tar.gz -> ${P}.tar.gz " @@ -548,6 +545,9 @@ DEPEND=" x11-libs/libXext x11-libs/libXrandr ) + openvr? ( + =media-libs/openvr-1.23.8-r0 + ) openxr? ( media-libs/openxr-loader[X?,wayland?] ) @@ -568,23 +568,15 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-fix-use-pipewire.patch" + "${FILESDIR}/${P}-devendor-openvr.patch" ) pkg_setup() { export PKG_CONFIG_ALLOW_CROSS=1 + export OPENVR_NO_VENDOR=1 rust_pkg_setup } -src_prepare() { - if use openvr ; then - # ovr_overlay_sys uses a submodule, so we move the repo to that location. - rm -d "${OPENVR_PATH}" || die - mv "${WORKDIR}/openvr-${OPENVR_REV}" "${OPENVR_PATH}" || die - fi - - default -} - src_configure() { local myfeatures=( $(usev openvr) @@ -598,27 +590,6 @@ src_configure() { } src_install() { - if use openvr ; then - # TODO: Figure out how to compile libopenvr_api.so and package it. - case "${ARCH}" in - arm64) - LIBOPENVR_PATH="${OPENVR_PATH}/bin/linuxarm64" - ;; - - amd64) - LIBOPENVR_PATH="${OPENVR_PATH}/bin/linux64" - ;; - - x86) - LIBOPENVR_PATH="${OPENVR_PATH}/bin/linux32" - ;; - - *) die "unsupported arch" - ;; - esac - - dolib.so "${LIBOPENVR_PATH}/libopenvr_api.so" || die - fi doicon --size 256 wlx-overlay-s.png doicon --size scalable wlx-overlay-s.svg domenu wlx-overlay-s.desktop
