Page MenuHomeFreeBSD
Files F174188963

D38612.diff
No OneTemporary
Actions

D38612.diff
View Options

diff --git a/x11-drivers/xf86-video-qxl/Makefile b/x11-drivers/xf86-video-qxl/Makefile
--- 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 @@
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
--- 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
--- 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.h b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.h
deleted file mode 100644
--- 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 <xf86Crtc.h>
- #include <xf86Opt.h>
-
--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_option_helpers.c b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_option_helpers.c
deleted file mode 100644
--- 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_ums_mode.c b/x11-drivers/xf86-video-qxl/files/patch-src-qxl_ums_mode.c
deleted file mode 100644
--- 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;
- }

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 2, 6:07 AM (9 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40051147
Default Alt Text
D38612.diff (5 KB)

Event Timeline