uph at-spi2-core limine mesa qt5-base

2023-04-11 00:05:46 +03:00 · 2023-04-11 00:05:46 +03:00 · b8bb2b34bd
commit b8bb2b34bd
parent 94445722ae
17 changed files with 768 additions and 79 deletions
--- a/at-spi2-core/PKGBUILD
+++ b/at-spi2-core/PKGBUILD
@ -8,13 +8,14 @@
 pkgbase=at-spi2-core
 pkgname=(at-spi2-core) # at-spi2-core-docs) # uncomment the docs sections and modify this pkg list to build the docs documents
 pkgver=2.48.0
-pkgrel=01
+pkgrel=02
 #  Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
 #  Let's see if it makes a difference to us :)  :P
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi w/o systemd"
 url="https://gitlab.gnome.org/GNOME/at-spi2-core"
-depends=(dbus glib2 libxtst libx11 libxml2)
+depends=(dbus glib2 libxtst libx11 libxml2 gsettings-desktop-schemas)
 makedepends=(gobject-introspection git meson gi-docgen python-sphinx)
+checkdepends=(at-spi2-core)
 _commit=d963aff7f6977e50517fb2ffe8b31f1db142107d  # tags/AT_SPI2_CORE_2_48_0^0
 # options=(debug)  ##  uncomment this to have the debug package built
 source=("git+$url.git#commit=$_commit")
