From 48069f777302c071ad19777021f1b8b4be1ee0f6 Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 23 Apr 2008 19:00:46 +0000 Subject: Update to xf86-video-intel-2.3.0. As usual, a very long ChangeLog[1], which I won't copy here. In brief: - new Intel Mobile graphics chipset support - XvMC for 915/945 [1] 2.3.0: http://lists.freedesktop.org/archives/intel-gfx/2008-April/000088.html 2.2.99.903: http://lists.freedesktop.org/archives/intel-gfx/2008-April/000075.html 2.2.99.902: http://lists.freedesktop.org/archives/intel-gfx/2008-March/000029.html 2.2.99.901: http://lists.freedesktop.org/archives/intel-gfx/2008-March/000012.html --- x11/xf86-video-intel/Makefile | 5 ++--- x11/xf86-video-intel/PLIST | 3 ++- x11/xf86-video-intel/distinfo | 12 +++++------- x11/xf86-video-intel/patches/patch-aa | 13 ------------- x11/xf86-video-intel/patches/patch-ab | 17 ++++------------- x11/xf86-video-intel/patches/patch-ac | 15 --------------- 6 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 x11/xf86-video-intel/patches/patch-aa delete mode 100644 x11/xf86-video-intel/patches/patch-ac diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile index 67410d178bc..69501906c27 100644 --- a/x11/xf86-video-intel/Makefile +++ b/x11/xf86-video-intel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2008/03/20 17:00:38 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2008/04/23 19:00:46 tnn Exp $ -DISTNAME= xf86-video-intel-2.2.1 -PKGREVISION= 1 +DISTNAME= xf86-video-intel-2.3.0 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-intel/PLIST b/x11/xf86-video-intel/PLIST index dbdaf0941cc..a1843eccf9e 100644 --- a/x11/xf86-video-intel/PLIST +++ b/x11/xf86-video-intel/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/13 17:50:11 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/04/23 19:00:46 tnn 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 diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo index d24cbc6f9dd..eda569682e7 100644 --- a/x11/xf86-video-intel/distinfo +++ b/x11/xf86-video-intel/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.6 2008/03/20 17:00:38 joerg Exp $ +$NetBSD: distinfo,v 1.7 2008/04/23 19:00:46 tnn Exp $ -SHA1 (xf86-video-intel-2.2.1.tar.bz2) = 7180c7ab83e3334053bd1bec1cdd1755b529e19c -RMD160 (xf86-video-intel-2.2.1.tar.bz2) = 5746abeb91d5b017d54cb26d2689b34c492496a7 -Size (xf86-video-intel-2.2.1.tar.bz2) = 604749 bytes -SHA1 (patch-aa) = d0a27b41536e665a898d41a6a671a595bab57f3f -SHA1 (patch-ab) = d9d43a87b26f8d9463ede28f082a469682173484 -SHA1 (patch-ac) = cfe8b6ea125e6e6ddbcad2afb875a575c7c610da +SHA1 (xf86-video-intel-2.3.0.tar.bz2) = a257c12739b94b5897a0c21cd9b8da46bd311d24 +RMD160 (xf86-video-intel-2.3.0.tar.bz2) = 4680b4cab5f3bb2fdc1e536be800c16f2e0e634e +Size (xf86-video-intel-2.3.0.tar.bz2) = 663384 bytes +SHA1 (patch-ab) = b0cb0975f3f0e5678ad967d560378ada9b3361b6 SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08 diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa deleted file mode 100644 index c6fdf2eaaee..00000000000 --- a/x11/xf86-video-intel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2007/08/15 19:09:51 joerg Exp $ - ---- configure.ac.orig 2007-08-15 20:24:10.000000000 +0200 -+++ configure.ac -@@ -96,7 +96,7 @@ AM_CONDITIONAL(HAVE_PCIACCESS, test "x$h - # Checks for header files. - AC_HEADER_STDC - --if test "$DRI" != no; then -+if test "x$DRI" = xauto; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], diff --git a/x11/xf86-video-intel/patches/patch-ab b/x11/xf86-video-intel/patches/patch-ab index 1c93dd375e0..e77f5140a6f 100644 --- a/x11/xf86-video-intel/patches/patch-ab +++ b/x11/xf86-video-intel/patches/patch-ab @@ -1,17 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2007/08/15 19:09:51 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2008/04/23 19:00:46 tnn Exp $ ---- configure.orig 2007-07-02 23:47:55.000000000 +0200 +--- configure.orig 2008-04-23 07:44:07.000000000 +0200 +++ configure -@@ -21062,7 +21062,7 @@ _ACEOF - fi - - --if test "$DRI" != no; then -+if test "x$DRI" = xauto; then - as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh` - { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5 - echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; } -@@ -21733,16 +21733,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA +@@ -21849,16 +21849,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 @@ -19,7 +10,7 @@ $NetBSD: patch-ab,v 1.1 2007/08/15 19:09:51 joerg Exp $ - { { 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 "$XORG_SGML_PATH/X11/defs.ent"; then +-if test -r "${sdkdir}/sarea.h"; then - eval "$as_ac_File=yes" -else eval "$as_ac_File=no" diff --git a/x11/xf86-video-intel/patches/patch-ac b/x11/xf86-video-intel/patches/patch-ac deleted file mode 100644 index e0a78c8b88b..00000000000 --- a/x11/xf86-video-intel/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/03/01 23:33:09 tnn Exp $ - -http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commit;h=02a3b80ee8341968dbce5b7cb871b187db5ff805 - ---- src/i830_debug.c.orig 2008-02-22 20:54:52.000000000 +0100 -+++ src/i830_debug.c -@@ -623,7 +623,7 @@ static struct i830SnapshotRec { - DEFINEREG(TV_H_CHROMA_59), - - DEFINEREG(MI_MODE), -- DEFINEREG(MI_DISPLAY_POWER_DOWN), -+ /* DEFINEREG(MI_DISPLAY_POWER_DOWN), CRL only */ - DEFINEREG(MI_ARB_STATE), - DEFINEREG(MI_RDRET_STATE), - DEFINEREG(ECOSKPD), -- cgit v1.2.3