fixed package breaking

3 files changed, 34 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b7262bc224a..c72bed372e94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hyprland-nvidia-git
 	pkgdesc = A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA patch)
-	pkgver = r2568.7739b776
+	pkgver = r3103.80cd2ef3
 	pkgrel = 1
 	url = https://github.com/hyprwm/Hyprland
 	arch = any
@@ -52,6 +52,6 @@ pkgbase = hyprland-nvidia-git
 	source = hyprland::git+https://github.com/hyprwm/Hyprland.git
 	source = nvidia.patch
 	sha256sums = SKIP
-	sha256sums = b412eb6040cf7406d20fe9941e8a08f2a314ec4d4ec305fca9f12ac2b0280737
+	sha256sums = d5ef5d171646a93c5f240ee4839685390a14c7be93aebaf5281cd19d6e450ce5
 
 pkgname = hyprland-nvidia-git
diff --git a/PKGBUILD b/PKGBUILD
index 396f1f6b369d..ea23ccc821f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname="hyprland"
 pkgname="${_pkgname}-nvidia-git"
-pkgver=r2568.7739b776
+pkgver=r3103.80cd2ef3
 pkgrel=1
 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA patch)"
 arch=(any)
@@ -54,7 +54,7 @@ source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git"
 conflicts=("${_pkgname}")
 provides=(hyprland)
 sha256sums=('SKIP'
-            'b412eb6040cf7406d20fe9941e8a08f2a314ec4d4ec305fca9f12ac2b0280737')
+            'd5ef5d171646a93c5f240ee4839685390a14c7be93aebaf5281cd19d6e450ce5')
 options=(!makeflags !buildflags !strip)
 
 pkgver() {
@@ -69,7 +69,7 @@ build() {
 	cd "${srcdir}/${_pkgname}"
 	git submodule update --init
 	make fixwlr
-	patch --directory="$srcdir/$_pkgname/subprojects/wlroots/" --forward --strip=0 \
+	patch --directory="$srcdir/$_pkgname/subprojects/wlroots/" --forward --strip=1 \
 		--input="${srcdir}/nvidia.patch"
 	cd "./subprojects/wlroots/" && meson build/ --prefix="${srcdir}/tmpwlr" --buildtype=release && ninja -C build/ && mkdir -p "${srcdir}/tmpwlr" && ninja -C build/ install && cd ../
     cd udis86 && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja && cmake --build ./build --config Release --target all -j$(shell nproc) && cd ../..
diff --git a/nvidia.patch b/nvidia.patch
index 38da095da505..926b4d09ee9c 100644
--- a/nvidia.patch
+++ b/nvidia.patch
@@ -1,39 +1,41 @@
-diff --unified --recursive --text hyprland-test/src/hyprland/subprojects/wlroots/render/gles2/renderer.c hyprland-git/src/hyprland/subprojects/wlroots/render/gles2/renderer.c
---- render/gles2/renderer.c	2022-10-23 11:18:56.598893482 +1000
-+++ render/gles2/renderer.c	2022-10-23 11:16:25.923036282 +1000
-@@ -159,7 +159,7 @@
- 		assert(wlr_egl_is_current(renderer->egl));
+diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
+index 9fe934f7..9662d4ee 100644
+--- a/render/gles2/renderer.c
++++ b/render/gles2/renderer.c
+@@ -176,7 +176,7 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
+        assert(wlr_egl_is_current(renderer->egl));
  
- 		push_gles2_debug(renderer);
--		glFlush();
-+		glFinish();
- 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
- 		pop_gles2_debug(renderer);
+        push_gles2_debug(renderer);
+-       glFlush();
++       glFinish();
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+        pop_gles2_debug(renderer);
  
-diff --unified --recursive --text hyprland-test/src/hyprland/subprojects/wlroots/types/output/render.c hyprland-git/src/hyprland/subprojects/wlroots/types/output/render.c
---- types/output/render.c	2022-10-23 11:18:56.598893482 +1000
-+++ types/output/render.c	2022-10-23 11:15:15.110308366 +1000
-@@ -325,22 +325,7 @@
+diff --git a/types/output/render.c b/types/output/render.c
+index a185d844..01df6ffc 100644
+--- a/types/output/render.c
++++ b/types/output/render.c
+@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
  }
  
  uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
--	struct wlr_renderer *renderer = output->renderer;
--	assert(renderer != NULL);
+-   struct wlr_renderer *renderer = output->renderer;
+-   assert(renderer != NULL);
 -
--	if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
--		return DRM_FORMAT_INVALID;
--	}
+-   if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
+-       return DRM_FORMAT_INVALID;
+-   }
 -
--	if (!output_attach_back_buffer(output, &output->pending, NULL)) {
--		return false;
--	}
+-   if (!wlr_output_attach_render(output, NULL)) {
+-       return false;
+-   }
 -
--	uint32_t fmt = renderer->impl->preferred_read_format(renderer);
+-   uint32_t fmt = renderer->impl->preferred_read_format(renderer);
 -
--	output_clear_back_buffer(output);
+-   output_clear_back_buffer(output);
 -
--	return fmt;
-+	return DRM_FORMAT_XRGB8888;
+-   return fmt;
++   return DRM_FORMAT_XRGB8888;
  }
  
- bool output_is_direct_scanout(struct wlr_output *output,
\ No newline at end of file
+ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
\ No newline at end of file