@ -41,7 +42,7 @@ check() {
  # memory test fails without desktop
  # broker fails to launch without journald
  # # Aaahhh journald must be running for the check to pass --- yawn yawn and again!
-  dbus-run-session meson test -C build --print-errorlogs || :
+  dbus-run-session meson test -C build --print-errorlogs
 }

 package_at-spi2-core() {
@ -87,6 +88,6 @@ license=(GPL2)

 sha256sums=('SKIP')
 
-##  97a243f405cf4dbb6af6c65344f1184ea5a12dc386bb99514c094687b3ae0f13  at-spi2-core-2.48.0-01-x86_64.pkg.tar.lz
+##  b49d51de057aa34607559fb9f7242d52a03b3dc25ece7fc33709e363c52d2261  at-spi2-core-2.48.0-02-x86_64.pkg.tar.lz


--- a/at-spi2-core/PKGBUILD-arch
+++ b/at-spi2-core/PKGBUILD-arch
@ -2,9 +2,12 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>

 pkgbase=at-spi2-core
-pkgname=(at-spi2-core at-spi2-core-docs)
+pkgname=(
+  at-spi2-core
+  at-spi2-core-docs
+)
 pkgver=2.48.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://gitlab.gnome.org/GNOME/at-spi2-core"
 arch=(x86_64)
@ -12,6 +15,7 @@ license=(GPL2)
 depends=(
  dbus
  glib2
+  gsettings-desktop-schemas
  libx11
  libxml2
  libxtst
@ -25,6 +29,9 @@ makedepends=(
  meson
  python-sphinx
 )
+checkdepends=(
+  at-spi2-core
+)
 _commit=d963aff7f6977e50517fb2ffe8b31f1db142107d  # tags/AT_SPI2_CORE_2_48_0^0
 source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
 b2sums=('SKIP')
@ -49,9 +56,7 @@ build() {
 }

 check() {
-  # memory test fails without desktop
-  # broker fails to launch without journald
-  dbus-run-session meson test -C build --print-errorlogs || :
+  dbus-run-session meson test -C build --print-errorlogs
 }

 package_at-spi2-core() {
--- a/at-spi2-core/deps
+++ b/at-spi2-core/deps
@ -7,5 +7,7 @@ libx11
 libxml2
 gi-docgen 
 python-sphinx
+at-spi2-core
+gsettings-desktop-schemas


--- a/limine/PKGBUILD
+++ b/limine/PKGBUILD
@ -9,18 +9,19 @@
 # https://github.com/void-linux/void-mklive/issues/313

 pkgname=limine
-pkgver=4.20230325.0
+## previous=4.20230325.0
+pkgver=4.20230408.0
 pkgrel=02
 pkgdesc="An advanced, portable, multiprotocol bootloader"
 url="https://limine-bootloader.org/"
 depends=('glibc')
+makedepends=('nasm' 'mtools' 'llvm' 'lld' 'clang')
 source=("https://github.com/limine-bootloader/limine/releases/download/v${pkgver}/limine-${pkgver}.tar.xz"
 	limine.boot.protocol
 	limine.barebones.wiki
 	limine.cfg::https://github.com/limine-bootloader/limine/raw/trunk/test/limine.cfg
 	bg.jpg::https://raw.githubusercontent.com/limine-bootloader/limine/trunk/test/bg.jpg
 	CONFIG.md::https://github.com/limine-bootloader/limine/raw/trunk/CONFIG.md)
-makedepends=('nasm' 'mtools' 'llvm' 'lld' 'clang')

 build() {
  cd "$pkgname-$pkgver"
@ -59,11 +60,18 @@ arch=(x86_64)

 license=('BSD')

-sha256sums=(d6cf3b67a06901e20495dae6308e344301e2ae25c42c08a64e694d9a1caae4bc # limine-4.20230325.0.tar.xz
+b2sums=('c4a5d0a93082b4f9569b2af6d8b345ca7b0e00aeff42af112e2f07541b091f54451af7be969fad3d28c6108cf2106ce7d5d463f0237090bfd5b3548e50ca935f'
+	SKIP
+	SKIP
+	SKIP
+	SKIP
+	SKIP)
+
+sha256sums=(e0f41a5242436a98638d3931ec65ae4aa07c838060ddb833b11783c25cc7e10e  # limine-4.20230408.0.tar.xz
 	8964016f9aaaf246d92433f6849c2e228483c7b9716d04afef234d9bb556ca8a  # limine.boot.protocol
-	aba179176961f3fece88672413f98d0ef93e9671f9d25846335aa1ae8e806ebb # limine.barebones.wiki
-	bfbd4b5e8d318cb6cb91c1e1311525f65046943edb642aa411bea94a522f3d32 # limine.cfg
-	15df8e06872a6cb89dfad3f99ad2b255dd1a54576e4343c954975e2ea48f28ab # bg.jpg
+	aba179176961f3fece88672413f98d0ef93e9671f9d25846335aa1ae8e806ebb  # limine.barebones.wiki
+	bfbd4b5e8d318cb6cb91c1e1311525f65046943edb642aa411bea94a522f3d32  # limine.cfg
+	15df8e06872a6cb89dfad3f99ad2b255dd1a54576e4343c954975e2ea48f28ab  # bg.jpg
 	929fdf6d57dd490ab4bf18ad0415318eeeafe35dae0095c3b477ad32c3f32919) #  CONFIG.md

-##  90f3d33cb7e0c88eb046e6540c3de34b6721c893d366e3bbf75ffaa156cec8b1  limine-4.20230325.0-02-x86_64.pkg.tar.lz
+##  6f114f7a8b7c8de6a399aaee7a53444497a7cf9932677071febfec1bdd524e7c  limine-4.20230408.0-02-x86_64.pkg.tar.lz
--- a/limine/PKGBUILD-aur
+++ b/limine/PKGBUILD-aur
@ -1,6 +1,6 @@
 # Maintainer: Mintsuki <mintsuki@protonmail.com>
 pkgname=limine
-pkgver=4.20230325.0
+pkgver=4.20230408.0
 pkgrel=1
 pkgdesc="An advanced, portable, multiprotocol bootloader"
 arch=('i686' 'pentium4' 'x86_64' 'armv7h' 'aarch64')
@ -8,7 +8,7 @@ url="https://limine-bootloader.org/"
 license=('BSD')
 depends=('glibc')
 source=("https://github.com/limine-bootloader/limine/releases/download/v${pkgver}/limine-${pkgver}.tar.xz")
-b2sums=('ce0ca350667210e0bf1fedfebee97e1763ca706b7f756e4d81fcd0ba35df436efac987bc9cb784dfc99ac770fcc5feee6145d763dc8df67f61231013262511ec')
+b2sums=('c4a5d0a93082b4f9569b2af6d8b345ca7b0e00aeff42af112e2f07541b091f54451af7be969fad3d28c6108cf2106ce7d5d463f0237090bfd5b3548e50ca935f')
 makedepends=('nasm' 'mtools' 'llvm' 'lld' 'clang')

 build() {
--- a/mesa/0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
+++ b/mesa/0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
@ -0,0 +1,130 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Date: Mon, 3 Apr 2023 14:52:59 +0300
+Subject: [PATCH] intel/fs: fix scheduling of HALT instructions
+
+With the following test :
+
+dEQP-VK.spirv_assembly.instruction.terminate_invocation.terminate.no_out_of_bounds_load
+
+There is a :
+
+shader_start:
+   ...                                 <- no control flow
+   g0 = some_alu
+   g1 = fbl
+   g2 = broadcast g3, g1
+   g4 = get_buffer_size g2
+   ...                                 <- no control flow
+   halt                                <- on some lanes
+   g5 = send <surface>, g4
+
+eliminate_find_live_channel will remove the fbl/broadcast because it
+assumes lane0 is active at get_buffer_size :
+
+shader_start:
+   ...                                 <- no control flow
+   g0 = some_alu
+   g4 = get_buffer_size g0
+   ...                                 <- no control flow
+   halt                                <- on some lanes
+   g5 = send <surface>, g4
+
+But then the instruction scheduler will move the get_buffer_size after
+the halt :
+
+shader_start:
+   ...                                 <- no control flow
+   halt                                <- on some lanes
+   g0 = some_alu
+   g4 = get_buffer_size g0
+   g5 = send <surface>, g4
+
+get_buffer_size pulls the surface index from lane0 in g0 which could
+have been turned off by the halt and we end up accessing an invalid
+surface handle.
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Cc: mesa-stable
+---
+ .../compiler/brw_schedule_instructions.cpp    | 46 +++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/src/intel/compiler/brw_schedule_instructions.cpp b/src/intel/compiler/brw_schedule_instructions.cpp
+index 3286e3f83b96..43f63784b2e8 100644
+--- a/src/intel/compiler/brw_schedule_instructions.cpp
+++ b/src/intel/compiler/brw_schedule_instructions.cpp
+@@ -651,6 +651,7 @@ public:
+       ralloc_free(this->mem_ctx);
+    }
+    void add_barrier_deps(schedule_node *n);
+   void add_cross_lane_deps(schedule_node *n);
+    void add_dep(schedule_node *before, schedule_node *after, int latency);
+    void add_dep(schedule_node *before, schedule_node *after);
+ 
+@@ -1098,6 +1099,28 @@ is_scheduling_barrier(const backend_instruction *inst)
+           inst->has_side_effects();
+ }
+ 
+static bool
+has_cross_lane_access(const fs_inst *inst)
+{
+   if (inst->opcode == SHADER_OPCODE_BROADCAST ||
+       inst->opcode == SHADER_OPCODE_READ_SR_REG ||
+       inst->opcode == SHADER_OPCODE_CLUSTER_BROADCAST ||
+       inst->opcode == SHADER_OPCODE_SHUFFLE ||
+       inst->opcode == FS_OPCODE_LOAD_LIVE_CHANNELS ||
+       inst->opcode == SHADER_OPCODE_FIND_LAST_LIVE_CHANNEL ||
+       inst->opcode == SHADER_OPCODE_FIND_LIVE_CHANNEL)
+      return true;
+
+   for (unsigned s = 0; s < inst->sources; s++) {
+      if (inst->src[s].file == VGRF) {
+         if (inst->src[s].stride == 0)
+            return true;
+      }
+   }
+
+   return false;
+}
+
+ /**
+  * Sometimes we really want this node to execute after everything that
+  * was before it and before everything that followed it.  This adds
+@@ -1128,6 +1151,25 @@ instruction_scheduler::add_barrier_deps(schedule_node *n)
+    }
+ }
+ 
+/**
+ * Because some instructions like HALT can disable lanes, scheduling prior to
+ * a cross lane access should not be allowed, otherwise we could end up with
+ * later instructions accessing uninitialized data.
+ */
+void
+instruction_scheduler::add_cross_lane_deps(schedule_node *n)
+{
+   schedule_node *prev = (schedule_node *)n->prev;
+
+   if (prev) {
+      while (!prev->is_head_sentinel()) {
+         if (has_cross_lane_access((fs_inst *)prev->inst))
+            add_dep(prev, n, 0);
+         prev = (schedule_node *)prev->prev;
+      }
+   }
+}
+
+ /* instruction scheduling needs to be aware of when an MRF write
+  * actually writes 2 MRFs.
+  */
+@@ -1165,6 +1207,10 @@ fs_instruction_scheduler::calculate_deps()
+       if (is_scheduling_barrier(inst))
+          add_barrier_deps(n);
+ 
+      if (inst->opcode == BRW_OPCODE_HALT ||
+          inst->opcode == SHADER_OPCODE_HALT_TARGET)
+          add_cross_lane_deps(n);
+
+       /* read-after-write deps. */
+       for (int i = 0; i < inst->sources; i++) {
+          if (inst->src[i].file == VGRF) {
--- a/mesa/0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+++ b/mesa/0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Thu, 2 Mar 2023 09:35:08 +0200
+Subject: [PATCH] egl/wayland: Fix destruction of event queue with proxies
+ still attached.
+
+Destroy the display wrapper proxy before destroying the event queue that
+the proxy is attached to.
+
+This silences a warning that libwayland 1.22 emits for programs that use
+EGL/Wayland:
+
+warning: queue 0x562a5ed2cd20 destroyed while proxies still attached:
+  wl_display@1 still attached
+
+Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646>
+---
+ src/egl/drivers/dri2/platform_wayland.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
+index 32b0ff70002d..962bc34a2166 100644
+--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -2800,10 +2800,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
+       wl_shm_destroy(dri2_dpy->wl_shm);
+    if (dri2_dpy->wl_registry)
+       wl_registry_destroy(dri2_dpy->wl_registry);
+-   if (dri2_dpy->wl_queue)
+-      wl_event_queue_destroy(dri2_dpy->wl_queue);
+    if (dri2_dpy->wl_dpy_wrapper)
+       wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
+   if (dri2_dpy->wl_queue)
+      wl_event_queue_destroy(dri2_dpy->wl_queue);
+ 
+    if (dri2_dpy->own_device)
+       wl_display_disconnect(dri2_dpy->wl_dpy);
--- a/mesa/0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
+++ b/mesa/0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Thu, 2 Mar 2023 10:10:42 +0200
+Subject: [PATCH] vulkan/wsi/wayland: Fix destruction of event queue with
+ proxies still attached.
+
+Destroy the surface dmabuf feedback proxy before destroying the event
+queue that the proxy is attached to.
+
+This silences a warning that libwayland 1.22 emits for programs that use
+Vulkan/Wayland:
+
+warning: queue 0x557a4efbcf70 destroyed while proxies still attached:
+  zwp_linux_dmabuf_feedback_v1@18 still attached
+
+Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
+---
+ src/vulkan/wsi/wsi_common_wayland.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index 0c6560371f75..6a241bcfabe1 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -1156,18 +1156,18 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
+    struct wsi_wl_surface *wsi_wl_surface =
+       wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
+ 
+-   if (wsi_wl_surface->surface)
+-      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
+-
+-   if (wsi_wl_surface->display)
+-      wsi_wl_display_destroy(wsi_wl_surface->display);
+-
+    if (wsi_wl_surface->wl_dmabuf_feedback) {
+       zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
+       dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
+       dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
+    }
+ 
+   if (wsi_wl_surface->surface)
+      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
+
+   if (wsi_wl_surface->display)
+      wsi_wl_display_destroy(wsi_wl_surface->display);
+
+    vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
+ }
+ 
--- a/mesa/PKGBUILD
+++ b/mesa/PKGBUILD
@ -1,4 +1,4 @@
-#!/usr/bin/bash
+ #!/usr/bin/bash
 # JOBoRun		: Jwm OpenBox Obarun RUNit
 # Maintainer	: Joe Bo Run <joborun@disroot.org>
 # PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
@ -9,7 +9,7 @@ pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast'
 	 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
-pkgver=23.0.1
+pkgver=23.0.2
 pkgrel=02
 #options=('debug' '!lto')  #  uncomment this if you want the debug package built # Arch removed debug for 22.3.3-3 version
 options=('!lto')
@ -20,28 +20,26 @@ makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence
 makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') # rusticl dependencies
 url="https://www.mesa3d.org/"
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
-        0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
-        0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+        0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
+        0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+        0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
        LICENSE)

 prepare() {
  cd mesa-$pkgver

-#  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111
-#  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
-#  # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
-#  patch -Np1 -i ../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+   # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7110
+   # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20765
+  patch -Np1 -i ../0001-intel-fs-fix-scheduling-of-HALT-instructions.patch

-  # https://gitlab.freedesktop.org/drm/intel/-/issues/6851
-  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449
-  patch -Np1 -i ../0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
-  patch -Np1 -i ../0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
-
-  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7110
-  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20765
-  patch -Np1 -i ../0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+  # https://bugs.archlinux.org/task/78137
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1826583
+  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
+  patch -Np1 -i ../0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch

+  # https://bugs.archlinux.org/task/78142
+  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
+  patch -Np1 -i ../0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
 }

 build() {
@ -255,21 +253,26 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l
              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>

-sha256sums=(e8e586856b55893abae9bdcdb98b41c081d909bb1faf372e6e7262307bf34adf  # mesa-23.0.1.tar.xz
-	b6d7db7f4835a65082a3dc10abaa20ecc1b05a4c87467fb8aaa8cbd1b24d33d8  # mesa-23.0.1.tar.xz.sig
-	99264c77d63d6fa810e295914808cde9f580a64e913e99fa794c1aa25a4f8fb2  # 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
-	d6ef8fb1809e8aeae0ec32bfe916adb770c64880bfd3d0f4472a616c9f356a9a  # 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
-	dc6790b5be0e80c23e74ae18ca1a2b40f57f4211cc7b645bf22b63af3b790e40  # 0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+sha256sums=(1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7  # mesa-23.0.2.tar.xz
+	7907436971fd69d82f40bed1b2a2d5a40c03b6decc2aac5a3feaa4d69af097c6  # mesa-23.0.2.tar.xz.sig
+	dc6790b5be0e80c23e74ae18ca1a2b40f57f4211cc7b645bf22b63af3b790e40  # 0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
+	c25493de3e5930702acf833d182aeca0895d6a9d9e830dca15c42d130e25c41c  # 0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+	db2be7ae0540d65e77449eda1af66200e27af382183fdcd0c87f99db3520b80a  # 0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
 	7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE

-##  5969cc13e4ec1c4efc9807d373ef2307801ffc0eca1a281cc3feb5d3ffb9667f  libva-mesa-driver-23.0.1-02-x86_64.pkg.tar.lz
-##  e729f720da7e5f074130e0dc047ca9804d3b5fc9b6a47f72e9261edf11850810  mesa-23.0.1-02-x86_64.pkg.tar.lz
-##  ee6b1e1dc643863c8c621f600275c5a6c98f0a22e04177036ac26021cee0031b  mesa-vdpau-23.0.1-02-x86_64.pkg.tar.lz
-##  a8c6df0bb4706854dca1d66046bbd2994de705e02cbfdbcb90f9743cb2eb3c6f  opencl-mesa-23.0.1-02-x86_64.pkg.tar.lz
-##  aa5306abad5e6e0cb3f3a6522e14877f5554aa556f89ac96702ce5a7b5bd981c  vulkan-intel-23.0.1-02-x86_64.pkg.tar.lz
-##  39f4df626106244a8573cfb4e44d65ec343cdc7f7c5a9165455d5dddce89714e  vulkan-mesa-layers-23.0.1-02-x86_64.pkg.tar.lz
-##  4c61c60faadf94052dc2bcfe4143ff8e0d9184505ec34ceaf82d9619fa0e47e5  vulkan-radeon-23.0.1-02-x86_64.pkg.tar.lz
-##  c904cdb3f107edc805c90843557bb6c5c3138290fd2de44fde5d28b5c9132f6d  vulkan-swrast-23.0.1-02-x86_64.pkg.tar.lz
-##  46d470afd9e77c5b507fedf46e08ada83110ce510f764c6574a80389447cc006  vulkan-virtio-23.0.1-02-x86_64.pkg.tar.lz
-
+b2sums=('5a90fcd8b7096dde1e6c82b9bb5b00622cc1cf35e4308419441d3489d66ed322843db89f2f1162c8c30f6bcddbce867447f83425a29145bd42a742b773ec1258'
+        'SKIP'
+        '37d1d070c45c85bce8abe3524a3f8d9ac9ed6326a3eec653cd89fffce3630b08eb9b96b11aeb495488230449c99f9b508f73a15e53265d2b159286b0e2dda7cc'
+        'ae891637318fdbb8dd58285098af7bea709fb032969a5671eb225a4a471bf9422fac2a6cb0fd188aad96ea5a03eb043f646f5d371dd655a100046adb1c91bd7d'
+        'a7312e0931904e659b3d33fcb37b13bcadab943c6040dd2b58ea191db350b50c1ba588e334b7e59b513bd6155797e29dc1bd1a6a35a278b3824d06534f2c9d17'
+        '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')

+##  b398eb793daf67d5227180dfc49605d8b132f13d86982da13f56492be7b5df71  libva-mesa-driver-23.0.2-02-x86_64.pkg.tar.lz
+##  f807b81bca57741a49bdafbb3ac20e902ebf534698a723f0a0e124963f6eecea  mesa-23.0.2-02-x86_64.pkg.tar.lz
+##  22ceae7185b208f1cf146c8150f6b663f4312ae116797e1387c4f4db98d27540  mesa-vdpau-23.0.2-02-x86_64.pkg.tar.lz
+##  2eca46a942ed16305ab339211bfac9e43a57be359a4c7adc01c17bc33a61bb05  opencl-mesa-23.0.2-02-x86_64.pkg.tar.lz
+##  e519fcc5720c482ff5ce164d969f015b44c0c6d192d1444a4e7022a7325e0794  vulkan-intel-23.0.2-02-x86_64.pkg.tar.lz
+##  0efd0087f4a360dee23538251430d53b3c66bb40446e7dc8a609d2051c27ac66  vulkan-mesa-layers-23.0.2-02-x86_64.pkg.tar.lz
+##  92d721f33c0ef07ecbaadfac93aeb57823df30d7b7f19ba70d2ee9c63740caee  vulkan-radeon-23.0.2-02-x86_64.pkg.tar.lz
+##  913e1e24a8cfe6d6a299d04faff3ed74934e484f0c43af424ead191459fa75b5  vulkan-swrast-23.0.2-02-x86_64.pkg.tar.lz
+##  b4f71a30a3a066f749098372f3f30a66a4a4c0d7d079f915d59dc52bf8792610  vulkan-virtio-23.0.2-02-x86_64.pkg.tar.lz
--- a/mesa/PKGBUILD-arch
+++ b/mesa/PKGBUILD-arch
@ -6,7 +6,7 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=23.0.1
+pkgver=23.0.2
 pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
@ -17,21 +17,21 @@ makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') # ru
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
-        0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
-        0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+        0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
+        0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+        0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
        LICENSE)
-sha256sums=('e8e586856b55893abae9bdcdb98b41c081d909bb1faf372e6e7262307bf34adf'
+sha256sums=('1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7'
            'SKIP'
-            '99264c77d63d6fa810e295914808cde9f580a64e913e99fa794c1aa25a4f8fb2'
-            'd6ef8fb1809e8aeae0ec32bfe916adb770c64880bfd3d0f4472a616c9f356a9a'
            'dc6790b5be0e80c23e74ae18ca1a2b40f57f4211cc7b645bf22b63af3b790e40'
+            'c25493de3e5930702acf833d182aeca0895d6a9d9e830dca15c42d130e25c41c'
+            'db2be7ae0540d65e77449eda1af66200e27af382183fdcd0c87f99db3520b80a'
            '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
-b2sums=('50d358e393037381d0d848f868ac3439b0851809c3533432dc428bd77e81bc71bbfd2b598e221b6e8c4c2528ef32e5624aec4fe2e552e01ee98abbcf96a1f5b7'
+b2sums=('5a90fcd8b7096dde1e6c82b9bb5b00622cc1cf35e4308419441d3489d66ed322843db89f2f1162c8c30f6bcddbce867447f83425a29145bd42a742b773ec1258'
        'SKIP'
-        'a90bfc47fb3a46eff1ef2455c7aa18c2bb515ec217b423d0a87cc5f3b824a77c0381e1378498464418644108142022dcd3c289e157877c6ae7584beaec1d9987'
-        'bd52994305fc0fa2f12c46ea3208bbb24f97495d9bad73120d83a6cdcf7e48f5ff0d14ac0055765516b70caacdf024fca4159b70b054e85f2783c78c9218aefe'
        '37d1d070c45c85bce8abe3524a3f8d9ac9ed6326a3eec653cd89fffce3630b08eb9b96b11aeb495488230449c99f9b508f73a15e53265d2b159286b0e2dda7cc'
+        'ae891637318fdbb8dd58285098af7bea709fb032969a5671eb225a4a471bf9422fac2a6cb0fd188aad96ea5a03eb043f646f5d371dd655a100046adb1c91bd7d'
+        'a7312e0931904e659b3d33fcb37b13bcadab943c6040dd2b58ea191db350b50c1ba588e334b7e59b513bd6155797e29dc1bd1a6a35a278b3824d06534f2c9d17'
        '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
@ -43,14 +43,18 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l
 prepare() {
  cd mesa-$pkgver

-  # https://gitlab.freedesktop.org/drm/intel/-/issues/6851
-  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449
-  patch -Np1 -i ../0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
-  patch -Np1 -i ../0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
-
  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7110
  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20765
-  patch -Np1 -i ../0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+  patch -Np1 -i ../0001-intel-fs-fix-scheduling-of-HALT-instructions.patch
+
+  # https://bugs.archlinux.org/task/78137
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1826583
+  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
+  patch -Np1 -i ../0002-egl-wayland-Fix-destruction-of-event-queue-with-prox.patch
+
+  # https://bugs.archlinux.org/task/78142
+  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
+  patch -Np1 -i ../0003-vulkan-wsi-wayland-Fix-destruction-of-event-queue-wi.patch
 }

 build() {
--- a/obs-studio/PKGBUILD
+++ b/obs-studio/PKGBUILD
@ -6,7 +6,8 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=obs-studio
-pkgver=29.0.2
+pkgver=29.1.beta2
+#pkgver=29.0.2
 #pkgver=29.0.0124+ga0b5c1b3f
 #pkgver=${_pkgver//-/_}
 pkgrel=02
@ -36,8 +37,9 @@ optdepends=("libfdk-aac: FDK AAC codec support"
 			"jack2: The JACK low-latency audio server")
 provides=("obs-studio=$pkgver")
 conflicts=("obs-studio-git")
-_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750  # tags/29.0.2
-source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
+##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750  # tags/29.0.2
+##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
+source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip"
 #source=("$pkgname::git+https://github.com/obsproject/obs-studio.git"
 #       "git+https://github.com/Mixer/ftl-sdk.git"
 #       "git+https://github.com/obsproject/obs-browser.git"
@ -62,7 +64,7 @@ source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_com
 prepare() {
 #  gitconf="protocol.file.allow=always"

-  cd $pkgname
+  cd $pkgname-$pkgver
  patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
  patch -Np1 < "$srcdir"/ignore_unused_submodules.patch

@ -81,7 +83,7 @@ prepare() {
 }

 build() {
-  cmake -B build -S $pkgname \
+  cmake -B build -S $pkgname-$pkgver \
    -DCMAKE_INSTALL_PREFIX="/usr" \
    -DENABLE_BROWSER=OFF \
    -DENABLE_VST=ON \
@ -110,6 +112,8 @@ build() {
 }

 package() {
+   cd $pkgname-$pkgver
+
 #  cd $pkgname/build
 #
 #  make install DESTDIR="$pkgdir"
--- a/obs-studio/obs-studio-rc/PKGBUILD
+++ b/obs-studio/obs-studio-rc/PKGBUILD
@ -0,0 +1,144 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=obs-studio-rc
+_pkgver=29.1.0-beta2
+pkgver=${_pkgver//-/_}
+pkgrel=1
+#epoch=5
+pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration"
+url="https://github.com/obsproject/obs-studio"
+# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system
+_mbedtlsver=2.28
+_pythonver=3.10
+depends=(
+  "jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg"
+  "mbedtls>=$_mbedtlsver"
+
+  # "libxinerama" provided by "vlc-luajit"
+  # "libxkbcommon-x11" provided by "qt6-base"
+  # "jansson" "curl" provided by "ftl-sdk"
+
+  # Needed to use Qt on Wayland platform
+  "qt6-wayland"
+
+  # Both needed to load linux-capture, so those two are no longer optional
+  "libxcomposite" "pipewire"
+
+  # Needed to use PipeWire capture
+  "xdg-desktop-portal"
+
+  # Needed by obs-browser
+#  "libxss" "libxrandr" "nss" "at-spi2-core"
+         
+  # AUR Packages
+  "ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk"
+)
+## About vlc-luajit
+# The official VLC package will make OBS crash when a VLC source is used.
+# The issue is that VLC and OBS are compiled with different lua version.
+# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS.
+# But to make people unable to install VLC official package with obs-studio-tytan652.
+# I decided to make vlc-luajit a dependency of OBS rather than an optional one.
+## About ffmpeg-obs
+# Read ffmpeg-obs PKGBUILD for more info
+makedepends=(
+  "cmake" "git" "libfdk-aac" "swig" "luajit" "sndio"
+  "python>=$_pythonver"
+
+  # Needed by obs-websocket
+  'asio' 'nlohmann-json' 'websocketpp'
+
+  # AUR Packages
+  "libajantv2"
+# needed when --browser is enabled
+#  "cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1"
+)
+
+optdepends=(
+  "libfdk-aac: FDK AAC codec support"
+  "intel-media-driver: Hardware encoding (>= Broadwell)"
+  "libva-intel-driver: Hardware encoding (<= Haswell)"
+  "libva-mesa-driver: Hardware encoding"
+  "swig: Scripting"
+  "luajit: Lua scripting"
+  "python>=$_pythonver: Python scripting"
+  "sndio: Sndio input client"
+  "v4l2loopback-dkms: Virtual camera output"
+  "libajantv2: AJA NTV 2 support"
+)
+provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket")
+conflicts=(
+  "obs-studio" "obs-vst" "obs-websocket" 
+  "obs-linuxbrowser" # This plugin is obsolete
+  "libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI
+) # "obs-browser"
+options=('debug')
+source=(
+  "obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver"
+  "obs-browser::git+https://github.com/obsproject/obs-browser.git"
+  "obs-websocket::git+https://github.com/obsproject/obs-websocket.git"
+  "qr::git+https://github.com/nayuki/QR-Code-generator.git"
+)
+
+
+
+if [[ $CARCH == 'x86_64' ]]; then
+  optdepends+=("decklink: Blackmagic Design DeckLink support")
+fi
+
+prepare() {
+  cd "$srcdir/obs-studio"
+  git config submodule.plugins/obs-browser.url $srcdir/obs-browser
+  git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket
+  git -c protocol.file.allow=always submodule update
+
+  cd plugins/obs-websocket
+  git config submodule.deps/qr.url $srcdir/qr
+  git -c protocol.file.allow=always submodule update deps/qr
+}
+
+build() {
+  cd "$srcdir"/obs-studio
+  mkdir -p build; cd build
+
+  cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DENABLE_RTMPS=ON \
+    -DQT_VERSION=6 \
+    -DENABLE_LIBFDK=ON \
+    -DENABLE_JACK=ON \
+    -DENABLE_SNDIO=ON \
+    -DENABLE_BROWSER=OFF \
+    -DCEF_ROOT_DIR=/opt/cef-obs \
+    -DBETA="$_pkgver" ..
+#    -DOBS_VERSION_OVERRIDE="$_pkgver" ..
+#    -DRELEASE_CANDIDATE="$_pkgver" ..
+
+  sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h
+
+  make
+}
+
+package() {
+  cd obs-studio/build
+
+  make install DESTDIR="$pkgdir"
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=("GPL3")
+
+sha256sums=(a  "SKIP"  "SKIP"  "SKIP"  "SKIP")
+
+##  
+
--- a/obs-studio/obs-studio-rc/PKGBUILD-aur
+++ b/obs-studio/obs-studio-rc/PKGBUILD-aur
@ -0,0 +1,143 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=obs-studio-rc
+_pkgver=29.1.0-beta2
+pkgver=${_pkgver//-/_}
+pkgrel=1
+#epoch=5
+pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration"
+url="https://github.com/obsproject/obs-studio"
+# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system
+_mbedtlsver=2.28
+_pythonver=3.10
+depends=(
+  "jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg"
+  "mbedtls>=$_mbedtlsver"
+
+  # "libxinerama" provided by "vlc-luajit"
+  # "libxkbcommon-x11" provided by "qt6-base"
+  # "jansson" "curl" provided by "ftl-sdk"
+
+  # Needed to use Qt on Wayland platform
+  "qt6-wayland"
+
+  # Both needed to load linux-capture, so those two are no longer optional
+  "libxcomposite" "pipewire"
+
+  # Needed to use PipeWire capture
+  "xdg-desktop-portal"
+
+  # Needed by obs-browser
+  "libxss" "libxrandr" "nss" "at-spi2-core"
+         
+  # AUR Packages
+  "ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk"
+)
+## About vlc-luajit
+# The official VLC package will make OBS crash when a VLC source is used.
+# The issue is that VLC and OBS are compiled with different lua version.
+# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS.
+# But to make people unable to install VLC official package with obs-studio-tytan652.
+# I decided to make vlc-luajit a dependency of OBS rather than an optional one.
+## About ffmpeg-obs
+# Read ffmpeg-obs PKGBUILD for more info
+makedepends=(
+  "cmake" "git" "libfdk-aac" "swig" "luajit" "sndio"
+  "python>=$_pythonver"
+
+  # Needed by obs-websocket
+  'asio' 'nlohmann-json' 'websocketpp'
+
+  # AUR Packages
+  "libajantv2"
+
+  "cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1"
+)
+optdepends=(
+  "libfdk-aac: FDK AAC codec support"
+  "intel-media-driver: Hardware encoding (>= Broadwell)"
+  "libva-intel-driver: Hardware encoding (<= Haswell)"
+  "libva-mesa-driver: Hardware encoding"
+  "swig: Scripting"
+  "luajit: Lua scripting"
+  "python>=$_pythonver: Python scripting"
+  "sndio: Sndio input client"
+  "v4l2loopback-dkms: Virtual camera output"
+  "libajantv2: AJA NTV 2 support"
+)
+provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket")
+conflicts=(
+  "obs-studio" "obs-vst" "obs-websocket" "obs-browser"
+  "obs-linuxbrowser" # This plugin is obsolete
+  "libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI
+)
+options=('debug')
+source=(
+  "obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver"
+  "obs-browser::git+https://github.com/obsproject/obs-browser.git"
+  "obs-websocket::git+https://github.com/obsproject/obs-websocket.git"
+  "qr::git+https://github.com/nayuki/QR-Code-generator.git"
+)
+
+
+
+if [[ $CARCH == 'x86_64' ]]; then
+  optdepends+=("decklink: Blackmagic Design DeckLink support")
+fi
+
+prepare() {
+  cd "$srcdir/obs-studio"
+  git config submodule.plugins/obs-browser.url $srcdir/obs-browser
+  git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket
+  git -c protocol.file.allow=always submodule update
+
+  cd plugins/obs-websocket
+  git config submodule.deps/qr.url $srcdir/qr
+  git -c protocol.file.allow=always submodule update deps/qr
+}
+
+build() {
+  cd "$srcdir"/obs-studio
+  mkdir -p build; cd build
+
+  cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DENABLE_RTMPS=ON \
+    -DQT_VERSION=6 \
+    -DENABLE_LIBFDK=ON \
+    -DENABLE_JACK=ON \
+    -DENABLE_SNDIO=ON \
+    -DENABLE_BROWSER=ON \
+    -DCEF_ROOT_DIR=/opt/cef-obs \
+    -DBETA="$_pkgver" ..
+#    -DOBS_VERSION_OVERRIDE="$_pkgver" ..
+#    -DRELEASE_CANDIDATE="$_pkgver" ..
+
+  sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h
+
+  make
+}
+
+package() {
+  cd obs-studio/build
+
+  make install DESTDIR="$pkgdir"
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=("GPL3")
+
+sha256sums=(a  "SKIP"  "SKIP"  "SKIP"  "SKIP")
+
+##  
+
--- a/obs-studio/obs-studio-rc/PKGBUILD-beta2
+++ b/obs-studio/obs-studio-rc/PKGBUILD-beta2
@ -0,0 +1,133 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=obs-studio
+_pkgver=29.1.0-beta2
+#pkgver=29.0.2
+#pkgver=29.0.0124+ga0b5c1b3f
+pkgver=${_pkgver//-/_}
+pkgrel=02
+#epoch=5
+pkgdesc="Free and open source software for video recording and live streaming. w/o systemd pipewire pulseaudio"
+
+url="https://github.com/obsproject/obs-studio"
+depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" "rnnoise" "pciutils"
+         "qt5-svg" "curl" "gtk-update-icon-cache" "libxcomposite")
+# "speexdsp" "pciutils" "libajantv2" "librist")
+makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio')
+
+#makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264"
+#             "vlc" "swig" "luajit" "python"
+# "cef-minimal-obs-bin" #"wayland"
+#             "qt5-wayland" "xdg-desktop-portal" 
+#"pipewire"
+#)
+optdepends=("libfdk-aac: FDK AAC codec support"
+            "libva-intel-driver: hardware encoding"
+            "libva-mesa-driver: hardware encoding"
+            "vlc: VLC Media Source"
+            "luajit: Lua scripting"
+            "python: Python scripting"
+            'sndio: Sndio input client'
+            "v4l2loopback-dkms: Virtual webcam"
+			"jack2: The JACK low-latency audio server")
+provides=("obs-studio=$pkgver")
+conflicts=("obs-studio-git")
+##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750  # tags/29.0.2
+##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
+source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip"
+#source=("$pkgname::git+https://github.com/obsproject/obs-studio.git"
+ #       "git+https://github.com/Mixer/ftl-sdk.git"
+ #       "git+https://github.com/obsproject/obs-browser.git"
+ #       "git+https://github.com/obsproject/obs-vst.git"
+ #       "git+https://github.com/obsproject/obs-websocket.git"
+ #       "git+https://github.com/chriskohlhoff/asio.git"
+ #       "git+https://github.com/nlohmann/json.git"
+ #       "git+https://github.com/nayuki/QR-Code-generator.git"
+ #       "git+https://github.com/zaphoyd/websocketpp.git"
+		fix_python_binary_loading.patch
+        ignore_unused_submodules.patch)
+
+##pkgver() {
+##  cd $pkgname
+##  git describe --long --tags | cut -d- -f1-2 | sed "s/-/\./"
+##}
+#pkgver() {
+#  cd $pkgname
+#  git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
+#}
+
+prepare() {
+#  gitconf="protocol.file.allow=always"
+
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
+  patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
+
+#  git config submodule.plugins/obs-outputs/ftl-sdk.url $srcdir/ftl-sdk
+#  git config submodule.plugins/obs-browser.url $srcdir/obs-browser
+#  git config submodule.plugins/obs-vst.url $srcdir/obs-vst
+#  git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket
+#  git -c $gitconf submodule update
+#
+#  cd plugins/obs-websocket
+#  git config submodule.deps/asio.url $srcdir/asio
+#  git config submodule.deps/json.url $srcdir/json
+#  git config submodule.deps/qr.url $srcdir/QR-Code-generator
+#  git config submodule.deps/websocketpp.url $srcdir/websocketpp
+#  git -c $gitconf submodule update
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DENABLE_BROWSER=OFF \
+    -DENABLE_VST=ON \
+    -DENABLE_VLC=OFF \
+    -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
+    -DENABLE_AJA=OFF \
+    -DENABLE_JACK=ON \
+    -DENABLE_ALSA=ON \
+    -DENABLE_LIBFDK=ON \
+    -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" \
+    -DENABLE_PIPEWIRE=FALSE \
+    -DENABLE_PULSEAUDIO=FALSE \
+    -Wno-dev
+  cmake --build build
+
+
+#  mkdir -p build; cd build
+#
+#  cmake \
+#    -DCMAKE_INSTALL_PREFIX=/usr \
+#    -DCMAKE_INSTALL_LIBDIR=lib \
+#    -DBUILD_BROWSER=ON \
+#    -DCEF_ROOT_DIR="/opt/cef-obs" \
+#    ..
+#  make
+}
+
+package() {
+   cd $pkgname-$pkgver
+
+#  cd $pkgname/build
+#
+#  make install DESTDIR="$pkgdir"
+
+  DESTDIR="$pkgdir" cmake --install build
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=("GPL2")
+
+sha256sums=(SKIP #SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP 
+	bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd  #  fix_python_binary_loading.patch
+	60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3) # ignore_unused_submodules.patch
+
--- a/obs-studio/obs-studio-rc/deps
+++ b/obs-studio/obs-studio-rc/deps
@ -0,0 +1,24 @@
+cmake
+git
+libfdk-aac
+swig
+sndio
+python
+asio
+nlohmann-json
+websocketpp
+libajantv2
+
+jack2
+gtk-update-icon-cache
+x264
+rnnoise
+qt6-svg
+mbedtls
+qt6-wayland
+libxcomposite
+pipewire
+xdg-desktop-portal
+ffmpeg-obs
+ftl-sdk
+
--- a/qt5-base/PKGBUILD
+++ b/qt5-base/PKGBUILD
@ -7,9 +7,9 @@

 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_basever=5.15.8
-pkgver=5.15.8+kde+r185
-_commit=6c09620dc84900c31a2d307a8640dbc15b1fcfdd
+_basever=5.15.9
+pkgver=5.15.9+kde+r150
+_commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c
 pkgrel=01
 url='https://www.qt.io'
 pkgdesc='A cross-platform application and UI framework'
@ -125,6 +125,6 @@ sha256sums=(SKIP
 	5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
 	4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch

-##  a15e0f7c869f5f7a0c49afa37d8f2000d75ec7bef62b07136f1ca0196a5ac110  qt5-base-5.15.8+kde+r185-01-x86_64.pkg.tar.lz
-##  4703b3d6606f27d57648c35d7650497d8883db0addddc357c61e9c140889b706  qt5-xcb-private-headers-5.15.8+kde+r185-01-x86_64.pkg.tar.lz
+##  1a5ba914d69747fbbea2faaeef0d39cffc97f8158466266396cae6b4450f14ea  qt5-base-5.15.9+kde+r150-01-x86_64.pkg.tar.lz
+##  affecc32d7034a49463054106fc0f3284726a478023b36f6b02347447f962a80  qt5-xcb-private-headers-5.15.9+kde+r150-01-x86_64.pkg.tar.lz

--- a/qt5-base/PKGBUILD-arch
+++ b/qt5-base/PKGBUILD-arch
@ -3,10 +3,10 @@

 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_basever=5.15.8
-pkgver=5.15.8+kde+r185
+_basever=5.15.9
+pkgver=5.15.9+kde+r150
 pkgrel=1
-_commit=6c09620dc84900c31a2d307a8640dbc15b1fcfdd
+_commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')