pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Make xf86-video-* drivers build against xorg-serve...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e9f23c1a3e50
branches: trunk
changeset: 649290:e9f23c1a3e50
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Apr 02 22:16:45 2015 +0000
description:
Make xf86-video-* drivers build against xorg-server-1.17 in addition to the
old 1.12 server. Mostly from FDO git. (xf86-video-ati6 was manually ported)
diffstat:
x11/xf86-video-apm/distinfo | 3 +-
x11/xf86-video-apm/patches/patch-src_apm.h | 23 +
x11/xf86-video-ark/distinfo | 3 +-
x11/xf86-video-ark/patches/patch-src_ark__driver.c | 35 +
x11/xf86-video-ati6/Makefile | 7 +-
x11/xf86-video-ati6/distinfo | 8 +-
x11/xf86-video-ati6/patches/patch-configure.ac | 33 +
x11/xf86-video-ati6/patches/patch-src_radeon__driver.c | 14 +-
x11/xf86-video-ati6/patches/patch-src_radeon__mm__i2c.c | 69 ++
x11/xf86-video-ati6/patches/patch-src_radeon__video.c | 198 +++++++
x11/xf86-video-ati6/patches/patch-src_radeon__video.h | 33 +
x11/xf86-video-chips/distinfo | 6 +-
x11/xf86-video-chips/patches/patch-configure | 4 +-
x11/xf86-video-chips/patches/patch-src_ct__ddc.c | 37 +
x11/xf86-video-chips/patches/patch-src_ct__driver.c | 91 +++
x11/xf86-video-cirrus/distinfo | 5 +-
x11/xf86-video-cirrus/patches/patch-src_alp__driver.c | 25 +
x11/xf86-video-cirrus/patches/patch-src_cir.h | 23 +
x11/xf86-video-cirrus/patches/patch-src_lg__driver.c | 25 +
x11/xf86-video-glint/distinfo | 3 +-
x11/xf86-video-glint/patches/patch-src_glint__driver.c | 29 +
x11/xf86-video-i128/distinfo | 3 +-
x11/xf86-video-i128/patches/patch-src_i128__driver.c | 29 +
x11/xf86-video-mach64/distinfo | 4 +-
x11/xf86-video-mach64/patches/patch-src_atimach64probe.c | 61 ++
x11/xf86-video-mach64/patches/patch-src_atipreinit.c | 27 +
x11/xf86-video-neomagic/distinfo | 3 +-
x11/xf86-video-neomagic/patches/patch-src_neo__driver.c | 92 +++
x11/xf86-video-nv/distinfo | 7 +-
x11/xf86-video-nv/patches/patch-src_g80__driver.c | 29 +
x11/xf86-video-nv/patches/patch-src_nv__driver.c | 21 +
x11/xf86-video-nv/patches/patch-src_nv__include.h | 38 +
x11/xf86-video-nv/patches/patch-src_riva_driver.c | 21 +
x11/xf86-video-nv/patches/patch-src_riva_include.h | 23 +
x11/xf86-video-r128/distinfo | 7 +-
x11/xf86-video-r128/patches/patch-src_r128.h | 27 +
x11/xf86-video-r128/patches/patch-src_r128__dri.c | 25 +
x11/xf86-video-r128/patches/patch-src_r128__driver.c | 56 ++
x11/xf86-video-r128/patches/patch-src_r128__probe.c | 26 +
x11/xf86-video-r128/patches/patch-src_r128__probe.h | 74 ++
x11/xf86-video-rendition/distinfo | 4 +-
x11/xf86-video-rendition/patches/patch-src_rendition.c | 70 ++
x11/xf86-video-rendition/patches/patch-src_rendition.h | 50 +
x11/xf86-video-s3/distinfo | 3 +-
x11/xf86-video-s3/patches/patch-src_s3__driver.c | 32 +
x11/xf86-video-s3virge/distinfo | 3 +-
x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c | 75 ++
x11/xf86-video-savage/distinfo | 5 +-
x11/xf86-video-savage/patches/patch-src-savage__driver.h | 23 +
x11/xf86-video-savage/patches/patch-src_savage__dri.c | 23 +
x11/xf86-video-savage/patches/patch-src_savage__driver.c | 38 +
x11/xf86-video-siliconmotion/distinfo | 6 +-
x11/xf86-video-siliconmotion/patches/patch-src_smi.h | 51 +
x11/xf86-video-siliconmotion/patches/patch-src_smi__driver.c | 20 +
x11/xf86-video-siliconmotion/patches/patch-src_smi__i2c.c | 19 +
x11/xf86-video-siliconmotion/patches/patch-src_smilynx__hw.c | 42 +
x11/xf86-video-sis/distinfo | 5 +-
x11/xf86-video-sis/patches/patch-src_sis.h | 34 +
x11/xf86-video-sis/patches/patch-src_sis__driver.c | 246 +++++++++
x11/xf86-video-sis/patches/patch-src_vstruct.h | 20 +
x11/xf86-video-tga/distinfo | 4 +-
x11/xf86-video-tga/patches/patch-src_tga__accel.c | 21 +
x11/xf86-video-tga/patches/patch-src_tga__driver.c | 30 +
x11/xf86-video-trident/Makefile | 5 +-
x11/xf86-video-trident/distinfo | 8 +-
x11/xf86-video-tseng/distinfo | 3 +-
x11/xf86-video-tseng/patches/patch-src_tseng__driver.c | 31 +
x11/xf86-video-wsfb/Makefile | 4 +-
x11/xf86-video-wsfb/distinfo | 5 +-
x11/xf86-video-wsfb/patches/patch-src_compat-api.h | 108 ++++
x11/xf86-video-wsfb/patches/patch-src_wsfb__driver.c | 282 ++++++++++-
71 files changed, 2464 insertions(+), 53 deletions(-)
diffs (truncated from 3032 to 300 lines):
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-apm/distinfo
--- a/x11/xf86-video-apm/distinfo Thu Apr 02 21:29:24 2015 +0000
+++ b/x11/xf86-video-apm/distinfo Thu Apr 02 22:16:45 2015 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2013/05/16 05:58:30 richard Exp $
+$NetBSD: distinfo,v 1.7 2015/04/02 22:16:45 tnn Exp $
SHA1 (xf86-video-apm-1.2.5.tar.bz2) = a4cdb587f94c0fd28bea92b2469ea1e55d6d6589
RMD160 (xf86-video-apm-1.2.5.tar.bz2) = 8a8ef0e08eedc12bb3ee901c3222e7a5d14ed7b4
Size (xf86-video-apm-1.2.5.tar.bz2) = 325277 bytes
+SHA1 (patch-src_apm.h) = d3aa30015f8a3a305cf4076ca356ad2c7a3ae700
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-apm/patches/patch-src_apm.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-apm/patches/patch-src_apm.h Thu Apr 02 22:16:45 2015 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_apm.h,v 1.1 2015/04/02 22:16:45 tnn Exp $
+
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax%redhat.com@localhost>
+Date: Wed, 9 Jan 2013 22:03:29 -0500
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
+
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- src/apm.h
++++ src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ark/distinfo
--- a/x11/xf86-video-ark/distinfo Thu Apr 02 21:29:24 2015 +0000
+++ b/x11/xf86-video-ark/distinfo Thu Apr 02 22:16:45 2015 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/05/16 06:00:38 richard Exp $
+$NetBSD: distinfo,v 1.5 2015/04/02 22:16:46 tnn Exp $
SHA1 (xf86-video-ark-0.7.5.tar.bz2) = 6abadee761f1a49b399361ecbcecef4e4a097c0d
RMD160 (xf86-video-ark-0.7.5.tar.bz2) = 4559cc0e416a6eabffe78e82d4b034cff716f8eb
Size (xf86-video-ark-0.7.5.tar.bz2) = 290423 bytes
+SHA1 (patch-src_ark__driver.c) = 922cbccbd93999e0d0c2ea433e78fb1927595721
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ark/patches/patch-src_ark__driver.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ark/patches/patch-src_ark__driver.c Thu Apr 02 22:16:45 2015 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_ark__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize%videotron.ca@localhost>
+Date: Tue, 17 Sep 2013 15:55:37 -0400
+Subject: Remove usage of mibstore.h (removed from server)
+
+The module had a compile error for this missing header file.
+
+Changes similar to vmware commit
+23d87c92b7211cc5249eefe4ab3a2c7f370e279e
+
+Reviewed-by: Alex Deucher <alexander.deucher%amd.com@localhost>
+Signed-off-by: Gaetan Nadon <memsize%videotron.ca@localhost>
+
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index b7c287c..65cfe84 100644
+--- src/ark_driver.c
++++ src/ark_driver.c
+@@ -39,7 +39,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "ark.h"
+
+@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
+
+ fbPictureInit (pScreen, 0, 0);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ if (!pARK->NoAccel) {
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/Makefile
--- a/x11/xf86-video-ati6/Makefile Thu Apr 02 21:29:24 2015 +0000
+++ b/x11/xf86-video-ati6/Makefile Thu Apr 02 22:16:45 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/10/26 10:20:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/02 22:16:46 tnn Exp $
DISTNAME= xf86-video-ati-6.14.6
PKGNAME= ${DISTNAME:S/ati/ati6/}
@@ -17,7 +17,7 @@
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= automake autoconf autoreconf gmake pkg-config
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
@@ -26,6 +26,9 @@
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
.endif
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vif
+
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/distinfo
--- a/x11/xf86-video-ati6/distinfo Thu Apr 02 21:29:24 2015 +0000
+++ b/x11/xf86-video-ati6/distinfo Thu Apr 02 22:16:45 2015 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2014/10/26 10:20:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2015/04/02 22:16:46 tnn Exp $
SHA1 (xf86-video-ati-6.14.6.tar.bz2) = b30383c7e5487c1df403a3af19fce8626d617a8d
RMD160 (xf86-video-ati-6.14.6.tar.bz2) = e285bff97a23f6e6f8553f1c010c840e6df882a8
Size (xf86-video-ati-6.14.6.tar.bz2) = 1139495 bytes
+SHA1 (patch-configure.ac) = a7a99e75acc2f6f962fe7cfed084c7451a89c45c
SHA1 (patch-src_atombios__crtc.c) = e6ec24fdc63e3744db9442ab5e12ffe6949eef19
SHA1 (patch-src_atombios__output.c) = ce3720c1d1cfd1f65023cea2745259af30a59add
SHA1 (patch-src_legacy__crtc.c) = 6be802fa29797265efeceaadec9607de334dbfc8
@@ -12,9 +13,12 @@
SHA1 (patch-src_radeon__accelfuncs.c) = f9d0ba2a0b7f62a56eecea117c4339f0e18b1e52
SHA1 (patch-src_radeon__crtc.c) = c22e5a9c4119a4c6aa3f64f83b326effe270c96c
SHA1 (patch-src_radeon__dri.c) = 479f58f8493543220b931182ab105309f8c035ab
-SHA1 (patch-src_radeon__driver.c) = 16bf5852e3ad684fca9c64768822868d4a224500
+SHA1 (patch-src_radeon__driver.c) = e6fead10db8c13fdff531aaa01bfd40e95906172
SHA1 (patch-src_radeon__exa.c) = d031dac6fcbcccff6534a04ebdf492dd6a5450e6
SHA1 (patch-src_radeon__exa__funcs.c) = 9a508251f04a26e857e4290de5a6b48f868df7d9
SHA1 (patch-src_radeon__exa__render.c) = e3f7d2d0bb15d28224366e11d96c984bf0fdaa93
+SHA1 (patch-src_radeon__mm__i2c.c) = 25703e33ea93306fa09eeb3ada636d55d2c70537
SHA1 (patch-src_radeon__render.c) = 919c108ba8bafdcdb4e0fba80da621674a62de8c
SHA1 (patch-src_radeon__textured__video.c) = 409a187b286a228f632e391d68ee71a14289c574
+SHA1 (patch-src_radeon__video.c) = 25f89edb7d89c8af6bd9b2bc9bba0596f242ac2e
+SHA1 (patch-src_radeon__video.h) = 24eaf52dcede405a9c2a3d0cc2f754430fd007ee
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/patches/patch-configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-configure.ac Thu Apr 02 22:16:45 2015 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure.ac,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+--- configure.ac.orig 2012-06-29 13:46:11.000000000 +0000
++++ configure.ac
+@@ -163,7 +163,27 @@ fi
+ AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
+ AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes)
+
+-AC_DEFINE(USE_XAA, 1, [Build support for XAA])
++AC_ARG_ENABLE(xaa,
++ AS_HELP_STRING([--enable-xaa],
++ [Enable legacy X Acceleration Architecture (XAA) [default=auto]]),
++ [XAA="$enableval"],
++ [XAA=auto])
++if test "x$XAA" != xno; then
++ save_CFLAGS=$CFLAGS
++ save_CPPFLAGS=$CPPFLAGS
++ CFLAGS=$XORG_CFLAGS
++ CPPFLAGS="$XORG_CFLAGS"
++ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
++ CFLAGS=$save_CFLAGS
++ CPPFLAGS=$save_CPPFLAGS
++fi
++AC_MSG_CHECKING([whether to include XAA support])
++AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
++AC_MSG_RESULT([$XAA])
++if test "x$XAA" = xyes; then
++ AC_DEFINE(USE_XAA, 1, [Build support for XAA])
++ AC_DEFINE(PKGSRC_LEGACY_XORG_SERVER, 1, [Legacy support for TV tuner])
++fi
+
+ # Properly handle EXA.
+ AC_MSG_CHECKING([whether to enable EXA support])
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/patches/patch-src_radeon__driver.c
--- a/x11/xf86-video-ati6/patches/patch-src_radeon__driver.c Thu Apr 02 21:29:24 2015 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_radeon__driver.c Thu Apr 02 22:16:45 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_radeon__driver.c,v 1.1 2013/10/31 00:07:24 wiz Exp $
+$NetBSD: patch-src_radeon__driver.c,v 1.2 2015/04/02 22:16:46 tnn Exp $
--- src/radeon_driver.c.orig 2012-06-25 08:19:41.000000000 +0000
+++ src/radeon_driver.c
@@ -21,3 +21,15 @@
info->dri->pKernelDRMVersion->version_minor >= 19)
{
if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
+@@ -6440,7 +6441,11 @@ static Bool RADEONCloseScreen(CLOSE_SCRE
+ if (info->dri && info->dri->pDamage) {
+ PixmapPtr pPix = pScreen->GetScreenPixmap(pScreen);
+
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ DamageUnregister(&pPix->drawable, info->dri->pDamage);
++#else
++ DamageUnregister(info->dri->pDamage);
++#endif
+ DamageDestroy(info->dri->pDamage);
+ info->dri->pDamage = NULL;
+ }
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/patches/patch-src_radeon__mm__i2c.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_radeon__mm__i2c.c Thu Apr 02 22:16:45 2015 +0000
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_radeon__mm__i2c.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+--- src/radeon_mm_i2c.c.orig 2012-06-25 08:19:41.000000000 +0000
++++ src/radeon_mm_i2c.c
+@@ -16,10 +16,21 @@
+
+ /* i2c stuff */
+ #include "xf86i2c.h"
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ #include "fi1236.h"
+ #include "msp3430.h"
+ #include "tda9885.h"
+ #include "uda1380.h"
++#else
++#define TUNER_TYPE_FI1216 -1
++#define TUNER_TYPE_FI1236 -1
++#define TUNER_TYPE_FI1236W -1
++#define TUNER_TYPE_FI1246 -1
++#define TUNER_TYPE_FI1256 -1
++#define TUNER_TYPE_MT2032 -1
++#define TUNER_TYPE_FM1216ME -1
++#define TUNER_TYPE_TEMIC_FN5AL -1
++#endif
+ #include "i2c_def.h"
+
+
+@@ -367,10 +378,12 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RA
+ RADEONPLLPtr pll = &(info->pll);
+
+ pPriv->i2c = NULL;
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ pPriv->fi1236 = NULL;
+ pPriv->msp3430 = NULL;
+ pPriv->tda9885 = NULL;
+ pPriv->uda1380 = NULL;
++#endif
+ #if 0 /* put back on when saa7114 support is present */
+ pPriv->saa7114 = NULL;
+ #endif
+@@ -469,6 +482,7 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RA
+ if(!info->MM_TABLE_valid)RADEON_read_eeprom(pPriv);
+ #endif
+
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ if(!xf86LoadSubModule(pScrn,"fi1236"))
+ {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to initialize fi1236 driver\n");
+@@ -595,6 +609,7 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RA
+ xf86_InitMSP3430(pPriv->msp3430);
+ xf86_MSP3430SetVolume(pPriv->msp3430, pPriv->mute ? MSP3430_FAST_MUTE : MSP3430_VOLUME(pPriv->volume));
+ }
++#endif
+
+ #if 0 /* put this back when saa7114 driver is ready */
+ if(!xf86LoadSubModule(pScrn,"saa7114"))
+@@ -624,6 +639,7 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RA
+
+ static void RADEON_TDA9885_Init(RADEONPortPrivPtr pPriv)
+ {
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ TDA9885Ptr t=pPriv->tda9885;
+ t->sound_trap=0;
+ t->auto_mute_fm=1; /* ? */
+@@ -639,4 +655,5 @@ t->minimum_gain=0;
+ t->gating=0;
+ t->vif_agc=1; /* set to 1 ? - depends on design */
+ t->gating=0;
++#endif
+ }
diff -r 9b0ebc5003d5 -r e9f23c1a3e50 x11/xf86-video-ati6/patches/patch-src_radeon__video.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_radeon__video.c Thu Apr 02 22:16:45 2015 +0000
@@ -0,0 +1,198 @@
+$NetBSD: patch-src_radeon__video.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+--- src/radeon_video.c.orig 2012-06-25 08:32:43.000000000 +0000
++++ src/radeon_video.c
+@@ -32,9 +32,11 @@
+
+ #include "theatre_detect.h"
+ #include "theatre_reg.h"
++#ifdef PKGSRC_LEGACY_XORG_SERVER
+ #include "fi1236.h"
+ #include "msp3430.h"
+ #include "tda9885.h"
++#endif
+
+ #define OFF_DELAY 250 /* milliseconds */
+ #define FREE_DELAY 15000
+@@ -1743,8 +1745,10 @@ RADEONStopVideo(ScrnInfoPtr pScrn, point
Home |
Main Index |
Thread Index |
Old Index