pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-intel Update to xf86-video-intel-2.7.0....
details: https://anonhg.NetBSD.org/pkgsrc/rev/700191c36ba0
branches: trunk
changeset: 392640:700191c36ba0
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue May 05 04:27:29 2009 +0000
description:
Update to xf86-video-intel-2.7.0. Too many changes to list here, but
with the usual number of regressions and regression fixes, tearing for
Xvideo is fixed as long as composition isn't used.
diffstat:
x11/xf86-video-intel/Makefile | 8 ++-
x11/xf86-video-intel/PLIST | 4 +-
x11/xf86-video-intel/distinfo | 13 ++----
x11/xf86-video-intel/patches/patch-aa | 61 -----------------------------------
x11/xf86-video-intel/patches/patch-ab | 21 ------------
x11/xf86-video-intel/patches/patch-ae | 25 --------------
x11/xf86-video-intel/patches/patch-af | 36 --------------------
x11/xf86-video-intel/patches/patch-ag | 21 ++++++++++++
8 files changed, 32 insertions(+), 157 deletions(-)
diffs (246 lines):
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/Makefile
--- a/x11/xf86-video-intel/Makefile Tue May 05 04:22:30 2009 +0000
+++ b/x11/xf86-video-intel/Makefile Tue May 05 04:27:29 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2009/01/05 13:18:18 hasso Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/05 04:27:29 joerg Exp $
-DISTNAME= xf86-video-intel-2.4.3
-PKGREVISION= 1
+DISTNAME= xf86-video-intel-2.7.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -20,8 +19,11 @@
USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
+BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.7
+
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/PLIST
--- a/x11/xf86-video-intel/PLIST Tue May 05 04:22:30 2009 +0000
+++ b/x11/xf86-video-intel/PLIST Tue May 05 04:27:29 2009 +0000
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/23 19:00:46 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/05/05 04:27:29 joerg Exp $
lib/libI810XvMC.la
lib/libIntelXvMC.la
lib/xorg/modules/drivers/ch7017.la
lib/xorg/modules/drivers/ch7xxx.la
-lib/xorg/modules/drivers/i810_drv.so
lib/xorg/modules/drivers/intel_drv.la
lib/xorg/modules/drivers/ivch.la
lib/xorg/modules/drivers/sil164.la
lib/xorg/modules/drivers/tfp410.la
-man/man4/i810.4
man/man4/intel.4
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/distinfo
--- a/x11/xf86-video-intel/distinfo Tue May 05 04:22:30 2009 +0000
+++ b/x11/xf86-video-intel/distinfo Tue May 05 04:27:29 2009 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.14 2009/01/05 13:18:18 hasso Exp $
+$NetBSD: distinfo,v 1.15 2009/05/05 04:27:29 joerg Exp $
-SHA1 (xf86-video-intel-2.4.3.tar.bz2) = 8335294c9b76b1f9daad5082d2290555ba2dbce5
-RMD160 (xf86-video-intel-2.4.3.tar.bz2) = 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e
-Size (xf86-video-intel-2.4.3.tar.bz2) = 661105 bytes
-SHA1 (patch-aa) = a85113f95b868510bc9b7a221065adc2f97c66e0
-SHA1 (patch-ab) = 8d1b93e73a1b64958c09a229151b498ea61dc158
+SHA1 (xf86-video-intel-2.7.0.tar.bz2) = 6d55b11ccf92ddc0763329f6e503e1a55b9beacc
+RMD160 (xf86-video-intel-2.7.0.tar.bz2) = 3e1bc024fb7a34c4efd817374b069c5b2e0288eb
+Size (xf86-video-intel-2.7.0.tar.bz2) = 781254 bytes
SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08
-SHA1 (patch-ae) = 0657661a7020d058ba3b7df6deea7dbda747438f
-SHA1 (patch-af) = ef827a0d55c3c87b509fd603ab72cdfbfd5e5e87
+SHA1 (patch-ag) = 68f282d59e03c74727de4577eb48297d9022e542
SHA1 (patch-ba) = 9152649277b417278fb290e24dac8ad6fb911238
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/patches/patch-aa
--- a/x11/xf86-video-intel/patches/patch-aa Tue May 05 04:22:30 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/01/05 13:18:18 hasso Exp $
-
-https://bugs.freedesktop.org/show_bug.cgi?id=16631 and G41 support.
-
---- src/i830_driver.c.orig 2008-11-13 22:13:56 +0200
-+++ src/i830_driver.c 2009-01-05 13:42:59 +0200
-@@ -255,6 +255,7 @@ static SymTabRec I830Chipsets[] = {
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
- {PCI_CHIP_G45_G, "G45/G43"},
- {PCI_CHIP_Q45_G, "Q45/Q43"},
-+ {PCI_CHIP_G41_G, "G41"},
- {-1, NULL}
- };
-
-@@ -282,6 +283,7 @@ static PciChipsets I830PciChipsets[] = {
- {PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
- {PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
-+ {PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED}
- };
-
-@@ -924,19 +926,18 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
- i830_lvds_init(pScrn);
-
- if (IS_I9XX(pI830)) {
-- if (INREG(SDVOB) & SDVO_DETECTED) {
-- Bool found = i830_sdvo_init(pScrn, SDVOB);
-+ Bool found;
-+ found = i830_sdvo_init(pScrn, SDVOB);
-
-- if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
-- i830_hdmi_init(pScrn, SDVOB);
-- }
-+ if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)
-+ && (INREG(SDVOB) & SDVO_DETECTED))
-+ i830_hdmi_init(pScrn, SDVOB);
-
-- if (INREG(SDVOC) & SDVO_DETECTED) {
-- Bool found = i830_sdvo_init(pScrn, SDVOC);
-+ found = i830_sdvo_init(pScrn, SDVOC);
-
-- if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
-- i830_hdmi_init(pScrn, SDVOC);
-- }
-+ if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)
-+ && (INREG(SDVOC) & SDVO_DETECTED))
-+ i830_hdmi_init(pScrn, SDVOC);
- } else {
- i830_dvo_init(pScrn);
- }
-@@ -1230,6 +1231,9 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
- case PCI_CHIP_Q45_G:
- chipname = "Q45/Q43";
- break;
-+ case PCI_CHIP_G41_G:
-+ chipname = "G41";
-+ break;
- default:
- chipname = "unknown chipset";
- break;
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/patches/patch-ab
--- a/x11/xf86-video-intel/patches/patch-ab Tue May 05 04:22:30 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/07/28 16:58:06 tnn Exp $
-
---- configure.orig 2008-07-23 09:35:10.000000000 +0200
-+++ configure
-@@ -22026,16 +22026,8 @@ echo $ECHO_N "checking for ${sdkdir}/sar
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "${sdkdir}/sarea.h"; then
-- eval "$as_ac_File=yes"
--else
- eval "$as_ac_File=no"
- fi
--fi
- ac_res=`eval echo '${'$as_ac_File'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/patches/patch-ae
--- a/x11/xf86-video-intel/patches/patch-ae Tue May 05 04:22:30 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/01/05 13:18:18 hasso Exp $
-
---- src/common.h.orig 2008-11-13 22:13:56 +0200
-+++ src/common.h 2009-01-05 13:37:17 +0200
-@@ -323,6 +323,11 @@ extern int I810_DEBUG;
- #define PCI_CHIP_Q45_G_BRIDGE 0x2E10
- #endif
-
-+#ifndef PCI_CHIP_G41_G
-+#define PCI_CHIP_G41_G 0x2E32
-+#define PCI_CHIP_G41_G_BRIDGE 0x2E30
-+#endif
-+
- #if XSERVER_LIBPCIACCESS
- #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
- #define VENDOR_ID(p) (p)->vendor_id
-@@ -355,7 +360,7 @@ extern int I810_DEBUG;
- #define IS_I945G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_G)
- #define IS_I945GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GME)
- #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
--#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G)
-+#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) ==
PCI_CHIP_G41_G)
- #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
- #define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) ==
PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_GM45(pI810) || IS_G4X(pI810))
- #define IS_G33CLASS(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G33_G ||\
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/patches/patch-af
--- a/x11/xf86-video-intel/patches/patch-af Tue May 05 04:22:30 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/01/05 13:18:18 hasso Exp $
-
---- src/i810_driver.c.orig 2008-11-13 22:13:56 +0200
-+++ src/i810_driver.c 2009-01-05 13:37:17 +0200
-@@ -156,6 +156,7 @@ static const struct pci_id_match intel_d
- INTEL_DEVICE_MATCH (PCI_CHIP_IGD_E_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
- { 0, 0, 0 },
- };
-
-@@ -212,6 +213,7 @@ static SymTabRec I810Chipsets[] = {
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
- {PCI_CHIP_G45_G, "G45/G43"},
- {PCI_CHIP_Q45_G, "Q45/Q43"},
-+ {PCI_CHIP_G41_G, "G41"},
- {-1, NULL}
- };
-
-@@ -245,6 +247,7 @@ static PciChipsets I810PciChipsets[] = {
- {PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
- {PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
-+ {PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED }
- };
-
-@@ -812,6 +815,7 @@ I810Probe(DriverPtr drv, int flags)
- case PCI_CHIP_IGD_E_G:
- case PCI_CHIP_G45_G:
- case PCI_CHIP_Q45_G:
-+ case PCI_CHIP_G41_G:
- xf86SetEntitySharable(usedChips[i]);
-
- /* Allocate an entity private if necessary */
diff -r 20c64a445d49 -r 700191c36ba0 x11/xf86-video-intel/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-intel/patches/patch-ag Tue May 05 04:27:29 2009 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 2009/05/05 04:27:30 joerg Exp $
+
+Unbreaks LVDS on Latitude D430.
+
+--- src/i830_lvds.c.orig 2009-05-05 06:24:41.000000000 +0200
++++ src/i830_lvds.c
+@@ -1422,12 +1422,14 @@ i830_lvds_init(ScrnInfoPtr pScrn)
+ DisplayModePtr lvds_ddc_mode = NULL;
+ struct i830_lvds_priv *dev_priv;
+
++#if 0
+ if (!pI830->integrated_lvds) {
+ if (pI830->debug_modes)
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Skipping LVDS from driver feature BDB's LVDS config info.\n");
+ return;
+ }
++#endif
+
+ if (pI830->quirk_flag & QUIRK_IGNORE_LVDS)
+ return;
Home |
Main Index |
Thread Index |
Old Index