diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-04-26 14:25:44 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-09-30 19:57:17 +0000 |
| commit | c982ad6eb68f2b280794174c0567d9e929494cc9 (patch) | |
| tree | 9b0f420599675002ebe3fe862e600573e1fc12c8 | |
| parent | 2ffb129f8286289430a3c9d438cfc693eba6404c (diff) | |
| download | ports-c982ad6eb68f2b280794174c0567d9e929494cc9.tar.gz ports-c982ad6eb68f2b280794174c0567d9e929494cc9.zip | |
x11-servers/xarcan: update to 0.6.1
Changes: https://github.com/letoram/xarcan/compare/0.6.0...0.6.1
Reported by: Repology
| -rw-r--r-- | x11-servers/xarcan/Makefile | 12 | ||||
| -rw-r--r-- | x11-servers/xarcan/distinfo | 8 | ||||
| -rw-r--r-- | x11-servers/xarcan/files/patch-clang16 | 33 |
3 files changed, 8 insertions, 45 deletions
diff --git a/x11-servers/xarcan/Makefile b/x11-servers/xarcan/Makefile index 8457c41e322e..95ee9400c9f7 100644 --- a/x11-servers/xarcan/Makefile +++ b/x11-servers/xarcan/Makefile @@ -1,11 +1,7 @@ PORTNAME= xarcan -DISTVERSION= 0.6.0 -PORTREVISION= 6 +DISTVERSION= 0.6.1 CATEGORIES= x11-servers -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 2be9063af666.patch:-p1 # https://github.com/letoram/xarcan/pull/8 - MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Arcan client WWW= https://arcan-fe.com/ @@ -15,14 +11,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ - libarcan_shmif_ext.so:multimedia/arcan + libarcan_shmif_ext.so:multimedia/arcan \ + libxcb-util.so:x11/xcb-util \ + libxcb-icccm.so:x11/xcb-util-wm RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config USES= compiler:c11 gl meson pkgconfig xorg USE_GITHUB= yes USE_GL= gbm gl -USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans +USE_XORG= pixman xau xcb xdmcp xfont2 xkbfile xshmfence xtrans GH_ACCOUNT= letoram MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ diff --git a/x11-servers/xarcan/distinfo b/x11-servers/xarcan/distinfo index 9133b91b77d9..cac33bdfb13d 100644 --- a/x11-servers/xarcan/distinfo +++ b/x11-servers/xarcan/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1606663795 -SHA256 (letoram-xarcan-0.6.0_GH0.tar.gz) = db582bf9c412842fb263d4eb5118f4c1eb6e7b579042a179044d9467fdb98193 -SIZE (letoram-xarcan-0.6.0_GH0.tar.gz) = 5129571 -SHA256 (2be9063af666.patch) = 6a7602ec2a09110f5aab44cb703970d43b36168cd07ad480df02294c2df9a54c -SIZE (2be9063af666.patch) = 756 +TIMESTAMP = 1650192289 +SHA256 (letoram-xarcan-0.6.1_GH0.tar.gz) = b31c053a3b33e0af37528b8388f5687fe0d4af572bda0e507667dc7dd80ee1ba +SIZE (letoram-xarcan-0.6.1_GH0.tar.gz) = 5490251 diff --git a/x11-servers/xarcan/files/patch-clang16 b/x11-servers/xarcan/files/patch-clang16 deleted file mode 100644 index a86f06fddfb8..000000000000 --- a/x11-servers/xarcan/files/patch-clang16 +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/letoram/xarcan/commit/c6173b4f6682 - -../hw/kdrive/arcan/arcan.c:1523:21: error: incompatible function pointer types initializing 'present_abort_vblank_ptr' (aka 'void (*)(struct _rrCrtc *, unsigned long, unsigned long)') with an expression of type 'void (void *)' [-Wincompatible-function-pointer-types] - .abort_vblank = arcanPresentAbortVblank, - ^~~~~~~~~~~~~~~~~~~~~~~ -../hw/kdrive/arcan/arcan.c:1704:25: warning: incompatible pointer types passing 'miPointerSpriteFuncRec *' (aka 'struct _miPointerSpriteFuncRec *') to parameter of type 'miPointerScreenFuncPtr' (aka 'struct _miPointerScreenFuncRec *') [-Wincompatible-pointer-types] - &ArcanPointerSpriteFuncs, FALSE); - ^~~~~~~~~~~~~~~~~~~~~~~~ - ---- hw/kdrive/arcan/arcan.c.orig 2020-11-29 15:29:55 UTC -+++ hw/kdrive/arcan/arcan.c -@@ -1458,11 +1458,9 @@ static int arcanPresentGetUstMsc(RRCrtcPtr crtc, CARD6 - return 0; - } - --static void arcanPresentAbortVblank(void *data) -+static void arcanPresentAbortVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc) - { -- struct ms_present_vblank_event *event = data; - trace("present:vblank abort"); -- free(event); - } - - static int arcanPresentQueueVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc) -@@ -1701,7 +1699,7 @@ arcanCursorInit(ScreenPtr screen) - - miPointerInitialize(screen, - &ArcanPointerSpriteFuncs, -- &ArcanPointerSpriteFuncs, FALSE); -+ &ArcanPointerScreenFuncs, FALSE); - - return TRUE; - } |