From nobody Tue Mar 7 19:44:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWQrB2wvKz3wYdW; Tue, 7 Mar 2023 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWQrB2MNcz3kFP; Tue, 7 Mar 2023 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678218266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPFe9rk7zxr7Qsxups5B+Wg36Dk/gpawpluRjrTwdSs=; b=dLoqyBr/w9NTmfzdnO5+EDCxeOOkffOeMIGHGsptX9ddAkokfYY/s8n/WcqhLDT8IqZtMw GwsspQBufuvgZWlXCq0gj9OgoDhsPiVmCgOHDGAErCs/N/VdrjT/KSjGBbxv+VmJxJdDXJ 33XEWcxH3zc36LB4tHBXhIBZp1KREaAK2xrupYpIh8D33Csk7QTwOW09r0r46RnLM9IC9x GErhsmtMO996FrrDoSCrfC4TAKO+BdlMGBsGeAsRxmRzyRVWiVE6ISYhwwWv7TE4GNsiDq zJWEszIq1zmCb7J3dUMdFFktK4eNSpF+VPzRotziEFMpmO0BSNlZQ3glX+udqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678218266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPFe9rk7zxr7Qsxups5B+Wg36Dk/gpawpluRjrTwdSs=; b=cL4+50CGBTPlNeYJzCgOcul6t10XKihmNsNYF9p1aEo8z4/H1t+cq7J++GAjkp6l9IxfKy QpAtiy1WKRABSBzja69ClD10vcpUswBuyVVVLE93DMfpNROsU80gwsvgFS5/aWUKT+Qpg5 zEovxFhms3Es9eIh+kYp26Tj9+za6IOpp9iZOJeCST0vA2L0y3uBNu1+HmNtC78UrgIuye 7o+s3aVbeDn/+Z8X4GfGitFDPBKp3d/Im/leiH+5eVpGNxmCyoLXOOg6y2i168cfKe0lUq 25N7fUefGxt3qZY7RjxCvCPI/7ErZu4GvxcfHzeDv2cMWEpQcE2oQO+EKV/A+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678218266; a=rsa-sha256; cv=none; b=rXFkOKUoo95488GIidAWDMbkwcrTTvHEEP6Ot5UYOccyfPRhGaQUYYH1s0cLNPvpPqNfln LlqIefmWvXsj7WqVAPBarfG5A0+N0C/ADgcFPYYPnfEzdPlc2e+9j+eK3T4zW1imloIOjy rVF2miKhwo39wNqMauT3Yb9nDuRZ2hdZS2+rRgKru+3U3Rt8+kRgy7onW8JN39Mk5cdS9t 5VDSwFUpikciM971JD9I8TSaUaNiIkZD2mmJ6ta0XEywtUO7EfKCb9Ce8E5uePrfnKEwP6 mP9y1DIwBJN6cmC2CjSJFSs9Mo/JH82W2IAzUfRnmkKiqATi09ZrGQWZrUgKPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PWQrB1RFSzwjj; Tue, 7 Mar 2023 19:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327JiQ8j002840; Tue, 7 Mar 2023 19:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327JiQb2002839; Tue, 7 Mar 2023 19:44:26 GMT (envelope-from git) Date: Tue, 7 Mar 2023 19:44:26 GMT Message-Id: <202303071944.327JiQb2002839@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 46488274d9a8 - main - x11-drivers/xf86-video-qxl: upgrade to 0.1.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46488274d9a842b80594d5e7bb0a079b298de344 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=46488274d9a842b80594d5e7bb0a079b298de344 commit 46488274d9a842b80594d5e7bb0a079b298de344 Author: Ronald Klop AuthorDate: 2023-02-15 14:43:11 +0000 Commit: Ronald Klop CommitDate: 2023-03-07 19:44:06 +0000 x11-drivers/xf86-video-qxl: upgrade to 0.1.6 - 4 patches are in the source now (checked manually) - made portlint, portclippy & portfmt happy - poudriere stage-qa: ok - compiles on aarch64 - maintainer timeout on review changelog: https://lists.x.org/archives/xorg-announce/2023-January/003316.html Differential Revision: https://reviews.freebsd.org/D38612 --- x11-drivers/xf86-video-qxl/Makefile | 13 ++++--- x11-drivers/xf86-video-qxl/distinfo | 6 ++-- .../xf86-video-qxl/files/patch-src-qxl_driver.c | 25 ------------- .../files/patch-src-qxl_option_helpers.c | 41 ---------------------- .../files/patch-src-qxl_option_helpers.h | 19 ---------- .../xf86-video-qxl/files/patch-src-qxl_ums_mode.c | 11 ------ 6 files changed, 9 insertions(+), 106 deletions(-) diff --git a/x11-drivers/xf86-video-qxl/Makefile b/x11-drivers/xf86-video-qxl/Makefile index 6c336ab8ba7f..137de34338c6 100644 --- a/x11-drivers/xf86-video-qxl/Makefile +++ b/x11-drivers/xf86-video-qxl/Makefile @@ -1,6 +1,5 @@ PORTNAME= xf86-video-qxl -DISTVERSION= 0.1.5 -PORTREVISION= 5 +DISTVERSION= 0.1.6 CATEGORIES= x11-drivers MAINTAINER= hrs@FreeBSD.org @@ -9,20 +8,20 @@ WWW= https://www.x.org/ LICENSE= MIT -BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ + spice-protocol>=0.12.10:devel/spice-protocol LIB_DEPENDS= libspice-server.so:devel/libspice-server \ libudev.so:devel/libudev-devd -USES= localbase:ldflags pkgconfig python shebangfix xorg \ +USES= localbase:ldflags pkgconfig python shebangfix tar:xz xorg \ xorg-cat:driver USE_XORG= xfont2 -CONFIGURE_ARGS+=--enable-xspice - python_OLD_CMD= /usr/bin/python SHEBANG_FILES= scripts/Xspice +CONFIGURE_ARGS+= --enable-xspice + OPTIONS_DEFINE= DOCS pre-install: diff --git a/x11-drivers/xf86-video-qxl/distinfo b/x11-drivers/xf86-video-qxl/distinfo index 0a152f7d5154..08b8b2dca587 100644 --- a/x11-drivers/xf86-video-qxl/distinfo +++ b/x11-drivers/xf86-video-qxl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514372367 -SHA256 (xorg/driver/xf86-video-qxl-0.1.5.tar.bz2) = b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 -SIZE (xorg/driver/xf86-video-qxl-0.1.5.tar.bz2) = 508266 +TIMESTAMP = 1678134808 +SHA256 (xorg/driver/xf86-video-qxl-0.1.6.tar.xz) = 2ad39558db47a8fcc036e290e0b084671e58d43344a57b279abd870c4c67965f +SIZE (xorg/driver/xf86-video-qxl-0.1.6.tar.xz) = 438844 diff --git a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_driver.c b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_driver.c deleted file mode 100644 index 1eecfe2c9cb7..000000000000 --- a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_driver.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/qxl_driver.c.orig 2016-12-19 17:25:56 UTC -+++ src/qxl_driver.c -@@ -807,8 +807,8 @@ qxl_screen_init (SCREEN_INIT_ARGS_DECL) - - CHECK_POINT (); - -- pScreen->width = pScrn->currentMode->HDisplay; -- pScreen->height = pScrn->currentMode->VDisplay; -+ pScreen->width = qxl->primary_mode.x_res; -+ pScreen->height = qxl->primary_mode.y_res; - - if (!xf86CrtcScreenInit (pScreen)) - return FALSE; -@@ -1005,6 +1005,11 @@ qxl_pre_init_common(ScrnInfoPtr pScrn) - get_bool_option (qxl->options, OPTION_DEBUG_RENDER_FALLBACKS, "QXL_DEBUG_RENDER_FALLBACKS"); - qxl->num_heads = - get_int_option (qxl->options, OPTION_NUM_HEADS, "QXL_NUM_HEADS"); -+ if (qxl->num_heads == 0) { -+ xf86DrvMsg (scrnIndex, X_INFO, "QXL_NUM_HEADS not configured, " -+ "defaulting to 1\n"); -+ qxl->num_heads = 1; -+ } - - qxl->deferred_fps = get_int_option(qxl->options, OPTION_SPICE_DEFERRED_FPS, "XSPICE_DEFERRED_FPS"); - if (qxl->deferred_fps > 0) diff --git a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.c b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.c deleted file mode 100644 index 844ab5e0072c..000000000000 --- a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.c +++ /dev/null @@ -1,41 +0,0 @@ ---- src/qxl_option_helpers.c.orig 2015-10-12 16:31:14 UTC -+++ src/qxl_option_helpers.c -@@ -10,31 +10,32 @@ - - #include "qxl_option_helpers.h" - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name) - { -+ int value; - if (env_name && getenv(env_name)) { - return atoi(getenv(env_name)); - } -- return options[option_index].value.num; -+ return xf86GetOptValInteger(options, token, &value) ? value : 0; - } - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name) - { - if (getenv(env_name)) { - return getenv(env_name); - } -- return options[option_index].value.str; -+ return xf86GetOptValString(options, token); - } - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name) - { - const char* value = getenv(env_name); - - if (!value) { -- return options[option_index].value.bool; -+ return xf86ReturnOptValBool(options, token, FALSE); - } - if (strcmp(value, "0") == 0 || - strcasecmp(value, "off") == 0 || diff --git a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.h b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.h deleted file mode 100644 index 7c4301816014..000000000000 --- a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/qxl_option_helpers.h.orig 2023-01-07 19:55:44 UTC -+++ src/qxl_option_helpers.h -@@ -6,13 +6,13 @@ - #include - #include - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name); - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name); - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name); - - #endif // OPTION_HELPERS_H diff --git a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_ums_mode.c b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_ums_mode.c deleted file mode 100644 index 1f3b15b63032..000000000000 --- a/x11-drivers/xf86-video-qxl/files/patch-src-qxl_ums_mode.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/qxl_ums_mode.c.orig 2023-01-07 21:22:08 UTC -+++ src/qxl_ums_mode.c -@@ -65,7 +65,7 @@ qxl_add_mode (qxl_screen_t *qxl, ScrnInfoPtr pScrn, in - DisplayModePtr mode; - - mode = screen_create_mode (pScrn, width, height, type); -- qxl->x_modes = xf86ModesAdd (qxl->x_modes, mode); -+ pScrn->modes = qxl->x_modes = xf86ModesAdd (qxl->x_modes, mode); - - return mode; - }