diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-04-28 10:32:57 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-04-28 11:03:11 +0000 |
| commit | ba39f94fb54a7d2b400b07a23c5b745e4c03b283 (patch) | |
| tree | d6eae5a2bf2de6c96b3d8f37c53b2c7a681d6f6d | |
| parent | a517abec3172cb6c116b00a363de7727ee5d1d63 (diff) | |
| download | ports-ba39f94fb54a7d2b400b07a23c5b745e4c03b283.tar.gz ports-ba39f94fb54a7d2b400b07a23c5b745e4c03b283.zip | |
x11-servers/xwayland-devel: unbreak fetch
fetch: https://codeload.github.com/freedesktop/xorg-xserver/tar.gz/xorg-server-21.0.99.1-454-g8f7279ade?dummy=/freedesktop-xorg-xserver-xorg-server-21.0.99.1-454-g8f7279ade_GH0.tar.gz: Not Found
fetch: https://codeload.github.com/freedesktop/xorg-xorgproto/tar.gz/xorgproto-2022.2?dummy=/freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz: Not Found
This reverts commit de23aec0f37e56da2ccf9577ce729db5fcc64871.
| -rw-r--r-- | x11-servers/xwayland-devel/Makefile | 23 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/distinfo | 24 |
2 files changed, 25 insertions, 22 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 883e472dd231..c1257e77bf67 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,14 +1,15 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-454 -DISTVERSIONSUFFIX= -g8f7279ade +DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-servers PKGNAMESUFFIX= -devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 537acb3eb02f.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= 3930d00746b0.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= 74813b4c09ca.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCH_SITES+= https://github.com/mirror/${GL_PROJECT}/commit/:github +PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 3930d00746b0.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 8b9bf0a22640.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1047 PATCHFILES+= 0c90fb305e9b.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1051 @@ -32,12 +33,14 @@ RUN_DEPENDS= xkbcomp:x11/xkbcomp \ CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl meson pkgconfig xorg -USE_GITHUB= yes +USE_GITLAB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans -GH_ACCOUNT= freedesktop -GH_PROJECT= xorg-xserver -GH_TUPLE= freedesktop:xorg-xorgproto:xorgproto-2022.2:xorgproto/subprojects/xorgproto +GL_SITE= https://gitlab.freedesktop.org +GL_ACCOUNT= xorg +GL_PROJECT= xserver +GL_COMMIT= 8f7279ade26961ae790a3345ce11a239c842c773 +GL_TUPLE= xorg/proto:xorgproto:824001c947cb1962209c6a8f2c63c2637877220d:xorgproto/subprojects/xorgproto MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ @@ -76,7 +79,7 @@ NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream -.ifdef GH_TUPLE +.ifdef GL_TUPLE post-install: # XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects @${RM} -r ${STAGEDIR}${PREFIX}/include/GL diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 8638aec02a5d..74a6804d6ab6 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,15 +1,15 @@ TIMESTAMP = 1681289065 -SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-454-g8f7279ade_GH0.tar.gz) = 4231ae7cbfa32e3e6ede7ad4c059bf36f7bfcba6108a1fae02d8f2081aed3716 -SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-454-g8f7279ade_GH0.tar.gz) = 5493841 -SHA256 (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 407311f6fab7cd17404ee0a25eb11cbee0aac0347ddc36ae841070490116a204 -SIZE (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 983580 -SHA256 (537acb3eb02f.patch) = 721835b2c7f5e531f9f1781dcf6d91e4a3ffbf7f9138710438045b0ca8e71d8f -SIZE (537acb3eb02f.patch) = 3736 +SHA256 (xorg-xserver-8f7279ade26961ae790a3345ce11a239c842c773_GL0.tar.gz) = 840a6dadb44b4a42fb2b4b9a8e71754216c45cf45e69f74ebc20649fc0c15bb9 +SIZE (xorg-xserver-8f7279ade26961ae790a3345ce11a239c842c773_GL0.tar.gz) = 5495726 +SHA256 (xorg/proto-xorgproto-824001c947cb1962209c6a8f2c63c2637877220d_GL0.tar.gz) = ab90ad2bc5fc3f36e150b5e116d8c375e207a7020ff4678c6df26b1d53a7fff3 +SIZE (xorg/proto-xorgproto-824001c947cb1962209c6a8f2c63c2637877220d_GL0.tar.gz) = 983944 +SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75 +SIZE (cd6c9c1246af.patch) = 3730 SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f7c8c8e3d5f49c7 SIZE (3930d00746b0.patch) = 18587 -SHA256 (74813b4c09ca.patch) = 1e115e88f1e2b078a0c2aa32da6ea6dfe6f39451f334b4313c625e10986deb30 -SIZE (74813b4c09ca.patch) = 2519 -SHA256 (8b9bf0a22640.patch) = 86a62b143705d037701abf41769c94f0ed555cf673e7500f5a3a782787fb02e5 -SIZE (8b9bf0a22640.patch) = 3696 -SHA256 (0c90fb305e9b.patch) = 5101da6ee65a525f0479f9979deafbd670d4274ab0fd4c20362ff9fefd944ace -SIZE (0c90fb305e9b.patch) = 2982 +SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29 +SIZE (3b0d1a3a2296.patch) = 2513 +SHA256 (8b9bf0a22640.patch) = a44b46488e9b038b546e756d96ee7e2856f58c8fa30b81ed02d75716fd2f07f2 +SIZE (8b9bf0a22640.patch) = 3708 +SHA256 (0c90fb305e9b.patch) = bb8ea8dc81ad9685388edbbac584717346ed8df575bd99ef9e86f0476a940c01 +SIZE (0c90fb305e9b.patch) = 2994 |