summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortohmais2023-07-20 10:29:06 +1000
committertohmais2023-07-20 10:29:06 +1000
commit0272473dbad64e80557ba085e3ddc5ccf724e47c (patch)
tree232a000814c0d7f956069758798531bc53abe219
parenteb734f7155cbf9b3cdcb3d6a47cb86d4312136c8 (diff)
downloadaur-0272473dbad64e80557ba085e3ddc5ccf724e47c.tar.gz
third time is the charm
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--nvidia.patch13
3 files changed, 11 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4132bc5f48ca..3b9dfddde049 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.7091d4e5
- pkgrel = 2
+ pkgrel = 3
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 = 81b3bd838ee4c8ba1697191c38fd0f899a3f4cff4c9edf07c9978b4267f8a3bd
+ sha256sums = 75d2a0158a42d1e3400e13242fe8f153069da6711faec688aa561f406b4e6fe7
pkgname = hyprland-nvidia-git
diff --git a/PKGBUILD b/PKGBUILD
index 8f9c33d5b72b..01388424065a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname="hyprland"
pkgname="${_pkgname}-nvidia-git"
pkgver=r3103.7091d4e5
-pkgrel=2
+pkgrel=3
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'
- '81b3bd838ee4c8ba1697191c38fd0f899a3f4cff4c9edf07c9978b4267f8a3bd')
+ '75d2a0158a42d1e3400e13242fe8f153069da6711faec688aa561f406b4e6fe7')
options=(!makeflags !buildflags !strip)
pkgver() {
@@ -69,7 +69,7 @@ build() {
cd "${srcdir}/${_pkgname}"
git submodule update --init
make fixwlr
- patch --directory="$srcdir/$_pkgname/" --forward --strip=0 \
+ patch --directory="$srcdir/$_pkgname/subprojects/wlroots/" --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 b69268d8ee2d..f8f134f0e5b6 100644
--- a/nvidia.patch
+++ b/nvidia.patch
@@ -1,8 +1,7 @@
-Submodule subprojects/wlroots contains modified content
-diff --git a/subprojects/wlroots/render/gles2/renderer.c b/subprojects/wlroots/render/gles2/renderer.c
+diff --git /render/gles2/renderer.c /render/gles2/renderer.c
index 9fe934f7..9662d4ee 100644
---- a/subprojects/wlroots/render/gles2/renderer.c
-+++ b/subprojects/wlroots/render/gles2/renderer.c
+--- render/gles2/renderer.c
++++ 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));
@@ -12,10 +11,10 @@ index 9fe934f7..9662d4ee 100644
glBindFramebuffer(GL_FRAMEBUFFER, 0);
pop_gles2_debug(renderer);
-diff --git a/subprojects/wlroots/types/output/render.c b/subprojects/wlroots/types/output/render.c
+diff --git /types/output/render.c /types/output/render.c
index a185d844..01df6ffc 100644
---- a/subprojects/wlroots/types/output/render.c
-+++ b/subprojects/wlroots/types/output/render.c
+--- types/output/render.c
++++ types/output/render.c
@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
}