diff --git a/.SRCINFO b/.SRCINFO index 8eab3f6..a02d905 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = obs-studio-wayland pkgdesc = Free, open source software for live streaming and recording (with wayland patches) pkgver = 25.0.8 - pkgrel = 5 + pkgrel = 6 url = https://obsproject.com arch = x86_64 license = GPL2 @@ -55,36 +55,36 @@ pkgbase = obs-studio-wayland source = 0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch source = 0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch source = 0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch - source = 0021-libobs-graphics-Add-Linux-only-device_texture_create.patch - source = 0022-deps-glad-Add-DMA-BUF-EGL-extensions.patch - source = 0023-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch - source = 0024-libobs-opengl-Create-GLES2-contexts.patch + source = 0021-Don-t-create-native-widget-siblings.patch + source = 0022-libobs-graphics-Add-Linux-only-device_texture_create.patch + source = 0023-deps-glad-Add-DMA-BUF-EGL-extensions.patch + source = 0024-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch sha512sums = a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08 sha512sums = 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc - sha512sums = c4e653fc744000e0b178848b21f326065dbc83966876594fd349be9b847382afabd0321081e83f3ef094fe067c97d8200817a6cd752df260874bc943271a8658 - sha512sums = 2359bb8f074e5e5676eefe4c655d79611c901f0c8316275ced4d711be42f74ea29d0167ad018f51064fb8a51535969ae742c576a8afe9d710116f7379a1ee67d - sha512sums = 019fd92b51cb432d81d4265e85751040aeedc1f466181c2e2ec14c253335b1a23571e961ce6415e045fa51ea15731de6e540664276cdd76a3ce198d56cb13eac - sha512sums = 2f3186d862a78d41496e5a43dd01f5b56edac9873ea309bdcc8c9a83083437e7a252ef0d7373f403dc70ee4f1be8ae6fc430d710b80222ada7ae3ce16b8103ea - sha512sums = 457534c7ffb7dd0064b143cdfe472d079251ebe891885372127cbff2b6cb70e7d1e55a2da7956c5b6d940e03f8efa57265453fa23a8fb9fa92e4b2c33c959316 - sha512sums = 2af83bba2aa2dd2aed11f9a4f431d9aaeae7c6154c921247510e91bb523cede756d0777fe522a5a6db81a9a6989769a839f365e698511890308c5a0ec6e695ec - sha512sums = 3f8094c9e577d81bfc9222e436947aa890ce81b2f0e3e43f979a7192cc3e1ca35ca63949e061cecdc6be0579636b6a8e0d8ba21a05a0e11a94ba42210fff851a - sha512sums = d0ff4c1bcb156b2c81be38682d4f99b1388d25521f7981016e850f1e8989d0bfe0d3d71d4ec18382f861ca889bcdfb27dd4d73ca7f763f997a5e388bbc8bdcbc - sha512sums = 061f7122d5ff8a98dd4ef875c2d7dc60a2dc30627a01a960bd78539e6c7f2bcbfda48f9f42f9f61434f6263686641af2cfb4d6971682be542b6c6f037986e6da - sha512sums = a91815239465656a0ab5902e524277659e0e3ab953d0539bc8ead8f65b3a279a801c02635aad541f871f5007943af704c8c64fec90534c66fe6e418d24787300 - sha512sums = e3bdcdae93fa134c1174bf84152385ae28eb7fd82504331f4dccfd46b6565eb605b63acd4972bed08bbe765c7e213b93d94077a9fafcfe33064b4a526f02f7a6 - sha512sums = f134c9fed318fde1d11f59e56676cc512bdea81df6a5ce90202759b300405d02981b6586e090cbae65fb730ca352c3942eeec636bb7d5a571475a815f73be89d - sha512sums = 530846836b8efc6b7549fb6d2b4288ac9782420fd8e51c988d579f701bc4a1f58b7f941d472ad7d4ab07869e45dfc905c3927a3ad735178a109881ed02ffdb77 - sha512sums = 014a9dd855e696a33e3b5c8f8a11ec6cf1edc6e0e6478cc5f11530c5535a1d1dfaaa75c5a3de258178e1ab16256fb8303b18c8a69407febe58a7d860b2396fda - sha512sums = afb5a5b0cfa09407efe6924b37f8c3b26ccf244acc4a99fcee0eb6705855d2dc8589ecbdb2fcf9066c9ec6d947a6810f58efe34362aa451af4cdf7fa30f2e4e4 - sha512sums = 5a09040d91bf293389c328f758416f29840eaf6b0acd78adf14b47fc48c417fb1b02ab97dc90c7d8381bc9ffa817cbc6acc83fd318ba85d73d39ae8f4f7a35e1 - sha512sums = d1ed4b6bb07b2da105e2d69c5af1d61bcd39f141c2500e606f251f2220632f4173d3b3de9e2c88dd0bf2e230cba291cda50fb3a7ca89ff391d0e5e36b2e4aa2f - sha512sums = c5b82ddaad7bcc5608168a318e6dde9a0aa0d1dc789d29751a9b22bec2b68288c71e5719c620073ee3c8d9bbf63d60e1634a351cc155b8f2b823d0cbc83cf578 - sha512sums = c9d1e42cb87964b764a70044aa828c8d712c709d9e1245f644e8aa2f4576cd33c78e81b9b736d39939959aa3811fe4a9cb6970c8278c22d3f5b7f48d43ae1d55 - sha512sums = a9893913797b503249d182ebbac0452827a837187e7817c46ab76df5d004ada810c2ff8523518d408daf396a4c72f707777a3dadeca598f404b074581f0125e8 - sha512sums = 848bcf4f525cca508131960fe6bb2757b0975065f680da9c8d692b5ea28b4c5cca7c2e71f1498c8425c0549fc23a41895638da9e1c433d05e6425ea36dc3ec1b - sha512sums = 71e11ef607a0371c378db0d50155530d2a918ca47fe15dd29dab36f50dda4a8e7a487f3600b4b03a240db4e84b73c5b49186ca275fb1968de8f15c8d16e8a813 - sha512sums = 73b82cd530e26d3751de9d3e54da0994cbd5d7c9e5ceed7088d50ef4eda8a8c36d30812e8e4a82be014813ed09aefcfa14e7361189a7b4cf763f20aa2ebda7b7 - sha512sums = 1442f7918df45b37e9b3bef05573d4f8c7224f950a85fd0b6200a2ca70b377344ecf37ed69b5474453f584d0992b446383b1a708c326e993a9c815882ba4232f + sha512sums = 412c4121fc77af66a3e55650859becb6fb6d668369d8767729893e98fea8f6f8dde4ec9bc160041bb986f8a508f762cc68446e3c8cf5525a5b6fbfac1c1bf4fd + sha512sums = 6af84ddd3bb6953911840bd130606d8c1148cb6fc8e5750da480adb542813dc336f64056ffec8f07dc7467031e640842490b35fe89b39b621bf7db92d049743f + sha512sums = 6205323d409b1c583257540e4d51f6c2a2e456b06a6b6d4edacad8d53af05e40afdd283567d910cdff2d4d6d50677df1e78421c19505a85a71538ca108442de7 + sha512sums = be0d996ed92eccc4c7da354775b927b34c98f6863a16357c473e04e25a61cd3d73f128cedd154a2a3dfa321444f2884dc7f47f895cd9e2014df8d739837b01af + sha512sums = bd7bed1f8bfad7a3a3abc71d0d2db48fcdbe231a42ab16aaf95e81016e11446558bbcb9f18c91af1834c4fd90e692b0865ed23730715b7174545a500a29c1fb7 + sha512sums = bda1c8488083b9b76d0a7597f81d01621981803f2634a14fdb2bfcb1fa57638afd20956defb9269d234ddc7143755303d7ba21376ebfde034025ab8d2441162f + sha512sums = c378765fdcb271a6c98965f91a44d3a990184324a5b1fceb7094cf5333938e30bd09978e47837061bbc9edb2847a0c5e5aea84cf7d1e7a0f34a1ed49ada291d8 + sha512sums = 9abc8155aa02bb8ee50a32217ff58fa7bc001f070dbdc25c4837a13a5b76088eaf0b5bb76bb4d3cc66f820e1866236bbdece77739d3bd02df5e0e6ed2d8d6932 + sha512sums = 2b5ab097562b46d19844f80680604126171732fda60984fd6cc63c188e23f04961c255b16af544893b587d00c14c49a465791bf3ee4af19ecb55c9ac09494d13 + sha512sums = d4f62e5cd212379600f559612592b29d8114b33ecb7d42f2817369866872fe31a20e734b3c3468eaea040ab4b48b94581bda2a45a9b09b029eecdbffdb7a067d + sha512sums = fe359f670c5e427d457c4b7a820cfddf37558209ebbd48eb16ca44c7f5342ae1e96685411a51207d8c16ed56b903f5282b29d56b892c7507cae790a759f30c1c + sha512sums = 10210a00eac70214c7df82460dc8d8d795e7e4fd0f732effca4ccbc12fe23ee4826faa8d49eb8be5498e895a58c5a481dd46ebd1781489aa2f097827db11362e + sha512sums = 57dd96edb1cfc833aea7afa504877d5cb7c0676ec9cba3c8eb615125d5a6e74311ed28edde37a7c34cefb06009c850427e17bff01a09e5b260e4cd645b34449a + sha512sums = 3adfe5956a20b06e30bf69bc119f2db8ad336a9288fc5b06d4303429b61d8de58973d223e8a0a4aae8feb16c4ca0ff52796cee229def981b690508be099f70fc + sha512sums = 10bb8c05f7aeee664823d5c709d71d6bc2db0939e7749016fa42be1f64a4b9af9c1ef8f60257b92ab2d93947d258e357aaf95c205f95e45e65dbb4c8e88b05b5 + sha512sums = 03df24ecd1c07ac526a0597a0fa505e84048e40fa60b9871c384959f8916fe610dde715bea267ce2d69ff3fae205eae43179dddfe9b1eb242e670d8c9fef6206 + sha512sums = d9d3f2aa11c04caf4a2cb4c70cbf9735f2c56995039585359f1cd3d9518bfdef2440086b30cf54c7cbf52daa4b78b2a3120eadfdb0994e9309c4e5e5ca4b8698 + sha512sums = d3b6abe7b332d31b8b6297b17861bf65c8ea0442026e9ca5d57b3f0e1df302ca6cb3df95f94d1a11143d941443ea748c956eaeb29ce30068da12b5c9bea80432 + sha512sums = 8b3e0a9a53b2af54662ac23ea8a196506e7434061b0123c9fdc1632aee1f8137fd26151c5fa8ac99d1a794a3d1c67197bab81cc7886a3e903c3bf3d2f3ab8324 + sha512sums = 77a14e4a5f44d0f0e3895e1802c715907174a007c72b074005b17d6997098ac399e8d08b14c6aa9a3d307354e3f1b52d0640d64c3afd8598f260029b3b41a926 + sha512sums = a03f2b34847a74920c840131db046370502f6de53c9e27e81c1e3e8cb9dfeae2954cc86d1e874513192ab34c17dd54a7eafc9eadee8037aafa26e2d2d05b7c47 + sha512sums = b4f768da3974891e50322aed57cbcb228a0f6d54126163719ea41eeb9a9e6ffd7bff30cc3fb0af3e9e8a165d5b0d84d7beb5f442d316a98c79acdb24333687cb + sha512sums = 475129b7243db100d5a93e4efb099c32b0bde8c9950494618c2d1bd91e91d19d6e4a2699f071145da585527fd890324073cd03bb520baf80332bbeda533e7015 + sha512sums = a7bae3d40e67de1a7753cc11f8bbf1a8cf87d642797fc14771e349d66a0127f5a6f767d04b434c5414cc50ae68508e3f21213b500b3abad1ebbb1a3b510be6fd pkgname = obs-studio-wayland diff --git a/0001-deps-glad-Add-EGL.patch b/0001-deps-glad-Add-EGL.patch index 53a3fbf..f912564 100644 --- a/0001-deps-glad-Add-EGL.patch +++ b/0001-deps-glad-Add-EGL.patch @@ -1,4 +1,4 @@ -From 48e3ddab8d44f1bb5c0430aef3b480c3c73a342d Mon Sep 17 00:00:00 2001 +From 9ae80ef763534a7e74b286bfa8752f1862b3c965 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 13:10:16 -0300 Subject: [PATCH 01/24] deps-glad: Add EGL diff --git a/0002-libobs-opengl-Rename-gl-x11.c-to-gl-x11-glx.c.patch b/0002-libobs-opengl-Rename-gl-x11.c-to-gl-x11-glx.c.patch index eed81e4..652b6c2 100644 --- a/0002-libobs-opengl-Rename-gl-x11.c-to-gl-x11-glx.c.patch +++ b/0002-libobs-opengl-Rename-gl-x11.c-to-gl-x11-glx.c.patch @@ -1,4 +1,4 @@ -From 3e53cda423e6969a8e7d842c5f1b0fe58f2ccfd6 Mon Sep 17 00:00:00 2001 +From 5e10b60ae82614cc6671864042f3629ce4743267 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 13:19:31 -0300 Subject: [PATCH 02/24] libobs-opengl: Rename gl-x11.c to gl-x11-glx.c diff --git a/0003-libobs-opengl-Factor-out-GLX-winsys.patch b/0003-libobs-opengl-Factor-out-GLX-winsys.patch index 73b5e69..870fa2a 100644 --- a/0003-libobs-opengl-Factor-out-GLX-winsys.patch +++ b/0003-libobs-opengl-Factor-out-GLX-winsys.patch @@ -1,4 +1,4 @@ -From e1eb076e87330b4cc197ae9f88cb1ede215dea71 Mon Sep 17 00:00:00 2001 +From 8ac176c96716a82ba889964425ef78bfcdbb3a2b Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 16:46:37 -0300 Subject: [PATCH 03/24] libobs-opengl: Factor out GLX winsys diff --git a/0004-libobs-opengl-Introduce-the-X11-EGL-winsys.patch b/0004-libobs-opengl-Introduce-the-X11-EGL-winsys.patch index 351d4e4..564813f 100644 --- a/0004-libobs-opengl-Introduce-the-X11-EGL-winsys.patch +++ b/0004-libobs-opengl-Introduce-the-X11-EGL-winsys.patch @@ -1,4 +1,4 @@ -From 1219e3656bd1cd07dccb454684e3e535c9de732d Mon Sep 17 00:00:00 2001 +From 25ae9766e63d059a10bdaa1ce267367e24e455d5 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 17:35:49 -0300 Subject: [PATCH 04/24] libobs-opengl: Introduce the X11/EGL winsys diff --git a/0005-deps-glad-Make-X11-required-as-well.patch b/0005-deps-glad-Make-X11-required-as-well.patch index 73bbd34..a2f07dc 100644 --- a/0005-deps-glad-Make-X11-required-as-well.patch +++ b/0005-deps-glad-Make-X11-required-as-well.patch @@ -1,4 +1,4 @@ -From 0be95c8ba491b168db8b44319e53af10e0646c07 Mon Sep 17 00:00:00 2001 +From 3a3655510da3bee8c0314543e299a617c780efe6 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 11 Apr 2020 23:49:05 -0300 Subject: [PATCH 05/24] deps/glad: Make X11 required as well diff --git a/0006-ci-Install-qtbase5-private-dev-on-Linux.patch b/0006-ci-Install-qtbase5-private-dev-on-Linux.patch index e83c953..049a3a3 100644 --- a/0006-ci-Install-qtbase5-private-dev-on-Linux.patch +++ b/0006-ci-Install-qtbase5-private-dev-on-Linux.patch @@ -1,4 +1,4 @@ -From 4056740eb1ba8de4eb0b4ec6621c48e3ca5fb314 Mon Sep 17 00:00:00 2001 +From 0bbcf8f5989342a8dd5115a8792bec6706e5bc54 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 6 Mar 2020 16:22:01 -0300 Subject: [PATCH 06/24] ci: Install qtbase5-private-dev on Linux diff --git a/0007-libobs-nix-Move-X11-specific-code-to-obs-nix-x11.c.patch b/0007-libobs-nix-Move-X11-specific-code-to-obs-nix-x11.c.patch index a82e27a..15f9fa9 100644 --- a/0007-libobs-nix-Move-X11-specific-code-to-obs-nix-x11.c.patch +++ b/0007-libobs-nix-Move-X11-specific-code-to-obs-nix-x11.c.patch @@ -1,4 +1,4 @@ -From 7aa2fd8902ede3ad5eabe3e0152d9688d12cf9bb Mon Sep 17 00:00:00 2001 +From 1aa93bda22845acc9dabfd4f810ce88d649de041 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 6 Mar 2020 17:24:33 -0300 Subject: [PATCH 07/24] libobs/nix: Move X11-specific code to obs-nix-x11.c diff --git a/0008-libobs-Introduce-the-concept-of-a-Unix-platform.patch b/0008-libobs-Introduce-the-concept-of-a-Unix-platform.patch index f42e271..b05c6a9 100644 --- a/0008-libobs-Introduce-the-concept-of-a-Unix-platform.patch +++ b/0008-libobs-Introduce-the-concept-of-a-Unix-platform.patch @@ -1,4 +1,4 @@ -From 53d14fdc3ddcd1e5232e9eb3dbd6cb993893b4b1 Mon Sep 17 00:00:00 2001 +From e4823815167d212426ad71d4f4a558c93928c623 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 6 Mar 2020 17:50:41 -0300 Subject: [PATCH 08/24] libobs: Introduce the concept of a Unix platform diff --git a/0009-UI-Set-the-Unix-platform-on-startup.patch b/0009-UI-Set-the-Unix-platform-on-startup.patch index 15e2063..1ca0f83 100644 --- a/0009-UI-Set-the-Unix-platform-on-startup.patch +++ b/0009-UI-Set-the-Unix-platform-on-startup.patch @@ -1,4 +1,4 @@ -From a80131faaa1fad9aff4c4cbe79d49016ff24a6e7 Mon Sep 17 00:00:00 2001 +From f686f95d5577e39d1e230992db9667263a50b056 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 7 Apr 2020 23:17:02 -0300 Subject: [PATCH 09/24] UI: Set the Unix platform on startup diff --git a/0010-linux-capture-Fail-to-load-when-running-on-EGL.patch b/0010-linux-capture-Fail-to-load-when-running-on-EGL.patch index c010cb3..6582480 100644 --- a/0010-linux-capture-Fail-to-load-when-running-on-EGL.patch +++ b/0010-linux-capture-Fail-to-load-when-running-on-EGL.patch @@ -1,4 +1,4 @@ -From 7f6041c7cb282d5354ad4afc545341f1437d1b46 Mon Sep 17 00:00:00 2001 +From 74515c11cd2386041df09d40591b61ec232726c6 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 8 Apr 2020 23:58:43 -0300 Subject: [PATCH 10/24] linux-capture: Fail to load when running on EGL diff --git a/0011-libobs-Add-a-Wayland-platform.patch b/0011-libobs-Add-a-Wayland-platform.patch index e5402a1..baeba83 100644 --- a/0011-libobs-Add-a-Wayland-platform.patch +++ b/0011-libobs-Add-a-Wayland-platform.patch @@ -1,4 +1,4 @@ -From 4f0e966291fc8f6780f1ff6439ada95e63847b95 Mon Sep 17 00:00:00 2001 +From 20b8264570f84ddc218b791643d26e168653ffbe Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 6 Mar 2020 18:53:42 -0300 Subject: [PATCH 11/24] libobs: Add a Wayland platform diff --git a/0012-libobs-opengl-Try-to-use-the-platform-display-if-ava.patch b/0012-libobs-opengl-Try-to-use-the-platform-display-if-ava.patch index 2bf9892..c211e4a 100644 --- a/0012-libobs-opengl-Try-to-use-the-platform-display-if-ava.patch +++ b/0012-libobs-opengl-Try-to-use-the-platform-display-if-ava.patch @@ -1,4 +1,4 @@ -From 8c482e031d9891e13d787653135651426661b3b6 Mon Sep 17 00:00:00 2001 +From a9847552f9b6034f78ce6aae2e4ad7a63a274c5a Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 11 Apr 2020 23:32:16 -0300 Subject: [PATCH 12/24] libobs-opengl: Try to use the platform display if diff --git a/0013-libobs-opengl-Introduce-an-EGL-Wayland-renderer.patch b/0013-libobs-opengl-Introduce-an-EGL-Wayland-renderer.patch index 4bae847..17b0ae6 100644 --- a/0013-libobs-opengl-Introduce-an-EGL-Wayland-renderer.patch +++ b/0013-libobs-opengl-Introduce-an-EGL-Wayland-renderer.patch @@ -1,4 +1,4 @@ -From c5e9210a3b0d5a19cfc1b74ea400f049d4983992 Mon Sep 17 00:00:00 2001 +From fc5b9a4e3f196e0795b1966b64b86d02e4cc1ecb Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 21:09:11 -0300 Subject: [PATCH 13/24] libobs-opengl: Introduce an EGL/Wayland renderer diff --git a/0014-UI-Retrieve-Wayland-surface-from-QWindow.patch b/0014-UI-Retrieve-Wayland-surface-from-QWindow.patch index 5017f0c..6457bc3 100644 --- a/0014-UI-Retrieve-Wayland-surface-from-QWindow.patch +++ b/0014-UI-Retrieve-Wayland-surface-from-QWindow.patch @@ -1,4 +1,4 @@ -From e628aba53a2c4e327460d9b005ecef56bf54ee72 Mon Sep 17 00:00:00 2001 +From 925a05f9db662ceb3200997d085dbce682f74ffc Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 9 Mar 2020 21:23:37 -0300 Subject: [PATCH 14/24] UI: Retrieve Wayland surface from QWindow diff --git a/0015-UI-Destroy-display-when-becoming-invisible.patch b/0015-UI-Destroy-display-when-becoming-invisible.patch index cb894e3..767ad35 100644 --- a/0015-UI-Destroy-display-when-becoming-invisible.patch +++ b/0015-UI-Destroy-display-when-becoming-invisible.patch @@ -1,4 +1,4 @@ -From 334bad8172f854d14e3079f03349d16a4ce2df73 Mon Sep 17 00:00:00 2001 +From 810e7a1d5e547d25da3d62ecbb25a1dcb8990d2f Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 18 Aug 2020 19:38:29 -0300 Subject: [PATCH 15/24] UI: Destroy display when becoming invisible diff --git a/0016-UI-Don-t-create-obs_display-when-QTToGSWindow-fails.patch b/0016-UI-Don-t-create-obs_display-when-QTToGSWindow-fails.patch index f07addd..7c7a39e 100644 --- a/0016-UI-Don-t-create-obs_display-when-QTToGSWindow-fails.patch +++ b/0016-UI-Don-t-create-obs_display-when-QTToGSWindow-fails.patch @@ -1,4 +1,4 @@ -From 7b989da443d84cca425c3669f072e413825bc657 Mon Sep 17 00:00:00 2001 +From 00fcdb6b5f8a01da49d3325884c2e17fa15a5110 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 19 Aug 2020 10:11:08 -0300 Subject: [PATCH 16/24] UI: Don't create obs_display when QTToGSWindow fails diff --git a/0017-UI-Rename-callback-to-match-signal-name.patch b/0017-UI-Rename-callback-to-match-signal-name.patch index eb9e54e..8a2d411 100644 --- a/0017-UI-Rename-callback-to-match-signal-name.patch +++ b/0017-UI-Rename-callback-to-match-signal-name.patch @@ -1,4 +1,4 @@ -From c69023203d043f4ed5d600911a11dacce1331b4f Mon Sep 17 00:00:00 2001 +From 0c2fdafdb3c0b522732905632bb01e4ada33171c Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 19 Aug 2020 13:08:01 -0300 Subject: [PATCH 17/24] UI: Rename callback to match signal name diff --git a/0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch b/0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch index 0e11e9c..90fac57 100644 --- a/0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch +++ b/0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch @@ -1,4 +1,4 @@ -From f385ff60cf00ed6bac84483bd5da9aa84638bb14 Mon Sep 17 00:00:00 2001 +From 9b1439bc349d79874e0b446d156982c130e698f0 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 19 Aug 2020 15:09:26 -0300 Subject: [PATCH 18/24] UI: Disable and ignore Always On Top on Wayland diff --git a/0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch b/0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch index 1ccd4cc..74988c2 100644 --- a/0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch +++ b/0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch @@ -1,4 +1,4 @@ -From e6406c1fb4fcd81383dd11847d0a21908a030877 Mon Sep 17 00:00:00 2001 +From 721a2b85b798f09a8458ed23198e95019dcc9bae Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 20 Aug 2020 11:57:19 -0300 Subject: [PATCH 19/24] UI: Make OBSQTDisplay::CreateDisplay() public and allow diff --git a/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch b/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch index bab2a3e..677ee1d 100644 --- a/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch +++ b/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch @@ -1,4 +1,4 @@ -From af18bb55d32a6794cd6ce2dd5f16d9a8e6bc700e Mon Sep 17 00:00:00 2001 +From 656c0b68892d1ab455979c59dfef529924c57bff Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 20 Aug 2020 11:58:45 -0300 Subject: [PATCH 20/24] UI: Check for Expose and PlatformSurface events to diff --git a/0021-Don-t-create-native-widget-siblings.patch b/0021-Don-t-create-native-widget-siblings.patch new file mode 100644 index 0000000..ed30512 --- /dev/null +++ b/0021-Don-t-create-native-widget-siblings.patch @@ -0,0 +1,36 @@ +From cbb48e4213f5666a8714a8d644f8f8fb1473d793 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Wed, 16 Sep 2020 15:24:22 +0100 +Subject: [PATCH 21/24] Don't create native widget siblings + +Native windows really only make sense for previews. They can be a new +xcb_window or a wayland subsurface. + +For historical reasons setting a widget to native will also affect +ancestors. Qt will still draw them as part of the parent as they are +never mapped, but a window is nonetheless created. + +This is especially problematic on wayland as then the subsurface is +parented to an unmapped window. + +This default behaviour can be turned off. Now only the native widgets +(the video previews) are actually native. +--- + UI/obs-app.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp +index 8335c2ce..44df67ad 100644 +--- a/UI/obs-app.cpp ++++ b/UI/obs-app.cpp +@@ -1353,6 +1353,7 @@ bool OBSApp::OBSInit() + ProfileScope("OBSApp::OBSInit"); + + setAttribute(Qt::AA_UseHighDpiPixmaps); ++ setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); + + qRegisterMetaType(); + +-- +2.28.0 + diff --git a/0021-libobs-graphics-Add-Linux-only-device_texture_create.patch b/0022-libobs-graphics-Add-Linux-only-device_texture_create.patch similarity index 98% rename from 0021-libobs-graphics-Add-Linux-only-device_texture_create.patch rename to 0022-libobs-graphics-Add-Linux-only-device_texture_create.patch index 2927e47..d95dd35 100644 --- a/0021-libobs-graphics-Add-Linux-only-device_texture_create.patch +++ b/0022-libobs-graphics-Add-Linux-only-device_texture_create.patch @@ -1,7 +1,7 @@ -From 35142e4c7c0ff41dfd869dbcdcef05ebc47102d3 Mon Sep 17 00:00:00 2001 +From 5af41c0c15639b58491b573e6c00eb6e9c7272a2 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 12 Mar 2020 23:50:18 -0300 -Subject: [PATCH 21/24] libobs/graphics: Add Linux-only +Subject: [PATCH 22/24] libobs/graphics: Add Linux-only device_texture_create_from_dmabuf The implementation are stubs as of now diff --git a/0022-deps-glad-Add-DMA-BUF-EGL-extensions.patch b/0023-deps-glad-Add-DMA-BUF-EGL-extensions.patch similarity index 98% rename from 0022-deps-glad-Add-DMA-BUF-EGL-extensions.patch rename to 0023-deps-glad-Add-DMA-BUF-EGL-extensions.patch index c641816..0950205 100644 --- a/0022-deps-glad-Add-DMA-BUF-EGL-extensions.patch +++ b/0023-deps-glad-Add-DMA-BUF-EGL-extensions.patch @@ -1,7 +1,7 @@ -From 81ec6cf5002e4f381d6fdcc82bc7ac1189628f53 Mon Sep 17 00:00:00 2001 +From 17e54962b4de4008a52c7d54d5402752a6d6f0e7 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 12 Mar 2020 23:57:23 -0300 -Subject: [PATCH 22/24] deps-glad: Add DMA-BUF EGL extensions +Subject: [PATCH 23/24] deps-glad: Add DMA-BUF EGL extensions --- deps/glad/include/glad/glad_egl.h | 63 +++++++++++++++++++++++++++++-- diff --git a/0024-libobs-opengl-Create-GLES2-contexts.patch b/0024-libobs-opengl-Create-GLES2-contexts.patch deleted file mode 100644 index 19a8def..0000000 --- a/0024-libobs-opengl-Create-GLES2-contexts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c526b2ac87ce5cb26db187bbd612b90bb35605fa Mon Sep 17 00:00:00 2001 -From: Georges Basile Stavracas Neto -Date: Fri, 28 Aug 2020 09:43:24 -0300 -Subject: [PATCH 24/24] libobs-opengl: Create GLES2 contexts - -They are required for importing DMA-BUF images. ---- - libobs-opengl/gl-wayland-egl.c | 2 +- - libobs-opengl/gl-x11-egl.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libobs-opengl/gl-wayland-egl.c b/libobs-opengl/gl-wayland-egl.c -index 299fe7ea..33352dfb 100644 ---- a/libobs-opengl/gl-wayland-egl.c -+++ b/libobs-opengl/gl-wayland-egl.c -@@ -27,7 +27,7 @@ - static const EGLint config_attribs[] = {EGL_SURFACE_TYPE, - EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, -- EGL_OPENGL_BIT, -+ EGL_OPENGL_ES2_BIT, - EGL_STENCIL_SIZE, - 0, - EGL_DEPTH_SIZE, -diff --git a/libobs-opengl/gl-x11-egl.c b/libobs-opengl/gl-x11-egl.c -index d56f6b71..40e6a7f8 100644 ---- a/libobs-opengl/gl-x11-egl.c -+++ b/libobs-opengl/gl-x11-egl.c -@@ -62,7 +62,7 @@ static const EGLint ctx_config_attribs[] = {EGL_STENCIL_SIZE, - EGL_ALPHA_SIZE, - 8, - EGL_RENDERABLE_TYPE, -- EGL_OPENGL_BIT, -+ EGL_OPENGL_ES2_BIT, - EGL_SURFACE_TYPE, - EGL_WINDOW_BIT | EGL_PBUFFER_BIT, - EGL_NONE}; --- -2.28.0 - diff --git a/0023-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch b/0024-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch similarity index 98% rename from 0023-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch rename to 0024-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch index 118de8a..9c3f373 100644 --- a/0023-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch +++ b/0024-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch @@ -1,7 +1,7 @@ -From 8b047f19f5351382da17951a24923ca195fb5002 Mon Sep 17 00:00:00 2001 +From 54e6e2f92cfeb9375e281c958102d58d076295a1 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 14 Mar 2020 14:26:02 -0300 -Subject: [PATCH 23/24] libobs-opengl: Implement DMA-BUF importing on EGL +Subject: [PATCH 24/24] libobs-opengl: Implement DMA-BUF importing on EGL renderers This is currently extremely limited. It only supports XRGB8888 @@ -30,7 +30,7 @@ index 0f694b6c..c434c65f 100644 gl-x11-glx.c) diff --git a/libobs-opengl/gl-egl-common.c b/libobs-opengl/gl-egl-common.c new file mode 100644 -index 00000000..8688af6b +index 00000000..0696839e --- /dev/null +++ b/libobs-opengl/gl-egl-common.c @@ -0,0 +1,340 @@ @@ -297,8 +297,8 @@ index 00000000..8688af6b + } + + egl_image = create_dmabuf_egl_image(egl_display, width, height, -+ DRM_FORMAT_ARGB8888, n_planes, fds, -+ strides, offsets, modifiers); ++ drm_format, n_planes, fds, strides, ++ offsets, modifiers); + if (egl_image == EGL_NO_IMAGE) { + blog(LOG_ERROR, "Cannot create EGLImage: %s", + gl_egl_error_to_string(eglGetError())); diff --git a/PKGBUILD b/PKGBUILD index 1af0297..89d4019 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=$_pkgname-wayland provides=("$_pkgname") conflicts=("$_pkgname") pkgver=25.0.8 -pkgrel=5 +pkgrel=6 pkgdesc="Free, open source software for live streaming and recording (with wayland patches)" arch=('x86_64') url="https://obsproject.com" @@ -46,37 +46,37 @@ source=( 0018-UI-Disable-and-ignore-Always-On-Top-on-Wayland-platf.patch 0019-UI-Make-OBSQTDisplay-CreateDisplay-public-and-allow-.patch 0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch - 0021-libobs-graphics-Add-Linux-only-device_texture_create.patch - 0022-deps-glad-Add-DMA-BUF-EGL-extensions.patch - 0023-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch - 0024-libobs-opengl-Create-GLES2-contexts.patch + 0021-Don-t-create-native-widget-siblings.patch + 0022-libobs-graphics-Add-Linux-only-device_texture_create.patch + 0023-deps-glad-Add-DMA-BUF-EGL-extensions.patch + 0024-libobs-opengl-Implement-DMA-BUF-importing-on-EGL-ren.patch ) sha512sums=('a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08' '1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc' - 'c4e653fc744000e0b178848b21f326065dbc83966876594fd349be9b847382afabd0321081e83f3ef094fe067c97d8200817a6cd752df260874bc943271a8658' - '2359bb8f074e5e5676eefe4c655d79611c901f0c8316275ced4d711be42f74ea29d0167ad018f51064fb8a51535969ae742c576a8afe9d710116f7379a1ee67d' - '019fd92b51cb432d81d4265e85751040aeedc1f466181c2e2ec14c253335b1a23571e961ce6415e045fa51ea15731de6e540664276cdd76a3ce198d56cb13eac' - '2f3186d862a78d41496e5a43dd01f5b56edac9873ea309bdcc8c9a83083437e7a252ef0d7373f403dc70ee4f1be8ae6fc430d710b80222ada7ae3ce16b8103ea' - '457534c7ffb7dd0064b143cdfe472d079251ebe891885372127cbff2b6cb70e7d1e55a2da7956c5b6d940e03f8efa57265453fa23a8fb9fa92e4b2c33c959316' - '2af83bba2aa2dd2aed11f9a4f431d9aaeae7c6154c921247510e91bb523cede756d0777fe522a5a6db81a9a6989769a839f365e698511890308c5a0ec6e695ec' - '3f8094c9e577d81bfc9222e436947aa890ce81b2f0e3e43f979a7192cc3e1ca35ca63949e061cecdc6be0579636b6a8e0d8ba21a05a0e11a94ba42210fff851a' - 'd0ff4c1bcb156b2c81be38682d4f99b1388d25521f7981016e850f1e8989d0bfe0d3d71d4ec18382f861ca889bcdfb27dd4d73ca7f763f997a5e388bbc8bdcbc' - '061f7122d5ff8a98dd4ef875c2d7dc60a2dc30627a01a960bd78539e6c7f2bcbfda48f9f42f9f61434f6263686641af2cfb4d6971682be542b6c6f037986e6da' - 'a91815239465656a0ab5902e524277659e0e3ab953d0539bc8ead8f65b3a279a801c02635aad541f871f5007943af704c8c64fec90534c66fe6e418d24787300' - 'e3bdcdae93fa134c1174bf84152385ae28eb7fd82504331f4dccfd46b6565eb605b63acd4972bed08bbe765c7e213b93d94077a9fafcfe33064b4a526f02f7a6' - 'f134c9fed318fde1d11f59e56676cc512bdea81df6a5ce90202759b300405d02981b6586e090cbae65fb730ca352c3942eeec636bb7d5a571475a815f73be89d' - '530846836b8efc6b7549fb6d2b4288ac9782420fd8e51c988d579f701bc4a1f58b7f941d472ad7d4ab07869e45dfc905c3927a3ad735178a109881ed02ffdb77' - '014a9dd855e696a33e3b5c8f8a11ec6cf1edc6e0e6478cc5f11530c5535a1d1dfaaa75c5a3de258178e1ab16256fb8303b18c8a69407febe58a7d860b2396fda' - 'afb5a5b0cfa09407efe6924b37f8c3b26ccf244acc4a99fcee0eb6705855d2dc8589ecbdb2fcf9066c9ec6d947a6810f58efe34362aa451af4cdf7fa30f2e4e4' - '5a09040d91bf293389c328f758416f29840eaf6b0acd78adf14b47fc48c417fb1b02ab97dc90c7d8381bc9ffa817cbc6acc83fd318ba85d73d39ae8f4f7a35e1' - 'd1ed4b6bb07b2da105e2d69c5af1d61bcd39f141c2500e606f251f2220632f4173d3b3de9e2c88dd0bf2e230cba291cda50fb3a7ca89ff391d0e5e36b2e4aa2f' - 'c5b82ddaad7bcc5608168a318e6dde9a0aa0d1dc789d29751a9b22bec2b68288c71e5719c620073ee3c8d9bbf63d60e1634a351cc155b8f2b823d0cbc83cf578' - 'c9d1e42cb87964b764a70044aa828c8d712c709d9e1245f644e8aa2f4576cd33c78e81b9b736d39939959aa3811fe4a9cb6970c8278c22d3f5b7f48d43ae1d55' - 'a9893913797b503249d182ebbac0452827a837187e7817c46ab76df5d004ada810c2ff8523518d408daf396a4c72f707777a3dadeca598f404b074581f0125e8' - '848bcf4f525cca508131960fe6bb2757b0975065f680da9c8d692b5ea28b4c5cca7c2e71f1498c8425c0549fc23a41895638da9e1c433d05e6425ea36dc3ec1b' - '71e11ef607a0371c378db0d50155530d2a918ca47fe15dd29dab36f50dda4a8e7a487f3600b4b03a240db4e84b73c5b49186ca275fb1968de8f15c8d16e8a813' - '73b82cd530e26d3751de9d3e54da0994cbd5d7c9e5ceed7088d50ef4eda8a8c36d30812e8e4a82be014813ed09aefcfa14e7361189a7b4cf763f20aa2ebda7b7' - '1442f7918df45b37e9b3bef05573d4f8c7224f950a85fd0b6200a2ca70b377344ecf37ed69b5474453f584d0992b446383b1a708c326e993a9c815882ba4232f') + '412c4121fc77af66a3e55650859becb6fb6d668369d8767729893e98fea8f6f8dde4ec9bc160041bb986f8a508f762cc68446e3c8cf5525a5b6fbfac1c1bf4fd' + '6af84ddd3bb6953911840bd130606d8c1148cb6fc8e5750da480adb542813dc336f64056ffec8f07dc7467031e640842490b35fe89b39b621bf7db92d049743f' + '6205323d409b1c583257540e4d51f6c2a2e456b06a6b6d4edacad8d53af05e40afdd283567d910cdff2d4d6d50677df1e78421c19505a85a71538ca108442de7' + 'be0d996ed92eccc4c7da354775b927b34c98f6863a16357c473e04e25a61cd3d73f128cedd154a2a3dfa321444f2884dc7f47f895cd9e2014df8d739837b01af' + 'bd7bed1f8bfad7a3a3abc71d0d2db48fcdbe231a42ab16aaf95e81016e11446558bbcb9f18c91af1834c4fd90e692b0865ed23730715b7174545a500a29c1fb7' + 'bda1c8488083b9b76d0a7597f81d01621981803f2634a14fdb2bfcb1fa57638afd20956defb9269d234ddc7143755303d7ba21376ebfde034025ab8d2441162f' + 'c378765fdcb271a6c98965f91a44d3a990184324a5b1fceb7094cf5333938e30bd09978e47837061bbc9edb2847a0c5e5aea84cf7d1e7a0f34a1ed49ada291d8' + '9abc8155aa02bb8ee50a32217ff58fa7bc001f070dbdc25c4837a13a5b76088eaf0b5bb76bb4d3cc66f820e1866236bbdece77739d3bd02df5e0e6ed2d8d6932' + '2b5ab097562b46d19844f80680604126171732fda60984fd6cc63c188e23f04961c255b16af544893b587d00c14c49a465791bf3ee4af19ecb55c9ac09494d13' + 'd4f62e5cd212379600f559612592b29d8114b33ecb7d42f2817369866872fe31a20e734b3c3468eaea040ab4b48b94581bda2a45a9b09b029eecdbffdb7a067d' + 'fe359f670c5e427d457c4b7a820cfddf37558209ebbd48eb16ca44c7f5342ae1e96685411a51207d8c16ed56b903f5282b29d56b892c7507cae790a759f30c1c' + '10210a00eac70214c7df82460dc8d8d795e7e4fd0f732effca4ccbc12fe23ee4826faa8d49eb8be5498e895a58c5a481dd46ebd1781489aa2f097827db11362e' + '57dd96edb1cfc833aea7afa504877d5cb7c0676ec9cba3c8eb615125d5a6e74311ed28edde37a7c34cefb06009c850427e17bff01a09e5b260e4cd645b34449a' + '3adfe5956a20b06e30bf69bc119f2db8ad336a9288fc5b06d4303429b61d8de58973d223e8a0a4aae8feb16c4ca0ff52796cee229def981b690508be099f70fc' + '10bb8c05f7aeee664823d5c709d71d6bc2db0939e7749016fa42be1f64a4b9af9c1ef8f60257b92ab2d93947d258e357aaf95c205f95e45e65dbb4c8e88b05b5' + '03df24ecd1c07ac526a0597a0fa505e84048e40fa60b9871c384959f8916fe610dde715bea267ce2d69ff3fae205eae43179dddfe9b1eb242e670d8c9fef6206' + 'd9d3f2aa11c04caf4a2cb4c70cbf9735f2c56995039585359f1cd3d9518bfdef2440086b30cf54c7cbf52daa4b78b2a3120eadfdb0994e9309c4e5e5ca4b8698' + 'd3b6abe7b332d31b8b6297b17861bf65c8ea0442026e9ca5d57b3f0e1df302ca6cb3df95f94d1a11143d941443ea748c956eaeb29ce30068da12b5c9bea80432' + '8b3e0a9a53b2af54662ac23ea8a196506e7434061b0123c9fdc1632aee1f8137fd26151c5fa8ac99d1a794a3d1c67197bab81cc7886a3e903c3bf3d2f3ab8324' + '77a14e4a5f44d0f0e3895e1802c715907174a007c72b074005b17d6997098ac399e8d08b14c6aa9a3d307354e3f1b52d0640d64c3afd8598f260029b3b41a926' + 'a03f2b34847a74920c840131db046370502f6de53c9e27e81c1e3e8cb9dfeae2954cc86d1e874513192ab34c17dd54a7eafc9eadee8037aafa26e2d2d05b7c47' + 'b4f768da3974891e50322aed57cbcb228a0f6d54126163719ea41eeb9a9e6ffd7bff30cc3fb0af3e9e8a165d5b0d84d7beb5f442d316a98c79acdb24333687cb' + '475129b7243db100d5a93e4efb099c32b0bde8c9950494618c2d1bd91e91d19d6e4a2699f071145da585527fd890324073cd03bb520baf80332bbeda533e7015' + 'a7bae3d40e67de1a7753cc11f8bbf1a8cf87d642797fc14771e349d66a0127f5a6f767d04b434c5414cc50ae68508e3f21213b500b3abad1ebbb1a3b510be6fd') prepare() { cd $_pkgname-$pkgver