diff options
author | tohmais | 2023-07-20 10:13:39 +1000 |
---|---|---|
committer | tohmais | 2023-07-20 10:13:39 +1000 |
commit | eb734f7155cbf9b3cdcb3d6a47cb86d4312136c8 (patch) | |
tree | 93afecb541db67673f96c792712106462f2cfe1e | |
parent | 2d9ac4796f9b727f82f6cc493954ce008ee1cbd1 (diff) | |
download | aur-eb734f7155cbf9b3cdcb3d6a47cb86d4312136c8.tar.gz |
this might fix it this time
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | nvidia.patch | 51 |
3 files changed, 33 insertions, 32 deletions
@@ -1,7 +1,7 @@ pkgbase = hyprland-nvidia-git pkgdesc = A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA patch) - pkgver = r3103.80cd2ef3 - pkgrel = 1 + pkgver = r3103.7091d4e5 + pkgrel = 2 url = https://github.com/hyprwm/Hyprland arch = any license = BSD @@ -52,6 +52,6 @@ pkgbase = hyprland-nvidia-git source = hyprland::git+https://github.com/hyprwm/Hyprland.git source = nvidia.patch sha256sums = SKIP - sha256sums = d5ef5d171646a93c5f240ee4839685390a14c7be93aebaf5281cd19d6e450ce5 + sha256sums = 81b3bd838ee4c8ba1697191c38fd0f899a3f4cff4c9edf07c9978b4267f8a3bd pkgname = hyprland-nvidia-git @@ -2,8 +2,8 @@ _pkgname="hyprland" pkgname="${_pkgname}-nvidia-git" -pkgver=r3103.80cd2ef3 -pkgrel=1 +pkgver=r3103.7091d4e5 +pkgrel=2 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA patch)" arch=(any) url="https://github.com/hyprwm/Hyprland" @@ -54,7 +54,7 @@ source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git" conflicts=("${_pkgname}") provides=(hyprland) sha256sums=('SKIP' - 'd5ef5d171646a93c5f240ee4839685390a14c7be93aebaf5281cd19d6e450ce5') + '81b3bd838ee4c8ba1697191c38fd0f899a3f4cff4c9edf07c9978b4267f8a3bd') 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=1 \ + patch --directory="$srcdir/$_pkgname/" --forward --strip=0 \ --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 926b4d09ee9c..b69268d8ee2d 100644 --- a/nvidia.patch +++ b/nvidia.patch @@ -1,41 +1,42 @@ -diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c +Submodule subprojects/wlroots contains modified content +diff --git a/subprojects/wlroots/render/gles2/renderer.c b/subprojects/wlroots/render/gles2/renderer.c index 9fe934f7..9662d4ee 100644 ---- a/render/gles2/renderer.c -+++ b/render/gles2/renderer.c +--- a/subprojects/wlroots/render/gles2/renderer.c ++++ b/subprojects/wlroots/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)); + 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 --git a/types/output/render.c b/types/output/render.c +diff --git a/subprojects/wlroots/types/output/render.c b/subprojects/wlroots/types/output/render.c index a185d844..01df6ffc 100644 ---- a/types/output/render.c -+++ b/types/output/render.c +--- a/subprojects/wlroots/types/output/render.c ++++ b/subprojects/wlroots/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 (!wlr_output_attach_render(output, 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; } - struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
\ No newline at end of file + struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output, |