Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-intel xf86-video-intel: update to the l...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bf042ffd4d3d
branches: trunk
changeset: 436301:bf042ffd4d3d
user: maya <maya%pkgsrc.org@localhost>
date: Fri Jul 31 14:41:37 2020 +0000
description:
xf86-video-intel: update to the latest git snapshot.
The released version is quite old and doesn't run properly on new devices.
Some logic from similar packages in wip.
diffstat:
x11/xf86-video-intel/Makefile | 22 +-
x11/xf86-video-intel/PLIST | 4 +-
x11/xf86-video-intel/distinfo | 22 +-
x11/xf86-video-intel/patches/patch-src_backlight.c | 25 --
x11/xf86-video-intel/patches/patch-src_compat-api.h | 40 ----
x11/xf86-video-intel/patches/patch-src_legacy_i810_i810__video.c | 88 ----------
x11/xf86-video-intel/patches/patch-src_sna_sna.h | 17 -
x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c | 60 ------
x11/xf86-video-intel/patches/patch-src_sna_sna__acpi.c | 38 ----
x11/xf86-video-intel/patches/patch-src_sna_sna__display.c | 16 -
x11/xf86-video-intel/patches/patch-src_sna_sna__dri2.c | 12 -
x11/xf86-video-intel/patches/patch-src_sna_sna__driver.c | 77 --------
x11/xf86-video-intel/patches/patch-src_uxa_intel.h | 17 -
x11/xf86-video-intel/patches/patch-src_uxa_intel__display.c | 55 ------
x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c | 76 --------
15 files changed, 23 insertions(+), 546 deletions(-)
diffs (truncated from 657 to 300 lines):
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/Makefile
--- a/x11/xf86-video-intel/Makefile Fri Jul 31 13:51:13 2020 +0000
+++ b/x11/xf86-video-intel/Makefile Fri Jul 31 14:41:37 2020 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2020/06/28 13:54:09 nia Exp $
+# $NetBSD: Makefile,v 1.44 2020/07/31 14:41:37 maya Exp $
-DISTNAME= xf86-video-intel-2.99.917
-PKGREVISION= 7
+PKGNAME= xf86-video-intel-2.99.917.20200515
+COMMIT_ID= 5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc
+DISTNAME= xf86-video-intel-${COMMIT_ID}
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
+#MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
+MASTER_SITES= https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg%NetBSD.org@localhost
@@ -13,11 +15,12 @@
CONFLICTS+= xf86-video-i810-[0-9]*
CONFIGURE_ARGS+= --enable-dri
-CONFIGURE_ARGS+= --disable-dri1
+CONFIGURE_ARGS+= --enable-dri2
+CONFIGURE_ARGS+= --enable-dri3
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config automake autoconf autoreconf
# Assumes platform compiler has SSE2, etc
ONLY_FOR_PLATFORM+= *-*-i386 *-*-x86_64
@@ -26,9 +29,14 @@
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.7
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vif
+
+.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libXvMC/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/PLIST
--- a/x11/xf86-video-intel/PLIST Fri Jul 31 13:51:13 2020 +0000
+++ b/x11/xf86-video-intel/PLIST Fri Jul 31 14:41:37 2020 +0000
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2013/05/16 06:16:50 richard Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/07/31 14:41:37 maya Exp $
+lib/libI810XvMC.la
+lib/libIntelXvMC.la
lib/xorg/modules/drivers/intel_drv.la
man/man4/intel.4
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/distinfo
--- a/x11/xf86-video-intel/distinfo Fri Jul 31 13:51:13 2020 +0000
+++ b/x11/xf86-video-intel/distinfo Fri Jul 31 14:41:37 2020 +0000
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.29 2018/05/15 10:50:19 wiz Exp $
+$NetBSD: distinfo,v 1.30 2020/07/31 14:41:37 maya Exp $
-SHA1 (xf86-video-intel-2.99.917.tar.bz2) = 9af9ded7a29026c211e5eb50a547e3e33976301d
-RMD160 (xf86-video-intel-2.99.917.tar.bz2) = dd443e9e87286bbc454f4231a7a5d7c9bb2488a1
-SHA512 (xf86-video-intel-2.99.917.tar.bz2) = cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f
-Size (xf86-video-intel-2.99.917.tar.bz2) = 2259040 bytes
-SHA1 (patch-src_backlight.c) = 39537a3233613c777f0475343f0be615bff3c3ca
-SHA1 (patch-src_compat-api.h) = 303cc02ad41aa8024631577b9ea0bb26cd5f23f4
+SHA1 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = f9cb02d46b771e278a11dc88536049daf76f6ee8
+RMD160 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = 40400b5860115d3c679ec849e0ba90dba74ee6ca
+SHA512 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) =
29fea01332438ad7616bae56a926f5c6fa08f93f67c23a0bb38f775719f12b15fba5bcb096c0665948f80d3ff6b7c108f360e44aae008192ef6c9b21187b4bbb
+Size (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = 1250303 bytes
SHA1 (patch-src_legacy_i810_i810__dri.c) = fb963b994d51c9db48457106048226214a2d986c
-SHA1 (patch-src_legacy_i810_i810__video.c) = 8788a9bf4e1efdb5292771c125af9a24c09d62da
-SHA1 (patch-src_sna_sna.h) = 13f0f7c9f8235f6100da90203a9ca4aa09fad977
-SHA1 (patch-src_sna_sna__accel.c) = 233229449a469e12a928bde4e2f8196157918102
-SHA1 (patch-src_sna_sna__acpi.c) = 7105609e38876fe8bb931d6980c023cabdf41736
-SHA1 (patch-src_sna_sna__display.c) = b2e5b330b5b4154b4d0bbf4edd7af1cec2c68cd8
-SHA1 (patch-src_sna_sna__dri2.c) = 4bcc7e5c502a340954073386dad88fd6cebcc7b1
-SHA1 (patch-src_sna_sna__driver.c) = ced69376d7f1af697b1f51ccb46d958495138136
-SHA1 (patch-src_uxa_intel.h) = 201a28ce259c474ea9f83700ec04c105388ad8ed
-SHA1 (patch-src_uxa_intel__display.c) = b8936ecbad39f5a507ae32b4c46d5069f53ca727
-SHA1 (patch-src_uxa_intel__driver.c) = e1800c27e1b35568254efa7bc16bf89a2e5a6fd4
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/patches/patch-src_backlight.c
--- a/x11/xf86-video-intel/patches/patch-src_backlight.c Fri Jul 31 13:51:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_backlight.c,v 1.2 2015/05/22 05:40:36 richard Exp $
-
-SunOS needs <sys/mkdev.h> for major()
-
---- src/backlight.c.orig 2014-11-18 21:50:39.000000000 +0000
-+++ src/backlight.c
-@@ -49,6 +49,9 @@
-
- #include "backlight.h"
- #include "fd.h"
-+#ifdef __sun
-+#include <sys/mkdev.h>
-+#endif
-
- #define BACKLIGHT_CLASS "/sys/class/backlight"
-
-@@ -84,7 +87,7 @@ void backlight_init(struct backlight *b)
- b->has_power = 0;
- }
-
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
-
- #include <dev/wscons/wsconsio.h>
- #include <xf86Priv.h>
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/patches/patch-src_compat-api.h
--- a/x11/xf86-video-intel/patches/patch-src_compat-api.h Fri Jul 31 13:51:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_compat-api.h,v 1.1 2016/12/07 21:59:54 wiz Exp $
-
-Upstream patches for xorg-server-1.19.
-
---- src/compat-api.h.orig 2014-11-18 21:50:39.000000000 +0000
-+++ src/compat-api.h
-@@ -30,6 +30,7 @@
-
- #include <xorg-server.h>
- #include <xorgVersion.h>
-+#include <xf86Module.h>
-
- #include <picturestr.h>
- #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-@@ -42,6 +43,10 @@
- #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
- #endif
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 22
-+#define HAVE_NOTIFY_FD 1
-+#endif
-+
- #ifndef XF86_SCRN_INTERFACE
-
- #define SCRN_ARG_TYPE int
-@@ -223,4 +228,14 @@ static inline void FreePixmap(PixmapPtr
- dstx, dsty)
- #endif
-
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0)
-+#define OsBlockSIGIO()
-+#define OsReleaseSIGIO()
-+#endif
-+
-+#if !HAVE_NOTIFY_FD
-+#define SetNotifyFd(fd, cb, mode, data) AddGeneralSocket(fd);
-+#define RemoveNotifyFd(fd) RemoveGeneralSocket(fd)
-+#endif
-+
- #endif
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/patches/patch-src_legacy_i810_i810__video.c
--- a/x11/xf86-video-intel/patches/patch-src_legacy_i810_i810__video.c Fri Jul 31 13:51:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-$NetBSD: patch-src_legacy_i810_i810__video.c,v 1.1 2016/12/07 21:59:54 wiz Exp $
-
-Upstream patches for xorg-server-1.19.
-
---- src/legacy/i810/i810_video.c.orig 2014-08-29 09:33:11.000000000 +0000
-+++ src/legacy/i810/i810_video.c
-@@ -77,7 +77,11 @@ static int I810PutImage( ScrnInfoPtr,
- static int I810QueryImageAttributes(ScrnInfoPtr,
- int, unsigned short *, unsigned short *, int *, int *);
-
-+#if !HAVE_NOTIFY_FD
- static void I810BlockHandler(BLOCKHANDLER_ARGS_DECL);
-+#else
-+static void I810BlockHandler(void *data, void *_timeout);
-+#endif
-
- #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-
-@@ -418,8 +422,14 @@ I810SetupImageVideo(ScreenPtr screen)
-
- pI810->adaptor = adapt;
-
-+#if !HAVE_NOTIFY_FD
- pI810->BlockHandler = screen->BlockHandler;
- screen->BlockHandler = I810BlockHandler;
-+#else
-+ RegisterBlockAndWakeupHandlers(I810BlockHandler,
-+ (ServerWakeupHandlerProcPtr)NoopDDA,
-+ pScrn);
-+#endif
-
- xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
- xvContrast = MAKE_ATOM("XV_CONTRAST");
-@@ -1135,6 +1145,7 @@ I810QueryImageAttributes(
- return size;
- }
-
-+#if !HAVE_NOTIFY_FD
- static void
- I810BlockHandler (BLOCKHANDLER_ARGS_DECL)
- {
-@@ -1172,7 +1183,38 @@ I810BlockHandler (BLOCKHANDLER_ARGS_DECL
- }
- }
- }
-+#else
-+static void
-+I810BlockHandler(void *data, void *_timeout)
-+{
-+ ScrnInfoPtr pScrn = data;
-+ I810Ptr pI810 = I810PTR(pScrn);
-+ I810PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
-+ I810OverlayRegPtr overlay = (I810OverlayRegPtr) (pI810->FbBase + pI810->OverlayStart);
-
-+ if(pPriv->videoStatus & TIMER_MASK) {
-+ UpdateCurrentTime();
-+ if(pPriv->videoStatus & OFF_TIMER) {
-+ if(pPriv->offTime < currentTime.milliseconds) {
-+ /* Turn off the overlay */
-+ overlay->OV0CMD &= 0xFFFFFFFE;
-+ OVERLAY_UPDATE(pI810->OverlayPhysical);
-+
-+ pPriv->videoStatus = FREE_TIMER;
-+ pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
-+ }
-+ } else { /* FREE_TIMER */
-+ if(pPriv->freeTime < currentTime.milliseconds) {
-+ if(pPriv->linear) {
-+ xf86FreeOffscreenLinear(pPriv->linear);
-+ pPriv->linear = NULL;
-+ }
-+ pPriv->videoStatus = 0;
-+ }
-+ }
-+ }
-+}
-+#endif
-
- /***************************************************************************
- * Offscreen Images
-@@ -1373,7 +1415,6 @@ I810DisplaySurface(
- UpdateCurrentTime();
- pI810Priv->videoStatus = FREE_TIMER;
- pI810Priv->freeTime = currentTime.milliseconds + FREE_DELAY;
-- pScrn->pScreen->BlockHandler = I810BlockHandler;
- }
-
- return Success;
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/patches/patch-src_sna_sna.h
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna.h Fri Jul 31 13:51:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_sna_sna.h,v 1.1 2016/12/07 21:59:54 wiz Exp $
-
-Upstream patches for xorg-server-1.19.
-
---- src/sna/sna.h.orig 2014-12-20 13:29:05.000000000 +0000
-+++ src/sna/sna.h
-@@ -364,8 +364,10 @@ struct sna {
- EntityInfoPtr pEnt;
- const struct intel_device_info *info;
-
-+#if !HAVE_NOTIFY_FD
- ScreenBlockHandlerProcPtr BlockHandler;
- ScreenWakeupHandlerProcPtr WakeupHandler;
-+#endif
- CloseScreenProcPtr CloseScreen;
-
- PicturePtr clear;
diff -r 0e50edc3cadd -r bf042ffd4d3d x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c Fri Jul 31 13:51:13 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-src_sna_sna__accel.c,v 1.2 2018/05/15 10:50:19 wiz Exp $
-
-Upstream patches for xorg-server-1.19 and 1.20.
-
---- src/sna/sna_accel.c.orig 2014-12-20 13:29:27.000000000 +0000
-+++ src/sna/sna_accel.c
-@@ -115,6 +115,11 @@
- #define RECTILINEAR 0x4
- #define OVERWRITES 0x8
-
-+#if XFONT2_CLIENT_FUNCS_VERSION >= 1
-+#define AllocateFontPrivateIndex() xfont2_allocate_font_private_index()
-+#define FontSetPrivate(font, idx, data) xfont2_font_set_private(font, idx, data)
-+#endif
-+
- #if 0
- static void __sna_fallback_flush(DrawablePtr d)
- {
-@@ -16754,7 +16764,9 @@ static int sna_create_gc(GCPtr gc)
-
- gc->freeCompClip = 0;
- gc->pCompositeClip = 0;
Home |
Main Index |
Thread Index |
Old Index