diff options
| author | Avery | 2023-03-01 22:33:56 +0800 |
|---|---|---|
| committer | Avery | 2023-03-01 22:33:56 +0800 |
| commit | 2c7d0851fb34a4717772322ca9c516888fc8931a (patch) | |
| tree | da1e5f47a8f8c356dc0cc792e28659980e3ad882 | |
| parent | 6b16b62b491a29be7f76be3fd5c6b5371376c3c4 (diff) | |
| download | aur-2c7d0851fb34a4717772322ca9c516888fc8931a.tar.gz | |
fix: fix build and xwayland-output ptrs
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0002_Add_unscaled_output_mode.patch | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-xwayland-hidpi-xprop-git pkgdesc = run X clients under wayland, with !733 HiDPI patch - pkgver = 22.1.5.r138.g459e28557 + pkgver = 22.1.8.r260.gf490622fc pkgrel = 1 url = https://xorg.freedesktop.org arch = x86_64 @@ -38,6 +38,6 @@ pkgbase = xorg-xwayland-hidpi-xprop-git sha512sums = SKIP sha512sums = ab927b1e038346f967723a3d45a405a0a8339759e15901d0913a55d1348683831e0d058c76c6f7cb2e264a5cef781a507fb290d139ac0f2806a62bd20d84147d sha512sums = f16cb5455a1caf26c586cca2d1ec6f4708804721b7d6a8d8bd1e4a7b47b97e8b822d3455fce0da3c74bb14baf6a3980574d85019cf242d6a033a578587f74b14 - sha512sums = fdaa9f489bb722c70e674271fe19bac7d7c7facc38ed305923077487f3e971d31ee0102cbd52770b35fa270744182a154ced7e039b26ef5952147357d889990d + sha512sums = 4c601d3ab5eb97d49a5bd400a6984b93b9f1f684078825a23aacbc857509cc8a11caf700bd4ba0f8320b84e9257a18db1f3d24f17907a4108d555aee02bcb71a pkgname = xorg-xwayland-hidpi-xprop-git diff --git a/0002_Add_unscaled_output_mode.patch b/0002_Add_unscaled_output_mode.patch index 4bb40215fe10..893160426611 100644 --- a/0002_Add_unscaled_output_mode.patch +++ b/0002_Add_unscaled_output_mode.patch @@ -19,7 +19,7 @@ diff --color --unified --recursive --text a/hw/xwayland/xwayland-output.c b/hw/x - int32_t width, int32_t height, - int *count) + int32_t width, int32_t height, int scale, -+ int *count, RRModePtr **preferred_mode) ++ int *count, RRModePtr *preferred_mode) { struct xwl_screen *xwl_screen = xwl_output->xwl_screen; RRModePtr *rr_modes; @@ -102,7 +102,7 @@ diff --color --unified --recursive --text a/hw/xwayland/xwayland-output.c b/hw/x int mode_width, mode_height, count; int width = 0, height = 0, has_this_output = 0; - RRModePtr *randr_modes; -+ RRModePtr *randr_modes, *preferred_mode; ++ RRModePtr *randr_modes, preferred_mode; int32_t scale = xwl_screen->global_output_scale; /* Clear out the "done" received flags */ @@ -5,7 +5,7 @@ # Contributor: AndyRTR <andyrtr@archlinux.org> pkgname=xorg-xwayland-hidpi-xprop-git -pkgver=22.1.5.r138.g459e28557 +pkgver=22.1.8.r260.gf490622fc pkgrel=1 arch=('x86_64') license=('custom') @@ -27,7 +27,7 @@ source=(git+https://gitlab.freedesktop.org/xorg/xserver.git sha512sums=('SKIP' 'ab927b1e038346f967723a3d45a405a0a8339759e15901d0913a55d1348683831e0d058c76c6f7cb2e264a5cef781a507fb290d139ac0f2806a62bd20d84147d' 'f16cb5455a1caf26c586cca2d1ec6f4708804721b7d6a8d8bd1e4a7b47b97e8b822d3455fce0da3c74bb14baf6a3980574d85019cf242d6a033a578587f74b14' - 'fdaa9f489bb722c70e674271fe19bac7d7c7facc38ed305923077487f3e971d31ee0102cbd52770b35fa270744182a154ced7e039b26ef5952147357d889990d') + '4c601d3ab5eb97d49a5bd400a6984b93b9f1f684078825a23aacbc857509cc8a11caf700bd4ba0f8320b84e9257a18db1f3d24f17907a4108d555aee02bcb71a') provides=('xorg-server-xwayland' 'xorg-xwayland') conflicts=('xorg-server-xwayland' 'xorg-xwayland') replaces=('xorg-server-xwayland') @@ -70,7 +70,7 @@ package() { # bin + manpage + .pc file install -m755 -Dt "${pkgdir}"/usr/bin build/hw/xwayland/Xwayland install -m644 -Dt "${pkgdir}"/usr/share/man/man1 build/hw/xwayland/Xwayland.1 - install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc + install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/meson-private/xwayland.pc # license install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING |