diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | dmabuf-capture-example.patch | 20 | ||||
| -rw-r--r-- | nvidia.patch | 2 |
4 files changed, 11 insertions, 37 deletions
@@ -1,7 +1,7 @@ pkgbase = wlroots-nvidia pkgdesc = Modular Wayland compositor library, with fix for nvidia flickering - pkgver = 0.16.2 - pkgrel = 2 + pkgver = 0.17.0 + pkgrel = 1 url = https://gitlab.freedesktop.org/wlroots/wlroots arch = x86_64 license = MIT @@ -27,20 +27,18 @@ pkgbase = wlroots-nvidia depends = xcb-util-renderutil depends = xcb-util-wm optdepends = xorg-xwayland: Xwayland support - provides = wlroots=0.16.2 + provides = wlroots=0.17.0 provides = libwlroots.so conflicts = wlroots conflicts = wlroots-git - source = wlroots-0.16.2.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz - source = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz.sig + source = wlroots-0.17.0.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0/downloads/wlroots-0.17.0.tar.gz + source = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0/downloads/wlroots-0.17.0.tar.gz.sig source = nvidia.patch - source = dmabuf-capture-example.patch validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 validpgpkeys = 9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A validpgpkeys = 4100929B33EEB0FD1DB852797BC79407090047CA - sha256sums = 83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa + sha256sums = 9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128 sha256sums = SKIP sha256sums = 83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783 - sha256sums = 7d6690e2d59c17830b7e3a8004b58d07b03be50f50e1e8190430ebf8c1971353 pkgname = wlroots-nvidia @@ -1,8 +1,8 @@ # Maintainer: Keith Plant <kplantjr at gmail dot com> pkgname="wlroots-nvidia" -pkgver="0.16.2" -pkgrel="2" +pkgver="0.17.0" +pkgrel="1" pkgdesc="Modular Wayland compositor library, with fix for nvidia flickering" license=("MIT") @@ -50,13 +50,11 @@ source=( "$wl_pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig" "nvidia.patch" - "dmabuf-capture-example.patch" ) sha256sums=( - '83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa' + '9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128' 'SKIP' - '83cbb8211265fed66b4320e6fd986606731b8f5f04bf6cabe7280e8f5fdba783' - '7d6690e2d59c17830b7e3a8004b58d07b03be50f50e1e8190430ebf8c1971353' + '980f4e7c37b30412d2726e5628d41541b76511a36297be7bdd305ba50ed89588' ) validpgpkeys=( '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser @@ -67,8 +65,6 @@ validpgpkeys=( prepare() { patch --directory="$wl_pkgname-$pkgver" --forward --strip=0 \ --input="$srcdir/nvidia.patch" - patch --directory="$wl_pkgname-$pkgver" --forward --strip=0 \ - --input="$srcdir/dmabuf-capture-example.patch" } build() { diff --git a/dmabuf-capture-example.patch b/dmabuf-capture-example.patch deleted file mode 100644 index ddde38523aed..000000000000 --- a/dmabuf-capture-example.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- examples/dmabuf-capture.c 2023-02-10 17:29:59.000000000 -0500 -+++ examples/dmabuf-capture.c 2023-03-26 11:58:01.738090539 -0400 -@@ -520,8 +520,15 @@ - } - }; - -- av_log(ctx, AV_LOG_INFO, "Encoded frame %i (%i in queue)\n", -- ctx->avctx->frame_number, get_fifo_size(&ctx->vid_frames)); -+ int64_t frame_num; -+ -+#if LIBAVUTIL_VERSION_MAJOR >= 58 -+ frame_num = ctx->avctx->frame_num; -+#else -+ frame_num = ctx->avctx->frame_number; -+#endif -+ av_log(ctx, AV_LOG_INFO, "Encoded frame %"PRIi64" (%i in queue)\n", -+ frame_num, get_fifo_size(&ctx->vid_frames)); - - } while (!ctx->err); - diff --git a/nvidia.patch b/nvidia.patch index f914120b144a..dec142057b3f 100644 --- a/nvidia.patch +++ b/nvidia.patch @@ -1,6 +1,6 @@ --- render/gles2/renderer.c 2022-12-25 10:50:12.000000000 -0500 +++ render/gles2/renderer.c 2023-01-04 18:34:37.961431132 -0500 -@@ -165,7 +165,7 @@ +@@ -179,7 +179,7 @@ assert(wlr_egl_is_current(renderer->egl)); push_gles2_debug(renderer); |