From nobody Thu Aug 01 13:35:03 2024 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 4WZVMD0pzqz5Sn4R; Thu, 01 Aug 2024 13:35:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZVMD0BlSz494H; Thu, 1 Aug 2024 13:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722519304; 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=+8ezV3CqBfINaLhhU67mh7GYqANOgp0pMKtpjcU+dh4=; b=H3OZO89zUIvI7FUfvXaGUd7kfJZXR/FlFmTlYSN6DCPDZ9h3MtvZnLMW6/XMm1lPURkqhp YG47+QG7VN36EqmEU3WFdwEPHVu9XAt/2JW/QzB+la4nMPgDmTHTMt43MYM7AqiIlkTHsd zgK3D0skzYAsP+sv57alcjQKZ6usPXq5HP3n+TWoceNXt2xzGH5q0goeodVwsgZkUJQdn4 gT7J4OgixZYBaV+NpnJzxYYIp+LdDWa3ypI3hB/nCMxwtjPSI5zpvEdzEURxU+zYruxXbK 99+6U/O8dl3hwNus+9Vg7B1KyUT70d88MUvBcq+1ev35oWwnNu+3XhE7FXKDLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722519304; a=rsa-sha256; cv=none; b=q3IHRV+2EWuCzLTWEGYaUe+oqcCNIRycuZrX+DA0aYIrN7Db/MtOXgGfRW23sq83Qn6Ilk wvvlAG60uMVVAwG3AwsOQSOiSytwMMf95bLSXlFwbHVHNi8ohLgUsMYzyBbIeIOijdMvrf E4U1EKu/Ur9cHQYyxGQ4vxI0/StETKLvO9KvKF9BdAq1TjOfDgYWkabtUboPDP0AvnHco9 /5oQjKtBJ4XSCEDqBsvn0qkziIVscu5N6OGRuOy7EUbJtZkTidyk8D6MV1yQL7BigPoG0Q nC3nfGwzIOxKjjPmBucR9o1mFAtprbXaDFQZkenIh2iL1Ih5VdaXxxavCS7YIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722519304; 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=+8ezV3CqBfINaLhhU67mh7GYqANOgp0pMKtpjcU+dh4=; b=I4LRtAMiVZ5nwjJOjNueaf1Klm43eYHsY9wk4OryCicGn3GfA1pwMuKZegzkSBD9ypCU7j TEj3sfALRyr3XQXj50tXt5x6o8Ca8ISKAvhc76AVm57LJE09oODXtrNqPc8Fq8PInnHo6+ JJ1sobFPOpDzmXK4M4Y89NLXeKXsTTemvl+NkEoaBKa/ysGaBryUE6S+y5O5lunv+YZnbz h0drVV1rzOjbN6/ueCo6N1MAh10jcbIoisRzeK73OpWuCyD7H0HQqbvW67PWk5R5887lBH zO8oAxg4mpHsDvxsEcORn4Il/OpSSriTFxjX96vxM4Z8cyQ3zXtGSxyTbwLzkg== 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 4WZVMC6w0JzmHC; Thu, 1 Aug 2024 13:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471DZ3FN021146; Thu, 1 Aug 2024 13:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471DZ3cA021143; Thu, 1 Aug 2024 13:35:03 GMT (envelope-from git) Date: Thu, 1 Aug 2024 13:35:03 GMT Message-Id: <202408011335.471DZ3cA021143@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 6e5bffcde1c9 - main - x11-drivers/xf86-video-mga: Restore port 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e5bffcde1c9f14f2348556bccb9c1a9d557c7b7 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e5bffcde1c9f14f2348556bccb9c1a9d557c7b7 commit 6e5bffcde1c9f14f2348556bccb9c1a9d557c7b7 Author: Emmanuel Vadot AuthorDate: 2024-08-01 13:31:01 +0000 Commit: Emmanuel Vadot CommitDate: 2024-08-01 13:34:19 +0000 x11-drivers/xf86-video-mga: Restore port This hardware is still present on server hardware. Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 270509 --- x11-drivers/Makefile | 1 + x11-drivers/xf86-video-mga/Makefile | 16 ++++++++++++++++ x11-drivers/xf86-video-mga/distinfo | 3 +++ .../xf86-video-mga/files/patch-src_mga__dac3026.c | 15 +++++++++++++++ .../xf86-video-mga/files/patch-src_mga__dri.c | 22 ++++++++++++++++++++++ .../xf86-video-mga/files/patch-src_mga__driver.c | 19 +++++++++++++++++++ x11-drivers/xf86-video-mga/pkg-descr | 1 + x11-drivers/xf86-video-mga/pkg-plist | 2 ++ 8 files changed, 79 insertions(+) diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 688416d9f60a..a3c59c418859 100644 --- a/x11-drivers/Makefile +++ b/x11-drivers/Makefile @@ -16,6 +16,7 @@ SUBDIR += xf86-video-ati SUBDIR += xf86-video-dummy SUBDIR += xf86-video-intel + SUBDIR += xf86-video-mga SUBDIR += xf86-video-nv SUBDIR += xf86-video-qxl SUBDIR += xf86-video-scfb diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile new file mode 100644 index 000000000000..8999babe9e91 --- /dev/null +++ b/x11-drivers/xf86-video-mga/Makefile @@ -0,0 +1,16 @@ +PORTNAME= xf86-video-mga +PORTVERSION= 2.0.0 +PORTREVISION= 5 +PORTEPOCH= 3 +CATEGORIES= x11-drivers + +MAINTAINER= x11@FreeBSD.org +COMMENT= X.Org mga display driver +WWW= https://www.x.org/ + +USES= gl xorg-cat:driver +USE_GL= gl + +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share + +.include diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo new file mode 100644 index 000000000000..ddc579a06475 --- /dev/null +++ b/x11-drivers/xf86-video-mga/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546479273 +SHA256 (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 +SIZE (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 452486 diff --git a/x11-drivers/xf86-video-mga/files/patch-src_mga__dac3026.c b/x11-drivers/xf86-video-mga/files/patch-src_mga__dac3026.c new file mode 100644 index 000000000000..4a225c085a78 --- /dev/null +++ b/x11-drivers/xf86-video-mga/files/patch-src_mga__dac3026.c @@ -0,0 +1,15 @@ +# Fix a style warning +# +--- src/mga_dac3026.c.orig 2017-01-17 22:40:29 UTC ++++ src/mga_dac3026.c +@@ -886,8 +886,8 @@ MGA3026LoadCursorImage( + outTi3026dreg(TVP3026_WADR_PAL, 0x00); + + while(i--) { +- while (INREG8(0x1FDA) & 0x01); +- while (!(INREG8(0x1FDA) & 0x01)); ++ while (INREG8(0x1FDA) & 0x01) {} ++ while (!(INREG8(0x1FDA) & 0x01)) {} + outTi3026dreg(TVP3026_CUR_RAM, *(src++)); + } + } diff --git a/x11-drivers/xf86-video-mga/files/patch-src_mga__dri.c b/x11-drivers/xf86-video-mga/files/patch-src_mga__dri.c new file mode 100644 index 000000000000..1c4114bc5920 --- /dev/null +++ b/x11-drivers/xf86-video-mga/files/patch-src_mga__dri.c @@ -0,0 +1,22 @@ +# Use the correct constants for this type +# +--- src/mga_dri.c.orig 2017-01-17 22:40:29 UTC ++++ src/mga_dri.c +@@ -316,7 +316,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP + for (;;) { + do { + /* first ask for quiescent and flush */ +- lock.flags = DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH; ++ lock.flags = _DRM_LOCK_QUIESCENT | _DRM_LOCK_FLUSH; + do { + ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, + &lock, sizeof( drm_lock_t ) ); +@@ -324,7 +324,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP + + /* if it's still busy just try quiescent */ + if ( ret == -EBUSY ) { +- lock.flags = DRM_LOCK_QUIESCENT; ++ lock.flags = _DRM_LOCK_QUIESCENT; + do { + ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, + &lock, sizeof( drm_lock_t ) ); diff --git a/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c b/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c new file mode 100644 index 000000000000..7f54cb869b32 --- /dev/null +++ b/x11-drivers/xf86-video-mga/files/patch-src_mga__driver.c @@ -0,0 +1,19 @@ +--- src/mga_driver.c.orig 2024-08-01 13:23:52 UTC ++++ src/mga_driver.c +@@ -702,6 +702,8 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_ + ScrnInfoPtr pScrn = NULL; + MGAPtr pMga; + ++#ifndef __FreeBSD__ ++ /* FreeBSD always has vgapci driver attached. */ + if (pci_device_has_kernel_driver(dev)) { + /* If it's a G200 server chip, it's probably on KMS, so bail; if not, + * it might be using matroxfb, which is ok. */ +@@ -721,6 +723,7 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_ + return FALSE; + } + } ++#endif + + /* Allocate a ScrnInfoRec and claim the slot */ + pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, MGAPciChipsets, diff --git a/x11-drivers/xf86-video-mga/pkg-descr b/x11-drivers/xf86-video-mga/pkg-descr new file mode 100644 index 000000000000..6eb856b4abf9 --- /dev/null +++ b/x11-drivers/xf86-video-mga/pkg-descr @@ -0,0 +1 @@ +This package contains the X.Org xf86-video-mga driver. diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist new file mode 100644 index 000000000000..f75700697c98 --- /dev/null +++ b/x11-drivers/xf86-video-mga/pkg-plist @@ -0,0 +1,2 @@ +lib/xorg/modules/drivers/mga_drv.so +share/man/man4/mga.4x.gz